diff --git a/zzz_evobackup b/zzz_evobackup index 633fb69..999bc80 100755 --- a/zzz_evobackup +++ b/zzz_evobackup @@ -88,20 +88,20 @@ pick_server() { } ## Verify other evobackup process and kill if needed -PIDFILE="/var/run/evobackup.pid" -if [ -e "${PIDFILE}" ]; then - pid=$(cat "${PIDFILE}") +PIDFILE=/var/run/evobackup.pid +if [ -e $PIDFILE ]; then + pid=$(cat "$PIDFILE") # Killing the childs of evobackup. - for ppid in $(ps h --ppid "${pid}" -o pid | tr -s '\n' ' '); do - kill -9 "${ppid}"; + for ppid in $(ps h --ppid "$pid" -o pid | tr -s '\n' ' '); do + kill -9 "$ppid"; done # Then kill the main PID. - kill -9 "${pid}" - echo "$0 is still running (PID ${pid}). Process has been killed" >&2 + kill -9 "$pid" + echo "$0 is still running (PID $pid). Process has been killed" >&2 fi -echo "$$" > ${PIDFILE} +echo "$$" > $PIDFILE # shellcheck disable=SC2064 -trap "rm -f ${PIDFILE}" EXIT +trap "rm -f $PIDFILE" EXIT ##### LOCAL BACKUP #################################################### @@ -223,27 +223,27 @@ uname -a > /home/backup/uname ## Dump network routes with mtr and traceroute (warning: could be long with aggressive firewalls) for addr in 8.8.8.8 www.evolix.fr travaux.evolix.net; do - mtr -r ${addr} > /home/backup/mtr-${addr} - traceroute -n ${addr} > /home/backup/traceroute-${addr} 2>&1 + mtr -r $addr > /home/backup/mtr-${addr} + traceroute -n $addr > /home/backup/traceroute-${addr} 2>&1 done ## Dump process with ps ps auwwx >/home/backup/ps.out -if [ "${SYSTEM}" = "linux" ]; then +if [ "$SYSTEM" = "linux" ]; then ## Dump network connections with netstat - netstat -taupen > /home/backup/netstat.out + netstat -taupen >/home/backup/netstat.out ## List Debian packages - dpkg -l > /home/backup/packages - dpkg --get-selections > /home/backup/packages.getselections - apt-cache dumpavail > /home/backup/packages.available + dpkg -l >/home/backup/packages + dpkg --get-selections >/home/backup/packages.getselections + apt-cache dumpavail >/home/backup/packages.available else ## Dump network connections with netstat - netstat -finet -atn > /home/backup/netstat.out + netstat -finet -atn >/home/backup/netstat.out ## List OpenBSD packages - pkg_info -m > /home/backup/packages + pkg_info -m >/home/backup/packages fi ##### REMOTE BACKUP ################################################### @@ -269,7 +269,7 @@ HOSTNAME=$(hostname) BEGINNING=$(/bin/date +"%d-%m-%Y ; %H:%M") -if [ "${SYSTEM}" = "linux" ]; then +if [ "$SYSTEM" = "linux" ]; then rep="/bin /boot /lib /opt /sbin /usr" else rep="/bsd /bin /sbin /usr" @@ -308,26 +308,26 @@ rsync -avzh --stats --delete --delete-excluded --force --ignore-errors --partial --exclude "/var/lib/clamav/*.tmp" \ --exclude "/home/mysqltmp" \ --exclude "/var/lib/php/sessions" \ - ${rep} \ + $rep \ /etc \ /root \ /var \ /home \ /srv \ - -e "ssh -p ${SSH_PORT}" \ - "root@${SSH_SERVER}:/var/backup/" \ + -e "ssh -p $SSH_PORT" \ + "root@$SSH_SERVER:/var/backup/" \ | tail -30 >> /var/log/evobackup.log END=$(/bin/date +"%d-%m-%Y ; %H:%M") ##### REPORTING ####################################################### -echo "EvoBackup - ${HOSTNAME} - START ${BEGINNING}" \ +echo "EvoBackup - $HOSTNAME - START $BEGINNING" \ >> /var/log/evobackup.log -echo "EvoBackup - ${HOSTNAME} - STOP ${END}" \ +echo "EvoBackup - $HOSTNAME - STOP $END" \ >> /var/log/evobackup.log tail -10 /var/log/evobackup.log | \ - mail -s "[info] EvoBackup - Client ${HOSTNAME}" \ - ${MAIL} + mail -s "[info] EvoBackup - Client $HOSTNAME" \ + $MAIL