[24402] in Source-Commits
/svn/athena r23997 - trunk/debathena/config/shell-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Tue Sep 8 15:35:20 2009
Date: Tue, 8 Sep 2009 15:35:06 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909081935.n88JZ6aV011977@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-08 15:35:06 -0400 (Tue, 08 Sep 2009)
New Revision: 23997
Modified:
trunk/debathena/config/shell-config/debian/bash.bashrc.debathena
trunk/debathena/config/shell-config/debian/csh.cshrc.debathena
trunk/debathena/config/shell-config/debian/profile.debathena
Log:
Source the system default dotfiles before sourcing our own, so that we
can actually override stuff.
Patch by Jessica Hamrick.
Modified: trunk/debathena/config/shell-config/debian/bash.bashrc.debathena
===================================================================
--- trunk/debathena/config/shell-config/debian/bash.bashrc.debathena 2009-09-08 14:36:40 UTC (rev 23996)
+++ trunk/debathena/config/shell-config/debian/bash.bashrc.debathena 2009-09-08 19:35:06 UTC (rev 23997)
@@ -1,10 +1,10 @@
# This is the Debathena /etc/bash.bashrc configuration.
# It is only necessary if you are not using debathena-login.
-# It sources all bash scripts in the directory bashrc.d
+# Source the normal bash.bashrc
+. /etc/bash.bashrc.debathena-orig
+
+# Source all bash scripts in the directory bashrc.d
# To remove this feature, uninstall the debathena-bash-config package.
DEBATHENA_BASHRC_DIR=/usr/share/debathena-bash-config/bashrc.d
for i in `run-parts --list "$DEBATHENA_BASHRC_DIR"`; do . "$i"; done
-
-# Now source the normal bash.bashrc (afterwards, to allow overrides)
-. /etc/bash.bashrc.debathena-orig
Modified: trunk/debathena/config/shell-config/debian/csh.cshrc.debathena
===================================================================
--- trunk/debathena/config/shell-config/debian/csh.cshrc.debathena 2009-09-08 14:36:40 UTC (rev 23996)
+++ trunk/debathena/config/shell-config/debian/csh.cshrc.debathena 2009-09-08 19:35:06 UTC (rev 23997)
@@ -1,6 +1,9 @@
# This is the Debathena csh.cshrc configuration.
# You should in general only use it if you are not using debathena-login.
+# Source the normal csh.cshrc
+source /etc/csh.cshrc.debathena-orig;
+
# It sources a csh script that creates the add and renew commands,
# sets ATHENA_SYS is set correctly, and other similar tasks.
# To remove this feature, uninstall the debathena-tcsh-config package.
@@ -8,6 +11,3 @@
if (-e $DEBATHENA_CSHRC) then
source $DEBATHENA_CSHRC;
endif
-
-# Now source the normal csh.cshrc (afterwards, to allow overrides)
-source /etc/csh.cshrc.debathena-orig;
Modified: trunk/debathena/config/shell-config/debian/profile.debathena
===================================================================
--- trunk/debathena/config/shell-config/debian/profile.debathena 2009-09-08 14:36:40 UTC (rev 23996)
+++ trunk/debathena/config/shell-config/debian/profile.debathena 2009-09-08 19:35:06 UTC (rev 23997)
@@ -1,11 +1,10 @@
# This is the Debathena /etc/profile configuration.
# It is only necessary if you are not using debathena-login.
-# It sources a bash script that creates the add and renew commands,
-# sets ATHENA_SYS is set correctly, and other similar tasks.
+# Source the normal profile
+. /etc/profile.debathena-orig
+
+# Source all bash scripts in the profile.d directory
# To remove this feature, uninstall the debathena-bash-config package.
DEBATHENA_PROFILE_DIR=/usr/share/debathena-bash-config/profile.d
for i in `run-parts --list "$DEBATHENA_PROFILE_DIR"`; do . "$i"; done
-
-# Now source the normal profile (afterwards, to allow overrides)
-. /etc/profile.debathena-orig
