diff --git a/scripts/upload.sh b/scripts/upload.sh index df11107e..c44ddfad 100644 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -166,7 +166,7 @@ parse_target() ssh_exec_stdin() { - ssh -l $login $IDENTITY $host -C "SCRIPT=\`mktemp /tmp/$MYNAME""_XXXXXX\`; cat > \$SCRIPT; /bin/sh \$SCRIPT; rm \$SCRIPT" + $SSH -l $login $IDENTITY $host -C "SCRIPT=\`mktemp /tmp/$MYNAME""_XXXXXX\`; cat > \$SCRIPT; /bin/sh \$SCRIPT; rm \$SCRIPT" } ssh_mkdir() @@ -279,6 +279,10 @@ rsync_ssh) esac # -- real run + +SSH=ssh +[ "$RSYNC_RSH" ] && SSH=$RSYNC_RSH + if [ -n "$VARIABLE" ]; then eval `parse_target` case "$VARIABLE" in @@ -313,7 +317,7 @@ eval `parse_target $target` case $method in rsync_ssh) ssh_mkdir $target_file $file_owner $file_group $dir_mode || break - /usr/bin/rsync -az --links -e "/usr/bin/ssh -l $login $IDENTITY" $source $login@$host:$target_file + /usr/bin/rsync -az --links -e "$SSH -l $login $IDENTITY" $source $login@$host:$target_file ssh_chown $target_path $file_owner $file_group ssh_chmod $target_path $file_mode $dir_mode ;;