iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[distro-setup]
/
path_add-function
diff --git
a/path_add-function
b/path_add-function
index 9537fe73076a308e22000c53b95902f00f7f7fbb..540306ca03f0d8aed9af772b7840696f38973fce 100644
(file)
--- a/
path_add-function
+++ b/
path_add-function
@@
-21,9
+21,9
@@
path_add() {
local help="usage: path_add [options] PATH
--help: print this
--end: adds to end of path, which will give it lowest priority
local help="usage: path_add [options] PATH
--help: print this
--end: adds to end of path, which will give it lowest priority
---ifexists: add to path only if
the
directory exists"
+--ifexists: add to path only if directory exists"
local found x y z ifexists end loop newpath
local found x y z ifexists end loop newpath
-
force
=false
+
ifexists
=false
end=false
loop=true
# portable substring matching is ugly http://mywiki.wooledge.org/BashFAQ/041
end=false
loop=true
# portable substring matching is ugly http://mywiki.wooledge.org/BashFAQ/041
@@
-32,8
+32,8
@@
path_add() {
--*)
if [ "$1" = --end ]; then
end=true
--*)
if [ "$1" = --end ]; then
end=true
- elif [ "$1" = --
force
]; then
-
force
=true
+ elif [ "$1" = --
ifexists
]; then
+
ifexists
=true
elif [ "$1" = --help ]; then
echo "$help"
return
elif [ "$1" = --help ]; then
echo "$help"
return
@@
-67,8
+67,7
@@
path_add() {
unset IFS
PATH="$newpath"
for x in "$@"; do
unset IFS
PATH="$newpath"
for x in "$@"; do
- x="$(readlink -f "$x")"
- if $force || [ -d "$x" ]; then
+ if ! $ifexists || [ -d "$x" ]; then
if [ ! "$PATH" ]; then
PATH="$x"
elif $end; then
if [ ! "$PATH" ]; then
PATH="$x"
elif $end; then