Author: adam-guest
Date: 2008-03-15 20:21:15 +0000 (Sat, 15 Mar 2008)
New Revision: 1144
Modified:
trunk/debian/changelog
trunk/scripts/pts-subscribe.sh
Log:
pts-subscribe: Don't complain about mail and/or at not being available
if --help / --version were used
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-15 19:45:49 UTC (rev 1143)
+++ trunk/debian/changelog 2008-03-15 20:21:15 UTC (rev 1144)
@@ -92,6 +92,8 @@
* grep-excuses: Fix reference to bjorn.haxx.se in help output to refer to
release.d.o/migration
* debpkg: Fix reference to dpkg(8) in the manpage
+ * pts-subscribe: Don't complain about mail and/or at not being available
+ if --help / --version were used
-- Adam D. Barratt <[EMAIL PROTECTED]> Sat, 01 Mar 2008 11:42:02 +0000
Modified: trunk/scripts/pts-subscribe.sh
===================================================================
--- trunk/scripts/pts-subscribe.sh 2008-03-15 19:45:49 UTC (rev 1143)
+++ trunk/scripts/pts-subscribe.sh 2008-03-15 20:21:15 UTC (rev 1144)
@@ -41,20 +41,6 @@
GNU General Public License, version 2 or later."
}
-# Check for a "mail" command
-if ! command -v mail >/dev/null 2>&1; then
- echo "$PROGNAME: Could not find the \"mail\" command; you must have the"
>&2
- echo "mailx or mailutils package installed to run this script." >&2
- exit 1
-fi
-
-# Check for an "at" command
-if ! command -v at >/dev/null 2>&1; then
- echo "$PROGNAME: Could not find the \"at\" command; you must have the" >&2
- echo "\"at\" package installed to run this script." >&2
- exit 1
-fi
-
# Boilerplate: set config variables
DEFAULT_PTS_UNTIL='now + 30 days'
VARS="PTS_UNTIL"
@@ -137,6 +123,20 @@
exit 1
fi
+# Check for a "mail" command
+if ! command -v mail >/dev/null 2>&1; then
+ echo "$PROGNAME: Could not find the \"mail\" command; you must have the"
>&2
+ echo "mailx or mailutils package installed to run this script." >&2
+ exit 1
+fi
+
+# Check for an "at" command
+if ! command -v at >/dev/null 2>&1; then
+ echo "$PROGNAME: Could not find the \"at\" command; you must have the" >&2
+ echo "\"at\" package installed to run this script." >&2
+ exit 1
+fi
+
pkg=$1
if [ -z "$DEBEMAIL" ]; then
--
To unsubscribe, send mail to [EMAIL PROTECTED]
