[26812] in Source-Commits
Re: /svn/athena r25770 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Sep 21 17:38:10 2012
Date: Fri, 21 Sep 2012 17:38:00 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201209211837.q8LIbqxh013312@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1209211737440.861@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
Can I log in now? Pretty please?
-Ben
On Fri, 21 Sep 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-09-21 14:37:52 -0400 (Fri, 21 Sep 2012)
> New Revision: 25770
>
> Modified:
> trunk/debathena/config/shell-config/debian/bash.bashrc.debathena
> trunk/debathena/config/shell-config/debian/changelog
> trunk/debathena/config/shell-config/debian/profile.debathena.sh
> Log:
> In shell-config:
> * Don't source the now non-existent original undiverted profile
>
>
> Modified: trunk/debathena/config/shell-config/debian/bash.bashrc.debathena
> ===================================================================
> --- trunk/debathena/config/shell-config/debian/bash.bashrc.debathena 2012-09-20 19:22:15 UTC (rev 25769)
> +++ trunk/debathena/config/shell-config/debian/bash.bashrc.debathena 2012-09-21 18:37:52 UTC (rev 25770)
> @@ -8,8 +8,6 @@
> # Source all bash scripts in our bashrc.d directory.
> for i in `run-parts --list "$DEBATHENA_BASHRC_DIR"`; do . "$i"; done
>
> -# In the event we're being sourced from something sourced by
> -# profile.debathena, inform it that bashrc.d/* has already been sourced.
> -if [ "$debathena_test_if_bashrc_runs" = 0 ]; then
> - debathena_test_if_bashrc_runs=1
> -fi
> +# Inform our /etc/profile.d script that bashrc.d has already been
> +# sourced.
> +debathena_bashrc_sourced=1
>
> Modified: trunk/debathena/config/shell-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/shell-config/debian/changelog 2012-09-20 19:22:15 UTC (rev 25769)
> +++ trunk/debathena/config/shell-config/debian/changelog 2012-09-21 18:37:52 UTC (rev 25770)
> @@ -1,3 +1,9 @@
> +debathena-shell-config (1.18) unstable; urgency=low
> +
> + * Don't source the now non-existent original undiverted profile
> +
> + -- Jonathan Reed <jdreed@mit.edu> Fri, 21 Sep 2012 14:37:39 -0400
> +
> debathena-shell-config (1.17) unstable; urgency=low
>
> * Remove stray escaped newline in DEB_DIVERT_FILES_debathena-bash-config
>
> Modified: trunk/debathena/config/shell-config/debian/profile.debathena.sh
> ===================================================================
> --- trunk/debathena/config/shell-config/debian/profile.debathena.sh 2012-09-20 19:22:15 UTC (rev 25769)
> +++ trunk/debathena/config/shell-config/debian/profile.debathena.sh 2012-09-21 18:37:52 UTC (rev 25770)
> @@ -1,21 +1,21 @@
> -# This is the Debathena /etc/profile configuration, installed by
> +# This is the Debathena /etc/profile.d 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
> +# /etc/profile has been sourced at this point (in fact, we're called
> +# as the last step in it)
> +# On Ubuntu, this will run /etc/bash.bashrc. Our bash.bashrc sets a
> +# variable, so we'll know if that happened.
>
> # 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
> + if [ "${debathena_bashrc_sourced:-x}" != 1 ]; then
> for i in `run-parts --list "$DEBATHENA_BASHRC_DIR"`; do . "$i"; done
> fi
> fi
> -unset debathena_test_if_bashrc_runs
> +unset debathena_bashrc_sourced
>
> # Finally, source all bash scripts in our profile.d directory.
> for i in `run-parts --list "$DEBATHENA_PROFILE_DIR"`; do . "$i"; done
>
>
