MakeRelease.job: Fix use of port 22 to upload binary tarballs/take #2

Sigh, the previous patch used a syntax that applies only with using an
rsync daemon (with rsync: protocol).

Let's use -e 'ssh -p 22', like we do in other scripts.

Change-Id: I41d3cb7ff843abcc56a94775e2fd04c5f317f7fa

1 files changed, 5 insertions, 4 deletions

diff --git a/MakeRelease.job b/MakeRelease.job
index ae13cb2b..954393b6 100755
--- a/MakeRelease.job
+++ b/MakeRelease.job
@@ -96,13 +96,14 @@ fi
 
 if test x"${fileserver}" = x; then
     rsh="sh -c"
+    rsync_flags=""
 else
     # Hardcode port 22 for the time being.  We use this parameter to
     # upload release tarballs to dev-01, but our ssh default config
     # points to the host container where the directory with binary
     # tarballs is not mapped.
     rsh="ssh -p 22 $fileserver"
-    fileserver="$fileserver:22"
+    rsync_flags="ssh -p 22"
 fi
 
 user_snapshots="${user_workspace}/snapshots"
@@ -266,7 +267,7 @@ if test -e ${logfile}; then
     xz ${logfile}
     $rsh "if test ! -d ${logs}; then mkdir -p ${logs}; fi"
     echo "Copying compressed log file ${logfile}.xz to ${fileserver:+$fileserver:}${logs}..."
-    rsync -a ${logfile}.xz ${fileserver:+$fileserver:}${logs}/
+    rsync -a ${rsync_flags:+-e "$rsync_flags"} ${logfile}.xz ${fileserver:+$fileserver:}${logs}/
 fi
 
 # force a failure if abe has build problems.
@@ -280,10 +281,10 @@ $rsh "if test ! -d ${binaries}; then mkdir -p ${binaries}; fi"
 # There could be a linux and/or a win32 manifest.
 for manifest in "${manifests[@]}"
 do
-    rsync -a ${manifest} ${fileserver:+$fileserver:}${binaries}/
+    rsync -a ${rsync_flags:+-e "$rsync_flags"} ${manifest} ${fileserver:+$fileserver:}${binaries}/
 done
 
-rsync -a "${tarballs[@]}" ${fileserver:+$fileserver:}${binaries}/
+rsync -a ${rsync_flags:+-e "$rsync_flags"} "${tarballs[@]}" ${fileserver:+$fileserver:}${binaries}/
 
 if $manifest_validation; then
     echo "Starting manifest validation."