749834d34dcc2756614432b936213a29e776fb46

Author
zertrin <zertrin@gmail.com>
Committer
zertrin <zertrin@gmail.com>
Date

Message

Merge remote-tracking branch 'mddirba/master' into dev

Diff

 1diff --git a/duplicity-backup.sh b/duplicity-backup.sh
 2old mode 100755
 3new mode 100644
 4index 1a093f99294c0a3cc6c8c4fd8bec5dd1161c8059..ed8283175459d9f5241a7d9fe34bf62fc7398af7
 5--- a/duplicity-backup.sh
 6+++ b/duplicity-backup.sh
 7@@ -401,6 +401,14 @@ get_remote_file_size()
 8   FRIENDLY_TYPE_NAME=""
 9   dest_type=`echo ${DEST} | cut -c 1,2`
10   case $dest_type in
11+    "ss")
12+      TMPDEST="${DEST#*://*/}"
13+      TMPDEST="${DEST%/${TMPDEST}}"
14+      ssh_opt=`echo $STATIC_OPTIONS |awk -vo="--ssh-options=" '{s=index($0,o); if (s) {s=substr($0,s+length(o)); m=substr(s,0,1); for (i=2; i < length(s); i++) { if (substr(s,i,1) == m && substr(s,i-1,1) != "\\") break; } print substr(s,2,i-2)}}'`
15+
16+      SIZE=`${TMPDEST%://*} ${ssh_opt} ${TMPDEST#*//} du -hs ${DEST#${TMPDEST}/} | awk '{print $1}'` 2>> ${LOGFILE}
17+      EMAIL_SUBJECT="$EMAIL_SUBJECT $SIZE `${TMPDEST%://*} ${ssh_opt} ${TMPDEST#*//} df -hP ${DEST#${TMPDEST}/} | awk '{tmp=$5 " used"}END{print tmp}'`" 2>> ${LOGFILE}
18+    ;;
19     "fi")
20       FRIENDLY_TYPE_NAME="File"
21       TMPDEST=`echo ${DEST} | cut -c 6-`