prepare release

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

Makefile

@@ -1,4 +1,4 @@
-V=20121103
+V=20121115
 
 PREFIX = /usr/local
 
@@ -115,6 +115,6 @@ dist:
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
 upload:
-	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/
 
 .PHONY: all clean install uninstall dist upload

archco.in

@@ -11,7 +11,7 @@ fi
 
 case $scriptname in
 	archco)
-		SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
+		SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
 	communityco)
 		SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
 	*)

checkpkg.in

@@ -58,7 +58,7 @@ for _pkgname in "${pkgname[@]}"; do
 		elif [[ -f "$STARTDIR/$oldpkg" ]]; then
 			ln -s "$STARTDIR/$oldpkg" "$oldpkg"
 		else
-			wget --quiet "$pkgurl"
+		        curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl"
 		fi
 	fi
 

commitpkg.in

@@ -105,7 +105,15 @@ for _arch in ${arch[@]}; do
 done
 
 if [[ -z $server ]]; then
-	server='nymeria.archlinux.org'
+	case "$repo" in
+		core|extra|testing|staging|kde-unstable|gnome-unstable)
+			server='gerolde.archlinux.org' ;;
+		community*|multilib*)
+			server='nymeria.archlinux.org' ;;
+		*)
+			server='gerolde.archlinux.org'
+			msg "Non-standard repository $repo in use, defaulting to server $server" ;;
+	esac
 fi
 
 if [[ -n $(svn status -q) ]]; then

crossrepomove.in

@@ -11,8 +11,8 @@ fi
 
 pkgbase="${1}"
 
-packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
-packages_server='nymeria.archlinux.org'
+packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
+packages_server='gerolde.archlinux.org'
 community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
 community_server='nymeria.archlinux.org'
 mirror='http://mirrors.kernel.org/archlinux'
@@ -72,11 +72,23 @@ svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${targe
 pushd "target_checkout/${pkgbase}/trunk" >/dev/null
 archrelease "${arch[@]/#/$target_repo-}" || die
 popd >/dev/null
-ssh "${target_server}" '/arch/db-update' || die
+
+if [[ "${target_server}" == "${community_server}" ]]; then
+        dbscripts_path='/srv/repos/svn-community/dbscripts'
+else
+        dbscripts_path='/arch'
+fi
+
+ssh "${target_server}" "${dbscripts_path}/db-update" || die
 
 msg "Removing ${pkgbase} from ${source_repo}"
+if [[ "${source_server}" == "${community_server}" ]]; then
+        dbscripts_path='/srv/repos/svn-community/dbscripts'
+else
+        dbscripts_path='/arch'
+fi
 for _arch in ${arch[@]}; do
-	ssh "${source_server}" "/arch/db-remove ${source_repo} ${_arch} ${pkgbase}"
+	ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}"
 done
 svn -q checkout -N "${source_svn}" source_checkout
 svn -q up "source_checkout/${pkgbase}"

mkarchroot.in

@@ -44,7 +44,7 @@ while getopts 'r:ufnhC:M:c:' arg; do
 		M) makepkg_conf="$OPTARG" ;;
 		n) NOCOPY='y' ;;
 		c) cache_dir="$OPTARG" ;;
-		h|?) usage 0 ;;
+		h|?) usage ;;
 		*) error "invalid argument '${arg}'"; usage ;;
 	esac
 done

rebuildpkgs.in

@@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
 chrootdir="$1"; shift
 pkgs="$@"
 
-SVNPATH='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
+SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
 
 msg "Work will be done in $(pwd)/rebuilds"