Allow v-restore-user to restore backup from FTP and SFTP

Before this fix, sftpc() function had two 'else' blocks... so it was broken code... and script was unable to download file from SFTP
This commit is contained in:
dpeca 2017-05-04 19:11:34 +02:00 committed by GitHub
commit b57c4dcd7b

View file

@ -62,7 +62,11 @@ ftp_download() {
if [ -z "$PORT" ]; then
PORT='21'
fi
ftpc "cd $BPATH" "get $1"
if [ -z $BPATH ]; then
ftpc "get $1"
else
ftpc "cd $BPATH" "get $1"
fi
}
# sftp command function
@ -99,8 +103,6 @@ sftpc() {
set arg [lindex \$argv \$count]
send "\$arg\r"
incr count
} else {
incr count
} else {
send "exit\r"
set output "Disconnected."
@ -131,7 +133,11 @@ sftp_download() {
PORT='22'
fi
cd $BACKUP
sftpc "cd $BPATH" "get $1" > /dev/null 2>&1
if [ -z $BPATH ]; then
sftpc "get $1" > /dev/null 2>&1
else
sftpc "cd $BPATH" "get $1" > /dev/null 2>&1
fi
}