diff --git a/osx/Dockerfile b/osx/Dockerfile index da08a9f7..8deef214 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re ENV KITEMATIC_VERSION 0.8.1 RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip -ENV INSTALLER_VERSION 1.8.0a +ENV INSTALLER_VERSION 1.8.0b ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution index 25d058ba..d355a242 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); } diff --git a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/main.scpt index aab9065f..2cc43942 100644 Binary files a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/main.scpt and b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/main.scpt differ diff --git a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh index bc822bd3..10bf5cf6 100755 --- a/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh +++ b/osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh @@ -21,13 +21,13 @@ fi $VBOXMANAGE showvminfo $VM &> /dev/null VM_EXISTS_CODE=$? -if [ $VM_EXISTS_CODE -ne 0 ]; then +if [ $VM_EXISTS_CODE -eq 1 ]; then echo "Creating Machine $VM..." $DOCKER_MACHINE rm -f $VM &> /dev/null rm -rf ~/.docker/machine/machines/$VM - $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM + $DOCKER_MACHINE -D create -d virtualbox --virtualbox-memory 2048 $VM else - echo "Machine $VM already exists." + echo "Machine $VM already exists in VirtualBox." fi echo "Starting machine $VM..." diff --git a/windows/start.sh b/windows/start.sh index 1a3b1f50..76964ecc 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -32,7 +32,7 @@ echo "Starting machine $VM..." $DOCKER_MACHINE start $VM echo "Setting environment variables for machine $VM..." -eval "$($DOCKER_MACHINE env $VM 2>/dev/null)" +eval "$($DOCKER_MACHINE env $VM)" clear cat << EOF