--- commitpkg | 60 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/commitpkg b/commitpkg index 15f6981..d7b4b6c 100755 --- a/commitpkg +++ b/commitpkg @@ -28,6 +28,36 @@ fi source PKGBUILD pkgbase=${pkgbase:-${pkgname[0]}} +# set up repo-specific opts depending on how we were called +server="gerolde.archlinux.org" +if [ "$cmd" == "extrapkg" ]; then + repo="extra" +elif [ "$cmd" == "corepkg" ]; then + repo="core" +elif [ "$cmd" == "testingpkg" ]; then + repo="testing" +elif [ "$cmd" == "communitypkg" ]; then + repo="community" + server="aur.archlinux.org" +elif [ "$cmd" == "community-testingpkg" ]; then + repo="community-testing" + server="aur.archlinux.org" +else + if [ $# -eq 0 ]; then + echo "usage: commitpkg <reponame> [-l limit] [commit message]" + exit 1 + fi + repo="$1" + shift +fi + +# see if any limit options were passed, we'll send them to SCP +unset scpopts +if [ "$1" = "-l" ]; then + scpopts="$1 $2" + shift 2 +fi + for _pkgname in ${pkgname[@]}; do pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT} @@ -47,36 +77,6 @@ for _pkgname in ${pkgname[@]}; do fi fi - # set up repo-specific opts depending on how we were called - server="gerolde.archlinux.org" - if [ "$cmd" == "extrapkg" ]; then - repo="extra" - elif [ "$cmd" == "corepkg" ]; then - repo="core" - elif [ "$cmd" == "testingpkg" ]; then - repo="testing" - elif [ "$cmd" == "communitypkg" ]; then - repo="community" - server="aur.archlinux.org" - elif [ "$cmd" == "community-testingpkg" ]; then - repo="community-testing" - server="aur.archlinux.org" - else - if [ $# -eq 0 ]; then - echo "usage: commitpkg <reponame> [-l limit] [commit message]" - exit 1 - fi - repo="$1" - shift - fi - - # see if any limit options were passed, we'll send them to SCP - unset scpopts - if [ "$1" = "-l" ]; then - scpopts="$1 $2" - shift 2 - fi - # combine what we know into a variable uploadto="staging/${repo}/$(basename ${pkgfile})" scp ${scpopts} "${pkgfile}" "${server}:${uploadto}" -- 1.6.4.4