Remove the community-specific code that calls tupkg. Make the server variable a bit more dependent on what repo we are uploading to in order to get community working, and finally create the correct symlinks for communitypkg in the Makefile. Note that this change will require the Arch devtools package to get a replace entry for aurtools. Signed-off-by: Dan McGee <dan@archlinux.org> --- Makefile | 2 ++ commitpkg | 32 +++++++++++--------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 6a99366..f29082a 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ install: ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg + ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg # arch{co,release,rm} install -m 755 archco $(DESTDIR)/usr/bin install -m 755 archrelease $(DESTDIR)/usr/bin @@ -27,6 +28,7 @@ uninstall: rm $(DESTDIR)/usr/bin/extrapkg rm $(DESTDIR)/usr/bin/corepkg rm $(DESTDIR)/usr/bin/testingpkg + rm $(DESTDIR)/usr/bin/communitypkg rm $(DESTDIR)/usr/sbin/mkarchroot rm $(DESTDIR)/usr/sbin/makechrootpkg rm $(DESTDIR)/usr/bin/lddd diff --git a/commitpkg b/commitpkg index c434974..8f4d37d 100755 --- a/commitpkg +++ b/commitpkg @@ -43,6 +43,8 @@ if [ ! -f $pkgfile ]; then fi fi +# set up repo-specific opts depending on how we were called +server="archlinux.org" if [ "$cmd" == "extrapkg" ]; then repo="extra" elif [ "$cmd" == "corepkg" ]; then @@ -53,6 +55,7 @@ elif [ "$cmd" == "unstablepkg" ]; then repo="unstable" elif [ "$cmd" == "communitypkg" ]; then repo="community" + server="community.archlinux.org" else if [ $# -eq 0 ]; then echo "usage: commitpkg <reponame> [-l limit] [commit message]" @@ -69,29 +72,16 @@ if [ "$1" = "-l" ]; then shift 2 fi -if [ "$repo" != "community" ]; then - # combine what we know into a variable - uploadto="staging/${repo}/$(basename ${pkgfile})" - server="archlinux.org" - scp ${scpopts} "${pkgfile}" "${server}:${uploadto}" - if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh ${server} md5sum "${uploadto}" | cut -d' ' -f1)" ]; then - echo "File got corrupted during upload, cancelled." - exit 1 - else - echo "File integrity okay." - fi +# combine what we know into a variable +uploadto="staging/${repo}/$(basename ${pkgfile})" +scp ${scpopts} "${pkgfile}" "${server}:${uploadto}" +if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh ${server} md5sum "${uploadto}" | cut -d' ' -f1)" ]; then + echo "File got corrupted during upload, cancelled." + exit 1 else - if [ ! -f ~/.tupkg ]; then - echo "Must configure tupkg via ~/.tupkg, cancelled" - exit 1 - fi - if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then - echo "Renaming makepkg3 package for compatibility" - mv $pkgfile $oldstylepkgfile - pkgfile=$oldstylepkgfile - fi - tupkg $pkgfile + echo "File integrity okay." fi + if [ $? -ne 0 ]; then echo "Cancelled" exit 1 -- 1.6.2.1