github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 13:01:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/v-restore-user
View file

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