Don't check if package was released already

The checks aren't reliable enough and fail if the local repo is broken due to
network failures. So for now we just allways commit.

.gitignore

@@ -0,0 +1,2 @@
+*~
+devtools-*.tar.gz

Makefile

@@ -1,15 +1,18 @@
 all:
 
 install:
-	# extrapkg/checkpkg and friends
+	# commitpkg/checkpkg and friends
 	mkdir -p $(DESTDIR)/usr/bin
 	install -m 755 checkpkg $(DESTDIR)/usr/bin
-	install -m 755 extrapkg $(DESTDIR)/usr/bin
+	install -m 755 commitpkg $(DESTDIR)/usr/bin
-	ln -sf extrapkg $(DESTDIR)/usr/bin/corepkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
-	ln -sf extrapkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg
-	ln -sf extrapkg $(DESTDIR)/usr/bin/unstablepkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/community-testingpkg
 	# arch{co,release,rm}
 	install -m 755 archco $(DESTDIR)/usr/bin
+	install -m 755 communityco $(DESTDIR)/usr/bin
 	install -m 755 archrelease $(DESTDIR)/usr/bin
 	install -m 755 archrm $(DESTDIR)/usr/bin
 	# new chroot tools, only usable by root
@@ -19,14 +22,17 @@ install:
 	#Additional packaging helper scripts
 	install -m 755 lddd $(DESTDIR)/usr/bin
 	install -m 755 finddeps $(DESTDIR)/usr/bin
+	install -m 755 rebuildpkgs $(DESTDIR)/usr/bin
 
 uninstall:
 	# remove all files we installed
 	rm $(DESTDIR)/usr/bin/checkpkg
+	rm $(DESTDIR)/usr/bin/commitpkg
 	rm $(DESTDIR)/usr/bin/extrapkg
 	rm $(DESTDIR)/usr/bin/corepkg
 	rm $(DESTDIR)/usr/bin/testingpkg
-	rm $(DESTDIR)/usr/bin/unstablepkg
+	rm $(DESTDIR)/usr/bin/communitypkg
+	rm $(DESTDIR)/usr/bin/community-testingpkg
 	rm $(DESTDIR)/usr/sbin/mkarchroot
 	rm $(DESTDIR)/usr/sbin/makechrootpkg
 	rm $(DESTDIR)/usr/bin/lddd
@@ -34,3 +40,8 @@ uninstall:
 	rm $(DESTDIR)/usr/bin/archco
 	rm $(DESTDIR)/usr/bin/archrelease
 	rm $(DESTDIR)/usr/bin/archrm
+	rm $(DESTDIR)/usr/bin/communityco
+	rm $(DESTDIR)/usr/bin/rebuildpkgs
+
+dist:
+	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz

archco

@@ -1,10 +1,13 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+if [ "$1" = '' ]; then
-	echo "Usage: archco <package name> [<package name>]"
+	echo 'Usage: archco <package name> [<package name>]'
 	exit 1
 fi
 
 for i in "$@"; do
-     svn co svn+ssh://svn.archlinux.org/home/svn-packages/$i
+	svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i
 done
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

archrelease

@@ -1,29 +1,36 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+abort() {
-    echo "Usage: archrelease <repo>"
+	echo ${1:-'archrelease: Cancelled'}
 	exit 1
+}
+
+if [ "$1" = '' ]; then
+	abort 'Usage: archrelease <repo>'
 fi
 
-if [ ! -d ../repos/$1 ]; then
+if [ ! -f PKGBUILD ]; then
-    pushd ..
+	abort 'archrelease: PKGBUILD not found'
-    svn copy -r HEAD trunk repos/$1
-    svn commit -m "archrelease: new repo $1"
-    pushd repos/$1
-    svnmerge init
-    svn commit -F svnmerge-commit-message.txt
-    rm svnmerge-commit-message.txt
-    popd
-    popd
-else
-    svnmerge merge ../repos/$1
-    pushd ..
-    if [ -f trunk/svnmerge-commit-message.txt ]; then
-        svn commit -F trunk/svnmerge-commit-message.txt
-        rm trunk/svnmerge-commit-message.txt
-    else
-        echo "Nothing to commit"
-    fi
-    popd
 fi
 
+if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
+	abort 'archrelease: Not in a package trunk dir'
+fi
+
+if [ ! -z "$(svn status -q)" ]; then
+	abort 'archrelease: You have not committed your changes yet!'
+fi
+
+echo -n 'releasing package...'
+pushd .. >/dev/null
+if [ -d "repos/${1}" ]; then
+	svn rm --force -q "repos/${1}"
+	svn commit -q -m "archrelease: remove ${1}" || abort
+fi
+svn copy -q -r HEAD trunk "repos/${1}"
+svn commit -q -m "archrelease: copy trunk to ${1}" || abort
+popd >/dev/null
+echo 'done'
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

archrm

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+if [ "$1" = '' ]; then
-	echo "Usage: archrm <path to checkout>"
+	echo 'Usage: archrm <path to checkout>'
 	exit 1
 fi
 
@@ -11,3 +11,6 @@ fi
 #popd
 
 rm -rf $1
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

checkpkg

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Source makepkg.conf; fail if it is not found
-if [ -r "/etc/makepkg.conf" ]; then
+if [ -r '/etc/makepkg.conf' ]; then
-	source "/etc/makepkg.conf"
+	source '/etc/makepkg.conf'
 else
-    echo "/etc/makepkg.conf not found!"
+	echo '/etc/makepkg.conf not found!'
 	exit 1
 fi
 
@@ -18,70 +18,78 @@ strip_url() {
 }
 
 if [ ! -f PKGBUILD ]; then
-	echo "This must be run in the directory of a built package."
+	echo 'This must be run in the directory of a built package.'
 	exit 1
 fi
 
-source PKGBUILD
+. PKGBUILD
+if [ "$arch" == 'any' ]; then
+	CARCH='any'
+fi
 
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+for _pkgname in ${pkgname[@]}; do
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
+	pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
-if [ -f "$(pwd)/$pkgfile" ]; then
+	if [ -f "$(pwd)/$pkgfile" ]; then
 		pkgfile=$(pwd)/$pkgfile
-elif [ -f "$PKGDEST/$pkgfile" ]; then
+	elif [ -f "$PKGDEST/$pkgfile" ]; then
 		pkgfile=$PKGDEST/$pkgfile
-elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
+	elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
 		pkgfile=$(pwd)/$oldstylepkgfile
-elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
+	elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
 		pkgfile=$PKGDEST/$oldstylepkgfile
-else
+	else
 		echo "File \"$pkgfile\" doesn't exist"
 		exit 1
-fi
-
-tmp=`pacman -Spd --noconfirm $pkgname`
-
-if [ $? -ne 0 ]; then
-	echo "Couldn't download previous package."
-	exit 1
-fi
-
-pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
-
-oldpkg=`strip_url $pkgurl`
-
-if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
-	echo "The built package is the one in the repo right now!"
-	exit 1
-fi
-
-if [ ! -f $oldpkg ]; then
-	if echo $pkgurl | grep "^file:///" > /dev/null 2>&1; then
-		cp `echo $pkgurl | sed 's#^file://##'` .
-	else
-		wget $pkgurl
 	fi
-fi
 
-tar tzf $oldpkg > filelist-old
+	tmp=`pacman -Spd --noconfirm $_pkgname`
-tar tzf "$pkgfile" > filelist
 
-sort -o filelist filelist
+	if [ $? -ne 0 ]; then
-sort -o filelist-old filelist-old
+		echo "Couldn't download previous package for $_pkgname."
+		exit 1
+	fi
 
-diff filelist-old filelist
+	pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
 
-if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
+	oldpkg=`strip_url $pkgurl`
+
+	if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
+		echo "The built package ($_pkgname) is the one in the repo right now!"
+		exit 1
+	fi
+
+	if [ ! -f $oldpkg ]; then
+		if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then
+			cp `echo $pkgurl | sed 's#^file://##'` .
+		elif [ -f $PKGDEST/$oldpkg ]; then
+			cp $PKGDEST/$oldpkg .
+		else
+			wget --quiet $pkgurl
+		fi
+	fi
+
+	bsdtar tf $oldpkg > filelist-$_pkgname-old
+	bsdtar tf "$pkgfile" > filelist-$_pkgname
+
+	sort -o filelist-$_pkgname filelist-$_pkgname
+	sort -o filelist-$_pkgname-old filelist-$_pkgname-old
+
+	diff filelist-$_pkgname-old filelist-$_pkgname
+
+	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so\.' > /dev/null 2>&1; then
 		mkdir -p pkg
 		cd pkg
-	tar xzf "$pkgfile" > /dev/null
+		bsdtar xf "$pkgfile" > /dev/null
-	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
+		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so\. | awk '{print $2}'`; do
 			echo -n "${i}: "
 			objdump -p $i | grep SONAME
 		done
-else
+	else
-	echo "No filename differences"
+		echo "No filename differences for $_pkgname."
-fi
+	fi
+done
 
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

commitpkg

@@ -0,0 +1,105 @@
+#!/bin/bash
+
+abort() {
+	echo ${1:-'Cancelled'}
+	exit 1
+}
+
+
+# Source makepkg.conf; fail if it is not found
+if [ -r '/etc/makepkg.conf' ]; then
+	source '/etc/makepkg.conf'
+else
+	abort '/etc/makepkg.conf not found!'
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+	. ~/.makepkg.conf
+fi
+
+cmd=$(basename "$0")
+
+if [ ! -f PKGBUILD ]; then
+	abort 'No PKGBUILD file'
+fi
+
+. PKGBUILD
+pkgbase=${pkgbase:-$pkgname}
+
+# 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
+		abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
+	fi
+	repo="$1"
+	shift
+fi
+
+# check if all local source files are under version control
+(for s in ${source[@]} $install; do
+	echo $s | grep -vq '://' && \
+	svn status $s | grep -q '?' && \
+	abort "$s is not under version control"
+done) || true
+
+# see if any limit options were passed, we'll send them to rsync
+unset rsyncopts
+if [ "$1" = '-l' ]; then
+	rsyncopts="--bwlimit=$2"
+	shift 2
+fi
+
+echo -n 'committing changes to trunk...'
+if [ -n "$1" ]; then
+	svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel
+$1" || abort
+else
+	svn commit -q || abort
+fi
+echo 'done'
+
+for _arch in ${arch[@]}; do
+	for _pkgname in ${pkgname[@]}; do
+		pkgfile=$_pkgname-$pkgver-$pkgrel-${_arch}$PKGEXT
+
+		if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
+			pkgfile="$PKGDEST/$pkgfile"
+		elif [ ! -f $pkgfile ]; then
+			echo "skipping ${_arch}"
+			continue 2
+		fi
+
+		echo -n 'uploading '
+		rsync -c -h -L --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
+	done
+	archrelease $repo-${_arch} || abort
+done
+
+if [ "${arch[*]}" == 'any' ]; then
+	if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
+		pushd ../repos/ >/dev/null
+		echo -n "removing $repo-i686 and $repo-x86_64..."
+		svn rm $repo-i686
+		svn rm $repo-x86_64
+		svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+		echo 'done'
+		popd >/dev/null
+	fi
+fi
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

communityco

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$1" = '' ]; then
+	echo 'Usage: communityco <package name> [<package name>]'
+	exit 1
+fi
+
+for i in "$@"; do
+	svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i
+done
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

extrapkg

@@ -1,123 +0,0 @@
-#!/bin/bash
-
-# Source makepkg.conf; fail if it is not found
-if [ -r "/etc/makepkg.conf" ]; then
-	source "/etc/makepkg.conf"
-else
-    echo "/etc/makepkg.conf not found!"
-    exit 1
-fi
-
-# Source user-specific makepkg.conf overrides
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-cmd=`basename $0`
-
-if [ ! -f PKGBUILD ]; then
-    echo "No PKGBUILD file"
-    exit 1
-fi
-
-# define staging areas based on architecture
-if [ "$CARCH" = "i686" ]; then
-    suffix=''
-elif [ "$CARCH" = "x86_64" ]; then
-    suffix='64'
-else
-    echo "CARCH must be set to a recognized value!"
-    exit 1
-fi
-
-source PKGBUILD
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-
-if [ ! -f $pkgfile ]; then
-    if [ -f $PKGDEST/$pkgfile ]; then
-        pkgfile=$PKGDEST/$pkgfile
-        oldstylepkgfile=$PKGDEST/$oldstylepkgfile
-    elif [ -f $oldstylepkgfile ]; then
-        pkgfile=$oldstylepkgfile
-    elif [ -f $PKGDEST/$oldstylepkgfile ]; then
-        pkgfile=$PKGDEST/$oldstylepkgfile
-    else
-        echo "File $pkgfile doesn't exist"
-        exit 1
-    fi
-fi
-
-if [ "$cmd" == "extrapkg" ]; then
-    repo="extra"
-elif [ "$cmd" == "corepkg" ]; then
-    repo="core"
-elif [ "$cmd" == "testingpkg" ]; then
-    repo="testing"
-elif [ "$cmd" == "unstablepkg" ]; then
-    repo="unstable"
-elif [ "$cmd" == "communitypkg" ]; then
-    repo="community"
-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
-
-if [ "$repo" != "community" ]; then
-    # combine what we know into a variable (suffix defined based on $CARCH)
-    uploadto="staging/${repo}${suffix}/add/$(basename ${pkgfile})"
-    scp ${scpopts} "${pkgfile}" "archlinux.org:${uploadto}"
-    if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
-        echo "File got corrupted during upload, cancelled."
-        exit 1
-    else
-        echo "File integrity okay."
-    fi
-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 compatability"
-        mv $pkgfile $oldstylepkgfile
-        pkgfile=$oldstylepkgfile
-    fi
-    tupkg $pkgfile
-fi
-if [ $? -ne 0 ]; then
-    echo "Cancelled"
-    exit 1
-fi
-echo "===> Uploaded $pkgfile"
-
-if [ "$1" != "" ]; then
-    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
-    $1" > /dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cancelled"
-        exit 1
-    fi
-    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel
-    $1\" message"
-else
-    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cancelled"
-        exit 1
-    fi
-    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"
-fi
-
-archrelease $repo-$CARCH
-if [ $? -ne 0 ]; then
-    echo "Cancelled"
-    exit 1
-fi
-echo "===> Tagged for $repo-$CARCH"
-
-# vim:ft=sh:ts=4:sw=4:et:

finddeps

@@ -3,12 +3,12 @@
 # finddeps - find packages that depend on a given depname
 #
 
-if [ "$1" = "" ]; then
+if [ "$1" = '' ]; then
-    echo "usage: finddeps <depname>"
+	echo 'usage: finddeps <depname>'
-    echo ""
+	echo ''
-    echo "Find packages that depend on a given depname."
+	echo 'Find packages that depend on a given depname.'
-    echo "Run this script from the top-level directory of your ABS tree."
+	echo 'Run this script from the top-level directory of your ABS tree.'
-    echo ""
+	echo ''
 	exit 0
 fi
 
@@ -38,4 +38,5 @@ for d in $(find . -type d); do
 	cd $tld
 done
 
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

lddd

@@ -6,24 +6,27 @@
 ifs=$IFS
 IFS=':'
 
-libdirs="/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib"
+libdirs='/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib'
 extras=
 
 TEMPDIR=$(mktemp /tmp/lddd-script.XXXX)
 rm $TEMPDIR
 mkdir -p $TEMPDIR
 
-echo " Go out and drink some tea, this will take a while :) ..."
+echo 'Go out and drink some tea, this will take a while :) ...'
 #  Check ELF binaries in the PATH and specified dir trees.
-for tree in $PATH $libdirs $extras
+for tree in $PATH $libdirs $extras; do
-do
 	echo DIR $tree
 
 	#  Get list of files in tree.
-    files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name '*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' ! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
+	files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
+	-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
+	'*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
+	! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
+	! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! \
+	-name '*.mcopclass' ! -name '*.mcoptype')
 	IFS=$ifs
-    for i in $files
+	for i in $files; do
-    do
 		if [ `file $i | grep -c 'ELF'` -ne 0 ]; then
 			#  Is an ELF binary.
 			if [ `ldd $i 2>/dev/null | grep -c 'not found'` -ne 0 ]; then
@@ -44,4 +47,5 @@ sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
 
 echo "Files saved to $TEMPDIR"
 
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

makechrootpkg

@@ -8,202 +8,242 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-FORCE="n"
+FORCE='n'
-RUN=""
+RUN=''
-MAKEPKG_ARGS="-sr"
+MAKEPKG_ARGS='-sr'
-REPACK=""
+REPACK=''
+COPY='copy'
 WORKDIR=$PWD
-clean_first="0"
 
-chrootdir="$CHROOT_SHELL"
+update_first='0'
+clean_first='0'
+install_pkg=''
+add_to_db=0
+
+chrootdir=''
 
 APPNAME=$(basename "${0}")
 
-usage ()
+usage() {
-{
+	echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
-    echo "usage ${APPNAME} [-h] [-c] [-r CHROOT_SHELL] [--] [makepkg args]"
+	echo ' Run this script in a PKGBUILD dir to build a package inside a'
-    echo " Run this script in a PKGBUILD dir to build a package inside a"
+	echo ' clean chroot. All unrecognized arguments passed to this script'
-    echo " clean chroot. All unrecognized arguments passed to this script"
+	echo ' will be passed to makepkg.'
-    echo " will be passed to makepkg."
+	echo ''
-    echo ""
+	echo ' The chroot dir consists of the following directories:'
-    echo "The \$CHROOT_SHELL environment variable is used to determine where"
+	echo ' <chrootdir>/{root, copy} but only "root" is required'
-    echo " your chroot shell is. The shell consists of the following"
+	echo ' by default. The working copy will be created as needed'
-    echo " directories: \$CHROOT_SHELL/{root, rw, union} but only 'root' is"
+	echo ''
-    echo " required by default. The rest will be created as needed"
+	echo 'The chroot "root" directory must be created via the following'
-    echo ""
+	echo 'command:'
-    echo "The -c flag, if specified, will remove all files created by previous"
+	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
-    echo "builds using makechrootpkg.  This will ensure a clean chroot is used."
+	echo ''
-    echo ""
-    echo "The chroot shell 'root' directory must be created via the following"
-    echo "command:"
-    echo "    mkarchroot \$CHROOT_SHELL/root base base-devel sudo"
-    echo ""
-    echo "If you have problems passing params to makepkg or need to pass long"
-    echo "options, put -- between the makechrootpkg args and the makepkg args"
-    echo ""
 	echo "Default makepkg args: $MAKEPKG_ARGS"
+	echo ''
+	echo 'Flags:'
+	echo '-h         This help'
+	echo '-c         Clean the chroot before building'
+	echo '-u         Update the working copy of the chroot before building'
+	echo '           This is useful for rebuilds without dirtying the pristine'
+	echo '           chroot'
+	echo '-d         Add the package to a local db at /repo after building'
+	echo '-r <dir>   The chroot dir to use'
+	echo '-I <pkg>   Install a package into the working copy of the chroot'
+	echo '-l <copy>  The directory to use as the working copy of the chroot'
+	echo '           Useful for maintain multiple copies Default: copy'
 	exit 1
 }
 
-while getopts ':r:h:c' arg; do
+while getopts 'hcudr:I:l:' arg; do
 	case "${arg}" in
-        r) chrootdir="$OPTARG" ;;
+		h) usage ;;
 		c) clean_first=1 ;;
-        h|?) usage ;;
+		u) update_first=1 ;;
+		d) add_to_db=1 ;;
+		r) chrootdir="$OPTARG" ;;
+		I) install_pkg="$OPTARG" ;;
+		l) COPY="$OPTARG" ;;
 		*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
 	esac
 done
 
 #Get rid of trailing / in chrootdir
 [ "$chrootdir" != "/" ] && chrootdir=$(echo $chrootdir | sed 's#/$##')
+copydir="$chrootdir/$COPY"
 
 # Pass all arguments after -- right to makepkg
 MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
 
 # See if -R was passed to makepkg
 for arg in ${*:$OPTIND}; do
-    if [ "$arg" = "-R" ]; then
+	if [ "$arg" = '-R' ]; then
 		REPACK=1
 		break;
 	fi
 done
 
-if [ "$EUID" != "0" ]; then
+if [ "$EUID" != '0' ]; then
-    echo "This script must be run as root."
+	echo 'This script must be run as root.'
 	exit 1
 fi
 
 if [ ! -f PKGBUILD ]; then
-    echo "This must be run in a directory containing a PKGBUILD."
+	echo 'This must be run in a directory containing a PKGBUILD.'
 	exit 1
 fi
 source PKGBUILD
 
 if [ ! -d "$chrootdir" ]; then
-    echo "No \$CHROOT_SHELL defined, or invalid path ($chrootdir)"
+	echo "No chroot dir defined, or invalid path '$chrootdir'"
 	exit 1
 fi
 
 if [ ! -d "$chrootdir/root" ]; then
-    echo "Missing \$CHROOT_SHELL root directory."
+	echo 'Missing chroot dir root directory.'
-    echo "Try using: mkarchroot \$CHROOT_SHELL base base-devel sudo"
+	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
 	usage
 fi
 
-[ -d "$chrootdir/rw" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/rw/" 
+umask 0022
-[ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
+if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
-[ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
+	echo -n 'creating clean working copy...'
-
+	mkdir -p "$copydir"
-cleanup ()
+	rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
-{
+	echo 'done'
-    echo "cleaning up unioned mounts"
-    umount "$chrootdir/union/pkgdest" 2>/dev/null
-    umount "$chrootdir/union/srcdest" 2>/dev/null
-    umount "$chrootdir/union"
-}
-
-uniondir="$chrootdir/union"
-echo "building union chroot"
-grep -Fq unionfs /proc/filesystems
-if [ $? -ne 0 ]; then
-    modprobe -q unionfs
-    if [ $? -ne 0 ]; then
-        echo "ERROR: No unionfs available. Abandon ship!" && exit 1
-    fi
 fi
-mount -t unionfs none -o "dirs=$chrootdir/rw=rw:$chrootdir/root=ro" "$uniondir"
-trap 'cleanup' 0 1 2 15
 
-echo "moving build files to chroot"
+if [ -n "$install_pkg" ]; then
-[ -d "$uniondir/build" ] || mkdir "$uniondir/build"
+	pkgname="$(basename "$install_pkg")"
+	cp "$install_pkg" "$copydir/$pkgname"
+	mkarchroot -r "pacman -U /$pkgname" "$copydir"
+	ret=$?
+	rm "$copydir/$pkgname"
+	#exit early, we've done all we need to
+	exit $ret
+fi
+
+if [ $update_first -eq 1 ]; then
+	mkarchroot -r 'pacman -Syu --noconfirm' "$copydir"
+fi
+
+[ -d "$copydir/build" ] || mkdir "$copydir/build"
 
 if [ "$REPACK" != "1" ]; then
 	#Remove anything in there UNLESS -R (repack) was passed to makepkg
-    rm -rf "$uniondir/build/"*
+	rm -rf "$copydir/build/"*
 fi
 
-# Copy makepkg.conf and ~/.makepkg.conf into the chroot so packager has
+# Get SRC/PKGDEST from makepkg.conf
-# all their custom variables set.
+SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
-if [ -r "/etc/makepkg.conf" ]; then
+PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
-  rm $uniondir/etc/makepkg.conf
+
-  cp /etc/makepkg.conf $uniondir/etc/makepkg.conf
+[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
-fi
+if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-if [ -r ~/.makepkg.conf ]; then
+	echo 'PKGDEST=/pkgdest' >> "$copydir/etc/makepkg.conf"
-  cat ~/.makepkg.conf >> $uniondir/etc/makepkg.conf
 fi
 
-source $uniondir/etc/makepkg.conf
+[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
-
+if ! grep 'SRCDEST=/srcdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-# Magic trickery with PKGDEST and SRCDEST, so that the built
+	echo 'SRCDEST=/srcdest' >> "$copydir/etc/makepkg.conf"
-# files end up where they're expected in the _real_ filesystem
-[ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest"
-[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
-[ ! -z "$PKGDEST" ] && mount --bind "$PKGDEST" "$uniondir/pkgdest"
-[ ! -z "$SRCDEST" ] && mount --bind "$SRCDEST" "$uniondir/srcdest"
-
-if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
-    echo "Setting PKGDEST in makepkg.conf"
-    echo "PKGDEST=/pkgdest" >> "$uniondir/etc/makepkg.conf"
 fi
 
-if ! grep "SRCDEST=/srcdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
-    echo "Setting SRCDEST in makepkg.conf"
-    echo "SRCDEST=/srcdest" >> "$uniondir/etc/makepkg.conf"
-fi
-
-chown -R nobody "$uniondir/build"
-chown -R nobody "$uniondir/srcdest"
-chown -R nobody "$uniondir/pkgdest"
-
 # Copy PKGBUILD and sources
 source PKGBUILD
-cp PKGBUILD "$uniondir/build/"
+cp PKGBUILD "$copydir/build/"
 for f in ${source[@]}; do
-    basef=$(basename $f)
+	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
 	if [ -f "$basef" ]; then
-        cp "$basef" "$uniondir/srcdest/"
+		cp "$basef" "$copydir/srcdest/"
+	elif [ -f "$SRCDEST/$basef" ]; then
+		cp "$SRCDEST/$basef" "$copydir/srcdest/"
 	fi
 done
-if [ "$install" != "" -a -f "$install" ]; then
+
-    cp "$install" "$uniondir/build/"
+install_files=$(grep 'install=' PKGBUILD)
+for pkg in ${pkgname[@]}; do
+	install_files+=' '
+	install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
+	install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq)
+done
+
+for f in $install_files;do
+	install="${f#"install="}"
+	if [ "$install" != "" -a -f "$install" ]; then
+		cp "$install" "$copydir/build/"
+	fi
+done
+
+if [ -f 'ChangeLog' ]; then
+	cp ChangeLog "$copydir/build/"
 fi
 
-if ! grep "^nobody" "$uniondir/etc/sudoers" >/dev/null 2>&1; then
+chown -R nobody "$copydir/build"
-    echo "allowing 'nobody' sudo rights in the chroot"
+chown -R nobody "$copydir/srcdest"
-    echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> "$uniondir/etc/sudoers"
+chown -R nobody "$copydir/pkgdest"
-    chmod 440 "$uniondir/etc/sudoers"
+
+if ! grep "^nobody" "$copydir/etc/sudoers" >/dev/null 2>&1; then
+	touch "$copydir/etc/sudoers"
+	echo 'nobody	ALL=(ALL) NOPASSWD: ALL' >> "$copydir/etc/sudoers"
+	chmod 440 "$copydir/etc/sudoers"
 fi
 
 #This is a little gross, but this way the script is recreated every time in the
-#rw portion of the union
+#working copy
 (cat <<EOF
 #!/bin/bash
 export LANG=$LOCALE
 cd /build
 export HOME=/build
 sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
+[ -f BUILD_FAILED ] && exit 1
+which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*${PKGEXT} > /pkgdest/namcap.log
+exit 0
 EOF
-) > "$uniondir/chrootbuild"
+) > "$copydir/chrootbuild"
-chmod +x "$uniondir/chrootbuild"
+chmod +x "$copydir/chrootbuild"
 
-mkarchroot -r "/chrootbuild" "$uniondir"
+if mkarchroot -r "/chrootbuild" "$copydir"; then
+	for pkgfile in "${copydir}"/pkgdest/*${PKGEXT}; do
+		[ -e "$pkgfile" ] || continue
+		_pkgname=$(basename "$pkgfile")
+		if [ "$add_to_db" -eq "1" ]; then
+			[ -d "${copydir}/repo" ] || mkdir -p "${copydir}/repo"
+			pushd "${copydir}/repo" >/dev/null
+			cp "$pkgfile" .
+			repo-add repo.db.tar.gz "$_pkgname"
+			popd >/dev/null
+		fi
 
-if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then
+		if [ -d "$PKGDEST" ]; then
-    echo "Build failed, check \$CHROOT_DIR/rw/build"
+			mv "$pkgfile" "${PKGDEST}"
-    rm ${chrootdir}/rw/build/BUILD_FAILED
+		else
-    exit 1
+			mv "$pkgfile" "${WORKDIR}"
+		fi
+	done
+
+	for f in "${copydir}"/srcdest/*; do
+		[ -e "$f" ] || continue
+		if [ -d "$SRCDEST" ]; then
+			mv "$f" "${SRCDEST}"
+		else
+			mv "$f" "${WORKDIR}"
+		fi
+	done
+
+	for l in "${copydir}"/build/*-{build,package}.log; do
+		[ -f "$l" ] && mv "$l" "${WORKDIR}"
+	done
 else
-    source ${WORKDIR}/PKGBUILD
+	#just in case. We returned 1, make sure we fail
-    if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
+	touch "${copydir}/build/BUILD_FAILED"
-        echo "Moving completed package file to ${WORKDIR}"
-        mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
-    fi
-    if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
-        echo "Moving downloaded source files to ${WORKDIR}"
-        mv ${chrootdir}/union/srcdest/* ${WORKDIR}
-    fi
-    rm -rf ${chrootdir}/rw/build/*
-    echo "Build complete"
 fi
 
-# vim:ft=sh:ts=4:sw=4:et:
+if [ -e "${copydir}/build/BUILD_FAILED" ]; then
+	echo "Build failed, check $copydir/build"
+	rm "${copydir}/build/BUILD_FAILED"
+else
+	rm -rf "${copydir}"/build/*
+fi
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

mkarchroot

@@ -8,119 +8,119 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-FORCE="n"
+FORCE='n'
-RUN=""
+RUN=''
+NOCOPY='n'
 
-working_dir=""
+working_dir=''
 
 APPNAME=$(basename "${0}")
 
 # usage: usage <exitvalue>
-usage ()
+usage() {
-{
 	echo "usage ${APPNAME} [options] working-dir [package-list | app]"
-    echo " options:"
+	echo ' options:'
-    echo "    -r <app>      Run 'app' within the context of the chroot"
+	echo '    -r <app>      Run "app" within the context of the chroot'
-    echo "    -u            Update the chroot via pacman"
+	echo '    -u            Update the chroot via pacman'
-    echo "    -f            Force overwrite of files in the working-dir"
+	echo '    -f            Force overwrite of files in the working-dir'
-    echo "    -C <file>     location of a pacman config file"
+	echo '    -C <file>     Location of a pacman config file'
-    echo "    -M <file>     location of a makepkg config file"
+	echo '    -M <file>     Location of a makepkg config file'
-    echo "    -h            This message"
+	echo '    -n            Do not copy config files into the chroot'
+	echo "    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg"
+	echo '    -h            This message'
 	exit $1
 }
 
-while getopts 'r:ufhC:M:' arg; do
+while getopts 'r:ufnhC:M:c:' arg; do
 	case "${arg}" in
 		r) RUN="$OPTARG" ;;
-        u) RUN="pacman -Syu" ;;
+		u) RUN='pacman -Syu' ;;
-        f) FORCE="y" ;;
+		f) FORCE='y' ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
+		n) NOCOPY='y' ;;
+		c) cache_dir="$OPTARG" ;;
 		h|?) usage 0 ;;
 		*) echo "invalid argument '${arg}'"; usage 1 ;;
 	esac
 done
 
-if [ "$EUID" != "0" ]; then
+if [ "$EUID" != '0' ]; then
-    echo "error: this script must be run as root."
+	echo 'error: this script must be run as root.'
 	exit 1
 fi
 
 shift $(($OPTIND - 1))
 
-if [ "$RUN" = "" -a $# -lt 2 ]; then
+if [ "$RUN" = '' -a $# -lt 2 ]; then
-    echo "you must specify a directory and one or more packages"
+	echo 'you must specify a directory and one or more packages'
 	usage 1
 elif [ $# -lt 1 ]; then
-    echo "you must specify a directory"
+	echo 'you must specify a directory'
 	usage 1
 fi
 
 working_dir="$(readlink -f ${1})"
 shift 1
 
-[ "${working_dir}" = "" ] && echo "error: please specify a working directory" && usage 1
+[ "${working_dir}" = '' ] && echo 'error: please specify a working directory' && usage 1
+
+if [ -z "$cache_dir" ]; then
+	cache_conf=${working_dir}/etc/pacman.conf
+	[ ! -f $cache_conf ] && cache_conf=${pac_conf:-/etc/pacman.conf}
+	cache_dir=$((grep -m 1 '^CacheDir' $cache_conf || echo 'CacheDir = /var/cache/pacman/pkg') | sed 's/CacheDir\s*=\s*//')
+	unset cache_conf
+fi
 
 # {{{ functions 
 
-chroot_mount ()
+chroot_mount() {
-{
-    echo "mounting sysfs : /sys"
 	[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
 	mount -t sysfs sysfs "${working_dir}/sys"
 
-    echo "mounting procfs : /proc"
 	[ -e "${working_dir}/proc" ] || mkdir "${working_dir}/proc"
 	mount -t proc proc "${working_dir}/proc"
 
-    echo "binding device nodes : /dev"
 	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
 	mount -o bind /dev "${working_dir}/dev"
 
-    echo "binding pacman cache : /var/cache/pacman"
+	[ -e "${cache_dir}" ] || mkdir -p "${cache_dir}"
-    [ -e "${working_dir}/var/cache/pacman" ] || mkdir -p "${working_dir}/var/cache/pacman"
+	[ -e "${working_dir}/${cache_dir}" ] || mkdir -p "${working_dir}/${cache_dir}"
-    mount -o bind /var/cache/pacman "${working_dir}/var/cache/pacman"
+	mount -o bind "${cache_dir}" "${working_dir}/${cache_dir}"
 
 	trap 'chroot_umount' 0 1 2 15
 }
 
-copy_hostconf ()
+copy_hostconf () {
-{
-    echo "copying mtab : /etc/mtab"
 	cp /etc/mtab "${working_dir}/etc/mtab"
-
-    echo "copying resolv.conf : /etc/resolv.conf"
 	cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
-
 }
 
-chroot_umount ()
+chroot_umount () {
-{
-    echo "cleaning up mounts"
 	umount "${working_dir}/proc"
 	umount "${working_dir}/sys"
 	umount "${working_dir}/dev"
-    umount "${working_dir}/var/cache/pacman"
+	umount "${working_dir}/${cache_dir}"
 }
 # }}}
 
+umask 0022
 if [ "$RUN" != "" ]; then
 	# run chroot {{{
 	#Sanity check
 	if [ ! -f "${working_dir}/.arch-chroot" ]; then
 		echo "error: '${working_dir}' does not appear to be a Arch chroot"
-        echo "  please build the image using mkarchroot"
+		echo '       please build the image using mkarchroot'
 		exit 1
 	fi
 
 	chroot_mount
 	copy_hostconf
 
-    echo "starting chroot ($RUN)"
 	chroot "${working_dir}" ${RUN}
 
 	# }}}
-else
+	else
 	# {{{ build chroot
 	if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
 		echo "error: working dir '${working_dir}' already exists - try using -f"
@@ -132,48 +132,41 @@ else
 
 	chroot_mount
 
-    pacargs="--noconfirm -v " #--noprogressbar -v
+	pacargs='--noconfirm -v ' #--noprogressbar -v
 	pacargs="$pacargs --root=${working_dir}"
 	# pacman takes these as relative to the given root
-    pacargs="$pacargs --cachedir=/var/cache/pacman/pkg"
+	pacargs="$pacargs --cachedir=${cache_dir}"
 	if [ "$pac_conf" != "" ]; then
 		pacargs="$pacargs --config=${pac_conf}"
 	fi
 
-    if [ $# -eq 0 ]; then
+	if [ $# -ne 0 ]; then
-        echo "no packages to install"
+		op='-Sy'
-    else
-        echo "installing packages:"
-        for i in $@; do echo -e "\t$i"; done
-
-        op="-Sy"
 		if [ "$FORCE" = "y" ]; then
 			op="${op}f"
 		fi
 		if ! pacman ${op} ${pacargs} $@; then
-            echo "error: failed to install all packages"
+			echo 'error: failed to install all packages'
 			exit 1
 		fi
 	fi
 
 	if [ -d "${working_dir}/lib/modules" ]; then
-        echo "running ldconfig"
 		ldconfig -r "${working_dir}"
 	fi
 
-    if [ "$pac_conf" != "" ]; then
+	if [ "$pac_conf" != "" -a "$NOCOPY" = "n" ]; then
-        echo "installing custom pacman.conf"
 		cp ${pac_conf} ${working_dir}/etc/pacman.conf
 	fi
 
-    if [ "$makepkg_conf" != "" ]; then
+	if [ "$makepkg_conf" != "" -a "$NOCOPY" = "n" ]; then
-        echo "installing custom makepkg.conf"
 		cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
 	fi
 
-    echo "generating default locales"
+	if [ -e "${working_dir}/etc/locale.gen" ]; then
 		cp /etc/locale.gen "${working_dir}/etc/locale.gen"
 		chroot "${working_dir}" locale-gen
+	fi
 
 	if [ ! -e "${working_dir}/.arch-chroot" ]; then
 		date +%s > "${working_dir}/.arch-chroot"
@@ -181,4 +174,5 @@ else
 	# }}}
 fi
 
-# vim:ft=sh:ts=4:sw=4:et:
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

rebuildpkgs

@@ -0,0 +1,104 @@
+#!/bin/bash
+# This script rebuilds a list of packages in order
+# and reports anything that fails
+# 
+# Due to sudo usage, it is recommended to allow makechrootpkg
+# to be run with NOPASSWD in your sudoers file
+#
+# FIXME
+# Currently uses $(pwd)/rebuilds as the directory for rebuilding...
+# TODO make this work for community too
+
+if [ $# -le 1 ]; then
+	echo "usage: $(basename $0) <chrootdir> <packages to rebuild>"
+	echo "  example: $(basename $0) ~/chroot readline bash foo bar baz"
+	exit 1
+fi
+
+# Source makepkg.conf; fail if it is not found
+if [ -r '/etc/makepkg.conf' ]; then
+	source '/etc/makepkg.conf'
+else
+	echo '/etc/makepkg.conf not found!'
+	exit 1
+fi
+
+die () {
+	echo $@ >&2
+	exit 1
+}
+
+bump_pkgrel() {
+	# Get the current pkgrel from SVN and update the working copy with it
+	# This prevents us from incrementing out of control :)
+	pbuild='.svn/text-base/PKGBUILD.svn-base'
+	oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
+
+	#remove decimals
+	rel=$(echo $oldrel | cut -d. -f1)
+
+	newrel=$(($rel + 1))
+
+	sed -i "s/pkgrel=$oldrel/pkgrel=$newrel/" PKGBUILD
+}
+
+pkg_from_pkgbuild() {
+	# we want the sourcing to be done in a subshell so we don't pollute our current namespace
+	export CARCH PKGEXT
+	(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
+}
+
+chrootdir="$1"; shift
+pkgs="$@"
+
+SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
+
+echo ":: Work will be done in $(pwd)/rebuilds"
+
+REBUILD_ROOT="$(pwd)/rebuilds"
+mkdir -p "$REBUILD_ROOT"
+cd "$REBUILD_ROOT"
+
+/usr/bin/svn co -N $SVNPATH
+
+FAILED=""
+for pkg in $pkgs; do
+	cd "$REBUILD_ROOT/svn-packages"
+
+	echo ":: Building '$pkg'"
+	/usr/bin/svn update "$pkg"
+	if [ ! -d "$pkg/trunk" ]; then
+		FAILED="$FAILED $pkg"
+		echo ":: $pkg does not exist in SVN"
+		continue
+	fi
+	cd "$pkg/trunk/"
+
+	bump_pkgrel
+
+	if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
+		FAILED="$FAILED $pkg"
+		echo ":: $pkg Failed!"
+	else
+		pkgfile=$(pkg_from_pkgbuild)
+		if [ -e "$pkgfile" ]; then
+			echo ":: $pkg Complete"
+		else
+			FAILED="$FAILED $pkg"
+			echo ":: $pkg Failed, no package built!"
+		fi
+	fi
+done
+
+cd "$REBUILD_ROOT"
+if [ "$FAILED" != "" ]; then
+	echo 'Packages failed:'
+	for pkg in $FAILED; do
+		echo -e "\t$pkg"
+	done
+fi
+
+echo 'SVN pkgbumps in svn-packages/ - commit when ready'
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132