[26858] in Source-Commits
/svn/athena r25797 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Nov 5 11:17:34 2012
Date: Mon, 5 Nov 2012 11:17:27 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201211051617.qA5GHRsm002599@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-11-05 11:17:27 -0500 (Mon, 05 Nov 2012)
New Revision: 25797
Modified:
trunk/debathena/scripts/build-server/make-chroot
Log:
Add usage message and make error messages clearer
Modified: trunk/debathena/scripts/build-server/make-chroot
===================================================================
--- trunk/debathena/scripts/build-server/make-chroot 2012-11-01 15:39:40 UTC (rev 25796)
+++ trunk/debathena/scripts/build-server/make-chroot 2012-11-05 16:17:27 UTC (rev 25797)
@@ -12,7 +12,9 @@
while getopts 'dzot' opt; do
case "$opt" in
d)
- DEBUG=1;;
+ DEBUG=1
+ set -x
+ ;;
z)
BZ2=1;;
o)
@@ -27,8 +29,13 @@
echo "-z is meaningless if not using a tar chroot and will be ignored" >&2
fi
-set -xe
+if [ -z "$1" ] || [ -z "$2" ]; then
+ echo "Usage: $0 <suite> <arch>" >&2
+ exit 1
+fi
+set -e
+
: ${VG=/dev/builder}
: ${CHROOTDIR=/srv}
: ${MIRRORHOST=localhost:9999}
@@ -46,7 +53,7 @@
trap 'exittrap' EXIT
if fgrep -qxRs "[$CHROOT]" /etc/schroot/schroot.conf /etc/schroot/chroot.d; then
- echo "Chroot $CHROOT already exists." >&2
+ echo "Chroot $CHROOT config already exists." >&2
exit 1
fi
if [ "$TYPE" = "tar" ] && [ -e "$FILE" ]; then
@@ -82,7 +89,7 @@
SOURCES="$SOURCESD/ubuntu/$SUITE.list"
MIRROR="http://$MIRRORHOST/ubuntu"
else
- echo "Unrecognized suite $SUITE." >&2
+ echo "Unrecognized suite $SUITE. (Did you create the sources.list file?)" >&2
exit 1
fi
