summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-28 11:09:49 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-28 11:09:49 -0500
commit8c0ab05d635c66feb07ec102515f02d13f9af2d6 (patch)
tree8cf425cf2243195c0de12c83588a32566588c2f0
parentc4785f9cb3e42b29d0cc39198559976cacc07995 (diff)
parent890baf68915294d27dfb11efc7a889e21e46ec2b (diff)
Merge remote-tracking branch 'devtools/master' into complete
Conflicts: mkarchroot.in
-rw-r--r--Makefile2
-rw-r--r--archbuild.in2
-rw-r--r--archco.in2
-rw-r--r--checkpkg.in2
-rw-r--r--commitpkg.in6
-rw-r--r--crossrepomove.in20
-rw-r--r--finddeps.in2
-rw-r--r--makechrootpkg.in2
-rw-r--r--mkarchroot.in4
-rw-r--r--rebuildpkgs.in2
10 files changed, 28 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index b0e07fa..931318b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20121027
+V=20121115
PREFIX = /usr/local
diff --git a/archbuild.in b/archbuild.in
index 9476415..a41d490 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -18,7 +18,7 @@ chroots='/var/lib/archbuild'
clean_first=false
usage() {
- echo "usage $cmd"
+ echo "Usage: $cmd"
echo ' -c Recreate the chroot before building'
echo ' -r <dir> Create chroots in this directory'
exit 1
diff --git a/archco.in b/archco.in
index 4e462ba..5d497cc 100644
--- a/archco.in
+++ b/archco.in
@@ -13,7 +13,7 @@ case $scriptname in
archco)
SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
communityco)
- SVNURL="svn+ssh://sigurd.archlinux.org/srv/svn-packages";;
+ SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
*)
die "Couldn't find svn url for $scriptname"
;;
diff --git a/checkpkg.in b/checkpkg.in
index d3a63ba..95bf049 100644
--- a/checkpkg.in
+++ b/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
diff --git a/commitpkg.in b/commitpkg.in
index be1ed71..d9ee0aa 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -42,7 +42,7 @@ pkgbase=${pkgbase:-$pkgname}
case "$cmd" in
commitpkg)
if (( $# == 0 )); then
- die 'usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
+ die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
fi
repo="$1"
shift
@@ -51,7 +51,7 @@ case "$cmd" in
repo="${cmd%pkg}"
;;
*)
- die 'usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
+ die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
;;
esac
@@ -109,7 +109,7 @@ if [[ -z $server ]]; then
core|extra|testing|staging|kde-unstable|gnome-unstable)
server='gerolde.archlinux.org' ;;
community*|multilib*)
- server='sigurd.archlinux.org' ;;
+ server='nymeria.archlinux.org' ;;
*)
server='gerolde.archlinux.org'
msg "Non-standard repository $repo in use, defaulting to server $server" ;;
diff --git a/crossrepomove.in b/crossrepomove.in
index 5a2c6e9..8794326 100644
--- a/crossrepomove.in
+++ b/crossrepomove.in
@@ -13,8 +13,8 @@ pkgbase="${1}"
packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
packages_server='gerolde.archlinux.org'
-community_svn='svn+ssh://sigurd.archlinux.org/srv/svn-packages'
-community_server='sigurd.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'
case $scriptname in
@@ -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}"
diff --git a/finddeps.in b/finddeps.in
index 1526fb8..7a2a3fb 100644
--- a/finddeps.in
+++ b/finddeps.in
@@ -8,7 +8,7 @@ m4_include(lib/common.sh)
match=$1
if [[ -z $match ]]; then
- echo 'usage: finddeps <depname>'
+ echo 'Usage: finddeps <depname>'
echo ''
echo 'Find packages that depend on a given depname.'
echo 'Run this script from the top-level directory of your ABS tree.'
diff --git a/makechrootpkg.in b/makechrootpkg.in
index b635432..05286c6 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -28,7 +28,7 @@ default_copy=$USER
src_owner=${SUDO_USER:-$USER}
usage() {
- echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
+ echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
echo ' Run this script in a PKGBUILD dir to build a package inside a'
echo ' clean chroot. All unrecognized arguments passed to this script'
echo ' will be passed to makepkg.'
diff --git a/mkarchroot.in b/mkarchroot.in
index 308f5d3..7b6adf7 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -23,7 +23,7 @@ APPNAME=$(basename "${0}")
# usage: usage <exitvalue>
usage() {
- echo "usage ${APPNAME} [options] working-dir [package-list | app]"
+ echo "Usage: ${APPNAME} [options] working-dir [package-list | app]"
echo ' options:'
echo ' -r <app> Run "app" within the context of the chroot'
echo ' -u Update the chroot via pacman'
@@ -47,7 +47,7 @@ while getopts 'r:ufnhC:M:c:' arg; do
n) NOCOPY='y' ;;
c) cache_dir="$OPTARG" ;;
N) NONETWORK='y' ;;
- h|?) usage 0 ;;
+ h|?) usage ;;
*) error "invalid argument '${arg}'"; usage ;;
esac
done
diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index f7b1612..a4c8969 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -12,7 +12,7 @@
m4_include(lib/common.sh)
if (( $# < 1 )); then
- echo "usage: $(basename $0) <chrootdir> <packages to rebuild>"
+ echo "Usage: $(basename $0) <chrootdir> <packages to rebuild>"
echo " example: $(basename $0) ~/chroot readline bash foo bar baz"
exit 1
fi