[25580] in Source-Commits
/svn/athena r25098 - trunk/debathena/debathena/dotfiles
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Apr 21 16:10:08 2011
Date: Thu, 21 Apr 2011 16:10:01 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201104212010.p3LKA1oh022081@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-04-21 16:10:01 -0400 (Thu, 21 Apr 2011)
New Revision: 25098
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
Log:
Fix inverted logic in cshrc
Use &> in bashrc instead of playing exec games
Fix typo in bashrc
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2011-04-21 20:00:55 UTC (rev 25097)
+++ trunk/debathena/debathena/dotfiles/bashrc 2011-04-21 20:10:01 UTC (rev 25098)
@@ -92,19 +92,14 @@
# listed above.
# ~/.bash_environment is not sourced if NOCALLS is set (i.e.,
# if you selected the xlogin "Ignore your customizations"
- # option when you logged in).q
+ # option when you logged in).
if [ "${NOCALLS+set}" != set -a -r ~/.bash_environment ]; then
if [ "$SILENT" = "yes" ]; then
- exec 6>&1 # Save STDOUT
- exec 7>&2 # Save STDERR
- exec > /dev/null 2>&1
+ . ~/.bash_environment &> /dev/null
+ else
+ . ~/.bash_environment
fi
- . ~/.bash_environment
- if [ "$SILENT" = "yes" ]; then
- exec 1>&6 6>&- # Restore STDOUT
- exec 2>&7 7>&- # Restore STDERR
- fi
fi
# If the user has a bindir in $HOME, put it in front of the path.
@@ -151,13 +146,8 @@
if [ "${NOCALLS+set}" != set -a -r ~/.bashrc.mine ]; then
if [ "$SILENT" = "yes" ]; then
- exec 6>&1 # Save STDOUT
- exec 7>&2 # Save STDERR
- exec > /dev/null 2>&1
+ . ~/.bashrc.mine &> /dev/null
+ else
+ . ~/.bashrc.mine
fi
- . ~/.bashrc.mine
- if [ "$SILENT" = "yes" ]; then
- exec 1>&6 6>&- # Restore STDOUT
- exec 2>&7 7>&- # Restore STDERR
- fi
fi
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2011-04-21 20:00:55 UTC (rev 25097)
+++ trunk/debathena/debathena/dotfiles/cshrc 2011-04-21 20:10:01 UTC (rev 25098)
@@ -115,9 +115,9 @@
if ((! $?NOCALLS) && (-r ~/.environment)) then
if ( $SILENT == "yes" ) then
+ source ~/.environment >&/dev/null
+ else
source ~/.environment
- else
- source ~/.environment >&/dev/null
endif
endif
@@ -173,8 +173,8 @@
if ((! $?NOCALLS) && (-r ~/.cshrc.mine)) then
if ( $SILENT == "yes" ) then
+ source ~/.cshrc.mine >&/dev/null
+ else
source ~/.cshrc.mine
- else
- source ~/.cshrc.mine >&/dev/null
endif
endif
