prepare release

-a i686 uploads only i686 packages and ignore everything else

Signed-off-by: Florian Pritz <bluewind@server-speed.net>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

Makefile

@@ -1,4 +1,4 @@
-V=0.9.21
+V=0.9.23
 
 BINPROGS = \
 	checkpkg \
@@ -57,6 +57,7 @@ install:
 	install -m0644 ${CONFIGFILES} $(DESTDIR)/usr/share/devtools
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)/usr/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)/usr/bin/$$l; done
+	install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools
 
 uninstall:
 	for f in ${BINPROGS}; do rm -f $(DESTDIR)/usr/bin/$$f; done
@@ -64,6 +65,7 @@ uninstall:
 	for f in ${CONFIGFILES}; do rm -f $(DESTDIR)/usr/share/devtools/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)/usr/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)/usr/bin/$$l; done
+	rm $(DESTDIR)/etc/bash_completion.d/devtools
 
 dist:
 	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz

bash_completion

@@ -0,0 +1,69 @@
+_devtools_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in ${!COMPREPLY[@]}; do
+      if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
+    done
+  done
+}
+
+_archco_pkg() {
+  _devtools_compgen "$(
+      \pacman -$1
+  )"
+}
+
+_archco() {
+  local cur prev 
+  COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
+
+  _archco_pkg Slq
+  true
+} &&
+complete -F _archco archco communityco
+
+_makechrootpkg() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-I -c -d -h -l -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _makechrootpkg makechrootpkg
+
+_mkarchroot() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -f -h -n -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _mkarchroot mkarchroot
+
+
+# ex:et ts=2 sw=2 ft=sh

checkpkg

@@ -32,23 +32,22 @@ TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
 cd $TEMPDIR
 
 for _pkgname in ${pkgname[@]}; do
-	pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	if [ -z ${epoch} ] ; then
-	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
+		pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	else
+		pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	fi
 
 	if [ -f "$STARTDIR/$pkgfile" ]; then
 		cp "$STARTDIR/$pkgfile" .
 	elif [ -f "$PKGDEST/$pkgfile" ]; then
 		cp "$PKGDEST/$pkgfile" .
-	elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then
-		cp "$STARTDIR/$oldstylepkgfile" .
-	elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-		cp "$PKGDEST/$oldstylepkgfile" .
 	else
 		echo "File \"$pkgfile\" doesn't exist"
 		exit 1
 	fi
 
-	tmp=`pacman -Spd --noconfirm $_pkgname`
+	tmp=`pacman -Spdd --noconfirm $_pkgname`
 
 	if [ $? -ne 0 ]; then
 		echo "Couldn't download previous package for $_pkgname."

commitpkg

@@ -54,7 +54,7 @@ pkgbase=${pkgbase:-$pkgname}
 case "$cmd" in
 	commitpkg)
 		if [ $# -eq 0 ]; then
-			abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
+			abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
 		fi
 		repo="$1"
 		shift
@@ -63,7 +63,7 @@ case "$cmd" in
 		repo="${cmd%pkg}"
 		;;
 	*)
-		abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
+		abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
 		;;
 esac
 
@@ -103,6 +103,11 @@ if [ "$1" = '-l' ]; then
 	shift 2
 fi
 
+if [ "$1" = "-a" ]; then
+	commit_arch=$2
+	shift 2
+fi
+
 echo -n 'committing changes to trunk...'
 if [ -n "$1" ]; then
 	svn commit -q -m "upgpkg: $pkgbase $pkgver-$pkgrel
@@ -115,6 +120,11 @@ echo 'done'
 declare -a uploads
 
 for _arch in ${arch[@]}; do
+	if [ -n "$commit_arch" ] && [ "${_arch}" != "$commit_arch" ]; then
+		echo "skipping ${_arch}"
+		continue
+	fi
+
 	for _pkgname in ${pkgname[@]}; do
 		fullver=$(get_full_version ${epoch:-0} $pkgver $pkgrel)
 		pkgfile=$(getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null)
@@ -132,7 +142,10 @@ for _arch in ${arch[@]}; do
 
 		if [[ $SIGNPKG == 'y' ]]; then
 			echo "Signing package ${pkgfile}..."
-			gpg --detach-sign --use-agent -u "${PACKAGER}" "${pkgfile}" || abort
+			if [[ -n $GPGKEY ]]; then
+				SIGNWITHKEY="-u ${GPGKEY}"
+			fi
+			gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || abort
 		fi
 
 		sigfile="${pkgfile}.sig"
@@ -160,4 +173,13 @@ if [ "${arch[*]}" == 'any' ]; then
 		echo 'done'
 		popd >/dev/null
 	fi
+else
+	if [ -d ../repos/$repo-any ]; then
+		pushd ../repos/ >/dev/null
+		echo "removing $repo-any..."
+		svn rm $repo-any
+		svn commit -q -m "removed $repo-any for $pkgname"
+		echo 'done'
+		popd >/dev/null
+	fi
 fi

makechrootpkg

@@ -277,7 +277,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 		fi
 	done
 
-	for l in "${copydir}"/build/{namcap,*-{build,package,package_*}}.log; do
+	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
 		[ -f "$l" ] && mv "$l" "${WORKDIR}"
 	done
 else

mkarchroot

@@ -73,7 +73,7 @@ if [ -z "$cache_dir" ]; then
 fi
 
 if [ -f /etc/pacman.d/mirrorlist ]; then
-	host_mirror=$(pacman -Sdp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
+	host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
 fi
 if [ -z "${host_mirror}" ]; then
 	host_mirror='http://mirrors.kernel.org/archlinux/$repo/os/$arch'