prepare 0.9.7 release

Thise code was copied from makepkg

Makefile

@@ -1,4 +1,4 @@
-V=0.9.6
+V=0.9.7
 
 all:
 

archco

@@ -8,6 +8,3 @@ fi
 for i in "$@"; do
 	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

@@ -31,6 +31,3 @@ 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

@@ -11,6 +11,3 @@ 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

@@ -90,6 +90,3 @@ for _pkgname in ${pkgname[@]}; do
 		echo "No filename differences for $_pkgname."
 	fi
 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

commitpkg

@@ -61,12 +61,24 @@ else
 fi
 
 # check if all local source files are under version control
-(for s in ${source[@]} $install; do
+(for s in ${source[@]}; do
 	echo $s | grep -vq '://' && \
 	svn status $s | grep -q '?' && \
 	abort "$s is not under version control"
 done) || true
 
+# check if changelog and install files are under version control
+(for i in 'changelog' 'install'; do
+	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
+	for file in $filelist; do
+		# evaluate any bash variables used
+		eval file=${file}
+		if svn status ${file} | grep -q '?'; then
+			abort "${file} is not under version control"
+		fi
+	done
+done) || true
+
 # see if any limit options were passed, we'll send them to rsync
 unset rsyncopts
 if [ "$1" = '-l' ]; then
@@ -96,7 +108,7 @@ for _arch in ${arch[@]}; do
 		fi
 
 		echo -n 'uploading '
-		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
+		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh $server:staging/$repo || abort
 	done
 	archrelease $repo-${_arch} || abort
 done
@@ -104,7 +116,7 @@ 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..."
+		echo "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"
@@ -112,6 +124,3 @@ if [ "${arch[*]}" == 'any' ]; then
 		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

@@ -8,6 +8,3 @@ 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

finddeps

@@ -37,6 +37,3 @@ for d in $(find . -type d); do
 	fi
 	cd $tld
 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

lddd

@@ -46,6 +46,3 @@ done
 sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
 
 echo "Files saved to $TEMPDIR"
-
-# 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

@@ -91,7 +91,6 @@ if [ ! -f PKGBUILD ]; then
 	echo 'This must be run in a directory containing a PKGBUILD.'
 	exit 1
 fi
-source PKGBUILD
 
 if [ ! -d "$chrootdir" ]; then
 	echo "No chroot dir defined, or invalid path '$chrootdir'"
@@ -134,8 +133,10 @@ if [ "$REPACK" != "1" ]; then
 fi
 
 # Get SRC/PKGDEST from makepkg.conf
-SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
+SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
-PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
+[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
+PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2)
+[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
 
 [ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
 if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
@@ -161,24 +162,17 @@ for f in ${source[@]}; do
 	fi
 done
 
-install_files=$(grep 'install=' PKGBUILD)
+for i in 'changelog' 'install'; do
-for pkg in ${pkgname[@]}; do
+	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	install_files+=' '
+	for file in $filelist; do
-	install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
+		# evaluate any bash variables used
-	install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq)
+		eval file=${file}
+		if [[ -f "$file" ]]; then
+			cp "$file" "$copydir/build/"
+		fi
+	done
 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
-
 chown -R nobody "$copydir/build"
 chown -R nobody "$copydir/srcdest"
 chown -R nobody "$copydir/pkgdest"
@@ -246,6 +240,3 @@ if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 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

@@ -173,6 +173,3 @@ if [ "$RUN" != "" ]; then
 	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

rebuildpkgs

@@ -99,6 +99,3 @@ if [ "$FAILED" != "" ]; then
 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