move finished and date finished to main script

When running this in my environment, which is at imaging, I comment out the cleanAndReboot function as a reboot is already planned/triggered. This was making the logs less clean/informative.
krispayne · Jul 29, 2016 · fdf11a7 · fdf11a7
1 parent d19a3d2
commit fdf11a7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/ElCapitan_CIS.sh b/ElCapitan_CIS.sh
@@ -794,15 +794,14 @@ artifacts() {
 cleanAndReboot() {
 
     ScriptLogging "  -------------------  "
-    ScriptLogging "Finished! Time to restart..."
+    ScriptLogging "   Time to restart..."
     ScriptLogging "  -------------------  "
 
     #/usr/bin/killall Finder
     #/usr/bin/killall SystemUIServer
     #/usr/bin/killall -HUP blued
     # ^ do we really need this if rebooting?
 
-    ScriptLogging "$(date +%Y-%m-%d\ %H:%M:%S)"
     ScriptLogging " "
     /sbin/shutdown -r now
 }
@@ -826,6 +825,12 @@ mainScript() {
     systemAccess
     userEnvironment
     cleanAndReboot
+
+    ScriptLogging "  -------------------  "
+    ScriptLogging "       Finished!"
+    ScriptLogging "  -------------------  "
+    ScriptLogging " "
+    ScriptLogging "$(date +%Y-%m-%d\ %H:%M:%S)"
 }
 
 # Run mainScript