[24465] in Source-Commits
/svn/athena r24056 - in trunk/athena/bin/bugme: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Wed Oct 7 00:45:36 2009
X-Barracuda-Envelope-From: broder@mit.edu
Date: Wed, 7 Oct 2009 00:45:24 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200910070445.n974jONR019148@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-10-07 00:45:24 -0400 (Wed, 07 Oct 2009)
New Revision: 24056
Modified:
trunk/athena/bin/bugme/bugme.xsession
trunk/athena/bin/bugme/debian/changelog
trunk/athena/bin/bugme/debian/control.in
Log:
In bugme:
* Use machtype -q to determine if a workstation is a quickstation.
Modified: trunk/athena/bin/bugme/bugme.xsession
===================================================================
--- trunk/athena/bin/bugme/bugme.xsession 2009-10-06 19:14:27 UTC (rev 24055)
+++ trunk/athena/bin/bugme/bugme.xsession 2009-10-07 04:45:24 UTC (rev 24056)
@@ -1,9 +1,3 @@
-: ${FORCE_QUICKSTATION=0}
-
-# Use IGNORECASE to make the match case insensitive
-# Use ret to set a default exit code, and then override it if there's
-# a match
-awk -v IGNORECASE=1 -v host="$(hostname --fqdn)" -v ret=1 '$0 == host { ret=0 } END { exit ret }' /afs/athena.mit.edu/system/config/quick/quickstations
-if [ $? -eq 0 -o $FORCE_QUICKSTATION -eq 1 ] && [ -x /usr/bin/bugme ]; then
+if [ "$(machtype -q)" = "quickstation" ] && [ -x /usr/bin/bugme ]; then
STARTUP="/usr/bin/bugme $STARTUP"
fi
Modified: trunk/athena/bin/bugme/debian/changelog
===================================================================
--- trunk/athena/bin/bugme/debian/changelog 2009-10-06 19:14:27 UTC (rev 24055)
+++ trunk/athena/bin/bugme/debian/changelog 2009-10-07 04:45:24 UTC (rev 24056)
@@ -1,3 +1,9 @@
+debathena-bugme (10.0.1-0debathena2) unstable; urgency=low
+
+ * Use machtype -q to determine if a workstation is a quickstation.
+
+ -- Evan Broder <broder@mit.edu> Mon, 05 Oct 2009 15:55:48 -0400
+
debathena-bugme (10.0.1-0debathena1) unstable; urgency=low
* Add a handler for timer window visibility events, to raise the
Modified: trunk/athena/bin/bugme/debian/control.in
===================================================================
--- trunk/athena/bin/bugme/debian/control.in 2009-10-06 19:14:27 UTC (rev 24055)
+++ trunk/athena/bin/bugme/debian/control.in 2009-10-07 04:45:24 UTC (rev 24056)
@@ -7,7 +7,7 @@
Package: debathena-bugme
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-gtk2, python-glade2
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-gtk2, python-glade2, debathena-machtype (>= 10.0.2-0debathena1~)
Description: Display a timer for Athena Quickstations
Athena quickstations are designed for short-term login sessions. This
time limit is enforced by a timer in the top left corner of the workstation
