[26008] in Source-Commits
/svn/athena r25343 - in trunk/debathena/debathena/dotfiles: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 1 16:21:48 2011
Date: Mon, 1 Aug 2011 16:21:41 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108012021.p71KLfLR010861@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-01 16:21:41 -0400 (Mon, 01 Aug 2011)
New Revision: 25343
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/debian/changelog
Log:
In dotfiles:
* Remove unneeded check for bash, per the comment (Trac: #878)
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2011-08-01 20:05:30 UTC (rev 25342)
+++ trunk/debathena/debathena/dotfiles/bashrc 2011-08-01 20:21:41 UTC (rev 25343)
@@ -22,16 +22,7 @@
# Set up standard system/user environment configuration (including setup of
# environment variables, attachment of lockers, and setting of search path)
-# If we see ENV_SET set to empty, we could be a tcsh user who has
-# decided to run bash, or we could be a bash user suffering from the
-# misfeature that the standard xsession script runs the tcsh dotfiles
-# for all users. Running the environment setup for the former
-# category of user would be unfriendly (it resets the homedir and
-# changes the path), so for now, only run environment setup for bash
-# users. If the xsession problem is ever fixed, change this
-# conditional to check for '"${ENV_SET+set}" != set' and eliminate the
-# shell check.
-if [ "${ENV_SET:+set}" != set -a "${SHELL##*/}" = bash ]; then
+if [ "${ENV_SET:+set}" != set ]; then
export ENV_SET=t # Avoid unnecessary repeat
export HOSTTYPE="`/bin/machtype`"
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-01 20:05:30 UTC (rev 25342)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-01 20:21:41 UTC (rev 25343)
@@ -1,10 +1,14 @@
debathena-dotfiles (10.0.28-0debathena2) UNRELEASED; urgency=low
+ [ Geoffrey Thomas ]
* quotawarn hasn't been in this package since 10.0.2-0debathena3, so
we don't need to depend on debathena-quota.
- -- Geoffrey Thomas <geofft@mit.edu> Sun, 26 Jun 2011 21:44:36 -0400
+ [ Jonathan Reed ]
+ * Remove unneeded check for bash, per the comment (Trac: #878)
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 01 Aug 2011 16:20:13 -0400
+
debathena-dotfiles (10.0.28-0debathena1) unstable; urgency=low
* Update lockers.7 for modern sysnames and the ubiquity of the
