fixes

diff --git a/.bashrc b/.bashrc
index caa13ebfc5fd21dded41f367fb2aab196dea946e..f94a429ed4b1c1c79bc021af702d1942d1dddeb5 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -106,6 +106,11 @@ else
     # this file, and we don't want to do that and cause an infinite
     # loop.
   fi
+  if [[ $EDITOR != emacsclient || $TZ != :/etc/localtime ]]; then
+    if [[ -s /etc/profile.d/environment.sh ]]; then
+      source /etc/profile.d/environment.sh
+    fi
+  fi
 
   # source brc and brc2 if they exist. We have to readlink because we
   # could be using sl() from ./brc.

diff --git a/distro-begin b/distro-begin
index 10b69d34e57334047aa00e20c647408302679734..639d5bb12335285883714781f5930929245ecda7 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -265,7 +265,7 @@ fi
 
 
 #### setup bash for root
-for x in /a/c/{.bashrc,brc,brc2,.bash_profile,.profile,.inputrc,path_add_function}; do
+for x in /a/c/{.bashrc,brc,brc2,.bash_profile,.profile,.inputrc,path_add-function}; do
   sudo -i <<EOF
 PATH="/a/exe:$PATH"
 lnf $x /root