[26774] in Source-Commits
/svn/athena r25744 - trunk/debathena/config/shell-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 29 16:46:45 2012
Date: Wed, 29 Aug 2012 16:46:43 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208292046.q7TKkhYb006468@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-29 16:46:43 -0400 (Wed, 29 Aug 2012)
New Revision: 25744
Added:
trunk/debathena/config/shell-config/debian/profile.debathena.sh
Removed:
trunk/debathena/config/shell-config/debian/profile.debathena
Modified:
trunk/debathena/config/shell-config/debian/changelog
trunk/debathena/config/shell-config/debian/control.in
trunk/debathena/config/shell-config/debian/debathena-bash-config.install
trunk/debathena/config/shell-config/debian/rules
Log:
In shell-config:
* Use profile.d to avoid diverting /etc/profile (Trac: #923)
* Bump standards-version
Modified: trunk/debathena/config/shell-config/debian/changelog
===================================================================
--- trunk/debathena/config/shell-config/debian/changelog 2012-08-29 20:32:57 UTC (rev 25743)
+++ trunk/debathena/config/shell-config/debian/changelog 2012-08-29 20:46:43 UTC (rev 25744)
@@ -1,8 +1,10 @@
-debathena-shell-config (1.16) UNRELEASED; urgency=low
+debathena-shell-config (1.16) unstable; urgency=low
* Bump debian/compat to 6
+ * Use profile.d to avoid diverting /etc/profile (Trac: #923)
+ * Bump standards-version
- -- Jonathan Reed <jdreed@mit.edu> Sun, 01 Jul 2012 12:21:37 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 29 Aug 2012 16:46:39 -0400
debathena-shell-config (1.15) unstable; urgency=low
Modified: trunk/debathena/config/shell-config/debian/control.in
===================================================================
--- trunk/debathena/config/shell-config/debian/control.in 2012-08-29 20:32:57 UTC (rev 25743)
+++ trunk/debathena/config/shell-config/debian/control.in 2012-08-29 20:46:43 UTC (rev 25744)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@
-Standards-Version: 3.7.2
+Standards-Version: 3.9.1
Package: debathena-bash-config
Architecture: all
Modified: trunk/debathena/config/shell-config/debian/debathena-bash-config.install
===================================================================
--- trunk/debathena/config/shell-config/debian/debathena-bash-config.install 2012-08-29 20:32:57 UTC (rev 25743)
+++ trunk/debathena/config/shell-config/debian/debathena-bash-config.install 2012-08-29 20:46:43 UTC (rev 25744)
@@ -1,4 +1,4 @@
debian/bash.bashrc.debathena /etc/
-debian/profile.debathena /etc/
+debian/profile.debathena.sh /etc/profile.d
debian/01-debathena-shell-init /usr/share/debathena-bash-config/bashrc.d/
debian/01-set-athena-user /usr/share/debathena-bash-config/profile.d/
Copied: trunk/debathena/config/shell-config/debian/profile.debathena.sh (from rev 25735, trunk/debathena/config/shell-config/debian/profile.debathena)
===================================================================
--- trunk/debathena/config/shell-config/debian/profile.debathena.sh (rev 0)
+++ trunk/debathena/config/shell-config/debian/profile.debathena.sh 2012-08-29 20:46:43 UTC (rev 25744)
@@ -0,0 +1,21 @@
+# This is the Debathena /etc/profile configuration, installed by
+# debathena-bash-config.
+
+DEBATHENA_PROFILE_DIR=/usr/share/debathena-bash-config/profile.d
+DEBATHENA_BASHRC_DIR=/usr/share/debathena-bash-config/bashrc.d
+
+# First source the normal profile. Sometimes this sources bash.bashrc
+# (e.g., on Ubuntu); sometimes it doesn't. Let's find out!
+debathena_test_if_bashrc_runs=0
+. /etc/profile.debathena-orig
+
+# If it didn't, source all bash scripts in our bashrc.d directory.
+if [ -n "$PS1" ] && [ -n "$BASH" ]; then
+ if [ "$debathena_test_if_bashrc_runs" = 0 ]; then
+ for i in `run-parts --list "$DEBATHENA_BASHRC_DIR"`; do . "$i"; done
+ fi
+fi
+unset debathena_test_if_bashrc_runs
+
+# Finally, source all bash scripts in our profile.d directory.
+for i in `run-parts --list "$DEBATHENA_PROFILE_DIR"`; do . "$i"; done
Modified: trunk/debathena/config/shell-config/debian/rules
===================================================================
--- trunk/debathena/config/shell-config/debian/rules 2012-08-29 20:32:57 UTC (rev 25743)
+++ trunk/debathena/config/shell-config/debian/rules 2012-08-29 20:46:43 UTC (rev 25744)
@@ -3,8 +3,10 @@
DEB_DIVERT_EXTENSION = .debathena
DEB_DIVERT_FILES_debathena-bash-config += \
/etc/bash.bashrc.debathena \
- /etc/profile.debathena
DEB_DIVERT_FILES_debathena-tcsh-config += \
/etc/csh.cshrc.debathena
+DEB_UNDIVERT_FILES_debathena-bash-config += \
+ /etc/profile.debathena
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
