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

integrate-distro.sh: Use CVS_RSH or GIT_SSH to ssh into localhost

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-26 07:27:02 +00:00
commit 3fd044c974
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/integrate-distro.sh
View file

@ -1479,7 +1479,13 @@ if [ `whoami` != root -o "$l32" ]; then
opts=""
[ "$config_file" ] && opts="$opts --config-file $config_file"
#debug="/bin/bash -x"
ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
ssh=ssh
[ "$CVS_RSH" ] && ssh="$CVS_RSH"
[ "$GIT_SSH" ] && ssh="$GIT_SSH"
ssh=`which $ssh`
[ -x "$ssh" ] || fatal "SSH executable \"$ssh\" not found"
$ssh -l root localhost $l32 $debug /bin/bash $exe $@ -p $root_password_file -u $scm_user -w $cwd $opt_ssh_auth_sock -P "$PATH" $opts
exit $?
fi

4
scripts/purge-stale-projects.sh
View file

@ -44,11 +44,9 @@ check_scm()
ssh=ssh
[ "$CVS_RSH" ] && ssh="$CVS_RSH"
[ "$GIT_SSH" ] && ssh="$GIT_SSH"
[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
ssh=`which $ssh`
[ -x "$ssh" ] || fatal "SSH executable \"$ssh\" not found"
[ "$JANWARE_USER" ] || JANWARE_USER=`whoami`
ssh="$ssh -l $JANWARE_USER"
for host in cvs.jannet.de git.jannet.de; do