XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix typeset_functions 

typeset_functions relies on a hack to determine the shell it is running
under. this hack fails on some versions of bash. if the $SHELL variable
is set, prefer that instead.

fix bug in draft()
pull/134/head
Travis Swicegood 2012-05-15 10:26:03 -05:00 committed by Erich Smith
parent 70e1cd36be
commit e14543a4bc
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/composure.sh
View File

@ -145,13 +145,19 @@ typeset_functions ()
# unfortunately, there does not seem to be a easy, portable way to list just the # unfortunately, there does not seem to be a easy, portable way to list just the
# names of the defined shell functions... # names of the defined shell functions...
# first, determine our shell:
typeset shell
if [ -n "$SHELL" ]; then
shell=$(basename $SHELL) # we assume this is set correctly!
else
# we'll have to try harder
# here's a hack I modified from a StackOverflow post: # here's a hack I modified from a StackOverflow post:
# we loop over the ps listing for the current process ($$), and print the last column (CMD) # we loop over the ps listing for the current process ($$), and print the last column (CMD)
# stripping any leading hyphens bash sometimes throws in there # stripping any leading hyphens bash sometimes throws in there
typeset x ans typeset x ans
typeset this=$(for x in $(ps -p $$); do ans=$x; done; printf "%s\n" $ans | sed 's/^-*//') typeset this=$(for x in $(ps -p $$); do ans=$x; done; printf "%s\n" $ans | sed 's/^-*//')
typeset shell=$(basename $this) # e.g. /bin/bash => bash typeset shell=$(basename $this) # e.g. /bin/bash => bash
fi
case "$shell" in case "$shell" in
bash) bash)
typeset -F | awk '{print $3}' typeset -F | awk '{print $3}'
@ -229,7 +235,7 @@ draft ()
fi fi
# aliases bind tighter than function names, disallow them # aliases bind tighter than function names, disallow them
if [ -n "$(type -a $func | grep 'is.*alias')" ]; then if [ -n "$(type -a $func 2>/dev/null | grep 'is.*alias')" ]; then
printf '%s\n' "sorry, $(type -a $func). please choose another name." printf '%s\n' "sorry, $(type -a $func). please choose another name."
return return
fi fi