Permalink
Browse files

move SHLVL check from 01_path to env

  • Loading branch information...
1 parent 98af52b commit ba40388a4bd8184b19f62369cd8127c28c52a0e9 @ryanfb ryanfb committed with Bryce Kerley Aug 15, 2008
Showing with 11 additions and 11 deletions.
  1. +4 −7 01_path
  2. +7 −4 env
View
11 01_path
@@ -1,8 +1,5 @@
-# Don't continually append to path for nested shells
-if [[ $SHLVL == 1 ]]; then
- # I want /opt/local/bin to take precedence
- path=(/opt/local/bin $path /usr/local/bin /usr/local/sbin)
+# I want /opt/local/bin to take precedence
+path=(/opt/local/bin $path)
- # Allow MacPorts man pages
- manpath=($manpath /opt/local/man)
-fi
+# Allow MacPorts man pages
+manpath=($manpath /opt/local/man)
View
11 env
@@ -1,5 +1,8 @@
-mydir=`dirname $0`
+# Don't re-env for nested shells
+if [[ $SHLVL == 1 ]]; then
+ mydir=`dirname $0`
-for f in $mydir/??_*; do
- source $f
-done
+ for f in $mydir/??_*; do
+ source $f
+ done
+fi

0 comments on commit ba40388

Please sign in to comment.