Reorder startup messages

[sven/scripts.git] / hetzner / hetznerbackupv2.sh

diff --git a/hetzner/hetznerbackupv2.sh b/hetzner/hetznerbackupv2.sh
index 570ace5f51b061bcb8cf92f21d1929ad815a21bf..7f07a0461eb17f6cc51bfecbd5979eae80b6d05d 100755 (executable)
--- a/hetzner/hetznerbackupv2.sh
+++ b/hetzner/hetznerbackupv2.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-### Halt on errors
-#set -e
-### Halt on unset variables
-set -u
-
 ### Do not inherit the following variables
 # Safety net just in case some calls this
 # script in a bogus way.
@@ -28,10 +23,6 @@ ERRSTAT=0
 
 ## Backup job for main
 job_main() {
-    echo "" >> $SESSIONLOG
-    echo "Backing up main `date`" >>
-    echo "" >> $SESSIONLOG
-
     echo "Going for /etc" >> $SESSIONLOG
     duplicity $BMODE $dry /etc $PROTO://$FTP_USER@$FTP_HOST/main/etc >> $SESSIONLOG 2>&1 || ERRSTAT=1
     duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/etc >> $SESSIONLOG 2>&1 || ERRSTAT=1
@@ -56,7 +47,7 @@ job_main() {
     echo "" >> $SESSIONLOG
 }
 
-# Append the session log to the main logfile and remove it
+## Append the session log to the main logfile and remove it
 clean_log() {
    cat $SESSIONLOG >> $LOGFILE
    rm $SESSIONLOG
@@ -71,12 +62,17 @@ else
     touch $LOCKFILE
 fi
 
+### Starting
+    echo "" >> $SESSIONLOG
+    echo "Starting Backup `date`" >> $SESSIONLOG
+    echo "" >> $SESSIONLOG
+
 ### Set the duplicity backup mode we would like to use
 if [[ $(LANG=C; date +%A) =~ Sunday ]]; then
-    echo "Runing in full mode"
+    echo "Runing in full mode" >> $SESSIONLOG
     BMODE="full"
 else
-    echo "Runing in incr mode"
+    echo "Runing in incr mode" >> $SESSIONLOG
     BMODE="incr"
 fi