janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

upload.sh: (hopefully) fixed ignored RSYNC_SSH

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-26 09:20:25 +00:00
commit 6cb7011db3
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/upload.sh
View file

@ -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
;;