Skip to content

Commit 3ce7255

Browse files
committed
complete function wrapper
1 parent b85ebb7 commit 3ce7255

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

complete-ng

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
## selector : from https://github.com/joknarf/selector
55
# no proper way to restore tty on trap
66

7-
: ${SELECTOR_FOLDER_ICON:=} # 🖿 🗀 📁 📂 🖿     
8-
: ${SELECTOR_FILE_ICON:=} #  🗎            🗋 🖹  
7+
: ${SELECTOR_FOLDER_ICON:=} # 🖿 🗀 📁 📂 🖿         
8+
: ${SELECTOR_FILE_ICON:=} #  🗎            🗋 🖹      📄
99

1010
function _ctrl_c
1111
{
@@ -303,8 +303,8 @@ function selector
303303
}
304304

305305
## end selector
306-
unalias complete 2>/dev/null
307-
alias complete=complete-ng
306+
#unalias complete 2>/dev/null
307+
#alias complete=complete-ng
308308

309309
_complete-ng_navigate() {
310310
local dir=$1 IFS
@@ -370,9 +370,6 @@ _complete-ng() {
370370
[ "$fn" ] || {
371371
[ "$_compfunc__D" ] && {
372372
$_compfunc__D "$@" # _completion_loader
373-
\complete -F _complete-ng -I 2>/dev/null
374-
eval $(\complete -p -E 2>/dev/null)
375-
eval $(\complete -p "$cmd" 2>/dev/null) # alias not necessary enable for bash completion loader
376373
fn=$(eval printf %s '$'_compfunc_"${cmd//[^a-zA-Z0-9_]/_}")
377374
}
378375
}
@@ -395,7 +392,7 @@ _complete-ng() {
395392
#[ -d "${COMPREPLY[0]}" ] && COMPREPLY[0]="${COMPREPLY[0]/\//}/"
396393
}
397394

398-
complete-ng() {
395+
complete() {
399396
local fn func cmd exc="^(_complete-ng|${COMPLETE_NG_EXCLUDE// /|})$"
400397
for i in "$@";do
401398
[ "$fn" ] && {
@@ -415,22 +412,22 @@ complete-ng() {
415412
eval "_compfunc_${c//[^a-zA-Z0-9_]/_}=$func"
416413
done
417414
}
418-
\complete "$@"
415+
builtin complete "$@"
419416
}
420417

421418
_complete-ng_init() {
422419
local IFS
423420
if cat <(printf %s) 2>/dev/null && [ "${BASH_VERSION%%.*}" -ge 4 ];then
424-
source <(\complete |sed -n -e '/-F _complete-ng /d' -e 's/^complete/complete-ng/' -e '/-F/p')
421+
source <(builtin complete |sed -n -e '/-F _complete-ng /d' -e '/-F/p')
425422
else # process substitution not working (ish/bash 3.2)
426-
\complete |sed -n -e '/-F _complete-ng /d' -e 's/^complete/complete-ng/' -e '/-F/p' >/tmp/.complete-ng.tmp.$$
423+
builtin complete |sed -n -e '/-F _complete-ng /d' -e '/-F/p' >/tmp/.complete-ng.tmp.$$
427424
source /tmp/.complete-ng.tmp.$$
428425
\rm -f /tmp/.complete-ng.tmp.$$
429426
fi
430-
\complete -F _complete-ng -D 2>/dev/null
431-
\complete -F _complete-ng -I 2>/dev/null
432-
\complete -F _complete-ng -E 2>/dev/null
433-
\complete -F _complete-ng ''
427+
builtin complete -F _complete-ng -D 2>/dev/null
428+
builtin complete -F _complete-ng -I 2>/dev/null
429+
builtin complete -F _complete-ng -E 2>/dev/null
430+
builtin complete -F _complete-ng ''
434431
}
435432

436433
: ${COMPLETE_NG_EXCLUDE:=_cdhist_cd}

0 commit comments

Comments
 (0)