Merge pull request #1384 from chef/darwin_detection

Make sure macOS detection works even if the string changes
chef · Jul 31, 2020 · 791c7e2 · 791c7e2
2 parents abd9f55 + 50684f9
commit 791c7e2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/omnibus/files/uninstall-scripts/uninstall_chef_workstation b/omnibus/files/uninstall-scripts/uninstall_chef_workstation
@@ -14,7 +14,7 @@ error_exit()
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" 2>&1 >/dev/null
+  uname -a | grep "^Darwin" 2>&1 >/dev/null
 }
 
 if is_darwin; then

diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
@@ -7,7 +7,7 @@ version="${VERSION:-latest}"
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" >/dev/null 2>&1
+  uname -a | grep "^Darwin" 2>&1 >/dev/null
 }
 
 echo "--- Installing $channel $product $version"

diff --git a/omnibus/package-scripts/chef-workstation/postinst b/omnibus/package-scripts/chef-workstation/postinst
@@ -33,7 +33,7 @@ error_exit()
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" >/dev/null 2>&1
+  uname -a | grep "^Darwin" 2>&1 >/dev/null
 }
 
 if is_darwin; then

diff --git a/omnibus/package-scripts/chef-workstation/postrm b/omnibus/package-scripts/chef-workstation/postrm
@@ -6,7 +6,7 @@
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" 2>&1 >/dev/null
+  uname -a | grep "^Darwin" 2>&1 >/dev/null
 }
 
 cleanup_symlinks() {

diff --git a/omnibus/package-scripts/chef-workstation/preinst b/omnibus/package-scripts/chef-workstation/preinst
@@ -14,7 +14,7 @@ error_exit()
 
 is_darwin()
 {
-  uname -v | grep "^Darwin" 2>&1 >/dev/null
+  uname -a | grep "^Darwin" 2>&1 >/dev/null
 }
 
 if is_darwin; then