X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=backup;h=2f820ec566f593b87c006e614cfbbc9c5173580a;hp=8d553c5cac6779e02f7e6f2df434c383be9a38b6;hb=d802c8aecc3efb8dbd1a9158a0cc77e61013c6c9;hpb=2d9b337ef3050148384186e9940d31ae92c685a4

diff --git a/backup b/backup
index 8d553c5..2f820ec 100755
--- a/backup
+++ b/backup
@@ -2,6 +2,7 @@
 set -eu
 cd $HOME
 LOG=.cache/duplicity/log
+PATH=$PATH:/sbin:/usr/sbin
 
 # do backup every day
 if [ -e "$LOG" ] && [ $(( `date +%s` - `stat -c %Y $LOG` )) -lt 86300 ]; then
@@ -9,22 +10,16 @@ if [ -e "$LOG" ] && [ $(( `date +%s` - `stat -c %Y $LOG` )) -lt 86300 ]; then
 fi
 
 # figure out $DISPLAY when running from cron
-if [ -z "${DISPLAY:-}" ]; then
-    socket="/run/user/`id -u`/X11-display"
-    if [ -L "$socket" ]; then
-        socket=$(readlink "$socket")
-        export DISPLAY=:${socket##*/X}
-    fi
-fi
+export DISPLAY="${DISPLAY:-:0}"
 
-if ! ip route | grep -q '^default.*wlan'; then
+if ! ip route | grep -q '^default.*wl'; then
     notify-send "Backup skipped, not on WLAN"
     exit 0
 fi
 
 # figure out ssh agent when running from cron
 if [ -z "${SSH_AUTH_SOCK:-}" ]; then
-    ssh_socket=$(ls /run/user/`id -u`/keyring-*/ssh 2>/dev/null)
+    ssh_socket=$(ls /run/user/`id -u`/keyring*/ssh 2>/dev/null)
     if [ -S "$ssh_socket" ]; then
         export SSH_AUTH_SOCK="$ssh_socket"
     fi
@@ -32,5 +27,6 @@ fi
 
 notify-send "Backup started"
 mkdir -p $(dirname $LOG)
-env PASSPHRASE="$(cat ~/.backup-passphrase)" duplicity --full-if-older-than 1M --exclude-globbing-filelist .duplicity-ignore . rsync://piware.de/backup/donald >> $LOG || { notify-send "BACKUP FAILED!"; exit 1; }
+env PASSPHRASE="$(cat ~/.backup-passphrase)" duplicity --allow-source-mismatch --full-if-older-than 1M --exclude-filelist .duplicity-ignore . rsync://piware.de/backup/donald >> $LOG || { notify-send "BACKUP FAILED!"; exit 1; }
 notify-send "Backup finished successfully"
+duplicity remove-all-but-n-full 6 --force rsync://piware.de/backup/donald