root/NCscripts/backup.sh

@@ -420,10 +420,8 @@ fi
 
 
 ### Log start of script operations
-echo -e "${note}${stamp}--- Start $scriptName execution ---${normal}" \
+echo -e "${note}${stamp}-- Start $scriptName execution ---${normal}" \
     >> "$logFile"
-echo -e "${info}${stamp}-- [INFO] Log file located at ${lit}${logFile}${info}" \
-    "--${normal}" >> "$logFile"
 
 
 ### Export logFile variable for use by Borg
@@ -437,7 +435,7 @@ echo -e "${info}${stamp} -- [INFO] mySQL dump file will be stored" \
     "at: ${lit}${sqlDumpDir}/${sqlDumpFile}${normal}" >> "$logFile"
 
 
-### 503 error page: If you don't plan on using the auto-copied 503 then comment
+### 503 error page: If you dont' plan on using the auto-copied 503 then comment
 ### this entire section starting with '--- Begin 503 section ---' until
 ### '--- End 503 section ---' to suppress generated warnings
 
@@ -694,16 +692,16 @@ export TMPDIR="${BORG_BASE_DIR}/tmp"
 # commandline depends on whether borgExclude is empty or not
 if [ -z "$borgExclude" ]; then
     # borgExclude is empty
-    echo -e "${info}${stamp} --[INFO] Executing borg without exclusions --" \
-        "${normal}" >> "$logFile"
+    echo -e "${bold}${op}${stamp} Executing borg without exclusions${normal}" \
+        >> "$logFile"
     borg --show-rc create ${borgCreateParams} ::`date +%Y-%m-%d_%H%M%S` \
         ${xtraFiles[@]} \
         ${sqlDumpDir} ${ncDataDir} \
         2>> "$logFile"
 else
     # borgExclude is not empty
-    echo -e "${info}${stamp} --[INFO] Executing borg with exclusions --" \
-        "${normal}" >> "$logFile"
+    echo -e "${bold}${op}${stamp} Executing borg with exclusions${normal}" \
+        >> "$logFile"
     borg --show-rc create ${borgCreateParams} --exclude-from ${borgExclude} \
         ::`date +%Y-%m-%d_%H%M%S` \
         ${xtraFiles[@]} \
@@ -730,8 +728,8 @@ fi
 # command depends on whether or not parameters have been defined
 if [ -n "$borgPrune" ]; then
     # parameters defined
-    echo -e "${info}${stamp} --[INFO] Executing borg prune operation --" \
-        "${normal}" >> "$logFile"
+    echo -e "${bold}${op}${stamp} Executing borg prune operation${normal}" \
+        >> "$logFile"
     borg prune --show-rc -v ${borgPruneParams} ${borgPrune} \
         2>> "$logFile"
     # check return-status