[23281] in Source-Commits
/svn/athena r22940 - in trunk/debathena/debathena/dotfiles: . debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Apr 22 16:19:54 2008
Date: Tue, 22 Apr 2008 16:18:39 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200804222018.QAA01426@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-04-22 16:18:38 -0400 (Tue, 22 Apr 2008)
New Revision: 22940
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
trunk/debathena/debathena/dotfiles/debian/changelog
Log:
In dotfiles:
* Fix a bug introduced in the handling of ~/.path files.
* Update several comments.
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2008-04-22 19:59:44 UTC (rev 22939)
+++ trunk/debathena/debathena/dotfiles/bashrc 2008-04-22 20:18:38 UTC (rev 22940)
@@ -23,9 +23,10 @@
# 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
-# 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.
+# 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
export ENV_SET=t # Avoid unnecessary repeat
@@ -79,7 +80,7 @@
. ~/.bash_environment
fi
- # Standard Athena path
+ # Standard Athena path modifications
athena_home_bin=$( /usr/bin/athdir "$HOME" )
PATH=${athena_home_bin:+$athena_home_bin:}$PATH:.
unset athena_home_bin
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2008-04-22 19:59:44 UTC (rev 22939)
+++ trunk/debathena/debathena/dotfiles/cshrc 2008-04-22 20:18:38 UTC (rev 22940)
@@ -29,7 +29,7 @@
alias add 'eval `/bin/attach -Padd \!:*`'
# Set up standard system/user environment configuration (including setup of
-# environment variables, attachment of lockers, and setting of search path)
+# environment variables, attachment of lockers, and additions to search path)
if (! $?ENV_SET) then
@@ -45,9 +45,6 @@
setenv VISUAL emacs # Set default screen editor
setenv MM_CHARSET iso-8859-1
- # Set standard Athena path variables. Actual $path (and thus $PATH)
- # are set later, after ~/.environment is sourced.
-
setenv ATHENA_SYS `/bin/machtype -S`
if ( $ATHENA_SYS == "" ) then
setenv ATHENA_SYS @sys
@@ -65,14 +62,6 @@
# location of the user's home directory. This will avoid having
# long pathnames being printed when /mit/<user> is a symlink to a
# path within AFS.
- #
- # This code has been optimized to run as quickly as possible. Since
- # it is being invoked only at the beginning of the session, and
- # prior to the inclusion of any of the user's other dotfiles, we can
- # assume that the current directory is the user's home directory.
- # Also, to avoid having the shell re-evaluate the current contents
- # of the directory, we help it by resetting its "cwd" variable. We
- # do error checking just in case the path somehow disappears.
set x=`(cd && /bin/pwd)`
if ("$x" != "") then
@@ -93,19 +82,12 @@
if ((! $?NOCALLS) && (-r ~/.environment)) source ~/.environment
- # Set up default search path, if not yet set. Use your ~/.path file
- # to provide an alternative path -- this file should be of the form
- # "set path=...", and can refer to the shell variable $athena_path,
- # defined above. The ~/.path file should list a complete path, since
- # the path identified there will be used INSTEAD of the default
- # path, not appended. ~/.path is not sourced if the xlogin "Ignore
- # your customizations" option was selected to begin the session.
-
if ((! $?NOCALLS) && (-r ~/.path)) then
- # User-specified path
+ # Support .path files for compatibility.
+ set athena_path=$path
source ~/.path
else
- # Standard Athena path
+ # Standard Athena path additions.
set path=(`/usr/bin/athdir $HOME` $path .)
endif
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2008-04-22 19:59:44 UTC (rev 22939)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2008-04-22 20:18:38 UTC (rev 22940)
@@ -1,3 +1,10 @@
+debathena-dotfiles (10.0.2-0debathena1) unstable; urgency=low
+
+ * Fix a bug introduced in the handling of ~/.path files.
+ * Update several comments.
+
+ -- Greg Hudson <ghudson@equal-rites.mit.edu> Tue, 22 Apr 2008 16:17:13 -0400
+
debathena-dotfiles (10.0.1-0debathena1) unstable; urgency=low
* Fix bug introduced in cshrc PATH handling.
