From e6f007f170695175d179a31f952159f4749589ef Mon Sep 17 00:00:00 2001 From: jgaunt Date: Wed, 4 Dec 2019 16:51:23 -0500 Subject: [PATCH] Update 'duplicacy.sh' --- duplicacy.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/duplicacy.sh b/duplicacy.sh index 79813e9..394d0ed 100644 --- a/duplicacy.sh +++ b/duplicacy.sh @@ -21,17 +21,18 @@ for folder in ${FOLDERS_TO_BACKUP[@]}; do duplicacy -verbose -log backup -stats >> ${LOGFILE} 2>&1 else # removes the slashes and replaces with a dash - id=${HOST}${folder////-} + id=${HOST}$(echo $folder | sed 's/\//-/g') # sftp password DUPLICACY_SSH_PASSWORD DUPLICACY__SSH_PASSWORD ssh_password - echo "Please enter duplicacy ssh password" - read -s SSH_PASSWORD - export DUPLICACY_SSH_PASSWORD=${SSH_PASSWORD} + if [ ${SSH_PASSWORD} == '' ]; then + echo "Please enter duplicacy ssh password" + read -s SSH_PASSWORD + export DUPLICACY_SSH_PASSWORD=${SSH_PASSWORD} + fi duplicacy init ${id} sftp://duplicacy@gauntnas.home.johnhgaunt.com//mnt/data-pool/backups/duplicacy/data duplicacy set -key ssh_password -value "${SSH_PASSWORD}" - SSH_PASSWORD='' fi done - +SSH_PASSWORD='' # compress the logs gzip $(dirname ${LOGFILE})/*.log