Merge branch 'dev'

* dev: no message v0.8
TheNewNormal · Mar 3, 2015 · 6b25376 · 6b25376
2 parents cda6e30 + ee2910b
commit 6b25376
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/CoreOS GUI/CoreOS GUI-Info.plist b/src/CoreOS GUI/CoreOS GUI-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.9</string>
+	<string>0.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>331</string>
+	<string>335</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/load_docker_images.command b/src/load_docker_images.command
@@ -21,11 +21,10 @@ cd ~/coreos-osx/docker_images
 
 for file in *.tar
 do
-    echo "Loading docker image $file"
+    echo "Loading docker image: $file"
     docker load < $file
 done
 
-echo " "
 echo "Done !!!"
 echo " "
 pause 'Press [Enter] key to continue...'
diff --git a/src/set_env.command b/src/set_env.command
@@ -11,7 +11,7 @@ mkdir -p ~/coreos-osx/.env
 
 # save App's Resouces folder
 echo "$1" > ~/coreos-osx/.env/resouces_path
-sed -i "" 's/S G/S\ G/g' ~/coreos-osx/.env/resouces_path
+#sed -i "" 's/S G/S\ G/g' ~/coreos-osx/.env/resouces_path
 
 # save App's version
 echo "$2" > ~/coreos-osx/.env/version

diff --git a/src/vagrant_up.command b/src/vagrant_up.command
@@ -18,7 +18,7 @@ export PATH=${HOME}/coreos-osx/bin:$PATH
 
 # set etcd endpoint
 export ETCDCTL_PEERS=http://172.19.8.99:4001
-echo "etcd ls /:"
+echo "etcdctl ls /:"
 etcdctl --no-sync ls /
 echo ""
 
@@ -32,7 +32,7 @@ echo ""
 # list fleet units
 cd ~/coreos-osx/fleet
 fleetctl start *.service
-echo "fleet list-units:"
+echo "fleetctl list-units:"
 fleetctl list-units
 echo " "