From c36fba4b996c084f83e8d4c4f91b050d3c37ed2b Mon Sep 17 00:00:00 2001
From: Manuel Hutter <manuel.hutter@gmail.com>
Date: Tue, 17 Jun 2014 19:04:22 +0200
Subject: [PATCH 1/3] Fixed global explorers on OSX

---
 cdist/conf/explorer/cpu_cores   | 23 ++++++++++++++++-------
 cdist/conf/explorer/cpu_sockets | 21 +++++++++++++++------
 cdist/conf/explorer/memory      | 16 +++++++++++++---
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
index efabc848..25d91f79 100755
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@@ -22,10 +22,19 @@
 
 # FIXME: other system types (not linux ...)
 
-if [ -r /proc/cpuinfo ]; then
-    cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)"
-    if [ ${cores} -eq 0 ]; then
-        cores="1"
-    fi
-    echo "${cores}"
-fi
+os=$("$__explorer/os")
+case "$os" in
+    "macosx")
+        echo "$(sysctl -n hw.physicalcpu)"
+    ;;
+
+    *)
+        if [ -r /proc/cpuinfo ]; then
+            cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)"
+            if [ ${cores} -eq 0 ]; then
+                cores="1"
+            fi
+            echo "$cores"
+        fi
+    ;;
+esac
diff --git a/cdist/conf/explorer/cpu_sockets b/cdist/conf/explorer/cpu_sockets
index 98836cec..42acac1c 100755
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@@ -22,10 +22,19 @@
 
 # FIXME: other system types (not linux ...)
 
-if [ -r /proc/cpuinfo ]; then
-    sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
-    if [ ${sockets} -eq 0 ]; then
-        sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
+os=$("$__explorer/os")
+case "$os" in
+    "macosx")
+        echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
+    ;;
+
+    *)
+    if [ -r /proc/cpuinfo ]; then
+        sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
+        if [ ${sockets} -eq 0 ]; then
+            sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
+        fi
+        echo "${sockets}"
     fi
-    echo "${sockets}"
-fi
+    ;;
+esac
diff --git a/cdist/conf/explorer/memory b/cdist/conf/explorer/memory
index 982b5dfa..c7dc9fb3 100755
--- a/cdist/conf/explorer/memory
+++ b/cdist/conf/explorer/memory
@@ -22,6 +22,16 @@
 
 # FIXME: other system types (not linux ...)
 
-if [ -r /proc/meminfo ]; then
-    echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')"
-fi
+os=$("$__explorer/os")
+case "$os" in
+    "macosx")
+        let memsize=$(sysctl -n hw.memsize)/1024
+        echo "$memsize"
+    ;;
+
+    *)
+    if [ -r /proc/meminfo ]; then
+        echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')"
+    fi
+    ;;
+esac

From e72782496434dd199f0816510bb189bd52d24b11 Mon Sep 17 00:00:00 2001
From: Manuel Hutter <manuel.hutter@gmail.com>
Date: Wed, 18 Jun 2014 10:19:21 +0200
Subject: [PATCH 2/3] `cat` and pipe diet

---
 cdist/conf/explorer/cpu_cores   | 2 +-
 cdist/conf/explorer/cpu_sockets | 2 +-
 cdist/conf/explorer/memory      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
index 25d91f79..7f7a955e 100755
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@@ -30,7 +30,7 @@ case "$os" in
 
     *)
         if [ -r /proc/cpuinfo ]; then
-            cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)"
+            cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
             if [ ${cores} -eq 0 ]; then
                 cores="1"
             fi
diff --git a/cdist/conf/explorer/cpu_sockets b/cdist/conf/explorer/cpu_sockets
index 42acac1c..8a8194df 100755
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@@ -30,7 +30,7 @@ case "$os" in
 
     *)
     if [ -r /proc/cpuinfo ]; then
-        sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
+        sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
         if [ ${sockets} -eq 0 ]; then
             sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
         fi
diff --git a/cdist/conf/explorer/memory b/cdist/conf/explorer/memory
index c7dc9fb3..a5cae048 100755
--- a/cdist/conf/explorer/memory
+++ b/cdist/conf/explorer/memory
@@ -31,7 +31,7 @@ case "$os" in
 
     *)
     if [ -r /proc/meminfo ]; then
-        echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')"
+        echo "$(grep "MemTotal:" /proc/meminfo | awk '{print $2}')"
     fi
     ;;
 esac

From 981f8068d26b6895e839bb0c98bd479b6edc7407 Mon Sep 17 00:00:00 2001
From: Manuel Hutter <manuel.hutter@gmail.com>
Date: Sat, 21 Jun 2014 14:24:10 +0200
Subject: [PATCH 3/3] code diet on "memory"

---
 cdist/conf/explorer/memory | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/explorer/memory b/cdist/conf/explorer/memory
index a5cae048..05db865f 100755
--- a/cdist/conf/explorer/memory
+++ b/cdist/conf/explorer/memory
@@ -25,13 +25,12 @@
 os=$("$__explorer/os")
 case "$os" in
     "macosx")
-        let memsize=$(sysctl -n hw.memsize)/1024
-        echo "$memsize"
+        echo "$(sysctl -n hw.memsize)/1024" | bc
     ;;
 
     *)
     if [ -r /proc/meminfo ]; then
-        echo "$(grep "MemTotal:" /proc/meminfo | awk '{print $2}')"
+        grep "MemTotal:" /proc/meminfo | awk '{print $2}'
     fi
     ;;
 esac