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

Fix for bash-it issue #154, where fasd z fails due a different locale that is using a comma as the decimal separator.

pull/156/head
Nils Winkler 2012-09-14 11:47:50 +02:00
parent 688d321af2
commit 396ca204e4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/available/fasd.plugin.bash
View File

@ -136,7 +136,7 @@ _fasd_zsh_word_complete() {
[ -z "\$_fasd_cur" ] && local _fasd_cur="\${words[CURRENT]}" [ -z "\$_fasd_cur" ] && local _fasd_cur="\${words[CURRENT]}"
local fnd="\${_fasd_cur//,/ }" local fnd="\${_fasd_cur//,/ }"
local typ=\${1:-e} local typ=\${1:-e}
fasd --query \$typ \$fnd | sort -nr | sed 's/^[0-9.]*[ ]*//' | \ fasd --query \$typ \$fnd | sort -nr | sed 's/^[^ ]*[ ]*//' | \
while read line; do while read line; do
compadd -U -V fasd "\$line" compadd -U -V fasd "\$line"
done done
@ -204,7 +204,7 @@ _fasd_bash_word_complete() {
[ "\$_fasd_cur" ] || local _fasd_cur="\${COMP_WORDS[COMP_CWORD]}" [ "\$_fasd_cur" ] || local _fasd_cur="\${COMP_WORDS[COMP_CWORD]}"
local typ=\${1:-e} local typ=\${1:-e}
local fnd="\${_fasd_cur//,/ }" local fnd="\${_fasd_cur//,/ }"
local RESULT=\$(fasd -q --query \$typ \$fnd | sed 's/^[0-9.]*[ ]*//') local RESULT=\$(fasd -q --query \$typ \$fnd | sed 's/^[^ ]*[ ]*//')
IFS=\$'\n' COMPREPLY=( \$RESULT ) IFS=\$'\n' COMPREPLY=( \$RESULT )
} >> "$_FASD_SINK" 2>&1 } >> "$_FASD_SINK" 2>&1
_fasd_bash_word_complete_trigger() { _fasd_bash_word_complete_trigger() {
@ -560,19 +560,19 @@ fasd [-A|-D] [paths ...]
result="$(echo "$result" | sort -nr)" result="$(echo "$result" | sort -nr)"
echo "$result" | sed = | sed 'N;s/\n/ /' | sort -nr >&2; printf "> " >&2 echo "$result" | sed = | sed 'N;s/\n/ /' | sort -nr >&2; printf "> " >&2
local i; read i; [ 0 -lt "${i:-0}" ] 2>> "$_FASD_SINK" || return 1 local i; read i; [ 0 -lt "${i:-0}" ] 2>> "$_FASD_SINK" || return 1
result="$(echo "$result" | sed -n "${i:-1}"'s/^[0-9.]*[ ]*//p')" result="$(echo "$result" | sed -n "${i:-1}"'s/^[^ ]*[ ]*//p')"
if [ "$result" ]; then if [ "$result" ]; then
fasd --add "$result"; eval ${exec:-echo} "\"$result\"" fasd --add "$result"; eval ${exec:-echo} "\"$result\""
fi fi
elif [ "$lst" ]; then elif [ "$lst" ]; then
echo "$result" | sort -n${r} | sed 's/^[0-9.]*[ ]*//' echo "$result" | sort -n${r} | sed 's/^[^ ]*[ ]*//'
elif [ "$show" ]; then elif [ "$show" ]; then
echo "$result" | sort -n echo "$result" | sort -n
elif [ "$fnd" -a "$exec" ]; then # exec elif [ "$fnd" -a "$exec" ]; then # exec
result="$(echo "$result" | sort -n | sed -n '$s/^[0-9.]*[ ]*//p')" result="$(echo "$result" | sort -n | sed -n '$s/^[^ ]*[ ]*//p')"
fasd --add "$result"; eval $exec "\"$result\"" fasd --add "$result"; eval $exec "\"$result\""
elif [ "$fnd" -a ! -t 1 ]; then # echo if output is not terminal elif [ "$fnd" -a ! -t 1 ]; then # echo if output is not terminal
result="$(echo "$result" | sort -n | sed -n '$s/^[0-9.]*[ ]*//p')" result="$(echo "$result" | sort -n | sed -n '$s/^[^ ]*[ ]*//p')"
fasd --add "$result"; echo "$result" fasd --add "$result"; echo "$result"
else # no args, show else # no args, show
echo "$result" | sort -n echo "$result" | sort -n