commitpkg: Added split package support
All packages created by the PKGBUILD are uploaded to the staging directory. The output and svn commit messages uses pkgbase instead of pkgname. Signed-off-by: Eric Blanger <snowmaniscool@gmail.com> [Allan: minor fix for existing issue] Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
f9aa28f895
commit
760c1c6c5f
111
commitpkg
111
commitpkg
|
@ -26,76 +26,79 @@ if [ -z "$CARCH" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source PKGBUILD
|
source PKGBUILD
|
||||||
pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
|
pkgbase=${pkgbase:-${pkgname[0]}}
|
||||||
anypkgfile=${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}
|
|
||||||
|
|
||||||
if [ ! -f $pkgfile ]; then
|
for _pkgname in ${pkgname[@]}; do
|
||||||
if [ -f $PKGDEST/$pkgfile ]; then
|
pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
|
||||||
pkgfile=$PKGDEST/$pkgfile
|
anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}
|
||||||
anypkgfile=$PKGDEST/$anypkgfile
|
|
||||||
elif [ -f $anypkgfile ]; then
|
if [ ! -f $pkgfile ]; then
|
||||||
pkgfile=$anypkgfile
|
if [ -f $PKGDEST/$pkgfile ]; then
|
||||||
CARCH=any
|
pkgfile=$PKGDEST/$pkgfile
|
||||||
elif [ -f $PKGDEST/$anypkgfile ]; then
|
elif [ -f $anypkgfile ]; then
|
||||||
pkgfile=$PKGDEST/$anypkgfile
|
pkgfile=$anypkgfile
|
||||||
CARCH=any
|
CARCH=any
|
||||||
else
|
elif [ -f $PKGDEST/$anypkgfile ]; then
|
||||||
echo "File $pkgfile doesn't exist"
|
pkgfile=$PKGDEST/$anypkgfile
|
||||||
exit 1
|
CARCH=any
|
||||||
|
else
|
||||||
|
echo "File $pkgfile doesn't exist"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# set up repo-specific opts depending on how we were called
|
# set up repo-specific opts depending on how we were called
|
||||||
server="gerolde.archlinux.org"
|
server="gerolde.archlinux.org"
|
||||||
if [ "$cmd" == "extrapkg" ]; then
|
if [ "$cmd" == "extrapkg" ]; then
|
||||||
repo="extra"
|
repo="extra"
|
||||||
elif [ "$cmd" == "corepkg" ]; then
|
elif [ "$cmd" == "corepkg" ]; then
|
||||||
repo="core"
|
repo="core"
|
||||||
elif [ "$cmd" == "testingpkg" ]; then
|
elif [ "$cmd" == "testingpkg" ]; then
|
||||||
repo="testing"
|
repo="testing"
|
||||||
elif [ "$cmd" == "communitypkg" ]; then
|
elif [ "$cmd" == "communitypkg" ]; then
|
||||||
repo="community"
|
repo="community"
|
||||||
server="aur.archlinux.org"
|
server="aur.archlinux.org"
|
||||||
else
|
else
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
echo "usage: commitpkg <reponame> [-l limit] [commit message]"
|
echo "usage: commitpkg <reponame> [-l limit] [commit message]"
|
||||||
exit 1
|
exit 1
|
||||||
|
fi
|
||||||
|
repo="$1"
|
||||||
|
shift
|
||||||
fi
|
fi
|
||||||
repo="$1"
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
|
|
||||||
# see if any limit options were passed, we'll send them to SCP
|
# see if any limit options were passed, we'll send them to SCP
|
||||||
unset scpopts
|
unset scpopts
|
||||||
if [ "$1" = "-l" ]; then
|
if [ "$1" = "-l" ]; then
|
||||||
scpopts="$1 $2"
|
scpopts="$1 $2"
|
||||||
shift 2
|
shift 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# combine what we know into a variable
|
# combine what we know into a variable
|
||||||
uploadto="staging/${repo}/$(basename ${pkgfile})"
|
uploadto="staging/${repo}/$(basename ${pkgfile})"
|
||||||
scp ${scpopts} "${pkgfile}" "${server}:${uploadto}"
|
scp ${scpopts} "${pkgfile}" "${server}:${uploadto}"
|
||||||
if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh ${server} md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
|
if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh ${server} md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
|
||||||
echo "File got corrupted during upload, cancelled."
|
echo "File got corrupted during upload, cancelled."
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
echo "File integrity okay."
|
echo "File integrity okay."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Cancelled"
|
echo "Cancelled"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "===> Uploaded $pkgfile"
|
echo "===> Uploaded $pkgfile"
|
||||||
|
done
|
||||||
|
|
||||||
if [ "$1" != "" ]; then
|
if [ "$1" != "" ]; then
|
||||||
svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
|
svn commit -m "upgpkg: $pkgbase $pkgver-$pkgrel
|
||||||
$1" > /dev/null
|
$1" > /dev/null
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Cancelled"
|
echo "Cancelled"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel
|
echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel
|
||||||
$1\" message"
|
$1\" message"
|
||||||
else
|
else
|
||||||
svn commit >/dev/null
|
svn commit >/dev/null
|
||||||
|
@ -103,7 +106,7 @@ else
|
||||||
echo "Cancelled"
|
echo "Cancelled"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"
|
echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel\" message"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
archrelease $repo-$CARCH
|
archrelease $repo-$CARCH
|
||||||
|
|
Loading…
Reference in New Issue