2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #93 : make message about unsupported destination disk usage more explicit

Browse source
This commit is contained in:
zertrin 2015-05-18 18:17:34 +02:00
parent 6fb8b4e46b
commit 4be3671511
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
duplicity-backup.sh
View file

@ -426,6 +426,8 @@ get_remote_file_size()
dest_type=`echo ${DEST} | cut -c 1,2` dest_type=`echo ${DEST} | cut -c 1,2`
case $dest_type in case $dest_type in
"ss") "ss")
FRIENDLY_TYPE_NAME="SSH"
TMPDEST="${DEST#*://*/}" TMPDEST="${DEST#*://*/}"
TMPDEST="${DEST%/${TMPDEST}}" TMPDEST="${DEST%/${TMPDEST}}"
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)}}'` 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)}}'`
@ -446,7 +448,7 @@ get_remote_file_size()
fi fi
;; ;;
"s3") "s3")
FRIENDLY_TYPE_NAME="S3" FRIENDLY_TYPE_NAME="Amazon S3"
if $S3CMD_AVAIL ; then if $S3CMD_AVAIL ; then
TMPDEST=$(echo ${DEST} | cut -c 11-) TMPDEST=$(echo ${DEST} | cut -c 11-)
dest_scheme=$(echo ${DEST} | cut -f -1 -d :) dest_scheme=$(echo ${DEST} | cut -f -1 -d :)
@ -464,13 +466,17 @@ get_remote_file_size()
fi fi
;; ;;
*) *)
# cover all so just grab first 4 chars from DEST # not yet available for the other backends
FRIENDLY_TYPE_NAME=`echo ${DEST} | cut -c 1,4` FRIENDLY_TYPE_NAME=""
SIZE="unsupported on"
;; ;;
esac esac
echo -e ""$SIZE"\t"$FRIENDLY_TYPE_NAME" type backend" >> ${LOGFILE} if $FRIENDLY_TYPE_NAME ; then
echo -e ""$SIZE"\t"$FRIENDLY_TYPE_NAME" type backend" >> ${LOGFILE}
else
echo "Destination disk use information is currently only available for the following storage backends:" >> ${LOGFILE}
echo "File, SSH, Amazon S3 and Google Cloud" >> ${LOGFILE}
fi
echo >> ${LOGFILE} echo >> ${LOGFILE}
} }