whoops, need to turn off globbing, or ALLOW * doesn't do what it is supposed to
This commit is contained in:
parent
f39ad54d93
commit
72ef38722d
1 changed files with 4 additions and 2 deletions
|
@ -64,7 +64,7 @@
|
||||||
# in its parent directory, in its grand-parent directory and so on,
|
# in its parent directory, in its grand-parent directory and so on,
|
||||||
# and finally in the $HOME directory. The first found file is taken.
|
# and finally in the $HOME directory. The first found file is taken.
|
||||||
#
|
#
|
||||||
# A file can use a list of four keywords with arguments, each on a
|
# A file can use a list of three keywords with arguments, each on a
|
||||||
# separate line:
|
# separate line:
|
||||||
#
|
#
|
||||||
# ALLOW <pattern-list> ... accept & report matching file
|
# ALLOW <pattern-list> ... accept & report matching file
|
||||||
|
@ -223,13 +223,14 @@ function search_config {
|
||||||
CONFIG="$file"
|
CONFIG="$file"
|
||||||
return 0
|
return 0
|
||||||
elif [ "$1" ]; then
|
elif [ "$1" ]; then
|
||||||
search_config ${1%/${1/#*\/}} # parent dir
|
search_config ${1%/${1##*/}} # parent dir
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
set -f
|
||||||
RULES=
|
RULES=
|
||||||
if search_config "$PWD"; then
|
if search_config "$PWD"; then
|
||||||
LOG "loading config file $CONFIG"
|
LOG "loading config file $CONFIG"
|
||||||
|
@ -241,6 +242,7 @@ elif [ -f ~/${CONFIG_FILE}rc ]; then
|
||||||
DEBUG "loading config file $CONFIG"
|
DEBUG "loading config file $CONFIG"
|
||||||
source ~/${CONFIG_FILE}rc
|
source ~/${CONFIG_FILE}rc
|
||||||
fi
|
fi
|
||||||
|
set +f
|
||||||
RULES="$PREFIX_RULES $RULES $DEFAULT_RULES $POSTFIX_RULES"
|
RULES="$PREFIX_RULES $RULES $DEFAULT_RULES $POSTFIX_RULES"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue