Commit 3d9c9c1b authored by Evangelos Foutras's avatar Evangelos Foutras Committed by Aaron Griffin
Browse files

Move initialization code out of the upload loop 



Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent 70e48eff

commitpkg

+30 −30
Original line number Diff line number Diff line
@@ -28,25 +28,6 @@ fi 
source PKGBUILD

pkgbase=${pkgbase:-${pkgname[0]}}



for _pkgname in ${pkgname[@]}; do

    pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

    anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}



    if [ ! -f $pkgfile ]; then

        if [ -f $PKGDEST/$pkgfile ]; then

            pkgfile=$PKGDEST/$pkgfile

        elif [ -f $anypkgfile ]; then

            pkgfile=$anypkgfile

            CARCH=any

        elif [ -f $PKGDEST/$anypkgfile ]; then

            pkgfile=$PKGDEST/$anypkgfile

            CARCH=any

        else

            echo "File $pkgfile doesn't exist"

            exit 1

        fi

    fi



# set up repo-specific opts depending on how we were called

server="gerolde.archlinux.org"

if [ "$cmd" == "extrapkg" ]; then
@@ -77,6 +58,25 @@ for _pkgname in ${pkgname[@]}; do 
    shift 2

fi



for _pkgname in ${pkgname[@]}; do

    pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}

    anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}



    if [ ! -f $pkgfile ]; then

        if [ -f $PKGDEST/$pkgfile ]; then

            pkgfile=$PKGDEST/$pkgfile

        elif [ -f $anypkgfile ]; then

            pkgfile=$anypkgfile

            CARCH=any

        elif [ -f $PKGDEST/$anypkgfile ]; then

            pkgfile=$PKGDEST/$anypkgfile

            CARCH=any

        else

            echo "File $pkgfile doesn't exist"

            exit 1

        fi

    fi



    # combine what we know into a variable

    uploadto="staging/${repo}/$(basename ${pkgfile})"

    scp ${scpopts} "${pkgfile}" "${server}:${uploadto}"