4
4
## selector : from https://github.com/joknarf/selector
5
5
# no proper way to restore tty on trap
6
6
7
- : ${SELECTOR_FOLDER_ICON:=} # 🖿 🗀 📁 📂 🖿
8
- : ${SELECTOR_FILE_ICON:=} # 🗎 🗋 🖹
7
+ : ${SELECTOR_FOLDER_ICON:=} # 🖿 🗀 📁 📂 🖿
8
+ : ${SELECTOR_FILE_ICON:=} # 🗎 🗋 🖹 📄
9
9
10
10
function _ctrl_c
11
11
{
@@ -303,8 +303,8 @@ function selector
303
303
}
304
304
305
305
## end selector
306
- unalias complete 2>/dev/null
307
- alias complete=complete-ng
306
+ # unalias complete 2>/dev/null
307
+ # alias complete=complete-ng
308
308
309
309
_complete-ng_navigate() {
310
310
local dir=$1 IFS
@@ -370,9 +370,6 @@ _complete-ng() {
370
370
[ "$fn" ] || {
371
371
[ "$_compfunc__D" ] && {
372
372
$_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
376
373
fn=$(eval printf %s '$'_compfunc_"${cmd//[^a-zA-Z0-9_]/_}")
377
374
}
378
375
}
@@ -395,7 +392,7 @@ _complete-ng() {
395
392
#[ -d "${COMPREPLY[0]}" ] && COMPREPLY[0]="${COMPREPLY[0]/\//}/"
396
393
}
397
394
398
- complete-ng () {
395
+ complete() {
399
396
local fn func cmd exc="^(_complete-ng|${COMPLETE_NG_EXCLUDE// /|})$"
400
397
for i in "$@";do
401
398
[ "$fn" ] && {
@@ -415,22 +412,22 @@ complete-ng() {
415
412
eval "_compfunc_${c//[^a-zA-Z0-9_]/_}=$func"
416
413
done
417
414
}
418
- \ complete "$@"
415
+ builtin complete "$@"
419
416
}
420
417
421
418
_complete-ng_init() {
422
419
local IFS
423
420
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')
425
422
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.$$
427
424
source /tmp/.complete-ng.tmp.$$
428
425
\rm -f /tmp/.complete-ng.tmp.$$
429
426
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 ''
434
431
}
435
432
436
433
: ${COMPLETE_NG_EXCLUDE:=_cdhist_cd}
0 commit comments