From 2c3299a98659c3f8839a714a1caf481d04b9d0db Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 12 Aug 2015 14:56:02 -0700 Subject: [PATCH] Check for Virtualbox.app Signed-off-by: Jeffrey Morgan --- osx/mpkg/Distribution | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution index 25d058ba1e..d355a2429f 100644 --- a/osx/mpkg/Distribution +++ b/osx/mpkg/Distribution @@ -114,7 +114,7 @@ { test = system.version['ProductVersion']; system.log("OS version detected: " + test); - result = (system.compareVersions(test, '10.6') >= 0); + result = (system.compareVersions(test, '10.9') >= 0); } catch (e) { system.log(e); result = false; } if (!result) @@ -131,7 +131,7 @@ line checking for running VMs instead. */ if (vboxNeedsUpgrade()) { system.log(vboxplist.CFBundleVersion); - rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep'); + rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox|VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep'); result = (rcScript != 0); system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result); }