forked from bkerley/zshkit
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move SHLVL check from 01_path to env
- Loading branch information
Showing
2 changed files
with
11 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| # 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |