diff --git a/osx/Dockerfile b/osx/Dockerfile
index aba578ed9b..4ebe479dd9 100644
--- a/osx/Dockerfile
+++ b/osx/Dockerfile
@@ -182,7 +182,7 @@ RUN sed -i \
-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
-e "s/%BOOT2DOCKER_ISO_VERSION%/$BOOT2DOCKER_ISO_VERSION/g" \
- -e "s/%DOCKERCLIAPP_VERSION%/$INSTALLER_VERSION/g" \
+ -e "s/%DOCKERQUICKSTARTTERMINALAPP_VERSION%/$INSTALLER_VERSION/g" \
-e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \
mpkg/Resources/en.lproj/Localizable.strings
diff --git a/osx/Makefile b/osx/Makefile
index 6771308fbd..813ebd639e 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -9,8 +9,6 @@ dockerbuild: clean
docker run --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)"
docker cp "$(DOCKER_CONTAINER)":/DockerToolbox.pkg .
docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true
- productsign --sign "3rd Party Mac Developer Installer: Docker Inc" DockerToolbox.pkg DockerToolboxSigned.pkg || true
- mv DockerToolboxSigned.pkg DockerToolbox.pkg || true
clean:
rm -f DockerToolbox.pkg
diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution
index b7940b53db..05f0cf001c 100644
--- a/osx/mpkg/Distribution
+++ b/osx/mpkg/Distribution
@@ -11,7 +11,7 @@
-
+
@@ -27,8 +27,8 @@
-
-
+
+
@@ -49,8 +49,8 @@
- #dockercliapp.pkg
-
+ #dockerquickstartterminalapp.pkg
+
#kitematicapp.pkg
@@ -98,11 +98,14 @@
try
{
/* Embedded scripts are not available here. So, just do a command
- line checking for running VMs instead. */
- rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep');
- result = (rcScript != 0);
- system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);
- } catch (e) { system.log(e); result = false; }
+ 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');
+ result = (rcScript != 0);
+ system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);
+ }
+ } catch (e) { system.log(e); }
if (!result)
{
@@ -114,10 +117,22 @@
system.log("result:" + result);
return result;
- }
+ }
+
+ function vboxNeedsUpgrade ()
+ {
+ try {
+ vboxplist = system.files.plistAtPath('/Applications/VirtualBox.app/Contents/Info.plist');
+ if (!vboxplist || !vboxplist.CFBundleVersion || system.compareVersions(vboxplist.CFBundleVersion, '%VBOX_VERSION') === -1) {
+ return true;
+ }
+
+ return false;
+ } catch (e){ system.log(e); return false; }
+ }
/* js:pkmk:end */
-
+
#VBoxKEXTs.pkg
#VirtualBox.pkg
#VirtualBoxCLI.pkg
diff --git a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Info.plist b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Info.plist
index a816fd8da2..5d9f64e0e0 100644
--- a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Info.plist
+++ b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Info.plist
@@ -11,7 +11,7 @@
CFBundleIconFile
applet
CFBundleIdentifier
- com.apple.ScriptEditor.id.dockercliapp
+ com.apple.ScriptEditor.id.dockerquickstartterminalapp
CFBundleInfoDictionaryVersion
6.0
CFBundleName
diff --git a/osx/mpkg/dockercliapp.pkg/PackageInfo b/osx/mpkg/dockercliapp.pkg/PackageInfo
deleted file mode 100644
index b349f74a4c..0000000000
--- a/osx/mpkg/dockercliapp.pkg/PackageInfo
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/osx/mpkg/dockerquickstartterminalapp.pkg/PackageInfo b/osx/mpkg/dockerquickstartterminalapp.pkg/PackageInfo
new file mode 100644
index 0000000000..137dc30325
--- /dev/null
+++ b/osx/mpkg/dockerquickstartterminalapp.pkg/PackageInfo
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+