It will still default to `whoami` if it's not configured in .ssh/config --- release.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/release.sh b/release.sh index f6eaf23..242850b 100755 --- a/release.sh +++ b/release.sh @@ -8,7 +8,7 @@ dri_list="[email protected]" host_people=annarchy.freedesktop.org host_xorg=xorg.freedesktop.org host_dri=dri.freedesktop.org -user=`whoami` +user= remote=origin usage() @@ -18,7 +18,7 @@ Usage: `basename $0` [options] <section> <tag_previous> <tag_current> Options: --force force overwritting an existing release - --user <name> username on $host_people (default "`whoami`") + --user <name> username on $host_people --help this help message --remote git remote where the change should be pushed (default "origin") HELP @@ -80,7 +80,7 @@ while [ $# != 0 ]; do ;; --user) shift - user=$1 + user=$1@ shift ;; --remote) @@ -160,8 +160,8 @@ if ! git tag -l $tag_current >/dev/null; then fi echo "checking for an existing release" -if ssh $u...@$host_people ls $srv_path/$targz >/dev/null 2>&1 || - ssh $u...@$host_people ls $srv_path/$tarbz2 >/dev/null 2>&1; then +if ssh $user$host_people ls $srv_path/$targz >/dev/null 2>&1 || + ssh $user$host_people ls $srv_path/$tarbz2 >/dev/null 2>&1; then if [ "x$force" = "xyes" ]; then echo "warning: overriding released file ... here be dragons." else @@ -175,7 +175,7 @@ gen_announce_mail >$announce echo " at: $announce" echo "installing release into server" -scp $tarball_dir/$targz $tarball_dir/$tarbz2 $u...@$host_people:$srv_path +scp $tarball_dir/$targz $tarball_dir/$tarbz2 $user$host_people:$srv_path echo "pushing changes upstream" git push $remote -- 1.6.3.3 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
