[26971] in Source-Commits
/svn/athena r25864 - in trunk/debathena/debathena/dotfiles: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Mar 21 16:43:40 2013
Date: Thu, 21 Mar 2013 16:43:34 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303212043.r2LKhYTZ023744@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-21 16:43:33 -0400 (Thu, 21 Mar 2013)
New Revision: 25864
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
trunk/debathena/debathena/dotfiles/debian/changelog
Log:
In dotfiles:
* Don't attempt to parse the clusterinfo with awk (Trac: #1037)
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2013-03-21 19:31:18 UTC (rev 25863)
+++ trunk/debathena/debathena/dotfiles/bashrc 2013-03-21 20:43:33 UTC (rev 25864)
@@ -56,9 +56,8 @@
fi
if [ "${PRINTER+set}" != set \
- -a -e /var/run/athena-clusterinfo.csh ]; then
- PRINTER=`awk '/LPR/ { print $3 }' \
- /var/run/athena-clusterinfo.csh`
+ -a -e /var/run/athena-clusterinfo.sh ]; then
+ PRINTER="$( . /var/run/athena-clusterinfo.sh && echo $LPR )"
if [ -n "$PRINTER" ]; then export PRINTER; fi
fi
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2013-03-21 19:31:18 UTC (rev 25863)
+++ trunk/debathena/debathena/dotfiles/cshrc 2013-03-21 20:43:33 UTC (rev 25864)
@@ -82,7 +82,8 @@
set bindir=arch/${ATHENA_SYS}/bin
if ( ! $?PRINTER && -e /var/run/athena-clusterinfo.csh ) then
- setenv PRINTER `awk '/LPR/ { print $3 }' /var/run/athena-clusterinfo.csh`
+ # Backticks will get us a subshell to avoid any other variables
+ setenv PRINTER `setenv LPR '' && source /var/run/athena-clusterinfo.sh && echo $LPR`
if ( $PRINTER == "" ) unsetenv PRINTER
endif
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2013-03-21 19:31:18 UTC (rev 25863)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2013-03-21 20:43:33 UTC (rev 25864)
@@ -1,12 +1,16 @@
-debathena-dotfiles (10.0.32-0debathena1) UNRELEASED; urgency=low
+debathena-dotfiles (10.0.32-0debathena1) unstable; urgency=low
+ [ Geoffrey Thomas ]
* Quote harder in cshrc, because tcsh's philosophy is apparently that
one can never have enough quoting. (This fixes a bug spotted by Alex
Dehnert where passing tcsh -c a command with an embedded newline
would print a spurious error message.)
- -- Geoffrey Thomas <geofft@mit.edu> Sun, 09 Dec 2012 02:59:36 -0500
+ [ Jonathan Reed ]
+ * Don't attempt to parse the clusterinfo with awk (Trac: #1037)
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 21 Mar 2013 16:43:23 -0400
+
debathena-dotfiles (10.0.31-0debathena1) unstable; urgency=low
* Add /usr/lib/init/check-for-reboot to the logout aliases (Trac: #971).
