[23883] in Source-Commits
/svn/athena r23493 - in trunk/athena/bin/machtype: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Feb 28 19:14:54 2009
Date: Sat, 28 Feb 2009 19:14:04 -0500
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903010014.n210E4TA030494@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-02-28 19:14:04 -0500 (Sat, 28 Feb 2009)
New Revision: 23493
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/machtype_linux.sh
Log:
In machtype:
* Change `machtype -E` and `machtype -L` to output more informative
information.
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2009-03-01 00:06:44 UTC (rev 23492)
+++ trunk/athena/bin/machtype/debian/changelog 2009-03-01 00:14:04 UTC (rev 23493)
@@ -1,3 +1,10 @@
+debathena-machtype (10.0.0-0debathena4) unstable; urgency=low
+
+ * Change `machtype -E` and `machtype -L` to output more informative
+ information.
+
+ -- Evan Broder <broder@mit.edu> Sat, 28 Feb 2009 19:13:47 -0500
+
debathena-machtype (10.0.0-0debathena3) unstable; urgency=low
* Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.
Modified: trunk/athena/bin/machtype/machtype_linux.sh
===================================================================
--- trunk/athena/bin/machtype/machtype_linux.sh 2009-03-01 00:06:44 UTC (rev 23492)
+++ trunk/athena/bin/machtype/machtype_linux.sh 2009-03-01 00:14:04 UTC (rev 23493)
@@ -91,12 +91,15 @@
fi
if [ $ath_vers ]; then
- if [ $verbose ]; then
- tail -1 /etc/athena/version
- else
- awk '{ v = $5; } END { print v; }' /etc/athena/version
- fi
- printed=1
+ for meta in cluster workstation login standard clients locker athena-libraries extra-software extra-software-nox thirdparty; do
+ if dpkg-query --showformat '${Status}\n' -W "debathena-$meta" 2>/dev/null | grep -q ' installed$'; then
+ echo "debathena-$meta"
+ printed=1
+ if [ ! $verbose ]; then
+ break
+ fi
+ fi
+ done
fi
if [ $base_os_name ]; then
@@ -109,7 +112,7 @@
fi
if [ $base_os_ver ]; then
- uname -r
+ lsb_release -sd
printed=1
fi
