Fix minor bugs

Fix notifications

README.md

@@ -1,2 +1,10 @@
-# simple_backup
+# simple-backup
-A simple backup script using rsync
+A simple backup script
+
+## Description
+simple-backup is just a bash script that allows you to backup your files.
+It reads from a configuration file the files/directories that must be copied,
+the destination directory for the backup and a few other options.
+
+## Dependencies
+rsync is used to perform the backup.  

simple-backup

@@ -15,12 +15,11 @@
 #You should have received a copy of the GNU General Public License
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#Version 1.2.2
 #Simple backup script. Reads options, sources and destination from a configuration file or standard input
 
 #Help function
 function help_function {
-   echo "simple_backup, version 1.2.3"
+   echo "simple_backup, version 1.3.1"
    echo ""
    echo "Usage: $0 [OPTIONS]"
    echo ""
@@ -55,9 +54,8 @@ function read_conf {
       if [[ ! -f "$CONFIG" ]]; then
          #If default config file doesn't exist, exit
          echo "$(date): Backup failed (see errors.log)" >> $LOG
+         echo "Backup failed"
          echo "Error: Configuration file not found" | tee $ERR
-         #If libnotify is installed, show desktop notification that backup failed
-         ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
 
          mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
          mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -72,10 +70,8 @@ function read_conf {
       if [[ ! -f "$CONFIG" ]]; then
          #If the provided configuration file doesn't exist, exit
          echo "$(date): Backup failed (see errors.log)" >> $LOG
+         echo "Backup failed"
          echo "Error: Configuration file not found" | tee -a $ERR
-         #If libnotify is installed, show desktop notification that backup failed
-         ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
-
          mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
          mv $ERR "$HOMEDIR/.simple_backup/errors.log"
          mv $WARN "$HOMEDIR/.simple_backup/warnings.log"
@@ -108,9 +104,8 @@ function read_conf {
    if [[ -z "$BACKUP_DEV" || ! -d "$BACKUP_DEV" ]]; then
       #If the backup directory is not set or doesn't exist, exit
       echo "$(date): Backup failed (see errors.log)" >> $LOG
+      echo "Backup failed"
       echo "Error: Output folder \"$BACKUP_DEV\" not found" | tee -a $ERR
-      #If libnotify is installed, show desktop notification that backup failed
-      ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
    
       mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
       mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -174,9 +169,8 @@ function parse_options {
 
                if [[ -z "$input" ]]; then
                   echo "$(date): Backup failed (see errors.log)" >> $LOG
+                  echo "Backup failed"
                   echo "Error: bad options format" | tee -a $ERR
-                  #If libnotify is installed, show desktop notification that backup failed
-                  ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
 
                   mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
                   mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -206,9 +200,8 @@ function parse_options {
 
             if [[ -z "$BACKUP_DEV" || ! -d "$BACKUP_DEV" ]]; then
                echo "$(date): Backup failed (see errors.log)" >> $LOG
+               echo "Backup failed"
                echo "Error: output folder \"$BACKUP_DEV\" not found" | tee -a $ERR
-               #If libnotify is installed, show desktop notification that backup failed
-               ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
 
                mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
                mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -264,13 +257,16 @@ function parse_options {
 
                if [[ ! -d "/home/$2" ]]; then
                   echo "$(date): Backup failed (see errors.log)" >> $LOG
+                  echo "Backup failed"
                   echo "Error: user $2 doesn't exist" | tee -a $ERR
-                  #If libnotify is installed, show desktop notification that backup failed
+                  
-                  ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
+                  if [[ ! -d "$HOMEDIR/.simple_backup" ]]; then
+                     mkdir "$HOMEDIR/.simple_backup"
+                  fi
 
-                  mv $LOG "HOMEDIR/.simple_backup/simple_backup.log"
+                  mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
-                  mv $ERR "HOMEDIR/.simple_bakup/errors.log"
+                  mv $ERR "$HOMEDIR/.simple_backup/errors.log"
-                  mv $WARN "HOMEDIR/.simple_backup/warnings.log"
+                  mv $WARN "$HOMEDIR/.simple_backup/warnings.log"
 
                   exit 1
                fi
@@ -286,7 +282,7 @@ function parse_options {
                fi
 
                HOMEDIR="/home/$2"
-               config="/home/$2/.simple_backup/config"
+               CONFIG="/home/$2/.simple_backup/config"
                USER="$2"
                
                read_conf "$config"
@@ -296,9 +292,8 @@ function parse_options {
 
          *)
             echo "$(date): Backup failed (see errors.log)" >> $LOG
+            echo "Backup failed"
             echo "Error: Option $1 not recognised. Use 'simple-backup -h' to see available options" | tee -a $ERR
-            #If libnotify is installed, show desktop notification that backup failed
-            ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup failed"
 
             mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
             mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -340,9 +335,8 @@ fi
 
 if [[ -z $n_in || $n_in -eq 0 ]]; then
    echo "$(date): Backup finished (no files copied)" >> $LOG
+   echo "Backup finished"
    echo "Warning: no valid input selected. Nothing to do" | tee -a $WARN
-   #If libnotify is installed, show desktop notification that backup finished
-   ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup finished (warnings)"
                
    mv $LOG "$HOMEDIR/.simple_backup/simple_backup.log"
    mv $ERR "$HOMEDIR/.simple_backup/errors.log"
@@ -352,8 +346,7 @@ if [[ -z $n_in || $n_in -eq 0 ]]; then
 fi
 
 echo "$(date): Starting backup" > $LOG
-#If libnotify is installed, show desktop notification that backup is starting
+echo "Starting backup..."
-! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Starting backup"
 
 #If specified, keep the last n backups and remove the others. Default: keep all
 if [[ -n $KEEP ]]; then
@@ -361,7 +354,8 @@ if [[ -n $KEEP ]]; then
    N_BACKUP=$(($N_BACKUP-1))
 
    if [[ $N_BACKUP -gt $KEEP ]]; then
-      echo "$(date): Removing old backups..." >> $LOG
+     echo "$(date): Removing old backups" >> $LOG
+      echo "Removing old backups..."
       REMOVE=$(mktemp)
       find $BACKUP_DEV/simple_backup/* -maxdepth 0 -type d | sort | head -n $(($N_BACKUP - $KEEP)) >> $REMOVE
 
@@ -371,6 +365,8 @@ if [[ -n $KEEP ]]; then
          echo "Removed backup: $line" >> $LOG
       done<$REMOVE
 
+      echo "Removed old backups"
+
       rm $REMOVE  
    fi
       
@@ -381,6 +377,8 @@ if [[ ! -z "$INPUTS" ]]; then
    sort "$INPUTS" -o "$INPUTS"
 fi
 
+echo "Copying files. This may take a long time..."
+
 if [[ -z "$LAST_BACKUP" ]]; then
    rsync -acrv -H -X -R --exclude-from="$EXCLUDE" --files-from="$INPUTS" / "$BACKUP_DIR" --ignore-missing-args >> $LOG 2>> $ERR
 else
@@ -390,13 +388,13 @@ fi
 #Update the logs
 if [[ $(cat $ERR | wc -l) -gt 0 ]]; then
    echo "$(date): Backup finished with errors" >> $LOG
-   error_flag=1
+   echo "Backup finished with errors"
 elif [[ $(cat $WARN | wc -l) -gt 0 ]]; then
    echo "$(date): Backup finished with warnings" >> $LOG
-   error_flag=2
+   echo "Backup finished (warnings)"
 else
    echo "$(date): Backup finished" >> $LOG
-   error_flag=0
+   echo "Backup finished"
 fi
 
 #Fix ownership and permissions of log files if needed
@@ -426,12 +424,4 @@ fi
 BACKUP_DIR_FULL=$(readlink -f "$BACKUP_DIR")
 ln -sf "$BACKUP_DIR_FULL" "$BACKUP_DEV/simple_backup/last_backup"
 
-if [[ $error_flag -eq 0 ]]; then
-   ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup finished"
-elif [[ $error_flag -eq 1 ]]; then
-   ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup finished (errors)"
-else
-   ! command -v notify-send > /dev/null 2>&1 || DISPLAY=:0.0 notify-send -u low -t 10000 "Backup finished (warnings)"
-fi
-
 exit 0