Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-06-25 17:20:06 -0400
committerAllan McRae <allan@archlinux.org>2019-06-26 10:15:47 +1000
commitcd475331f4dd0b464ecb281714134ca76e57b39d (patch)
treede17d8ba36eeb16bb4c346326cff0918ad953730 /scripts
parentd917109432665a6c7ca903fa727cf9a0dc9c7a0c (diff)
bash-completion: use POSIX character classes in regular expressions
bash uses POSIX extended regular expressions via regex(3), which does not guarantee support for shorthand character classes. Although glibc supports it, msys2-runtime does not. Make sure the completion script works (hopefully) everywhere by being more portable. Fixes: https://github.com/msys2/MSYS2-packages/pull/1549 Original-patch-by: plotasse <platos@protonmail.ch> Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/completion/bash_completion.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in
index a1ab9fec..915004e2 100644
--- a/scripts/completion/bash_completion.in
+++ b/scripts/completion/bash_completion.in
@@ -24,7 +24,7 @@ _arch_ptr2comp() {
}
_arch_incomp() {
- local r="\s-(-${1#* }\s|\w*${1% *})"; [[ $COMP_LINE =~ $r ]]
+ local r="[[:space:]]-(-${1#* }[[:space:]]|[[:alnum:]_]*${1% *})"; [[ $COMP_LINE =~ $r ]]
}
_pacman_keyids() {
@@ -77,7 +77,7 @@ _makepkg() {
_init_completion || return
if [[ $prev = @(-p|--config) ]]; then
compopt -o default
- elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then
+ elif [[ ! $prev =~ ^-(-(config|help|key|version)$|[[:alnum:]_]*[Vh]) ]]; then
opts=('allsource asdeps check clean cleanbuild config force geninteg help
holdver ignorearch install key log needed noarchive nobuild nocheck
nocolor noconfirm nodeps noextract noprepare noprogressbar nosign
@@ -127,7 +127,7 @@ _pacman() {
if [[ $? != 0 ]]; then
_arch_ptr2comp core
- elif [[ ! $prev =~ ^-\w*[Vbhr] &&
+ elif [[ ! $prev =~ ^-[[:alnum:]_]*[Vbhr] &&
! $prev = --@(cachedir|color|config|dbpath|help|hookdir|gpgdir|logfile|root|version) ]]
then
[[ $cur = -* ]] && _arch_ptr2comp ${o#* } common ||