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.

archrelease

@@ -1,34 +1,34 @@
 #!/bin/bash
 
-if [ "$1" = '' ]; then
-	echo 'Usage: archrelease <repo>'
+abort() {
+	echo ${1:-'archrelease: Cancelled'}
 	exit 1
+}
+
+if [ "$1" = '' ]; then
+	abort 'Usage: archrelease <repo>'
 fi
 
 if [ ! -f PKGBUILD ]; then
-	echo 'archrelease: PKGBUILD not found'
-	exit 1
+	abort 'archrelease: PKGBUILD not found'
 fi
 
 if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
-	echo 'archrelease: Not in a package trunk dir'
-	exit 1
+	abort 'archrelease: Not in a package trunk dir'
 fi
 
-if [ "$(svn diff)" != '' ]; then
-	echo 'archrelease: You have not committed your changes yet!'
-	echo '             Please run "svn commit" first'
-	exit 1
+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"
+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"
+svn copy -q -r HEAD trunk "repos/${1}"
+svn commit -q -m "archrelease: copy trunk to ${1}" || abort
 popd >/dev/null
 echo 'done'
 

commitpkg

@@ -84,7 +84,7 @@ for _arch in ${arch[@]}; do
 		fi
 
 		echo -n 'uploading '
-		rsync -c -h --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
+		rsync -c -h -L --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
 	done
 	archrelease $repo-${_arch} || abort
 done

lddd

@@ -19,12 +19,12 @@ for tree in $PATH $libdirs $extras; 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; do
 		if [ `file $i | grep -c 'ELF'` -ne 0 ]; then

mkarchroot

@@ -26,7 +26,7 @@ usage() {
 	echo '    -C <file>     Location of a pacman config file'
 	echo '    -M <file>     Location of a makepkg config file'
 	echo '    -n            Do not copy config files into the chroot'
-	echo "    -c <dir>      Set pacman cache. Default: ${cache_dir}"
+	echo "    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg"
 	echo '    -h            This message'
 	exit $1
 }