annotate .shell.d/00.path_manipulation.sh @ 377:117e3c11d953

zprofile: introduce zprofile use El Capitan (OS X 10.11) introduces a system-level /etc/zprofile which uses a path_helper thing to mangle $PATH. Unfortunately, the way path_helper works, it forces /usr/local/bin and /usr/bin to the *start* of the PATH variable, which means that any PATH mutations I want have to run after /etc/zprofile calls path_helper. As such, move my path insertions into .zprofile{,-machine} rather than .zshenv{,-machine} so that I can still ensure my path entries are at the start of PATH rather than the end. This works because: > Commands are then read from $ZDOTDIR/.zshenv. If the shell is a > login shell, commands are read from /etc/zprofile and then > $ZDOTDIR/.zprofile. Then, if the shell is interactive, commands > are read from /etc/zshrc and then $ZDOTDIR/.zshrc. Finally, if the > shell is a login shell, /etc/zlogin and $ZDOTDIR/.zlogin are read. This means that non-login shells no longer pick up my custom PATH entries, but as I only use OS X as a desktop OS that seems like a workable tradeoff for now.
author Augie Fackler <raf@durin42.com>
date Sun, 31 Jan 2016 20:46:29 -0500
parents 7dfb7799567f
children c85072e620a8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 # Functions for manipulating $PATH. Split out so I can use them in .zshenv if I want.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 function insert_path_element() {
135
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
4 insert_element_into_var $1 PATH
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 }
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 function remove_path_element() {
149
7dfb7799567f path_manipulation: Fix accidental recursion.
Augie Fackler <durin42@gmail.com>
parents: 135
diff changeset
8 remove_element_from_var $1 PATH
135
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
9 }
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
10
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
11 function insert_element_into_var () {
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
12 eval varcontents=\$"$2"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
13 eval varname="$2"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
14 newcomp="$1"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
15 if echo "$varcontents" | grep "$newcomp:" >> /dev/null; then
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
16 true
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
17 elif [[ "$varcontents" == "" ]] ; then
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
18 export $varname="$newcomp"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
19 else
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
20 export $varname="$newcomp:$varcontents"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
21 fi
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
22 }
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
23
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
24 function remove_element_from_var() {
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
25 eval varcontents=\$"$2"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
26 eval varname="$2"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
27 newcomp="$1"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
28 if echo "$varcontents" | grep "$newcomp:" >> /dev/null; then
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
29 export $varname="`echo $varcontents | sed s%$newcomp:%%`"
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
30 elif [[ "$varcontents" == "$newcomp" ]] ; then
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
31 unset $varname
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
32 else
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
33 echo $1 not in $varname
de6d0a9a7e3f path_manipulation: more flexible so it can be used on non-PATH items
Augie Fackler <durin42@gmail.com>
parents: 39
diff changeset
34 fi
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 }