Also move some rsync options to $rsyncopts to help with readability.

Signed-off-by: Rémy Oudompheng remy@archlinux.org --- commitpkg | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/commitpkg b/commitpkg index dfc2bd1..fb8f9ea 100755 --- a/commitpkg +++ b/commitpkg @@ -104,9 +104,9 @@ for i in 'changelog' 'install'; do done

# see if any limit options were passed, we'll send them to rsync -unset rsyncopts +rsyncopts="-p --chmod 'ug=rw,o=r' -c -h -L --progress" if [ "$1" = '-l' ]; then - rsyncopts="--bwlimit=$2" + rsyncopts="$rsyncopts --bwlimit=$2" shift 2 fi

@@ -135,7 +135,13 @@ for _arch in ${arch[@]}; do fi

echo -n 'uploading ' - rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/${pkgfile##*/}" || abort + rsync -e ssh $rsyncopts --partial "${pkgfile}" "$server:staging/$repo/${pkgfile##*/}" || abort + + sigfile="${pkgfile}.sig" + if [ -f "${sigfile}" ]; then + echo -n 'uploading ' + rsync -e ssh $rsyncopts --partial "${sigfile}" "$server:staging/$repo/${sigfile##*/}" || abort + fi done archrelease $repo-${_arch} || abort done