From bf0588cbca3b1d9a3afb36d6863e9ee1882591cd Mon Sep 17 00:00:00 2001
From: Rimantas Mocevicius <rmocius@gmail.com>
Date: Mon, 4 Jan 2016 18:11:39 +0000
Subject: [PATCH] v0.4.0

---
 src/Kube-Solo/Kube-Solo-Info.plist |  4 ++--
 src/bin/install_deis               |  6 +-----
 src/fetch_latest_iso.command       | 10 +++++++---
 src/first-init.command             |  7 +++++++
 src/functions.sh                   |  8 ++++++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist
index b56b341..3de0cf8 100644
--- a/src/Kube-Solo/Kube-Solo-Info.plist
+++ b/src/Kube-Solo/Kube-Solo-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.9</string>
+	<string>0.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>133</string>
+	<string>135</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/src/bin/install_deis b/src/bin/install_deis
index ef3a16d..57fcc2c 100755
--- a/src/bin/install_deis
+++ b/src/bin/install_deis
@@ -14,16 +14,12 @@ echo "helm is installed to ~/kube-solo/bin ... "
 
 # run helm for the first time
 helm up
-
 # add Chart repo
 helm repo add kube-charts https://github.com/TheNewNormal/kube-charts
-
 # Get the latest version of all Charts from repos
 helm up
-
 # Fetch Deis-Lite Chart to your helm's working directory
 helm fetch kube-charts/deis-lite
-
 # Install Deis-Lite PaaS
 helm install deis-lite
 
@@ -60,6 +56,6 @@ echo " "
 echo "Please read how to:" 
 echo "Deploy Applications - https://github.com/deis/workflow/blob/master/docs/src/using-deis/deploying-an-application.md"
 echo "To manage Applications - https://github.com/deis/workflow/blob/master/docs/src/using-deis/managing-an-application.md"
-echo "Using Deis - https://github.com/deis/workflow/tree/master/docs/src/using-deis"
+echo "Using Deis PaaS - https://github.com/deis/workflow/tree/master/docs/src/using-deis"
 echo " "
 
diff --git a/src/fetch_latest_iso.command b/src/fetch_latest_iso.command
index 9ae3e3a..599e33b 100755
--- a/src/fetch_latest_iso.command
+++ b/src/fetch_latest_iso.command
@@ -19,9 +19,13 @@ echo " "
 echo "Fetching lastest CoreOS $CHANNEL channel ISO ..."
 echo " "
 #
-"${res_folder}"/bin/corectl pull --channel="$CHANNEL"
+"${res_folder}"/bin/corectl pull --channel="$CHANNEL" 2>&1 | tee ~/kube-solo/tmp/check_channel
+CHECK_CHANNEL=$(cat ~/kube-solo/tmp/check_channel | grep "already available")
 #
-echo " "
-echo "You need to reload your VM to be booted from the lastest version !!! "
+if [[ "$CHECK_CHANNEL" == "" ]]; then
+    echo " "
+    echo "You need to reload your VM to be booted from the lastest version !!! "
+fi
+rm -f ~/kube-solo/tmp/check_channel
 echo " "
 pause 'Press [Enter] key to continue...'
diff --git a/src/first-init.command b/src/first-init.command
index 8e9c0e9..8b01e16 100755
--- a/src/first-init.command
+++ b/src/first-init.command
@@ -75,6 +75,13 @@ install_k8s_files
 download_osx_clients
 #
 
+# run helm for the first time
+helm up
+# add kube-charts repo
+helm repo add kube-charts https://github.com/TheNewNormal/kube-charts
+# Get the latest version of all Charts from repos
+helm up
+
 # set etcd endpoint
 export ETCDCTL_PEERS=http://$vm_ip:2379
 
diff --git a/src/functions.sh b/src/functions.sh
index e43df11..35c7ce1 100755
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -76,11 +76,15 @@ if [ -z "$disk_size" ]
 then
     echo " "
     echo "Creating 5GB disk ..."
-    dd if=/dev/zero of=root.img bs=1024 count=0 seek=$[1024*5120]
+### dd if=/dev/zero of=root.img bs=1m count=$[5120]
+    mkfile 5g root.img
+    echo "Created 5GB ROOT disk"
 else
     echo " "
     echo "Creating "$disk_size"GB disk (it could take a while for big disks)..."
-    dd if=/dev/zero of=root.img bs=1024 count=0 seek=$[1024*$disk_size*1024]
+###    dd if=/dev/zero of=root.img bs=1m count=$[$disk_size*1024]
+    mkfile "$disk_size"g root.img
+    echo "Created "$disk_size"GB ROOT disk"
 fi
 echo " "
 #