diff --git a/resources/install b/resources/install index ad6951aebf..f3535ec9fd 100755 --- a/resources/install +++ b/resources/install @@ -36,6 +36,8 @@ echo ' ' > /Library/LaunchAgents/com.kitematic.route.plist sudo -u $USER $DIR/boot2docker init --lowerip=192.168.59.103 --upperip=192.168.59.103 +VBoxManage modifyvm boot2docker-vm --nic2 hostonly --nictype2 virtio --cableconnected2 on --hostonlyadapter2 vboxnet0 +VBoxManage dhcpserver add --netname=vboxnet0 --ip=192.168.59.99 --netmask=255.255.255.0 --lowerip=192.168.59.103 --upperip=192.168.59.103 # Add entries to routing table for Kitematic VM /sbin/route delete 172.17.0.0/16 192.168.59.103 diff --git a/script/dist.sh b/script/dist.sh index 56c145a351..1aecd569a3 100755 --- a/script/dist.sh +++ b/script/dist.sh @@ -6,6 +6,7 @@ source $DIR/colors.sh source $DIR/versions.sh BASE=$DIR/.. + pushd $BASE if [ ! -d bundle ]; then @@ -18,6 +19,7 @@ rm -rf dist/osx/Kitematic.zip mkdir -p dist/osx/ cecho "-----> Creating Kitematic.app..." $blue +find cache/node-webkit -name "debug\.log" -print0 | xargs -0 rm -rf cp -R cache/node-webkit/node-webkit.app dist/osx/ mv dist/osx/node-webkit.app dist/osx/Kitematic.app mkdir -p dist/osx/Kitematic.app/Contents/Resources/app.nw @@ -50,8 +52,8 @@ if [ -f $DIR/sign.sh ]; then fi pushd dist/osx -cecho "-----> Creating disributable zip file...." $blue -zip -rq --display-dots Kitematic.zip Kitematic.app + cecho "-----> Creating disributable zip file...." $blue + ditto -c -k --sequesterRsrc --keepParent Kitematic.app Kitematic.zip popd cecho "Done." $green diff --git a/script/versions.sh b/script/versions.sh index 0c12c7cd49..f1f7853a2f 100644 --- a/script/versions.sh +++ b/script/versions.sh @@ -4,8 +4,8 @@ BASE_IMAGE_FILE=base-images.tar.gz VIRTUALBOX_FILE=virtualbox-4.3.12.pkg -BOOT2DOCKER_CLI_VERSION=1.1.2 +BOOT2DOCKER_CLI_VERSION=1.2.0 BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION BOOT2DOCKER_CLI_FILE=boot2docker -COCOASUDO_FILE=cocoasudo \ No newline at end of file +COCOASUDO_FILE=cocoasudo