prepare release

This makes it much better readable especially for very large file lists.

Makefile

@@ -1,4 +1,4 @@
-V=0.9.15
+V=0.9.17
 
 all:
 

archrelease

@@ -13,7 +13,9 @@ if [ ! -f PKGBUILD ]; then
 	abort 'archrelease: PKGBUILD not found'
 fi
 
-if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
+trunk=$(basename $(pwd))
+
+if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
 	abort 'archrelease: Not in a package trunk dir'
 fi
 
@@ -27,7 +29,7 @@ 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 copy -q -r HEAD "${trunk}" "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to ${1}" || abort
+svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort
 popd >/dev/null
 echo 'done'

checkpkg

@@ -69,6 +69,8 @@ for _pkgname in ${pkgname[@]}; do
 			cp `echo $pkgurl | sed 's#^file://##'` .
 		elif [ -f $PKGDEST/$oldpkg ]; then
 			cp $PKGDEST/$oldpkg .
+		elif [ -f $STARTDIR/$oldpkg ]; then
+			cp $STARTDIR/$oldpkg .
 		else
 			wget --quiet $pkgurl
 		fi
@@ -80,7 +82,7 @@ for _pkgname in ${pkgname[@]}; do
 	sort -o filelist-$_pkgname filelist-$_pkgname
 	sort -o filelist-$_pkgname-old filelist-$_pkgname-old
 
-	diff -u filelist-$_pkgname-old filelist-$_pkgname
+	sdiff -s filelist-$_pkgname-old filelist-$_pkgname
 
 	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then
 		mkdir -p pkg
@@ -90,6 +92,7 @@ for _pkgname in ${pkgname[@]}; do
 			echo -n "${i}: "
 			objdump -p $i | grep SONAME
 		done
+		cd ..
 	else
 		echo "No soname differences for $_pkgname."
 	fi

mkarchroot

@@ -34,7 +34,7 @@ usage() {
 while getopts 'r:ufnhC:M:c:' arg; do
 	case "${arg}" in
 		r) RUN="$OPTARG" ;;
-		u) RUN='pacman -Syu --noconfirm' ;;
+		u) RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"' ;;
 		f) FORCE='y' ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
@@ -157,7 +157,7 @@ if [ "$RUN" != "" ]; then
 	chroot_mount
 	copy_hostconf
 
-	chroot "${working_dir}" ${RUN}
+	eval chroot "${working_dir}" ${RUN}
 
 	# }}}
 	else