diff --git a/duplicity-backup.sh b/duplicity-backup.sh old mode 100755 new mode 100644 index 44bab45..58eb713 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -401,8 +401,10 @@ get_remote_file_size() "ss") TMPDEST="${DEST#*://*/}" TMPDEST="${DEST%/${TMPDEST}}" - ssh_opt=`echo $STATIC_OPTIONS |perl -ne 'print "-i $1" if (/IdentityFile= - SIZE=`${TMPDEST%://*} ${ssh_opt} ${TMPDEST#*//} du -hs ${DEST#${TMPDEST}/ + ssh_opt=`echo $STATIC_OPTIONS |perl -ne 'print "-i $1" if (/IdentityFile="?([^"]*)/);'` + + SIZE=`${TMPDEST%://*} ${ssh_opt} ${TMPDEST#*//} du -hs ${DEST#${TMPDEST}/} | awk '{print $1}'` 2>> ${LOGFILE} + EMAIL_SUBJECT="$EMAIL_SUBJECT $SIZE `${TMPDEST%://*} ${ssh_opt} ${TMPDEST#*//} df -hP ${DEST#${TMPDEST}/} | awk '{tmp=$5 " used"}END{print tmp}'`" 2>> ${LOGFILE} ;; "fi") TMPDEST=`echo ${DEST} | cut -c 6-`