Merge pull request #374 from ben-efiz/non-localized-type-check

Made 'type' command using default LANG (not system LANG) to ...
Fixes #180
Fixes #204
pull/375/head
Nils Winkler 2014-12-03 15:17:56 +01:00
commit 82d5eedae3
2 changed files with 2 additions and 2 deletions

View File

@ -235,7 +235,7 @@ draft ()
fi
# aliases bind tighter than function names, disallow them
if [ -n "$(type -a $func 2>/dev/null | grep 'is.*alias')" ]; then
if [ -n "$(LANG=C type -t $func 2>/dev/null | grep 'alias')" ]; then
printf '%s\n' "sorry, $(type -a $func). please choose another name."
return
fi

View File

@ -80,7 +80,7 @@ _is_function ()
_about 'sets $? to true if parameter is the name of a function'
_param '1: name of alleged function'
_group 'lib'
[ -n "$(type -a $1 2>/dev/null | grep 'is a function')" ]
[ -n "$(LANG=C type -t $1 2>/dev/null | grep 'function')" ]
}
_bash-it-aliases ()