From f5b2d65337c81ef3b58f376d2128a6ab8f1ccaf4 Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Tue, 12 Apr 2022 15:59:12 +0900 Subject: 50017: allow lowercase to match with uppercase in timezone name --- Completion/Unix/Type/_time_zone | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Completion/Unix') diff --git a/Completion/Unix/Type/_time_zone b/Completion/Unix/Type/_time_zone index c437252a8..a7b63adcd 100644 --- a/Completion/Unix/Type/_time_zone +++ b/Completion/Unix/Type/_time_zone @@ -6,4 +6,5 @@ if (( ! $+_zoneinfo_dirs )); then _zoneinfo_dirs=( /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) ) fi -_wanted time-zones expl 'time zone' _files -g '[A-Z]*' -W _zoneinfo_dirs "$@" - +_wanted time-zones expl 'time zone' \ + _files -g '[A-Z]*' -M 'm:{a-z}={A-Z}' -W _zoneinfo_dirs "$@" - -- cgit v1.2.3 From a270da2adacb10a96cbfa0f4ede06b9282af213c Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Tue, 19 Apr 2022 22:44:30 -0700 Subject: unposted (cf. users/27656 (Tomasz Pala), users/27660): fix $SUFFIX when GLOB_COMPLETE --- ChangeLog | 7 ++++++- Completion/Unix/Type/_path_files | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'Completion/Unix') diff --git a/ChangeLog b/ChangeLog index 929cdec82..e090f83a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2022-04-14 Bart Schaefer +2022-04-19 Bart Schaefer + + * unposted (cf. users/27656 (Tomasz Pala), users/27660): + Completion/Unix/Type/_path_files: fix $SUFFIX when GLOB_COMPLETE + +2022-04-14 Bart Schaefer * 50069: Test/C03traps.ztst: fix test description diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index 06d9d8d51..d46dcbe5a 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -734,7 +734,7 @@ for prepath in "$prepaths[@]"; do compadd "$tmp4[@]" -s "${Uopt:+$ISUFFIX}" $listopts - "$tmpdisp" done else - [[ -n "$compstate[pattern_match]" ]] && SUFFIX="${SUFFIX:s./.*/}*" + [[ -n "$compstate[pattern_match]" ]] && SUFFIX="${SUFFIX:gs./.*/}*" for i in "$tmp1[@]"; do _list_files i "$prepath$realpath$testpath" -- cgit v1.2.3 From f59025f8490cc349e73f8d6c088391046115bb92 Mon Sep 17 00:00:00 2001 From: dana Date: Tue, 26 Apr 2022 21:54:29 -0500 Subject: unposted: Fix util-linux variant detection in _getopt This had been broken all along for the actual util-linux getopt; i think the 'enhanced' text comes from the original author's version, which Homebrew was still using when the function was written --- ChangeLog | 3 +++ Completion/Unix/Command/_getopt | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'Completion/Unix') diff --git a/ChangeLog b/ChangeLog index 3646486c2..8ff17f179 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2022-04-26 dana + * unposted: Completion/Unix/Command/_getopt: Fix util-linux + variant detection + * unposted: NEWS: Adjust dedication wording 2022-04-26 Jun-ichi Takimoto diff --git a/Completion/Unix/Command/_getopt b/Completion/Unix/Command/_getopt index 3359818b5..a8b0f6fc9 100644 --- a/Completion/Unix/Command/_getopt +++ b/Completion/Unix/Command/_getopt @@ -2,9 +2,10 @@ local -a args aopts -# Note: BusyBox getopt is borrowed straight from util-linux, so they're -# basically identical -if _pick_variant busybox=BusyBox util-linux='getopt*enhanced' unix --version; then +# @todo BusyBox getopt is borrowed straight from util-linux, so they're nearly +# identical, but not quite: BusyBox doesn't have -h and -V and often doesn't +# support long options. So possibly this could be more accurate +if _pick_variant busybox=BusyBox util-linux='(enhanced|util-linux)' unix --version; then args=( '(-a --alternative)'{-a,--alternative}'[allow long options with single -]' '(: -)'{-h,--help}'[display help information]' -- cgit v1.2.3