Merge pull request #24 from TheNewNormal/v0.4.8

v0.4.8

src/Kube-Solo/Kube-Solo-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.7</string>
+	<string>0.4.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>149</string>
+	<string>151</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/first-init.command

@@ -44,7 +44,19 @@ echo "Starting VM ..."
 echo " "
 echo -e "$my_password\n" | sudo -Sv > /dev/null 2>&1
 #
-sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml
+sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml 2>&1 | tee ~/kube-solo/logs/first-init_vm_up.log
+CHECK_VM_STATUS=$(cat ~/kube-solo/logs/first-init_vm_up.log | grep "started")
+#
+if [[ "$CHECK_VM_STATUS" == "" ]]; then
+    echo " "
+    echo "VM have not booted, please check '~/kube-solo/logs/first-init_vm_up.log' and report the problem !!! "
+    echo " "
+    pause 'Press [Enter] key to continue...'
+    exit 0
+else
+    echo "VM successfully started !!!" >> ~/kube-solo/logs/first-init_vm_up.log
+fi
+
 # check id /Users/homefolder is mounted, if not mount it
 "${res_folder}"/bin/corectl ssh k8solo-01 'source /etc/environment; if df -h | grep ${HOMEDIR}; then echo 0; else sudo systemctl restart ${HOMEDIR}; fi' > /dev/null 2>&1
 

src/kube-solo-install.command

@@ -6,6 +6,7 @@
     # create in "kube-solo" all required folders and files at user's home folder where all the data will be stored
     mkdir ~/kube-solo
     mkdir ~/kube-solo/tmp
+    mkdir ~/kube-solo/logs
     mkdir ~/kube-solo/bin
     mkdir ~/kube-solo/cloud-init
     mkdir ~/kube-solo/settings

src/reload.command

@@ -31,7 +31,19 @@ echo " "
 echo "Starting VM ..."
 echo -e "$my_password\n" | sudo -Sv > /dev/null 2>&1
 #
-sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml
+sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml 2>&1 | tee ~/kube-solo/logs/vm_reload.log
+CHECK_VM_STATUS=$(cat ~/kube-solo/logs/vm_reload.log | grep "started")
+#
+if [[ "$CHECK_VM_STATUS" == "" ]]; then
+    echo " "
+    echo "VM have not booted, please check '~/kube-solo/logs/vm_reload.log' and report the problem !!! "
+    echo " "
+    pause 'Press [Enter] key to continue...'
+    exit 0
+else
+    echo "VM successfully started !!!" >> ~/kube-solo/logs/vm_reload.log
+fi
+
 # check id /Users/homefolder is mounted, if not mount it
 "${res_folder}"/bin/corectl ssh k8solo-01 'source /etc/environment; if df -h | grep ${HOMEDIR}; then echo 0; else sudo systemctl restart ${HOMEDIR}; fi' > /dev/null 2>&1
 echo " "

src/up.command

@@ -20,6 +20,9 @@ then
     unzip "${res_folder}"/files/iTerm2.zip -d /Applications/
 fi
 
+# create logs dir
+mkdir ~/kube-solo/logs > /dev/null 2>&1
+
 # copy bin files to ~/kube-solo/bin
 rsync -r --verbose --exclude 'helm' "${res_folder}"/bin/* ~/kube-solo/bin/ > /dev/null 2>&1
 rm -f ~/kube-solo/bin/gen_kubeconfig
@@ -70,8 +73,20 @@ echo "Starting VM ..."
 echo " "
 echo -e "$my_password\n" | sudo -Sv > /dev/null 2>&1
 #
-sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml
-# check id /Users/homefolder is mounted, if not mount it
+sudo "${res_folder}"/bin/corectl load settings/k8solo-01.toml 2>&1 | tee ~/kube-solo/logs/vm_up.log
+CHECK_VM_STATUS=$(cat ~/kube-solo/logs/vm_up.log | grep "started")
+#
+if [[ "$CHECK_VM_STATUS" == "" ]]; then
+    echo " "
+    echo "VM have not booted, please check '~/kube-solo/logs/vm_up.log' and report the problem !!! "
+    echo " "
+    pause 'Press [Enter] key to continue...'
+    exit 0
+else
+    echo "VM successfully started !!!" >> ~/kube-solo/logs/vm_up.log
+fi
+
+# check if /Users/homefolder is mounted, if not mount it
 "${res_folder}"/bin/corectl ssh k8solo-01 'source /etc/environment; if df -h | grep ${HOMEDIR}; then echo 0; else sudo systemctl restart ${HOMEDIR}; fi' > /dev/null 2>&1
 
 # save VM's IP