[26777] in Source-Commits
/svn/athena r25747 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Aug 31 11:23:28 2012
Date: Fri, 31 Aug 2012 11:23:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208311523.q7VFNLq7009633@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-31 11:23:21 -0400 (Fri, 31 Aug 2012)
New Revision: 25747
Modified:
trunk/debathena/scripts/all-schroots
trunk/debathena/scripts/da
trunk/debathena/scripts/dacopy
trunk/debathena/scripts/damove
trunk/debathena/scripts/daremove
trunk/debathena/scripts/daschroot
trunk/debathena/scripts/dasource
trunk/debathena/scripts/daupload-equivs-proposed
trunk/debathena/scripts/daupload-proposed
trunk/debathena/scripts/ood-packages
trunk/debathena/scripts/sbuildhack
Log:
Get rid of "dirname $0" and replace with DA_SCRIPTS_DIR, which
allows overriding at run time. (Trac: #1191)
Modified: trunk/debathena/scripts/all-schroots
===================================================================
--- trunk/debathena/scripts/all-schroots 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/all-schroots 2012-08-31 15:23:21 UTC (rev 25747)
@@ -11,7 +11,8 @@
# Debian/Ubuntu version, and ephemeral session chroots are used
# instead of source chroots.
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
if [ "$1" = "-A" ]; then
Modified: trunk/debathena/scripts/da
===================================================================
--- trunk/debathena/scripts/da 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/da 2012-08-31 15:23:21 UTC (rev 25747)
@@ -15,7 +15,8 @@
# Typically this script is used to build Debathena packages, in which
# case PROGRAM is sbuildhack and ARGUMENTS is a path to a .dsc file.
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
A=0
if [ "$1" = -A ]; then A=1; shift; fi
Modified: trunk/debathena/scripts/dacopy
===================================================================
--- trunk/debathena/scripts/dacopy 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/dacopy 2012-08-31 15:23:21 UTC (rev 25747)
@@ -8,7 +8,8 @@
# This copies any source or binary package built from the source
# package PACKAGE
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
if [ "$#" -lt 3 ]; then
echo "Usage: dacopy NEW_SUFFIX OLD_SUFFIX SOURCE_PACKAGE" >&2
Modified: trunk/debathena/scripts/damove
===================================================================
--- trunk/debathena/scripts/damove 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/damove 2012-08-31 15:23:21 UTC (rev 25747)
@@ -10,7 +10,8 @@
set -e
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
if [ "$#" -lt 3 ]; then
echo "Usage: damove NEW_SUFFIX OLD_SUFFIX SOURCE_PACKAGE" >&2
Modified: trunk/debathena/scripts/daremove
===================================================================
--- trunk/debathena/scripts/daremove 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/daremove 2012-08-31 15:23:21 UTC (rev 25747)
@@ -8,7 +8,8 @@
# This removes any source or binary package built from the source
# package PACKAGE
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
if [ "$#" -ne 2 ]; then
echo "Usage: daremove SUFFIX SOURCE_PACKAGE" >&2
Modified: trunk/debathena/scripts/daschroot
===================================================================
--- trunk/debathena/scripts/daschroot 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/daschroot 2012-08-31 15:23:21 UTC (rev 25747)
@@ -10,12 +10,14 @@
arch="$2"
shift 2
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+
if ! schroot -c "$dist-$arch-sbuild" -i >/dev/null; then
exit $?
fi
session=$(schroot -c "$dist-$arch-sbuild" -b)
-schroot -c "$session" -r -u root -- env SBUILD_BUILD_CONF_DISTRIBUTION="$dist" "$(readlink -f "$(dirname "$0")/chroot-sources")"
+schroot -c "$session" -r -u root -- env SBUILD_BUILD_CONF_DISTRIBUTION="$dist" "$(readlink -f "$DA_SCRIPTS_DIR/chroot-sources")"
if [ "$#" -gt 0 ]; then
echo "I: Entering schroot session $session"
fi
Modified: trunk/debathena/scripts/dasource
===================================================================
--- trunk/debathena/scripts/dasource 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/dasource 2012-08-31 15:23:21 UTC (rev 25747)
@@ -25,8 +25,8 @@
usage() {
die "dasource [-r repos] [packagename ...]"
}
-
-basedir=$(dirname "$(readlink -f "$0")")
+: ${DA_SCRIPTS_DIR="$(dirname "$(readlink -f "$0")")"}
+basedir="$DA_SCRIPTS_DIR"
repo=svn+ssh://svn.mit.edu/athena/trunk
while getopts r: opt; do
Modified: trunk/debathena/scripts/daupload-equivs-proposed
===================================================================
--- trunk/debathena/scripts/daupload-equivs-proposed 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/daupload-equivs-proposed 2012-08-31 15:23:21 UTC (rev 25747)
@@ -8,7 +8,8 @@
# packages are very simple, there is no need to build them separately
# for each dist.
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
case "$(basename "$0")" in
daupload-equivs)
Modified: trunk/debathena/scripts/daupload-proposed
===================================================================
--- trunk/debathena/scripts/daupload-proposed 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/daupload-proposed 2012-08-31 15:23:21 UTC (rev 25747)
@@ -17,7 +17,8 @@
# This script will skip dists listed in ./nobuild.
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
case "$(basename "$0")" in
daupload-release)
Modified: trunk/debathena/scripts/ood-packages
===================================================================
--- trunk/debathena/scripts/ood-packages 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/ood-packages 2012-08-31 15:23:21 UTC (rev 25747)
@@ -19,7 +19,8 @@
set -e
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
die() {
echo "$@" >&2
Modified: trunk/debathena/scripts/sbuildhack
===================================================================
--- trunk/debathena/scripts/sbuildhack 2012-08-31 12:46:23 UTC (rev 25746)
+++ trunk/debathena/scripts/sbuildhack 2012-08-31 15:23:21 UTC (rev 25747)
@@ -13,7 +13,8 @@
exit 1
}
-. $(dirname "$0")/debian-versions.sh
+: ${DA_SCRIPTS_DIR="$(dirname "$0")"}
+. "$DA_SCRIPTS_DIR"/debian-versions.sh
dist_arch=$1; shift
if [ -z "$dist_arch" ]; then usage; fi
@@ -30,5 +31,5 @@
sbuild --append-to-version=`gettag "$dist"` \
-d "$dist" --arch="$arch" \
--apt-update --apt-distupgrade \
- --setup-hook="$(readlink -f "$(dirname "$0")/chroot-sources")" \
+ --setup-hook="$(readlink -f "$DA_SCRIPTS_DIR/chroot-sources")" \
-v "$@"
