diff --git a/README.md b/README.md
index 7ea3dfc51..f7e6e1f42 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ ProxSpace comes with 2 different executables .bat files.
 ProxSpace will automatically download and update to the latest required packages. All tools will be contained within the ProxSpace folder, however **once ProxSpace is setup the ProxSpace folder must not be moved**. If you wish to have ProxSpace in a different directory, you need to reinstall it.
 
 ProxSpace is based on:
- - msys2-x86_64-20200903
+ - msys2-x86_64-20210215
  
  Following packages will be automatically download or updated:
  - arm-none-eabi-gcc
diff --git a/msys2/etc/localtime b/msys2/etc/localtime
index 7f6d958f8..465546bd3 100644
Binary files a/msys2/etc/localtime and b/msys2/etc/localtime differ
diff --git a/msys2/etc/makepkg_clang32.conf b/msys2/etc/makepkg_clang32.conf
index a34885582..57edd6db8 100644
--- a/msys2/etc/makepkg_clang32.conf
+++ b/msys2/etc/makepkg_clang32.conf
@@ -48,7 +48,7 @@ CHOST="i686-w64-mingw32"
 #
 MINGW_CHOST="i686-w64-mingw32"
 MINGW_PREFIX="/clang32"
-MINGW_PACKAGE_PREFIX="clang-mingw-w64-i686"
+MINGW_PACKAGE_PREFIX="mingw-w64-clang-i686"
 
 # DirectX compatibility environment variable
 DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase,--no-seh"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags
diff --git a/msys2/etc/makepkg_clang64.conf b/msys2/etc/makepkg_clang64.conf
index e5d259130..b7997be32 100644
--- a/msys2/etc/makepkg_clang64.conf
+++ b/msys2/etc/makepkg_clang64.conf
@@ -48,7 +48,7 @@ CHOST="x86_64-w64-mingw32"
 #
 MINGW_CHOST="x86_64-w64-mingw32"
 MINGW_PREFIX="/clang64"
-MINGW_PACKAGE_PREFIX="clang-mingw-w64-x86_64"
+MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
 
 # DirectX compatibility environment variable
 DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, High entropy ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags
diff --git a/msys2/etc/makepkg_mingw64.conf b/msys2/etc/makepkg_mingw64.conf
index f210f1eb0..be189bca4 100644
--- a/msys2/etc/makepkg_mingw64.conf
+++ b/msys2/etc/makepkg_mingw64.conf
@@ -59,7 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat,--default-image-base-high"
 # Uncomment to disable hardening (ASLR, High entropy ASLR, DEP)
 #LDFLAGS="-pipe"
 #-- Make Flags: change this for DistCC/SMP systems
diff --git a/msys2/etc/msystem b/msys2/etc/msystem
index a151ec8e9..a79cb5a01 100644
--- a/msys2/etc/msystem
+++ b/msys2/etc/msystem
@@ -43,6 +43,26 @@ case "${MSYSTEM}" in
         CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
         export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
         ;;
+    CLANG32)
+        MSYSTEM_PREFIX='/clang32'
+        MSYSTEM_CARCH='i686'
+        MSYSTEM_CHOST='i686-w64-mingw32'
+        MINGW_CHOST="${MSYSTEM_CHOST}"
+        MINGW_PREFIX="${MSYSTEM_PREFIX}"
+        MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
+        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        ;;
+    CLANG64)
+        MSYSTEM_PREFIX='/clang64'
+        MSYSTEM_CARCH='x86_64'
+        MSYSTEM_CHOST='x86_64-w64-mingw32'
+        MINGW_CHOST="${MSYSTEM_CHOST}"
+        MINGW_PREFIX="${MSYSTEM_PREFIX}"
+        MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
+        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        ;;
     *)
         MSYSTEM_PREFIX='/usr'
         MSYSTEM_CARCH="$(/usr/bin/uname -m)"
diff --git a/msys2/etc/nanorc b/msys2/etc/nanorc
new file mode 100644
index 000000000..be7ee23ae
--- /dev/null
+++ b/msys2/etc/nanorc
@@ -0,0 +1,295 @@
+## Sample initialization file for GNU nano.
+##
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default.  To make sure that an option
+## is disabled, you can use "unset <option>".
+##
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
+## double quote on the line will be seen as the closing quote.
+
+## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
+## stop at word ends instead of at beginnings.
+# set afterends
+
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks
+
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
+# set autoindent
+
+## Back up files to the current filename plus a tilde.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## Treat any line with leading whitespace as the beginning of a paragraph.
+# set bookstyle
+
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters.  Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
+# set brackets ""')>]}"
+
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
+## Do case-sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the status bar.  Note that
+## this overrides "quickblank".
+# set constantshow
+
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Set the target width for automatic hard-wrapping and for justifying
+## paragraphs.  If the specified value is 0 or less, the wrapping point
+## will be the terminal's width minus this number.
+# set fill -8
+
+## Remember the used search/replace strings for the next session.
+# set historylog
+
+## Display a "scrollbar" on the righthand side of the edit window.
+# set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left (and any anchors in the margin).
+# set linenumbers
+
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa.  There are
+## no plans to implement vim-style undo state in these files.
+# set locking
+
+## Fall back to slow libmagic to try and determine an applicable syntax.
+# set magic
+
+## The opening and closing brackets that can be found by bracket
+## searches.  They cannot contain blank characters.  The former set must
+## come before the latter set, and both must be in the same order.
+# set matchbrackets "(<[{)>]}"
+
+## Enable mouse support, if available for your system.  When enabled,
+## mouse clicks can be used to place the cursor, set the mark (with a
+## double click), and execute shortcuts.  The mouse will work in the X
+## Window System, and on the console when gpm is running.
+# set mouse
+
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
+# set multibuffer
+
+## Don't convert files from DOS/Mac format.
+# set noconvert
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
+## Set operating directory.  nano will not read or write files outside
+## this directory and its subdirectories.  Also, the current directory
+## is changed to here, so any files are inserted from this dir.  A blank
+## string means the operating-directory feature is turned off.
+# set operatingdir ""
+
+## Remember the cursor position in each file for the next editing session.
+# set positionlog
+
+## Preserve the XON and XOFF keys (^Q and ^S).
+# set preserve
+
+## The characters treated as closing punctuation when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+# set punct "!.?"
+
+## Do quick status-bar blanking.  Status-bar messages will disappear after
+## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
+# set quickblank
+
+## The regular expression that matches quoting characters in email
+## or line-comment introducers in source code.  The default is:
+# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
+
+## Try to work around a mismatching terminfo terminal description.
+# set rawsequences
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
+# set regexp
+
+## Save a changed buffer automatically on exit; don't prompt.
+# set saveonexit
+## (The old form of this option, 'set tempfile', is deprecated.)
+
+## Put the cursor on the highlighted item in the file browser, and show
+## the cursor in the help viewer; useful for people who use a braille
+## display and people with poor vision.
+# set showcursor
+
+## Make the Home key smarter.  When Home is pressed anywhere but at the
+## very beginning of non-whitespace characters on a line, the cursor
+## will jump to that beginning (either forwards or backwards).  If the
+## cursor is already at that position, it will jump to the true
+## beginning of the line.
+# set smarthome
+
+## Spread overlong lines over multiple screen lines.
+# set softwrap
+
+## Use this spelling checker instead of the internal one.  This option
+## does not have a default value.
+# set speller "aspell -x -c"
+
+## Use the end of the title bar for some state flags: I = auto-indenting,
+## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
+# set stateflags
+
+## Allow nano to be suspended (with ^Z by default).
+# set suspendable
+## (The old form of this option, 'set suspend', is deprecated.)
+
+## Use this tab size instead of the default; it must be greater than 0.
+# set tabsize 8
+
+## Convert typed tabs to spaces.
+# set tabstospaces
+
+## Snip whitespace at the end of lines when justifying or hard-wrapping.
+# set trimblanks
+
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
+
+## Detect word boundaries differently by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words.  This option does not have a default value.  When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
+
+## Paint the interface elements of nano.  These are examples;
+## by default there are no colors, except for errorcolor.
+# set titlecolor bold,lightwhite,blue
+# set statuscolor bold,lightwhite,green
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,magenta
+# set stripecolor ,yellow
+# set scrollercolor cyan
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+
+## In root's .nanorc you might want to use:
+# set titlecolor bold,lightwhite,magenta
+# set statuscolor bold,lightwhite,magenta
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,cyan
+# set stripecolor ,yellow
+# set scrollercolor magenta
+# set numbercolor magenta
+# set keycolor lightmagenta
+# set functioncolor magenta
+
+
+## === Syntax coloring ===
+## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
+
+## To include most of the existing syntax definitions, you can do:
+# include "/usr/share/nano/*.nanorc"
+
+## Or you can select just the ones you need.  For example:
+# include "/usr/share/nano/html.nanorc"
+# include "/usr/share/nano/python.nanorc"
+# include "/usr/share/nano/sh.nanorc"
+
+## In /usr/share/nano/extra/ you can find some syntaxes that are
+## specific for certain distros or for some less common languages.
+
+
+## If <Tab> should always produce four spaces when editing a Python file,
+## independent of the settings of 'tabsize' and 'tabstospaces':
+# extendsyntax python tabgives "    "
+
+## If <Tab> should always produce an actual TAB when editing a Makefile:
+# extendsyntax makefile tabgives "	"
+
+
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function.  The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function.  So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H chopwordleft main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^S savefile main
+#bind ^W writeout main
+#bind ^O insert main
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy main
+#bind ^V paste all
+#bind ^P location main
+#bind ^A mark main
+#unbind ^K main
+#unbind ^U all
+#unbind ^N main
+#unbind ^Y all
+#unbind M-J main
+#unbind M-T main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#bind M-U undo main
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#set multibuffer
diff --git a/msys2/etc/pacman.d/mirrorlist.mingw32 b/msys2/etc/pacman.d/mirrorlist.mingw32
index fcfaa2ee6..6fe318a57 100644
--- a/msys2/etc/pacman.d/mirrorlist.mingw32
+++ b/msys2/etc/pacman.d/mirrorlist.mingw32
@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/mingw/i686/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/i686/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/i686/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/i686/
 Server = http://mirrors.ustc.edu.cn/msys2/mingw/i686/
 Server = http://mirror.bit.edu.cn/msys2/mingw/i686/
 Server = https://mirror.selfnet.de/msys2/mingw/i686/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/i686/
+Server = https://mirror.jmu.edu/pub/msys2/mingw/i686/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/i686/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/i686/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/i686/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/i686/
+Server = https://mirrors.dotsrc.org/msys2/mingw/i686/ 
+Server = https://mirror.ufro.cl/msys2/mingw/i686/
+Server = https://mirror.clarkson.edu/msys2/mingw/i686/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/i686/
+Server = https://download.nus.edu.sg/mirror/msys2/mingw/i686/
+Server = https://ftp.osuosl.org/pub/msys2/mingw/i686/
+Server = https://fastmirror.pp.ua/msys2/mingw/i686/
diff --git a/msys2/etc/pacman.d/mirrorlist.mingw64 b/msys2/etc/pacman.d/mirrorlist.mingw64
index c6a7d681b..17905b4a7 100644
--- a/msys2/etc/pacman.d/mirrorlist.mingw64
+++ b/msys2/etc/pacman.d/mirrorlist.mingw64
@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/mingw/x86_64/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/x86_64/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/x86_64/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/x86_64/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/x86_64/
 Server = http://mirrors.ustc.edu.cn/msys2/mingw/x86_64/
 Server = http://mirror.bit.edu.cn/msys2/mingw/x86_64/
 Server = https://mirror.selfnet.de/msys2/mingw/x86_64/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/x86_64/
+Server = https://mirror.jmu.edu/pub/msys2/mingw/x86_64/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/x86_64/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/x86_64/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/x86_64/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/x86_64/
+Server = https://mirrors.dotsrc.org/msys2/mingw/x86_64/ 
+Server = https://mirror.ufro.cl/msys2/mingw/x86_64/
+Server = https://mirror.clarkson.edu/msys2/mingw/x86_64/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/x86_64/
+Server = https://download.nus.edu.sg/mirror/msys2/mingw/x86_64/
+Server = https://ftp.osuosl.org/pub/msys2/mingw/x86_64/
+Server = https://fastmirror.pp.ua/msys2/mingw/x86_64/
diff --git a/msys2/etc/pacman.d/mirrorlist.msys b/msys2/etc/pacman.d/mirrorlist.msys
index d2e273ca2..1961d46c5 100644
--- a/msys2/etc/pacman.d/mirrorlist.msys
+++ b/msys2/etc/pacman.d/mirrorlist.msys
@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/msys/$arch/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MSYS2/$arch/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/$arch/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/msys/$arch/
 Server = https://mirror.yandex.ru/mirrors/msys2/msys/$arch/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/msys/$arch/
 Server = http://mirrors.ustc.edu.cn/msys2/msys/$arch/
 Server = http://mirror.bit.edu.cn/msys2/msys/$arch/
 Server = https://mirror.selfnet.de/msys2/msys/$arch/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/msys/$arch/
+Server = https://mirror.jmu.edu/pub/msys2/msys/$arch/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/msys/$arch/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/msys/$arch/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/msys/$arch/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/msys/$arch/
+Server = https://mirrors.dotsrc.org/msys2/msys/$arch/ 
+Server = https://mirror.ufro.cl/msys2/msys/$arch/
+Server = https://mirror.clarkson.edu/msys2/msys/$arch/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/msys/$arch/
+Server = https://download.nus.edu.sg/mirror/msys2/msys/$arch/
+Server = https://ftp.osuosl.org/pub/msys2/msys/$arch/
+Server = https://fastmirror.pp.ua/msys2/msys/$arch/
diff --git a/msys2/etc/pki/ca-trust/extracted/java/cacerts b/msys2/etc/pki/ca-trust/extracted/java/cacerts
index f5ad077a7..f5e98123e 100644
Binary files a/msys2/etc/pki/ca-trust/extracted/java/cacerts and b/msys2/etc/pki/ca-trust/extracted/java/cacerts differ
diff --git a/msys2/etc/post-install/01-devices.post b/msys2/etc/post-install/01-devices.post
index 0d1285914..d5b6fe355 100644
--- a/msys2/etc/post-install/01-devices.post
+++ b/msys2/etc/post-install/01-devices.post
@@ -52,8 +52,6 @@ maybe_create_devs ()
       echo "POSIX semaphores and POSIX shared memory will not work"
       echo
     fi
-  else
-    chmod 1777 "${DEVDIR}/shm"
   fi
 
   # Check for ${DEVDIR}/mqueue directory (for POSIX message queues)
@@ -81,8 +79,6 @@ maybe_create_devs ()
       echo "POSIX message queues will not work"
       echo
     fi
-  else
-    chmod 1777 "${DEVDIR}/mqueue"
   fi
   
   # Install /dev/fd, /dev/std{in,out,err}.  The bash builtin test was compiled
diff --git a/msys2/etc/profile b/msys2/etc/profile
index dd0c0a267..149507566 100644
--- a/msys2/etc/profile
+++ b/msys2/etc/profile
@@ -47,14 +47,7 @@ esac
 unset MINGW_MOUNT_POINT
 . '/etc/msystem'
 case "${MSYSTEM}" in
-MINGW32)
-  MINGW_MOUNT_POINT="${MINGW_PREFIX}"
-  PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
-  PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"
-  ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal"
-  MANPATH="${MINGW_MOUNT_POINT}/local/man:${MINGW_MOUNT_POINT}/share/man:${MANPATH}"
-  ;;
-MINGW64)
+MINGW*|CLANG*)
   MINGW_MOUNT_POINT="${MINGW_PREFIX}"
   PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
   PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"
diff --git a/msys2/etc/profile.d/bash_completion.sh b/msys2/etc/profile.d/bash_completion.sh
index 031ba9461..e1a51b0ab 100644
--- a/msys2/etc/profile.d/bash_completion.sh
+++ b/msys2/etc/profile.d/bash_completion.sh
@@ -3,9 +3,9 @@
 if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO-}" = x ]; then
 
     # Check for recent enough version of bash.
-    if [ "${BASH_VERSINFO[0]}" -gt 4 ] || \
-       [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 1 ]; then
-        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+    if [ "${BASH_VERSINFO[0]}" -gt 4 ] ||
+        [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 2 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] &&
             . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
         if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
             # Source completion code.
diff --git a/msys2/msys2_shell.cmd b/msys2/msys2_shell.cmd
index 5891885b1..3854e4b53 100644
--- a/msys2/msys2_shell.cmd
+++ b/msys2/msys2_shell.cmd
@@ -93,13 +93,16 @@ set msys2_arg=
 set msys2_shiftCounter=
 set msys2_full_cmd=
 
-rem Setup proper title
+rem Setup proper title and icon
 if "%MSYSTEM%" == "MINGW32" (
   set "CONTITLE=MinGW x32"
+  set "CONICON=mingw32.ico"
 ) else if "%MSYSTEM%" == "MINGW64" (
   set "CONTITLE=MinGW x64"
+  set "CONICON=mingw64.ico"
 ) else (
   set "CONTITLE=MSYS2 MSYS"
+  set "CONICON=msys2.ico"
 )
 
 if "x%MSYSCON%" == "xmintty.exe" goto startmintty
@@ -110,9 +113,9 @@ if NOT EXIST "%WD%mintty.exe" goto startsh
 set MSYSCON=mintty.exe
 :startmintty
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 ) else (
-  "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%
 
@@ -122,9 +125,9 @@ call :conemudetect || (
   exit /b 1
 )
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 ) else (
-  "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%
 
diff --git a/msys2/usr/bin/ash.exe b/msys2/usr/bin/ash.exe
index 0fd052687..595d52e69 100644
Binary files a/msys2/usr/bin/ash.exe and b/msys2/usr/bin/ash.exe differ
diff --git a/msys2/usr/bin/bash.exe b/msys2/usr/bin/bash.exe
index aa79eab71..93c1e6499 100644
Binary files a/msys2/usr/bin/bash.exe and b/msys2/usr/bin/bash.exe differ
diff --git a/msys2/usr/bin/bashbug b/msys2/usr/bin/bashbug
index cdfcb20bf..3b024e2ea 100644
--- a/msys2/usr/bin/bashbug
+++ b/msys2/usr/bin/bashbug
@@ -7,7 +7,7 @@
 # chet@cwru.edu and, optionally, to bash-testers@cwru.edu.
 # Other versions send mail to bug-bash@gnu.org.
 #
-# Copyright (C) 1996-2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,9 @@
 MACHINE="x86_64"
 OS="msys"
 CC="gcc"
-CFLAGS=" -DPROGRAM='bash.exe' -DCONF_HOSTTYPE='x86_64' -DCONF_OSTYPE='msys' -DCONF_MACHTYPE='x86_64-pc-msys' -DCONF_VENDOR='pc' -DLOCALEDIR='/usr/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -DRECYCLES_PIDS   -I.  -I. -I./include -I./lib  -DWORDEXP_OPTION -march=x86-64 -mtune=generic -O2 -pipe -Wno-parentheses -Wno-format-security -D_STATIC_BUILD"
-RELEASE="4.4"
-PATCHLEVEL="23"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -D_STATIC_BUILD "
+RELEASE="5.1"
+PATCHLEVEL="4"
 RELSTATUS="release"
 MACHTYPE="x86_64-pc-msys"
 
@@ -43,7 +43,7 @@ export PATH
 
 #Securely create a temporary directory for the temporary files
 TEMPDIR=$TMPDIR/bbug.$$
-(umask 077 && mkdir $TEMPDIR) || {
+(umask 077 && mkdir "$TEMPDIR") || {
 	echo "$0: could not create temporary directory" >&2
 	exit 1
 }
@@ -132,6 +132,8 @@ if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then
 		DEFEDITOR=emacs
 	elif [ -x /usr/bin/xemacs ]; then
 		DEFEDITOR=xemacs
+	elif [ -x /usr/bin/nano ]; then
+		DEFEDITOR=nano
 	elif [ -x /usr/contrib/bin/jove ]; then
 		DEFEDITOR=jove
 	elif [ -x /usr/local/bin/jove ]; then
diff --git a/msys2/usr/bin/brotli.exe b/msys2/usr/bin/brotli.exe
index 2428058f9..5901ec6e9 100644
Binary files a/msys2/usr/bin/brotli.exe and b/msys2/usr/bin/brotli.exe differ
diff --git a/msys2/usr/bin/bsdtar.exe b/msys2/usr/bin/bsdtar.exe
index 397c0ef26..e8b21bcf7 100644
Binary files a/msys2/usr/bin/bsdtar.exe and b/msys2/usr/bin/bsdtar.exe differ
diff --git a/msys2/usr/bin/chattr.exe b/msys2/usr/bin/chattr.exe
index 7e729f217..3727f73e1 100644
Binary files a/msys2/usr/bin/chattr.exe and b/msys2/usr/bin/chattr.exe differ
diff --git a/msys2/usr/bin/checkupdates b/msys2/usr/bin/checkupdates
index 9be8261bd..965951cf4 100644
--- a/msys2/usr/bin/checkupdates
+++ b/msys2/usr/bin/checkupdates
@@ -19,7 +19,7 @@
 #
 
 declare -r myname='checkupdates'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 
diff --git a/msys2/usr/bin/curl.exe b/msys2/usr/bin/curl.exe
index 5c1553db1..5772e58f4 100644
Binary files a/msys2/usr/bin/curl.exe and b/msys2/usr/bin/curl.exe differ
diff --git a/msys2/usr/bin/cygcheck.exe b/msys2/usr/bin/cygcheck.exe
index a6f0affb7..34b504f6e 100644
Binary files a/msys2/usr/bin/cygcheck.exe and b/msys2/usr/bin/cygcheck.exe differ
diff --git a/msys2/usr/bin/cygpath.exe b/msys2/usr/bin/cygpath.exe
index 41e57a03b..acfcc2dfc 100644
Binary files a/msys2/usr/bin/cygpath.exe and b/msys2/usr/bin/cygpath.exe differ
diff --git a/msys2/usr/bin/cygwin-console-helper.exe b/msys2/usr/bin/cygwin-console-helper.exe
index ece9984f2..cfa21929e 100644
Binary files a/msys2/usr/bin/cygwin-console-helper.exe and b/msys2/usr/bin/cygwin-console-helper.exe differ
diff --git a/msys2/usr/bin/dash.exe b/msys2/usr/bin/dash.exe
index 0fd052687..595d52e69 100644
Binary files a/msys2/usr/bin/dash.exe and b/msys2/usr/bin/dash.exe differ
diff --git a/msys2/usr/bin/dirmngr-client.exe b/msys2/usr/bin/dirmngr-client.exe
index 75a91482d..67a5fd70a 100644
Binary files a/msys2/usr/bin/dirmngr-client.exe and b/msys2/usr/bin/dirmngr-client.exe differ
diff --git a/msys2/usr/bin/dirmngr.exe b/msys2/usr/bin/dirmngr.exe
index d20eb8e92..989b8ba18 100644
Binary files a/msys2/usr/bin/dirmngr.exe and b/msys2/usr/bin/dirmngr.exe differ
diff --git a/msys2/usr/bin/dumper.exe b/msys2/usr/bin/dumper.exe
index 6b201577f..98631142a 100644
Binary files a/msys2/usr/bin/dumper.exe and b/msys2/usr/bin/dumper.exe differ
diff --git a/msys2/usr/bin/dumpsexp.exe b/msys2/usr/bin/dumpsexp.exe
index e856ffd4c..49469bf42 100644
Binary files a/msys2/usr/bin/dumpsexp.exe and b/msys2/usr/bin/dumpsexp.exe differ
diff --git a/msys2/usr/bin/file.exe b/msys2/usr/bin/file.exe
index 0e0eba70d..fd0f02120 100644
Binary files a/msys2/usr/bin/file.exe and b/msys2/usr/bin/file.exe differ
diff --git a/msys2/usr/bin/gapplication.exe b/msys2/usr/bin/gapplication.exe
index 8ec8b4605..439bba031 100644
Binary files a/msys2/usr/bin/gapplication.exe and b/msys2/usr/bin/gapplication.exe differ
diff --git a/msys2/usr/bin/gdbm_dump.exe b/msys2/usr/bin/gdbm_dump.exe
index 62857975a..91b63aa46 100644
Binary files a/msys2/usr/bin/gdbm_dump.exe and b/msys2/usr/bin/gdbm_dump.exe differ
diff --git a/msys2/usr/bin/gdbm_load.exe b/msys2/usr/bin/gdbm_load.exe
index bbf737ccb..49c21c89a 100644
Binary files a/msys2/usr/bin/gdbm_load.exe and b/msys2/usr/bin/gdbm_load.exe differ
diff --git a/msys2/usr/bin/gdbmtool.exe b/msys2/usr/bin/gdbmtool.exe
index b359d235f..0fd83707e 100644
Binary files a/msys2/usr/bin/gdbmtool.exe and b/msys2/usr/bin/gdbmtool.exe differ
diff --git a/msys2/usr/bin/gdbus.exe b/msys2/usr/bin/gdbus.exe
index b4be838ba..7d5e87de0 100644
Binary files a/msys2/usr/bin/gdbus.exe and b/msys2/usr/bin/gdbus.exe differ
diff --git a/msys2/usr/bin/gencat.exe b/msys2/usr/bin/gencat.exe
index 452039024..555e65b1a 100644
Binary files a/msys2/usr/bin/gencat.exe and b/msys2/usr/bin/gencat.exe differ
diff --git a/msys2/usr/bin/getconf.exe b/msys2/usr/bin/getconf.exe
index 262f0bd64..e595b5480 100644
Binary files a/msys2/usr/bin/getconf.exe and b/msys2/usr/bin/getconf.exe differ
diff --git a/msys2/usr/bin/getfacl.exe b/msys2/usr/bin/getfacl.exe
index a9c463b46..af0164237 100644
Binary files a/msys2/usr/bin/getfacl.exe and b/msys2/usr/bin/getfacl.exe differ
diff --git a/msys2/usr/bin/gio-querymodules.exe b/msys2/usr/bin/gio-querymodules.exe
index c30ead5fe..defdf390a 100644
Binary files a/msys2/usr/bin/gio-querymodules.exe and b/msys2/usr/bin/gio-querymodules.exe differ
diff --git a/msys2/usr/bin/glib-compile-schemas.exe b/msys2/usr/bin/glib-compile-schemas.exe
index 8ecc265a7..72e19b7ea 100644
Binary files a/msys2/usr/bin/glib-compile-schemas.exe and b/msys2/usr/bin/glib-compile-schemas.exe differ
diff --git a/msys2/usr/bin/gobject-query.exe b/msys2/usr/bin/gobject-query.exe
index 1c7c3d139..960743e6a 100644
Binary files a/msys2/usr/bin/gobject-query.exe and b/msys2/usr/bin/gobject-query.exe differ
diff --git a/msys2/usr/bin/gpg-agent.exe b/msys2/usr/bin/gpg-agent.exe
index 72016f333..467fde8aa 100644
Binary files a/msys2/usr/bin/gpg-agent.exe and b/msys2/usr/bin/gpg-agent.exe differ
diff --git a/msys2/usr/bin/gpg-connect-agent.exe b/msys2/usr/bin/gpg-connect-agent.exe
index 140d40e98..8e763920e 100644
Binary files a/msys2/usr/bin/gpg-connect-agent.exe and b/msys2/usr/bin/gpg-connect-agent.exe differ
diff --git a/msys2/usr/bin/gpg-error.exe b/msys2/usr/bin/gpg-error.exe
index 1d92b811f..4b21a1ce1 100644
Binary files a/msys2/usr/bin/gpg-error.exe and b/msys2/usr/bin/gpg-error.exe differ
diff --git a/msys2/usr/bin/gpg-wks-server.exe b/msys2/usr/bin/gpg-wks-server.exe
index ba6408f62..df9d0080c 100644
Binary files a/msys2/usr/bin/gpg-wks-server.exe and b/msys2/usr/bin/gpg-wks-server.exe differ
diff --git a/msys2/usr/bin/gpg.exe b/msys2/usr/bin/gpg.exe
index 21f25ad47..f5e05eb3d 100644
Binary files a/msys2/usr/bin/gpg.exe and b/msys2/usr/bin/gpg.exe differ
diff --git a/msys2/usr/bin/gpgconf.exe b/msys2/usr/bin/gpgconf.exe
index f1ccc2b47..fd58e65c2 100644
Binary files a/msys2/usr/bin/gpgconf.exe and b/msys2/usr/bin/gpgconf.exe differ
diff --git a/msys2/usr/bin/gpgme-json.exe b/msys2/usr/bin/gpgme-json.exe
index 84ccdcfc9..0272b85a6 100644
Binary files a/msys2/usr/bin/gpgme-json.exe and b/msys2/usr/bin/gpgme-json.exe differ
diff --git a/msys2/usr/bin/gpgme-tool.exe b/msys2/usr/bin/gpgme-tool.exe
index 043a1de3b..01497a133 100644
Binary files a/msys2/usr/bin/gpgme-tool.exe and b/msys2/usr/bin/gpgme-tool.exe differ
diff --git a/msys2/usr/bin/gpgparsemail.exe b/msys2/usr/bin/gpgparsemail.exe
index 4b2177d81..00e23c75c 100644
Binary files a/msys2/usr/bin/gpgparsemail.exe and b/msys2/usr/bin/gpgparsemail.exe differ
diff --git a/msys2/usr/bin/gpgscm.exe b/msys2/usr/bin/gpgscm.exe
index 08b80141d..968e5244d 100644
Binary files a/msys2/usr/bin/gpgscm.exe and b/msys2/usr/bin/gpgscm.exe differ
diff --git a/msys2/usr/bin/gpgsm.exe b/msys2/usr/bin/gpgsm.exe
index e618399a3..a19c0f668 100644
Binary files a/msys2/usr/bin/gpgsm.exe and b/msys2/usr/bin/gpgsm.exe differ
diff --git a/msys2/usr/bin/gpgsplit.exe b/msys2/usr/bin/gpgsplit.exe
new file mode 100644
index 000000000..f2678a128
Binary files /dev/null and b/msys2/usr/bin/gpgsplit.exe differ
diff --git a/msys2/usr/bin/gpgtar.exe b/msys2/usr/bin/gpgtar.exe
index d27b739c2..717c7e701 100644
Binary files a/msys2/usr/bin/gpgtar.exe and b/msys2/usr/bin/gpgtar.exe differ
diff --git a/msys2/usr/bin/gpgv.exe b/msys2/usr/bin/gpgv.exe
index 266537739..ed66d0f89 100644
Binary files a/msys2/usr/bin/gpgv.exe and b/msys2/usr/bin/gpgv.exe differ
diff --git a/msys2/usr/bin/gsettings.exe b/msys2/usr/bin/gsettings.exe
index ca65cf1bb..c2fd84167 100644
Binary files a/msys2/usr/bin/gsettings.exe and b/msys2/usr/bin/gsettings.exe differ
diff --git a/msys2/usr/bin/hmac256.exe b/msys2/usr/bin/hmac256.exe
index 48d9ab0ab..a30a72c3f 100644
Binary files a/msys2/usr/bin/hmac256.exe and b/msys2/usr/bin/hmac256.exe differ
diff --git a/msys2/usr/bin/iconv.exe b/msys2/usr/bin/iconv.exe
index b751fa7f9..037003072 100644
Binary files a/msys2/usr/bin/iconv.exe and b/msys2/usr/bin/iconv.exe differ
diff --git a/msys2/usr/bin/info.exe b/msys2/usr/bin/info.exe
index f670c2b6c..71ae8db35 100644
Binary files a/msys2/usr/bin/info.exe and b/msys2/usr/bin/info.exe differ
diff --git a/msys2/usr/bin/install-info.exe b/msys2/usr/bin/install-info.exe
index b229eec26..9c1fbd9d5 100644
Binary files a/msys2/usr/bin/install-info.exe and b/msys2/usr/bin/install-info.exe differ
diff --git a/msys2/usr/bin/kbxutil.exe b/msys2/usr/bin/kbxutil.exe
index 29b318d0e..552d9b39c 100644
Binary files a/msys2/usr/bin/kbxutil.exe and b/msys2/usr/bin/kbxutil.exe differ
diff --git a/msys2/usr/bin/kill.exe b/msys2/usr/bin/kill.exe
index 325132865..a32cdf027 100644
Binary files a/msys2/usr/bin/kill.exe and b/msys2/usr/bin/kill.exe differ
diff --git a/msys2/usr/bin/ldd.exe b/msys2/usr/bin/ldd.exe
index d9593ecec..d5ce442b9 100644
Binary files a/msys2/usr/bin/ldd.exe and b/msys2/usr/bin/ldd.exe differ
diff --git a/msys2/usr/bin/ldh.exe b/msys2/usr/bin/ldh.exe
index 566c768ce..642aaf507 100644
Binary files a/msys2/usr/bin/ldh.exe and b/msys2/usr/bin/ldh.exe differ
diff --git a/msys2/usr/bin/less.exe b/msys2/usr/bin/less.exe
index 1578bcd53..294884f63 100644
Binary files a/msys2/usr/bin/less.exe and b/msys2/usr/bin/less.exe differ
diff --git a/msys2/usr/bin/lessecho.exe b/msys2/usr/bin/lessecho.exe
index 5058254d8..8969380b9 100644
Binary files a/msys2/usr/bin/lessecho.exe and b/msys2/usr/bin/lessecho.exe differ
diff --git a/msys2/usr/bin/lesskey.exe b/msys2/usr/bin/lesskey.exe
index 4fd63b794..da6a53fe8 100644
Binary files a/msys2/usr/bin/lesskey.exe and b/msys2/usr/bin/lesskey.exe differ
diff --git a/msys2/usr/bin/locale.exe b/msys2/usr/bin/locale.exe
index 35fe76376..634c7473e 100644
Binary files a/msys2/usr/bin/locale.exe and b/msys2/usr/bin/locale.exe differ
diff --git a/msys2/usr/bin/lsattr.exe b/msys2/usr/bin/lsattr.exe
index a55f39c68..806259ca6 100644
Binary files a/msys2/usr/bin/lsattr.exe and b/msys2/usr/bin/lsattr.exe differ
diff --git a/msys2/usr/bin/makepkg-clang b/msys2/usr/bin/makepkg-clang
deleted file mode 100644
index 85ebd1d3b..000000000
--- a/msys2/usr/bin/makepkg-clang
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-#   makepkg-mingw - wrapper for makepkg to build mingw-w64 packages under  MSYS2
-#
-#   Copyright (c) 2018 Alexey Pavlov <alexpux@gmail.com>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-plain() {
-  local mesg=$1; shift
-  printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_warning() {
-  local mesg=$1; shift
-  printf "${YELLOW}=> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_msg1() {
-  local mesg=$1; shift
-  printf "${GREEN}==> ${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_msg2() {
-  local mesg=$1; shift
-  printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_error() {
-  local mesg=$1; shift
-  printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-if /usr/bin/tput setaf 0 &>/dev/null; then
-  ALL_OFF="$(/usr/bin/tput sgr0)"
-  BOLD="$(/usr/bin/tput bold)"
-  BLUE="${BOLD}$(/usr/bin/tput setaf 4)"
-  GREEN="${BOLD}$(/usr/bin/tput setaf 2)"
-  RED="${BOLD}$(/usr/bin/tput setaf 1)"
-  YELLOW="${BOLD}$(/usr/bin/tput setaf 3)"
-else
-  ALL_OFF="\e[1;0m"
-  BOLD="\e[1;1m"
-  BLUE="${BOLD}\e[1;34m"
-  GREEN="${BOLD}\e[1;32m"
-  RED="${BOLD}\e[1;31m"
-  YELLOW="${BOLD}\e[1;33m"
-fi
-
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-MINGW_INSTALLS="${MINGW_INSTALLS,,}"
-MINGW_INSTALLS="${MINGW_INSTALLS:-clang64 clang32}"
-
-for _mingw in ${MINGW_INSTALLS}; do
-  if [ ! "${_mingw}" = 'clang32' -a ! "${_mingw}" = 'clang64' ]; then
-    print_error "Requested mingw installation '${_mingw}', but only 'clang32' and 'clang64' are allowed."
-    exit 1
-  fi
-done
-
-for _arg in "$@"; do
-  if [ ${_arg} = "--help" -o ${_arg} = "-h" -o ${_arg} = "--version" -o ${_arg} = "-V" ]; then
-    /usr/bin/makepkg $@
-    exit 0
-  fi
-done
-
-for _mingw in ${MINGW_INSTALLS}; do
-  case ${_mingw} in
-    clang32)
-      _arch=i686
-      _msystem=MINGW32
-    ;;
-    clang64)
-      _arch=x86_64
-      _msystem=MINGW64
-    ;;
-  esac
-
-  if [ -f "/${_mingw}/bin/clang.exe" ]; then
-    MSYSTEM=${_msystem} \
-    PATH=/${_mingw}/bin:$(echo $PATH | tr ':' '\n' | awk '$0 != "/opt/bin"' | paste -sd:) \
-    /usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf $@ || exit 1
-  else
-    print_warning "You don't have installed mingw-w64 toolchain for architecture ${_arch}."
-    print_warning "To install it run: 'pacman -S mingw-w64-${_arch}-toolchain'"
-  fi
-done
-
-exit 0
diff --git a/msys2/usr/bin/makepkg-mingw b/msys2/usr/bin/makepkg-mingw
index df775f7e8..3a93e87a6 100644
--- a/msys2/usr/bin/makepkg-mingw
+++ b/msys2/usr/bin/makepkg-mingw
@@ -17,6 +17,8 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+set -e
+
 plain() {
   local mesg=$1; shift
   printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
@@ -61,17 +63,18 @@ fi
 readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
 MINGW_INSTALLS="${MINGW_INSTALLS,,}"
 MINGW_INSTALLS="${MINGW_INSTALLS:-mingw64 mingw32}"
+MINGW_INSTALLS_ALLOWED=('mingw32' 'mingw64' 'clang32' 'clang64')
 
 for _mingw in ${MINGW_INSTALLS}; do
-  if [ ! "${_mingw}" = 'mingw32' -a ! "${_mingw}" = 'mingw64' ]; then
-    print_error "Requested mingw installation '${_mingw}', but only 'mingw32' and 'mingw64' are allowed."
+  if [[ ! " ${MINGW_INSTALLS_ALLOWED[*]} " = *" ${_mingw} "* ]]; then
+    print_error "Requested mingw installation '${_mingw}' unknown, possible values: ${MINGW_INSTALLS_ALLOWED[*]}"
     exit 1
   fi
 done
 
 for _arg in "$@"; do
-  if [ ${_arg} = "--help" -o ${_arg} = "-h" -o ${_arg} = "--version" -o ${_arg} = "-V" ]; then
-    /usr/bin/makepkg $@
+  if [ "${_arg}" = "--help" ] || [ "${_arg}" = "-h" ] || [ "${_arg}" = "--version" ] || [ "${_arg}" = "-V" ]; then
+    /usr/bin/makepkg "$@"
     exit 0
   fi
 done
@@ -79,23 +82,36 @@ done
 for _mingw in ${MINGW_INSTALLS}; do
   case ${_mingw} in
     mingw32)
-      _arch=i686
       _msystem=MINGW32
+      _compiler="/${_mingw}/bin/gcc.exe"
+      _toolchain="mingw-w64-i686-toolchain"
     ;;
     mingw64)
-      _arch=x86_64
       _msystem=MINGW64
+      _compiler="/${_mingw}/bin/gcc.exe"
+      _toolchain="mingw-w64-x86_64-toolchain"
+    ;;
+    clang32)
+      _msystem=CLANG32
+      _compiler="/${_mingw}/bin/clang.exe"
+      _toolchain="mingw-w64-clang-i686-clang"
+    ;;
+    clang64)
+      _msystem=CLANG64
+      _compiler="/${_mingw}/bin/clang.exe"
+      _toolchain="mingw-w64-clang-x86_64-clang"
     ;;
   esac
 
-  if [ -f "/${_mingw}/bin/gcc.exe" ]; then
-    MSYSTEM=${_msystem} \
-    PATH=/${_mingw}/bin:$(echo $PATH | tr ':' '\n' | awk '$0 != "/opt/bin"' | paste -sd:) \
-    /usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf $@ || exit 1
-  else
-    print_warning "You don't have installed mingw-w64 toolchain for architecture ${_arch}."
-    print_warning "To install it run: 'pacman -S mingw-w64-${_arch}-toolchain'"
+  if [ ! -f "${_compiler}" ]; then
+    print_warning "You don't have the required toolchain installed for ${_mingw}."
+    print_warning "To install it run: 'pacman -S -${_toolchain}'"
   fi
+
+  MSYSTEM="${_msystem}" \
+  CHERE_INVOKING=1 \
+    bash -leo pipefail -c "/usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf \"\$@\"" bash "$@"
+
 done
 
 exit 0
diff --git a/msys2/usr/bin/minidumper.exe b/msys2/usr/bin/minidumper.exe
index e22c040f3..00d8d128b 100644
Binary files a/msys2/usr/bin/minidumper.exe and b/msys2/usr/bin/minidumper.exe differ
diff --git a/msys2/usr/bin/mintty.exe b/msys2/usr/bin/mintty.exe
index f4dbb95aa..57d7258eb 100644
Binary files a/msys2/usr/bin/mintty.exe and b/msys2/usr/bin/mintty.exe differ
diff --git a/msys2/usr/bin/mkgroup.exe b/msys2/usr/bin/mkgroup.exe
index 3fa5089e3..30a4bcf80 100644
Binary files a/msys2/usr/bin/mkgroup.exe and b/msys2/usr/bin/mkgroup.exe differ
diff --git a/msys2/usr/bin/mkpasswd.exe b/msys2/usr/bin/mkpasswd.exe
index 0ea5a24aa..f96207e78 100644
Binary files a/msys2/usr/bin/mkpasswd.exe and b/msys2/usr/bin/mkpasswd.exe differ
diff --git a/msys2/usr/bin/mount.exe b/msys2/usr/bin/mount.exe
index c80c0e31d..b1469dd9d 100644
Binary files a/msys2/usr/bin/mount.exe and b/msys2/usr/bin/mount.exe differ
diff --git a/msys2/usr/bin/mpicalc.exe b/msys2/usr/bin/mpicalc.exe
index 088744037..38eef7b17 100644
Binary files a/msys2/usr/bin/mpicalc.exe and b/msys2/usr/bin/mpicalc.exe differ
diff --git a/msys2/usr/bin/msys-2.0.dll b/msys2/usr/bin/msys-2.0.dll
index 14f90edcf..d100c984e 100644
Binary files a/msys2/usr/bin/msys-2.0.dll and b/msys2/usr/bin/msys-2.0.dll differ
diff --git a/msys2/usr/bin/msys-assuan-0.dll b/msys2/usr/bin/msys-assuan-0.dll
index 4c10cf4d3..dd01d2d4a 100644
Binary files a/msys2/usr/bin/msys-assuan-0.dll and b/msys2/usr/bin/msys-assuan-0.dll differ
diff --git a/msys2/usr/bin/msys-atomic-1.dll b/msys2/usr/bin/msys-atomic-1.dll
index fc7c264a4..c0f441e2f 100644
Binary files a/msys2/usr/bin/msys-atomic-1.dll and b/msys2/usr/bin/msys-atomic-1.dll differ
diff --git a/msys2/usr/bin/msys-brotlicommon-1.dll b/msys2/usr/bin/msys-brotlicommon-1.dll
index 7bfe54ee8..d9e558142 100644
Binary files a/msys2/usr/bin/msys-brotlicommon-1.dll and b/msys2/usr/bin/msys-brotlicommon-1.dll differ
diff --git a/msys2/usr/bin/msys-brotlidec-1.dll b/msys2/usr/bin/msys-brotlidec-1.dll
index 5df528c6d..5fb2e42b5 100644
Binary files a/msys2/usr/bin/msys-brotlidec-1.dll and b/msys2/usr/bin/msys-brotlidec-1.dll differ
diff --git a/msys2/usr/bin/msys-brotlienc-1.dll b/msys2/usr/bin/msys-brotlienc-1.dll
index 4c8de0ced..0abc0e3d8 100644
Binary files a/msys2/usr/bin/msys-brotlienc-1.dll and b/msys2/usr/bin/msys-brotlienc-1.dll differ
diff --git a/msys2/usr/bin/msys-charset-1.dll b/msys2/usr/bin/msys-charset-1.dll
index 87442e31d..9119b2e0e 100644
Binary files a/msys2/usr/bin/msys-charset-1.dll and b/msys2/usr/bin/msys-charset-1.dll differ
diff --git a/msys2/usr/bin/msys-crypto-1.1.dll b/msys2/usr/bin/msys-crypto-1.1.dll
index d9fe9e988..918a6117e 100644
Binary files a/msys2/usr/bin/msys-crypto-1.1.dll and b/msys2/usr/bin/msys-crypto-1.1.dll differ
diff --git a/msys2/usr/bin/msys-curl-4.dll b/msys2/usr/bin/msys-curl-4.dll
index 89b2976ad..2426f0957 100644
Binary files a/msys2/usr/bin/msys-curl-4.dll and b/msys2/usr/bin/msys-curl-4.dll differ
diff --git a/msys2/usr/bin/msys-edit-0.dll b/msys2/usr/bin/msys-edit-0.dll
index 105e0b824..c0d60a55d 100644
Binary files a/msys2/usr/bin/msys-edit-0.dll and b/msys2/usr/bin/msys-edit-0.dll differ
diff --git a/msys2/usr/bin/msys-expat-1.dll b/msys2/usr/bin/msys-expat-1.dll
index 1f686e3eb..1df1880fd 100644
Binary files a/msys2/usr/bin/msys-expat-1.dll and b/msys2/usr/bin/msys-expat-1.dll differ
diff --git a/msys2/usr/bin/msys-gcc_s-seh-1.dll b/msys2/usr/bin/msys-gcc_s-seh-1.dll
index d58321790..e622ed1e1 100644
Binary files a/msys2/usr/bin/msys-gcc_s-seh-1.dll and b/msys2/usr/bin/msys-gcc_s-seh-1.dll differ
diff --git a/msys2/usr/bin/msys-gcrypt-20.dll b/msys2/usr/bin/msys-gcrypt-20.dll
index 2e813ad03..1aee42709 100644
Binary files a/msys2/usr/bin/msys-gcrypt-20.dll and b/msys2/usr/bin/msys-gcrypt-20.dll differ
diff --git a/msys2/usr/bin/msys-gdbm-6.dll b/msys2/usr/bin/msys-gdbm-6.dll
index d7847575b..f7c0c439e 100644
Binary files a/msys2/usr/bin/msys-gdbm-6.dll and b/msys2/usr/bin/msys-gdbm-6.dll differ
diff --git a/msys2/usr/bin/msys-gdbm_compat-4.dll b/msys2/usr/bin/msys-gdbm_compat-4.dll
index 318381871..bda1bfea6 100644
Binary files a/msys2/usr/bin/msys-gdbm_compat-4.dll and b/msys2/usr/bin/msys-gdbm_compat-4.dll differ
diff --git a/msys2/usr/bin/msys-gfortran-5.dll b/msys2/usr/bin/msys-gfortran-5.dll
index d5edcff4c..91b18c748 100644
Binary files a/msys2/usr/bin/msys-gfortran-5.dll and b/msys2/usr/bin/msys-gfortran-5.dll differ
diff --git a/msys2/usr/bin/msys-gio-2.0-0.dll b/msys2/usr/bin/msys-gio-2.0-0.dll
index 0ed9e1767..781f916f8 100644
Binary files a/msys2/usr/bin/msys-gio-2.0-0.dll and b/msys2/usr/bin/msys-gio-2.0-0.dll differ
diff --git a/msys2/usr/bin/msys-glib-2.0-0.dll b/msys2/usr/bin/msys-glib-2.0-0.dll
index a196fbbfb..9205ab698 100644
Binary files a/msys2/usr/bin/msys-glib-2.0-0.dll and b/msys2/usr/bin/msys-glib-2.0-0.dll differ
diff --git a/msys2/usr/bin/msys-gmodule-2.0-0.dll b/msys2/usr/bin/msys-gmodule-2.0-0.dll
index ab396c221..61b25fb84 100644
Binary files a/msys2/usr/bin/msys-gmodule-2.0-0.dll and b/msys2/usr/bin/msys-gmodule-2.0-0.dll differ
diff --git a/msys2/usr/bin/msys-gmp-10.dll b/msys2/usr/bin/msys-gmp-10.dll
index c174994af..9528024ba 100644
Binary files a/msys2/usr/bin/msys-gmp-10.dll and b/msys2/usr/bin/msys-gmp-10.dll differ
diff --git a/msys2/usr/bin/msys-gmpxx-4.dll b/msys2/usr/bin/msys-gmpxx-4.dll
index bdbb0ad4d..e1a37aaf0 100644
Binary files a/msys2/usr/bin/msys-gmpxx-4.dll and b/msys2/usr/bin/msys-gmpxx-4.dll differ
diff --git a/msys2/usr/bin/msys-gnutls-30.dll b/msys2/usr/bin/msys-gnutls-30.dll
index 79a799f98..f338789e8 100644
Binary files a/msys2/usr/bin/msys-gnutls-30.dll and b/msys2/usr/bin/msys-gnutls-30.dll differ
diff --git a/msys2/usr/bin/msys-gnutlsxx-28.dll b/msys2/usr/bin/msys-gnutlsxx-28.dll
index f1f4a0629..506a162e2 100644
Binary files a/msys2/usr/bin/msys-gnutlsxx-28.dll and b/msys2/usr/bin/msys-gnutlsxx-28.dll differ
diff --git a/msys2/usr/bin/msys-gobject-2.0-0.dll b/msys2/usr/bin/msys-gobject-2.0-0.dll
index 38b89e661..194687b4f 100644
Binary files a/msys2/usr/bin/msys-gobject-2.0-0.dll and b/msys2/usr/bin/msys-gobject-2.0-0.dll differ
diff --git a/msys2/usr/bin/msys-gomp-1.dll b/msys2/usr/bin/msys-gomp-1.dll
index 5f539175e..e2437052f 100644
Binary files a/msys2/usr/bin/msys-gomp-1.dll and b/msys2/usr/bin/msys-gomp-1.dll differ
diff --git a/msys2/usr/bin/msys-gpg-error-0.dll b/msys2/usr/bin/msys-gpg-error-0.dll
index 7bbbf63c7..170dabe8f 100644
Binary files a/msys2/usr/bin/msys-gpg-error-0.dll and b/msys2/usr/bin/msys-gpg-error-0.dll differ
diff --git a/msys2/usr/bin/msys-gpgme-11.dll b/msys2/usr/bin/msys-gpgme-11.dll
index 53e994ef6..4d147bb64 100644
Binary files a/msys2/usr/bin/msys-gpgme-11.dll and b/msys2/usr/bin/msys-gpgme-11.dll differ
diff --git a/msys2/usr/bin/msys-gpgmepp-6.dll b/msys2/usr/bin/msys-gpgmepp-6.dll
index 4ca3ef5f6..5dff370d7 100644
Binary files a/msys2/usr/bin/msys-gpgmepp-6.dll and b/msys2/usr/bin/msys-gpgmepp-6.dll differ
diff --git a/msys2/usr/bin/msys-gthread-2.0-0.dll b/msys2/usr/bin/msys-gthread-2.0-0.dll
index 3d55999a5..e5c93dc78 100644
Binary files a/msys2/usr/bin/msys-gthread-2.0-0.dll and b/msys2/usr/bin/msys-gthread-2.0-0.dll differ
diff --git a/msys2/usr/bin/msys-history8.dll b/msys2/usr/bin/msys-history8.dll
index d52a66d26..ae51ef1b4 100644
Binary files a/msys2/usr/bin/msys-history8.dll and b/msys2/usr/bin/msys-history8.dll differ
diff --git a/msys2/usr/bin/msys-hogweed-6.dll b/msys2/usr/bin/msys-hogweed-6.dll
index 1284b4b9f..fdcb34e99 100644
Binary files a/msys2/usr/bin/msys-hogweed-6.dll and b/msys2/usr/bin/msys-hogweed-6.dll differ
diff --git a/msys2/usr/bin/msys-iconv-2.dll b/msys2/usr/bin/msys-iconv-2.dll
index ea9efe42f..074485c89 100644
Binary files a/msys2/usr/bin/msys-iconv-2.dll and b/msys2/usr/bin/msys-iconv-2.dll differ
diff --git a/msys2/usr/bin/msys-icudata67.dll b/msys2/usr/bin/msys-icudata68.dll
similarity index 79%
rename from msys2/usr/bin/msys-icudata67.dll
rename to msys2/usr/bin/msys-icudata68.dll
index 48a71cec9..c5daa98ca 100644
Binary files a/msys2/usr/bin/msys-icudata67.dll and b/msys2/usr/bin/msys-icudata68.dll differ
diff --git a/msys2/usr/bin/msys-icui18n67.dll b/msys2/usr/bin/msys-icui18n67.dll
deleted file mode 100644
index 11c493bfe..000000000
Binary files a/msys2/usr/bin/msys-icui18n67.dll and /dev/null differ
diff --git a/msys2/usr/bin/msys-icui18n68.dll b/msys2/usr/bin/msys-icui18n68.dll
new file mode 100644
index 000000000..f013275b0
Binary files /dev/null and b/msys2/usr/bin/msys-icui18n68.dll differ
diff --git a/msys2/usr/bin/msys-icuio67.dll b/msys2/usr/bin/msys-icuio67.dll
deleted file mode 100644
index b4fb3b1cd..000000000
Binary files a/msys2/usr/bin/msys-icuio67.dll and /dev/null differ
diff --git a/msys2/usr/bin/msys-icuio68.dll b/msys2/usr/bin/msys-icuio68.dll
new file mode 100644
index 000000000..a2e6b4b33
Binary files /dev/null and b/msys2/usr/bin/msys-icuio68.dll differ
diff --git a/msys2/usr/bin/msys-icutest67.dll b/msys2/usr/bin/msys-icutest67.dll
deleted file mode 100644
index b6b779fdc..000000000
Binary files a/msys2/usr/bin/msys-icutest67.dll and /dev/null differ
diff --git a/msys2/usr/bin/msys-icutest68.dll b/msys2/usr/bin/msys-icutest68.dll
new file mode 100644
index 000000000..fbfe31cc3
Binary files /dev/null and b/msys2/usr/bin/msys-icutest68.dll differ
diff --git a/msys2/usr/bin/msys-icutu67.dll b/msys2/usr/bin/msys-icutu67.dll
deleted file mode 100644
index 7914790fb..000000000
Binary files a/msys2/usr/bin/msys-icutu67.dll and /dev/null differ
diff --git a/msys2/usr/bin/msys-icutu68.dll b/msys2/usr/bin/msys-icutu68.dll
new file mode 100644
index 000000000..a6e763c1f
Binary files /dev/null and b/msys2/usr/bin/msys-icutu68.dll differ
diff --git a/msys2/usr/bin/msys-icuuc67.dll b/msys2/usr/bin/msys-icuuc67.dll
deleted file mode 100644
index 55085e253..000000000
Binary files a/msys2/usr/bin/msys-icuuc67.dll and /dev/null differ
diff --git a/msys2/usr/bin/msys-icuuc68.dll b/msys2/usr/bin/msys-icuuc68.dll
new file mode 100644
index 000000000..672180446
Binary files /dev/null and b/msys2/usr/bin/msys-icuuc68.dll differ
diff --git a/msys2/usr/bin/msys-lz4-1.dll b/msys2/usr/bin/msys-lz4-1.dll
index e2f998843..ec47efcb8 100644
Binary files a/msys2/usr/bin/msys-lz4-1.dll and b/msys2/usr/bin/msys-lz4-1.dll differ
diff --git a/msys2/usr/bin/msys-magic-1.dll b/msys2/usr/bin/msys-magic-1.dll
index 82561e9b1..e2861de41 100644
Binary files a/msys2/usr/bin/msys-magic-1.dll and b/msys2/usr/bin/msys-magic-1.dll differ
diff --git a/msys2/usr/bin/msys-nettle-8.dll b/msys2/usr/bin/msys-nettle-8.dll
index 6f5dc9b20..fe0c26289 100644
Binary files a/msys2/usr/bin/msys-nettle-8.dll and b/msys2/usr/bin/msys-nettle-8.dll differ
diff --git a/msys2/usr/bin/msys-p11-kit-0.dll b/msys2/usr/bin/msys-p11-kit-0.dll
index def95511c..b783179e0 100644
Binary files a/msys2/usr/bin/msys-p11-kit-0.dll and b/msys2/usr/bin/msys-p11-kit-0.dll differ
diff --git a/msys2/usr/bin/msys-pcre2-8-0.dll b/msys2/usr/bin/msys-pcre2-8-0.dll
index 111f7c28a..376565078 100644
Binary files a/msys2/usr/bin/msys-pcre2-8-0.dll and b/msys2/usr/bin/msys-pcre2-8-0.dll differ
diff --git a/msys2/usr/bin/msys-psl-5.dll b/msys2/usr/bin/msys-psl-5.dll
index 05d5194ee..806a7e792 100644
Binary files a/msys2/usr/bin/msys-psl-5.dll and b/msys2/usr/bin/msys-psl-5.dll differ
diff --git a/msys2/usr/bin/msys-quadmath-0.dll b/msys2/usr/bin/msys-quadmath-0.dll
index db5c9470e..9fc16ffc2 100644
Binary files a/msys2/usr/bin/msys-quadmath-0.dll and b/msys2/usr/bin/msys-quadmath-0.dll differ
diff --git a/msys2/usr/bin/msys-readline8.dll b/msys2/usr/bin/msys-readline8.dll
index 3bdc6c13c..caea09dd5 100644
Binary files a/msys2/usr/bin/msys-readline8.dll and b/msys2/usr/bin/msys-readline8.dll differ
diff --git a/msys2/usr/bin/msys-sqlite3-0.dll b/msys2/usr/bin/msys-sqlite3-0.dll
index 5fc53b688..e69681bdb 100644
Binary files a/msys2/usr/bin/msys-sqlite3-0.dll and b/msys2/usr/bin/msys-sqlite3-0.dll differ
diff --git a/msys2/usr/bin/msys-ssl-1.1.dll b/msys2/usr/bin/msys-ssl-1.1.dll
index 5c95332fd..48dae9464 100644
Binary files a/msys2/usr/bin/msys-ssl-1.1.dll and b/msys2/usr/bin/msys-ssl-1.1.dll differ
diff --git a/msys2/usr/bin/msys-stdc++-6.dll b/msys2/usr/bin/msys-stdc++-6.dll
index 6209124e7..5bc9fb40c 100644
Binary files a/msys2/usr/bin/msys-stdc++-6.dll and b/msys2/usr/bin/msys-stdc++-6.dll differ
diff --git a/msys2/usr/bin/msys-xml2-2.dll b/msys2/usr/bin/msys-xml2-2.dll
index 21b58f004..554018738 100644
Binary files a/msys2/usr/bin/msys-xml2-2.dll and b/msys2/usr/bin/msys-xml2-2.dll differ
diff --git a/msys2/usr/bin/msys-zstd-1.dll b/msys2/usr/bin/msys-zstd-1.dll
index 8e7fddeda..1b4784950 100644
Binary files a/msys2/usr/bin/msys-zstd-1.dll and b/msys2/usr/bin/msys-zstd-1.dll differ
diff --git a/msys2/usr/bin/nano.exe b/msys2/usr/bin/nano.exe
new file mode 100644
index 000000000..a4d2c04d6
Binary files /dev/null and b/msys2/usr/bin/nano.exe differ
diff --git a/msys2/usr/bin/nettle-hash.exe b/msys2/usr/bin/nettle-hash.exe
index 663860856..ff695ec25 100644
Binary files a/msys2/usr/bin/nettle-hash.exe and b/msys2/usr/bin/nettle-hash.exe differ
diff --git a/msys2/usr/bin/nettle-lfib-stream.exe b/msys2/usr/bin/nettle-lfib-stream.exe
index d3eb142c6..f32372a71 100644
Binary files a/msys2/usr/bin/nettle-lfib-stream.exe and b/msys2/usr/bin/nettle-lfib-stream.exe differ
diff --git a/msys2/usr/bin/nettle-pbkdf2.exe b/msys2/usr/bin/nettle-pbkdf2.exe
index d88fb0aac..713b67aba 100644
Binary files a/msys2/usr/bin/nettle-pbkdf2.exe and b/msys2/usr/bin/nettle-pbkdf2.exe differ
diff --git a/msys2/usr/bin/openssl.exe b/msys2/usr/bin/openssl.exe
index 9410c9c29..45232c661 100644
Binary files a/msys2/usr/bin/openssl.exe and b/msys2/usr/bin/openssl.exe differ
diff --git a/msys2/usr/bin/p11-kit.exe b/msys2/usr/bin/p11-kit.exe
index a975edfe1..c57e76430 100644
Binary files a/msys2/usr/bin/p11-kit.exe and b/msys2/usr/bin/p11-kit.exe differ
diff --git a/msys2/usr/bin/paccache b/msys2/usr/bin/paccache
index 23321e615..590114600 100644
--- a/msys2/usr/bin/paccache
+++ b/msys2/usr/bin/paccache
@@ -23,7 +23,7 @@ shopt -s nullglob
 shopt -s extglob
 
 declare -r myname='paccache'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 
@@ -399,7 +399,8 @@ candidates=("${candtemp[@]}")
 unset candtemp
 
 # do this before we destroy anything
-totalsaved=$(stat -c %s "${candidates[@]}" | awk '{ sum += $1 } END { print sum }')
+totalsaved=$(printf '%s\0' "${candidates[@]}" | xargs -0 stat -c %s |
+		awk '{ sum += $1 } END { print sum }')
 
 # Exit immediately if a pipeline returns non-zero.
 set -o errexit
diff --git a/msys2/usr/bin/pacdiff b/msys2/usr/bin/pacdiff
index 1803e427b..8db2081a7 100644
--- a/msys2/usr/bin/pacdiff
+++ b/msys2/usr/bin/pacdiff
@@ -21,7 +21,7 @@
 shopt -s extglob
 
 declare -r myname='pacdiff'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 
diff --git a/msys2/usr/bin/paclist b/msys2/usr/bin/paclist
index 9bcf0f0de..2d6b139a9 100644
--- a/msys2/usr/bin/paclist
+++ b/msys2/usr/bin/paclist
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 declare -r myname='paclist'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 usage() {
 	printf "%s v%s\n" "${myname}" "${myver}"
diff --git a/msys2/usr/bin/paclog-pkglist b/msys2/usr/bin/paclog-pkglist
index 2e3a4ea37..8b9a783ac 100644
--- a/msys2/usr/bin/paclog-pkglist
+++ b/msys2/usr/bin/paclog-pkglist
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 declare -r myname='paclog-pkglist'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 export TEXTDOMAIN='pacman'
 export TEXTDOMAINDIR='/usr/share/locale'
diff --git a/msys2/usr/bin/pacman-conf.exe b/msys2/usr/bin/pacman-conf.exe
index 1ce20ee75..73d962be5 100644
Binary files a/msys2/usr/bin/pacman-conf.exe and b/msys2/usr/bin/pacman-conf.exe differ
diff --git a/msys2/usr/bin/pacman.exe b/msys2/usr/bin/pacman.exe
index 6e004073d..644f7cdef 100644
Binary files a/msys2/usr/bin/pacman.exe and b/msys2/usr/bin/pacman.exe differ
diff --git a/msys2/usr/bin/pacscripts b/msys2/usr/bin/pacscripts
index bbceaea8c..9748270fb 100644
--- a/msys2/usr/bin/pacscripts
+++ b/msys2/usr/bin/pacscripts
@@ -25,7 +25,7 @@ set -o nounset
 set -o errexit
 
 declare -r myname='pacscripts'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 error() {
 	local mesg=$1; shift
diff --git a/msys2/usr/bin/pacsearch b/msys2/usr/bin/pacsearch
index 751bb5cad..75d748761 100644
--- a/msys2/usr/bin/pacsearch
+++ b/msys2/usr/bin/pacsearch
@@ -24,7 +24,7 @@ use warnings;
 use Term::ANSIColor;
 
 my $myname = 'pacsearch';
-my $myver = '1.3.0';
+my $myver = '1.4.0';
 
 sub usage {
 	print "$myname v$myver\n\n";
diff --git a/msys2/usr/bin/pacsort.exe b/msys2/usr/bin/pacsort.exe
index 63666d19e..8cbb3378f 100644
Binary files a/msys2/usr/bin/pacsort.exe and b/msys2/usr/bin/pacsort.exe differ
diff --git a/msys2/usr/bin/pactree.exe b/msys2/usr/bin/pactree.exe
index 8db5685f6..ca75f3097 100644
Binary files a/msys2/usr/bin/pactree.exe and b/msys2/usr/bin/pactree.exe differ
diff --git a/msys2/usr/bin/passwd.exe b/msys2/usr/bin/passwd.exe
index 710eb7706..50abe4f5d 100644
Binary files a/msys2/usr/bin/passwd.exe and b/msys2/usr/bin/passwd.exe differ
diff --git a/msys2/usr/bin/peflags.exe b/msys2/usr/bin/peflags.exe
index d3f37cdf7..03a598759 100644
Binary files a/msys2/usr/bin/peflags.exe and b/msys2/usr/bin/peflags.exe differ
diff --git a/msys2/usr/bin/pkcs1-conv.exe b/msys2/usr/bin/pkcs1-conv.exe
index dd43e5c9f..46b4a19a4 100644
Binary files a/msys2/usr/bin/pkcs1-conv.exe and b/msys2/usr/bin/pkcs1-conv.exe differ
diff --git a/msys2/usr/bin/pldd.exe b/msys2/usr/bin/pldd.exe
index e8eea2148..8ce33f219 100644
Binary files a/msys2/usr/bin/pldd.exe and b/msys2/usr/bin/pldd.exe differ
diff --git a/msys2/usr/bin/ps.exe b/msys2/usr/bin/ps.exe
index ac21db867..7ea21843f 100644
Binary files a/msys2/usr/bin/ps.exe and b/msys2/usr/bin/ps.exe differ
diff --git a/msys2/usr/bin/psl.exe b/msys2/usr/bin/psl.exe
index 65b342cb9..b2822e92f 100644
Binary files a/msys2/usr/bin/psl.exe and b/msys2/usr/bin/psl.exe differ
diff --git a/msys2/usr/bin/rankmirrors b/msys2/usr/bin/rankmirrors
index 39df23c14..1bd9d4b14 100644
--- a/msys2/usr/bin/rankmirrors
+++ b/msys2/usr/bin/rankmirrors
@@ -22,7 +22,7 @@
 trap finaloutput INT
 
 declare -r myname='rankmirrors'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 usage() {
 	echo "${myname} v${myver}"
diff --git a/msys2/usr/bin/rebase.exe b/msys2/usr/bin/rebase.exe
index 9fcad2266..62dfcc975 100644
Binary files a/msys2/usr/bin/rebase.exe and b/msys2/usr/bin/rebase.exe differ
diff --git a/msys2/usr/bin/regtool.exe b/msys2/usr/bin/regtool.exe
index db4c700d9..d2f3afb89 100644
Binary files a/msys2/usr/bin/regtool.exe and b/msys2/usr/bin/regtool.exe differ
diff --git a/msys2/usr/bin/rnano.exe b/msys2/usr/bin/rnano.exe
new file mode 100644
index 000000000..a4d2c04d6
Binary files /dev/null and b/msys2/usr/bin/rnano.exe differ
diff --git a/msys2/usr/bin/setfacl.exe b/msys2/usr/bin/setfacl.exe
index 2a9fe9d57..f123864f6 100644
Binary files a/msys2/usr/bin/setfacl.exe and b/msys2/usr/bin/setfacl.exe differ
diff --git a/msys2/usr/bin/setmetamode.exe b/msys2/usr/bin/setmetamode.exe
index cc38497d5..e70c68533 100644
Binary files a/msys2/usr/bin/setmetamode.exe and b/msys2/usr/bin/setmetamode.exe differ
diff --git a/msys2/usr/bin/sexp-conv.exe b/msys2/usr/bin/sexp-conv.exe
index d61fc9e06..649147883 100644
Binary files a/msys2/usr/bin/sexp-conv.exe and b/msys2/usr/bin/sexp-conv.exe differ
diff --git a/msys2/usr/bin/sh.exe b/msys2/usr/bin/sh.exe
index aa79eab71..93c1e6499 100644
Binary files a/msys2/usr/bin/sh.exe and b/msys2/usr/bin/sh.exe differ
diff --git a/msys2/usr/bin/ssp.exe b/msys2/usr/bin/ssp.exe
index 739234e0d..9fdbf0bc5 100644
Binary files a/msys2/usr/bin/ssp.exe and b/msys2/usr/bin/ssp.exe differ
diff --git a/msys2/usr/bin/strace.exe b/msys2/usr/bin/strace.exe
index d8217a6a3..43e989220 100644
Binary files a/msys2/usr/bin/strace.exe and b/msys2/usr/bin/strace.exe differ
diff --git a/msys2/usr/bin/testpkg.exe b/msys2/usr/bin/testpkg.exe
index 5b2c82460..c52b7acdb 100644
Binary files a/msys2/usr/bin/testpkg.exe and b/msys2/usr/bin/testpkg.exe differ
diff --git a/msys2/usr/bin/trust.exe b/msys2/usr/bin/trust.exe
index 355e6910a..3fc360571 100644
Binary files a/msys2/usr/bin/trust.exe and b/msys2/usr/bin/trust.exe differ
diff --git a/msys2/usr/bin/tzselect b/msys2/usr/bin/tzselect
index 07c583591..7c1e74c1f 100644
--- a/msys2/usr/bin/tzselect
+++ b/msys2/usr/bin/tzselect
@@ -3,7 +3,7 @@
 # Interact with the user via stderr and stdin.
 
 PKGVERSION='(tzcode) '
-TZVERSION=unknown
+TZVERSION=2020f-dirty
 REPORT_BUGS_TO=tz@iana.org
 
 # Contributed by Paul Eggert.  This file is in the public domain.
diff --git a/msys2/usr/bin/tzset.exe b/msys2/usr/bin/tzset.exe
index 526268d9a..69d76f035 100644
Binary files a/msys2/usr/bin/tzset.exe and b/msys2/usr/bin/tzset.exe differ
diff --git a/msys2/usr/bin/umount.exe b/msys2/usr/bin/umount.exe
index f98aefb06..ca9d3dd5f 100644
Binary files a/msys2/usr/bin/umount.exe and b/msys2/usr/bin/umount.exe differ
diff --git a/msys2/usr/bin/unzstd.exe b/msys2/usr/bin/unzstd.exe
index f22eb12c9..64584788f 100644
Binary files a/msys2/usr/bin/unzstd.exe and b/msys2/usr/bin/unzstd.exe differ
diff --git a/msys2/usr/bin/updpkgsums b/msys2/usr/bin/updpkgsums
index 714224755..650f2b5d2 100644
--- a/msys2/usr/bin/updpkgsums
+++ b/msys2/usr/bin/updpkgsums
@@ -20,7 +20,7 @@
 shopt -s extglob
 
 declare -r myname='updpkgsums'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 
diff --git a/msys2/usr/bin/vercmp.exe b/msys2/usr/bin/vercmp.exe
index abe31e8eb..da09d833b 100644
Binary files a/msys2/usr/bin/vercmp.exe and b/msys2/usr/bin/vercmp.exe differ
diff --git a/msys2/usr/bin/watchgnupg.exe b/msys2/usr/bin/watchgnupg.exe
index a27475cc5..55e375053 100644
Binary files a/msys2/usr/bin/watchgnupg.exe and b/msys2/usr/bin/watchgnupg.exe differ
diff --git a/msys2/usr/bin/wget.exe b/msys2/usr/bin/wget.exe
index 5bf7810a7..544c0e7b6 100644
Binary files a/msys2/usr/bin/wget.exe and b/msys2/usr/bin/wget.exe differ
diff --git a/msys2/usr/bin/xmlcatalog.exe b/msys2/usr/bin/xmlcatalog.exe
index 9b673f315..92894dcd8 100644
Binary files a/msys2/usr/bin/xmlcatalog.exe and b/msys2/usr/bin/xmlcatalog.exe differ
diff --git a/msys2/usr/bin/xmllint.exe b/msys2/usr/bin/xmllint.exe
index 0b7f9d8ab..3e00e77a6 100644
Binary files a/msys2/usr/bin/xmllint.exe and b/msys2/usr/bin/xmllint.exe differ
diff --git a/msys2/usr/bin/yat2m.exe b/msys2/usr/bin/yat2m.exe
index ebb77d309..f75551e39 100644
Binary files a/msys2/usr/bin/yat2m.exe and b/msys2/usr/bin/yat2m.exe differ
diff --git a/msys2/usr/bin/zdump.exe b/msys2/usr/bin/zdump.exe
index 5a658ae60..2549f8671 100644
Binary files a/msys2/usr/bin/zdump.exe and b/msys2/usr/bin/zdump.exe differ
diff --git a/msys2/usr/bin/zic.exe b/msys2/usr/bin/zic.exe
index 8088b4119..86ccaf03a 100644
Binary files a/msys2/usr/bin/zic.exe and b/msys2/usr/bin/zic.exe differ
diff --git a/msys2/usr/bin/zstd.exe b/msys2/usr/bin/zstd.exe
index f22eb12c9..64584788f 100644
Binary files a/msys2/usr/bin/zstd.exe and b/msys2/usr/bin/zstd.exe differ
diff --git a/msys2/usr/bin/zstdcat.exe b/msys2/usr/bin/zstdcat.exe
index f22eb12c9..64584788f 100644
Binary files a/msys2/usr/bin/zstdcat.exe and b/msys2/usr/bin/zstdcat.exe differ
diff --git a/msys2/usr/bin/zstdmt.exe b/msys2/usr/bin/zstdmt.exe
index f22eb12c9..64584788f 100644
Binary files a/msys2/usr/bin/zstdmt.exe and b/msys2/usr/bin/zstdmt.exe differ
diff --git a/msys2/usr/lib/gio/modules/libgiofam.dll.a b/msys2/usr/lib/gio/modules/libgiofam.dll.a
index c31d786e3..f8ce35080 100644
Binary files a/msys2/usr/lib/gio/modules/libgiofam.dll.a and b/msys2/usr/lib/gio/modules/libgiofam.dll.a differ
diff --git a/msys2/usr/lib/gio/modules/msys-giofam.dll b/msys2/usr/lib/gio/modules/msys-giofam.dll
index 3570cd435..6c6940044 100644
Binary files a/msys2/usr/lib/gio/modules/msys-giofam.dll and b/msys2/usr/lib/gio/modules/msys-giofam.dll differ
diff --git a/msys2/usr/lib/gnupg/gpg-check-pattern.exe b/msys2/usr/lib/gnupg/gpg-check-pattern.exe
index 19080524a..be5199512 100644
Binary files a/msys2/usr/lib/gnupg/gpg-check-pattern.exe and b/msys2/usr/lib/gnupg/gpg-check-pattern.exe differ
diff --git a/msys2/usr/lib/gnupg/gpg-preset-passphrase.exe b/msys2/usr/lib/gnupg/gpg-preset-passphrase.exe
index aedb91b09..d035a4e51 100644
Binary files a/msys2/usr/lib/gnupg/gpg-preset-passphrase.exe and b/msys2/usr/lib/gnupg/gpg-preset-passphrase.exe differ
diff --git a/msys2/usr/lib/gnupg/gpg-protect-tool.exe b/msys2/usr/lib/gnupg/gpg-protect-tool.exe
index 3c8af0736..d23c0e23b 100644
Binary files a/msys2/usr/lib/gnupg/gpg-protect-tool.exe and b/msys2/usr/lib/gnupg/gpg-protect-tool.exe differ
diff --git a/msys2/usr/lib/gnupg/gpg-wks-client.exe b/msys2/usr/lib/gnupg/gpg-wks-client.exe
index fe5a0b4c3..bf9435e56 100644
Binary files a/msys2/usr/lib/gnupg/gpg-wks-client.exe and b/msys2/usr/lib/gnupg/gpg-wks-client.exe differ
diff --git a/msys2/usr/lib/gnupg/scdaemon.exe b/msys2/usr/lib/gnupg/scdaemon.exe
index bbb4222d2..74514f5a1 100644
Binary files a/msys2/usr/lib/gnupg/scdaemon.exe and b/msys2/usr/lib/gnupg/scdaemon.exe differ
diff --git a/msys2/usr/lib/libalpm.a b/msys2/usr/lib/libalpm.a
index 1d3ca9136..35262533f 100644
Binary files a/msys2/usr/lib/libalpm.a and b/msys2/usr/lib/libalpm.a differ
diff --git a/msys2/usr/lib/libmagic.dll.a b/msys2/usr/lib/libmagic.dll.a
index cb6990bcf..024555202 100644
Binary files a/msys2/usr/lib/libmagic.dll.a and b/msys2/usr/lib/libmagic.dll.a differ
diff --git a/msys2/usr/lib/libtz.a b/msys2/usr/lib/libtz.a
index 859a6c9f3..e354ced1c 100644
Binary files a/msys2/usr/lib/libtz.a and b/msys2/usr/lib/libtz.a differ
diff --git a/msys2/usr/lib/openssl/engines-1.1/capi.dll b/msys2/usr/lib/openssl/engines-1.1/capi.dll
index e8f357f1a..bed34790b 100644
Binary files a/msys2/usr/lib/openssl/engines-1.1/capi.dll and b/msys2/usr/lib/openssl/engines-1.1/capi.dll differ
diff --git a/msys2/usr/lib/openssl/engines-1.1/padlock.dll b/msys2/usr/lib/openssl/engines-1.1/padlock.dll
index 2a7326bf5..12894a749 100644
Binary files a/msys2/usr/lib/openssl/engines-1.1/padlock.dll and b/msys2/usr/lib/openssl/engines-1.1/padlock.dll differ
diff --git a/msys2/usr/lib/pkcs11/p11-kit-client.dll b/msys2/usr/lib/pkcs11/p11-kit-client.dll
index e7d70eedb..8ab892d8c 100644
Binary files a/msys2/usr/lib/pkcs11/p11-kit-client.dll and b/msys2/usr/lib/pkcs11/p11-kit-client.dll differ
diff --git a/msys2/usr/lib/pkcs11/p11-kit-trust.dll b/msys2/usr/lib/pkcs11/p11-kit-trust.dll
index 819d82172..c31eda2cc 100644
Binary files a/msys2/usr/lib/pkcs11/p11-kit-trust.dll and b/msys2/usr/lib/pkcs11/p11-kit-trust.dll differ
diff --git a/msys2/usr/lib/pkgconfig/libalpm.pc b/msys2/usr/lib/pkgconfig/libalpm.pc
index a18aedb6c..fcc6e9ea9 100644
--- a/msys2/usr/lib/pkgconfig/libalpm.pc
+++ b/msys2/usr/lib/pkgconfig/libalpm.pc
@@ -7,5 +7,5 @@ Description: Arch Linux package management library
 URL: http://www.archlinux.org/pacman/
 Version: 12.0.2
 Requires: libcrypto, libarchive >= 3.0.0, libcurl >= 7.32.0, gpgme >= 1.3.0
-Libs: -L${libdir} -lalpm /usr/lib/gcc/x86_64-pc-msys/9.3.0/../../../../lib/libintl.a
-Cflags:-I${includedir}
+Libs: -L${libdir} -lalpm /usr/lib/gcc/x86_64-pc-msys/10.2.0/../../../../lib/libintl.a
+Cflags: -I${includedir}
diff --git a/msys2/usr/lib/pkgconfig/libmagic.pc b/msys2/usr/lib/pkgconfig/libmagic.pc
index f174f4acd..028b0afda 100644
--- a/msys2/usr/lib/pkgconfig/libmagic.pc
+++ b/msys2/usr/lib/pkgconfig/libmagic.pc
@@ -7,4 +7,4 @@ Name: libmagic
 Description: Magic number recognition library
 Version: 5.39
 Libs: -L${libdir} -lmagic
-Libs.private: -llzma -lbz2 -lz 
+Libs.private: -lbz2 -lz 
diff --git a/msys2/usr/lib/systemd/system/paccache.service b/msys2/usr/lib/systemd/system/paccache.service
index bd86faf28..77ff0225b 100644
--- a/msys2/usr/lib/systemd/system/paccache.service
+++ b/msys2/usr/lib/systemd/system/paccache.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Discard unused packages
+Description=Remove unused cached package files
 
 [Service]
 Type=oneshot
diff --git a/msys2/usr/libexec/p11-kit/p11-kit-remote.exe b/msys2/usr/libexec/p11-kit/p11-kit-remote.exe
index 6c1c26562..7ad15133d 100644
Binary files a/msys2/usr/libexec/p11-kit/p11-kit-remote.exe and b/msys2/usr/libexec/p11-kit/p11-kit-remote.exe differ
diff --git a/msys2/usr/libexec/p11-kit/p11-kit-server.exe b/msys2/usr/libexec/p11-kit/p11-kit-server.exe
index 0f8ccf1d8..1a941afe9 100644
Binary files a/msys2/usr/libexec/p11-kit/p11-kit-server.exe and b/msys2/usr/libexec/p11-kit/p11-kit-server.exe differ
diff --git a/msys2/usr/share/aclocal/libcurl.m4 b/msys2/usr/share/aclocal/libcurl.m4
index c3c17661b..ad53a444e 100644
--- a/msys2/usr/share/aclocal/libcurl.m4
+++ b/msys2/usr/share/aclocal/libcurl.m4
@@ -9,7 +9,7 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at https://curl.haxx.se/docs/copyright.html.
+# are also available at https://curl.se/docs/copyright.html.
 #
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell
 # copies of the Software, and permit persons to whom the Software is
diff --git a/msys2/usr/share/bash-completion/bash_completion b/msys2/usr/share/bash-completion/bash_completion
index b455ba51d..4022782d3 100644
--- a/msys2/usr/share/bash-completion/bash_completion
+++ b/msys2/usr/share/bash-completion/bash_completion
@@ -1,9 +1,9 @@
 #                                                          -*- shell-script -*-
 #
-#   bash_completion - programmable completion functions for bash 4.1+
+#   bash_completion - programmable completion functions for bash 4.2+
 #
 #   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
-#             © 2009-2019, Bash Completion Maintainers
+#             © 2009-2020, Bash Completion Maintainers
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #
 #   https://github.com/scop/bash-completion
 
-BASH_COMPLETION_VERSINFO=(2 10)
+BASH_COMPLETION_VERSINFO=(2 11)
 
 if [[ $- == *v* ]]; then
     BASH_COMPLETION_ORIGINAL_V_VALUE="-v"
@@ -87,18 +87,18 @@ _userland()
 {
     local userland=$(uname -s)
     [[ $userland == @(Linux|GNU/*) ]] && userland=GNU
-    [[ $userland == $1 ]]
+    [[ $userland == "$1" ]]
 }
 
 # This function sets correct SysV init directories
 #
 _sysvdirs()
 {
-    sysvdirs=( )
-    [[ -d /etc/rc.d/init.d ]] && sysvdirs+=( /etc/rc.d/init.d )
-    [[ -d /etc/init.d ]] && sysvdirs+=( /etc/init.d )
+    sysvdirs=()
+    [[ -d /etc/rc.d/init.d ]] && sysvdirs+=(/etc/rc.d/init.d)
+    [[ -d /etc/init.d ]] && sysvdirs+=(/etc/init.d)
     # Slackware uses /etc/rc.d
-    [[ -f /etc/slackware-version ]] && sysvdirs=( /etc/rc.d )
+    [[ -f /etc/slackware-version ]] && sysvdirs=(/etc/rc.d)
     return 0
 }
 
@@ -138,19 +138,17 @@ quote()
 # @see _quote_readline_by_ref()
 quote_readline()
 {
-    local quoted
+    local ret
     _quote_readline_by_ref "$1" ret
     printf %s "$ret"
 } # quote_readline()
 
-
 # This function shell-dequotes the argument
 dequote()
 {
     eval printf %s "$1" 2>/dev/null
 }
 
-
 # Assign variable one scope above the caller
 # Usage: local "$1" && _upvar $1 "value(s)"
 # Param: $1  Variable name to assign value to
@@ -159,21 +157,20 @@ dequote()
 # NOTE: For assigning multiple variables, use '_upvars'.  Do NOT
 #       use multiple '_upvar' calls, since one '_upvar' call might
 #       reassign a variable to be used by another '_upvar' call.
-# See: http://fvue.nl/wiki/Bash:_Passing_variables_by_reference
+# See: https://fvue.nl/wiki/Bash:_Passing_variables_by_reference
 _upvar()
 {
     echo "bash_completion: $FUNCNAME: deprecated function," \
         "use _upvars instead" >&2
-    if unset -v "$1"; then           # Unset & validate varname
-        if (( $# == 2 )); then
-            eval $1=\"\$2\"          # Return single value
+    if unset -v "$1"; then # Unset & validate varname
+        if (($# == 2)); then
+            eval $1=\"\$2\" # Return single value
         else
-            eval $1=\(\"\${@:2}\"\)  # Return array
+            eval $1=\(\"\$"{@:2}"\"\) # Return array
         fi
     fi
 }
 
-
 # Assign variables one scope above the caller
 # Usage: local varname [varname ...] &&
 #        _upvars [-v varname value] | [-aN varname [value ...]] ...
@@ -181,43 +178,54 @@ _upvar()
 #     -aN  Assign next N values to varname as array
 #     -v   Assign single value to varname
 # Return: 1 if error occurs
-# See: http://fvue.nl/wiki/Bash:_Passing_variables_by_reference
+# See: https://fvue.nl/wiki/Bash:_Passing_variables_by_reference
 _upvars()
 {
-    if ! (( $# )); then
+    if ! (($#)); then
         echo "bash_completion: $FUNCNAME: usage: $FUNCNAME" \
             "[-v varname value] | [-aN varname [value ...]] ..." >&2
         return 2
     fi
-    while (( $# )); do
+    while (($#)); do
         case $1 in
             -a*)
                 # Error checking
-                [[ ${1#-a} ]] || { echo "bash_completion: $FUNCNAME:" \
-                    "\`$1': missing number specifier" >&2; return 1; }
-                printf %d "${1#-a}" &>/dev/null || { echo bash_completion: \
-                    "$FUNCNAME: \`$1': invalid number specifier" >&2
-                    return 1; }
+                [[ ${1#-a} ]] || {
+                    echo "bash_completion: $FUNCNAME:" \
+                        "\`$1': missing number specifier" >&2
+                    return 1
+                }
+                printf %d "${1#-a}" &>/dev/null || {
+                    echo bash_completion: \
+                        "$FUNCNAME: \`$1': invalid number specifier" >&2
+                    return 1
+                }
                 # Assign array of -aN elements
-                [[ "$2" ]] && unset -v "$2" && eval $2=\(\"\${@:3:${1#-a}}\"\) &&
-                shift $((${1#-a} + 2)) || { echo bash_completion: \
-                    "$FUNCNAME: \`$1${2+ }$2': missing argument(s)" \
-                    >&2; return 1; }
+                [[ "$2" ]] && unset -v "$2" && eval $2=\(\"\$"{@:3:${1#-a}}"\"\) &&
+                    shift $((${1#-a} + 2)) || {
+                    echo bash_completion: \
+                        "$FUNCNAME: \`$1${2+ }$2': missing argument(s)" \
+                        >&2
+                    return 1
+                }
                 ;;
             -v)
                 # Assign single value
                 [[ "$2" ]] && unset -v "$2" && eval $2=\"\$3\" &&
-                shift 3 || { echo "bash_completion: $FUNCNAME: $1:" \
-                    "missing argument(s)" >&2; return 1; }
+                    shift 3 || {
+                    echo "bash_completion: $FUNCNAME: $1:" \
+                        "missing argument(s)" >&2
+                    return 1
+                }
                 ;;
             *)
                 echo "bash_completion: $FUNCNAME: $1: invalid option" >&2
-                return 1 ;;
+                return 1
+                ;;
         esac
     done
 }
 
-
 # Reassemble command line words, excluding specified characters from the
 # list of word completion separators (COMP_WORDBREAKS).
 # @param $1 chars  Characters out of $COMP_WORDBREAKS which should
@@ -234,49 +242,49 @@ __reassemble_comp_words_by_ref()
     if [[ $1 ]]; then
         # Yes, exclude word separator characters;
         # Exclude only those characters, which were really included
-        exclude="${1//[^$COMP_WORDBREAKS]}"
+        exclude="[${1//[^$COMP_WORDBREAKS]/}]"
     fi
 
     # Default to cword unchanged
     printf -v "$3" %s "$COMP_CWORD"
     # Are characters excluded which were former included?
-    if [[ $exclude ]]; then
+    if [[ -v exclude ]]; then
         # Yes, list of word completion separators has shrunk;
         line=$COMP_LINE
         # Re-assemble words to complete
-        for (( i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+        for ((i = 0, j = 0; i < ${#COMP_WORDS[@]}; i++, j++)); do
             # Is current word not word 0 (the command itself) and is word not
             # empty and is word made up of just word separator characters to
             # be excluded and is current word not preceded by whitespace in
             # original line?
-            while [[ $i -gt 0 && ${COMP_WORDS[$i]} == +([$exclude]) ]]; do
+            while [[ $i -gt 0 && ${COMP_WORDS[i]} == +($exclude) ]]; do
                 # Is word separator not preceded by whitespace in original line
                 # and are we not going to append to word 0 (the command
                 # itself), then append to current word.
-                [[ $line != [[:blank:]]* ]] && (( j >= 2 )) && ((j--))
+                [[ $line != [[:blank:]]* ]] && ((j >= 2)) && ((j--))
                 # Append word separator to current or new word
                 ref="$2[$j]"
-                printf -v "$ref" %s "${!ref}${COMP_WORDS[i]}"
+                printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
                 # Indicate new cword
-                [[ $i == $COMP_CWORD ]] && printf -v "$3" %s "$j"
+                ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
                 # Remove optional whitespace + word separator from line copy
-                line=${line#*"${COMP_WORDS[$i]}"}
+                line=${line#*"${COMP_WORDS[i]}"}
                 # Start new word if word separator in original line is
                 # followed by whitespace.
                 [[ $line == [[:blank:]]* ]] && ((j++))
                 # Indicate next word if available, else end *both* while and
                 # for loop
-                (( $i < ${#COMP_WORDS[@]} - 1)) && ((i++)) || break 2
+                ((i < ${#COMP_WORDS[@]} - 1)) && ((i++)) || break 2
             done
             # Append word to current word
             ref="$2[$j]"
-            printf -v "$ref" %s "${!ref}${COMP_WORDS[i]}"
+            printf -v "$ref" %s "${!ref-}${COMP_WORDS[i]}"
             # Remove optional whitespace + word from line copy
             line=${line#*"${COMP_WORDS[i]}"}
             # Indicate new cword
-            [[ $i == $COMP_CWORD ]] && printf -v "$3" %s "$j"
+            ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
         done
-        [[ $i == $COMP_CWORD ]] && printf -v "$3" %s "$j"
+        ((i == COMP_CWORD)) && printf -v "$3" %s "$j"
     else
         # No, list of word completions separators hasn't changed;
         for i in "${!COMP_WORDS[@]}"; do
@@ -285,7 +293,6 @@ __reassemble_comp_words_by_ref()
     fi
 } # __reassemble_comp_words_by_ref()
 
-
 # @param $1 exclude  Characters out of $COMP_WORDBREAKS which should NOT be
 #     considered word breaks. This is useful for things like scp where
 #     we want to return host:path and not only path, so we would pass the
@@ -299,45 +306,41 @@ __get_cword_at_cursor_by_ref()
     local cword words=()
     __reassemble_comp_words_by_ref "$1" words cword
 
-    local i cur index=$COMP_POINT lead=${COMP_LINE:0:$COMP_POINT}
+    local i cur="" index=$COMP_POINT lead=${COMP_LINE:0:COMP_POINT}
     # Cursor not at position 0 and not leaded by just space(s)?
-    if [[ $index -gt 0 && ( $lead && ${lead//[[:space:]]} ) ]]; then
+    if [[ $index -gt 0 && ($lead && ${lead//[[:space:]]/}) ]]; then
         cur=$COMP_LINE
-        for (( i = 0; i <= cword; ++i )); do
-            while [[
-                # Current word fits in $cur?
-                ${#cur} -ge ${#words[i]} &&
-                # $cur doesn't match cword?
-                "${cur:0:${#words[i]}}" != "${words[i]}"
-            ]]; do
+        for ((i = 0; i <= cword; ++i)); do
+            # Current word fits in $cur, and $cur doesn't match cword?
+            while [[ ${#cur} -ge ${#words[i]} && \
+                ${cur:0:${#words[i]}} != "${words[i]-}" ]]; do
                 # Strip first character
                 cur="${cur:1}"
                 # Decrease cursor position, staying >= 0
-                [[ $index -gt 0 ]] && ((index--))
+                ((index > 0)) && ((index--))
             done
 
             # Does found word match cword?
-            if [[ $i -lt $cword ]]; then
+            if ((i < cword)); then
                 # No, cword lies further;
                 local old_size=${#cur}
                 cur="${cur#"${words[i]}"}"
                 local new_size=${#cur}
-                (( index -= old_size - new_size ))
+                ((index -= old_size - new_size))
             fi
         done
         # Clear $cur if just space(s)
-        [[ $cur && ! ${cur//[[:space:]]} ]] && cur=
+        [[ $cur && ! ${cur//[[:space:]]/} ]] && cur=
         # Zero $index if negative
-        [[ $index -lt 0 ]] && index=0
+        ((index < 0)) && index=0
     fi
 
-    local "$2" "$3" "$4" && _upvars -a${#words[@]} $2 "${words[@]}" \
-        -v $3 "$cword" -v $4 "${cur:0:$index}"
+    local "$2" "$3" "$4" && _upvars -a${#words[@]} $2 ${words+"${words[@]}"} \
+        -v $3 "$cword" -v $4 "${cur:0:index}"
 }
 
-
 # Get the word to complete and optional previous words.
-# This is nicer than ${COMP_WORDS[$COMP_CWORD]}, since it handles cases
+# This is nicer than ${COMP_WORDS[COMP_CWORD]}, since it handles cases
 # where the user is completing in the middle of a word.
 # (For example, if the line is "ls foobar",
 # and the cursor is here -------->   ^
@@ -376,35 +379,51 @@ _get_comp_words_by_ref()
             n) exclude=$OPTARG ;;
             p) vprev=$OPTARG ;;
             w) vwords=$OPTARG ;;
+            *)
+                echo "bash_completion: $FUNCNAME: usage error" >&2
+                return 1
+                ;;
         esac
     done
     while [[ $# -ge $OPTIND ]]; do
         case ${!OPTIND} in
-            cur)   vcur=cur ;;
-            prev)  vprev=prev ;;
+            cur) vcur=cur ;;
+            prev) vprev=prev ;;
             cword) vcword=cword ;;
             words) vwords=words ;;
-            *) echo "bash_completion: $FUNCNAME: \`${!OPTIND}':" \
-                "unknown argument" >&2; return 1 ;;
+            *)
+                echo "bash_completion: $FUNCNAME: \`${!OPTIND}':" \
+                    "unknown argument" >&2
+                return 1
+                ;;
         esac
-        (( OPTIND += 1 ))
+        ((OPTIND += 1))
     done
 
-    __get_cword_at_cursor_by_ref "$exclude" words cword cur
+    __get_cword_at_cursor_by_ref "${exclude-}" words cword cur
 
-    [[ $vcur   ]] && { upvars+=("$vcur"  ); upargs+=(-v $vcur   "$cur"  ); }
-    [[ $vcword ]] && { upvars+=("$vcword"); upargs+=(-v $vcword "$cword"); }
-    [[ $vprev && $cword -ge 1 ]] && { upvars+=("$vprev" ); upargs+=(-v $vprev
-        "${words[cword - 1]}"); }
-    [[ $vwords ]] && { upvars+=("$vwords"); upargs+=(-a${#words[@]} $vwords
-        "${words[@]}"); }
+    [[ -v vcur ]] && {
+        upvars+=("$vcur")
+        upargs+=(-v $vcur "$cur")
+    }
+    [[ -v vcword ]] && {
+        upvars+=("$vcword")
+        upargs+=(-v $vcword "$cword")
+    }
+    [[ -v vprev && $cword -ge 1 ]] && {
+        upvars+=("$vprev")
+        upargs+=(-v $vprev "${words[cword - 1]}")
+    }
+    [[ -v vwords ]] && {
+        upvars+=("$vwords")
+        upargs+=(-a${#words[@]} $vwords ${words+"${words[@]}"})
+    }
 
-    (( ${#upvars[@]} )) && local "${upvars[@]}" && _upvars "${upargs[@]}"
+    ((${#upvars[@]})) && local "${upvars[@]}" && _upvars "${upargs[@]}"
 }
 
-
 # Get the word to complete.
-# This is nicer than ${COMP_WORDS[$COMP_CWORD]}, since it handles cases
+# This is nicer than ${COMP_WORDS[COMP_CWORD]}, since it handles cases
 # where the user is completing in the middle of a word.
 # (For example, if the line is "ls foobar",
 # and the cursor is here -------->   ^
@@ -422,51 +441,47 @@ _get_cword()
 {
     local LC_CTYPE=C
     local cword words
-    __reassemble_comp_words_by_ref "$1" words cword
+    __reassemble_comp_words_by_ref "${1-}" words cword
 
     # return previous word offset by $2
-    if [[ ${2//[^0-9]/} ]]; then
-        printf "%s" "${words[cword-$2]}"
-    elif [[ "${#words[cword]}" -eq 0 || "$COMP_POINT" == "${#COMP_LINE}" ]]; then
-        printf "%s" "${words[cword]}"
+    if [[ ${2-} && ${2//[^0-9]/} ]]; then
+        printf "%s" "${words[cword - $2]}"
+    elif ((${#words[cword]} == 0 && COMP_POINT == ${#COMP_LINE})); then
+        : # nothing
     else
         local i
         local cur="$COMP_LINE"
         local index="$COMP_POINT"
-        for (( i = 0; i <= cword; ++i )); do
-            while [[
-                # Current word fits in $cur?
-                "${#cur}" -ge ${#words[i]} &&
-                # $cur doesn't match cword?
-                "${cur:0:${#words[i]}}" != "${words[i]}"
-            ]]; do
+        for ((i = 0; i <= cword; ++i)); do
+            # Current word fits in $cur, and $cur doesn't match cword?
+            while [[ ${#cur} -ge ${#words[i]} && \
+                ${cur:0:${#words[i]}} != "${words[i]}" ]]; do
                 # Strip first character
                 cur="${cur:1}"
                 # Decrease cursor position, staying >= 0
-                [[ $index -gt 0 ]] && ((index--))
+                ((index > 0)) && ((index--))
             done
 
-            # Does found word matches cword?
-            if [[ "$i" -lt "$cword" ]]; then
+            # Does found word match cword?
+            if ((i < cword)); then
                 # No, cword lies further;
                 local old_size="${#cur}"
                 cur="${cur#${words[i]}}"
                 local new_size="${#cur}"
-                (( index -= old_size - new_size ))
+                ((index -= old_size - new_size))
             fi
         done
 
-        if [[ "${words[cword]:0:${#cur}}" != "$cur" ]]; then
+        if [[ ${words[cword]:0:${#cur}} != "$cur" ]]; then
             # We messed up! At least return the whole word so things
             # keep working
             printf "%s" "${words[cword]}"
         else
-            printf "%s" "${cur:0:$index}"
+            printf "%s" "${cur:0:index}"
         fi
     fi
 } # _get_cword()
 
-
 # Get word previous to the current word.
 # This is a good alternative to `prev=${COMP_WORDS[COMP_CWORD-1]}' because bash4
 # will properly return the previous word with respect to any given exclusions to
@@ -476,12 +491,11 @@ _get_cword()
 #
 _get_pword()
 {
-    if [[ $COMP_CWORD -ge 1 ]]; then
+    if ((COMP_CWORD >= 1)); then
         _get_cword "${@:-}" 1
     fi
 }
 
-
 # If the word-to-complete contains a colon (:), left-trim COMPREPLY items with
 # word-to-complete.
 # With a colon in COMP_WORDBREAKS, words containing
@@ -495,23 +509,22 @@ _get_pword()
 #    COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
 #
 # See also: Bash FAQ - E13) Why does filename completion misbehave if a colon
-# appears in the filename? - http://tiswww.case.edu/php/chet/bash/FAQ
+# appears in the filename? - https://tiswww.case.edu/php/chet/bash/FAQ
 # @param $1 current word to complete (cur)
 # @modifies global array $COMPREPLY
 #
 __ltrim_colon_completions()
 {
-    if [[ "$1" == *:* && "$COMP_WORDBREAKS" == *:* ]]; then
+    if [[ $1 == *:* && $COMP_WORDBREAKS == *:* ]]; then
         # Remove colon-word prefix from COMPREPLY items
         local colon_word=${1%"${1##*:}"}
         local i=${#COMPREPLY[*]}
-        while [[ $((--i)) -ge 0 ]]; do
-            COMPREPLY[$i]=${COMPREPLY[$i]#"$colon_word"}
+        while ((i-- > 0)); do
+            COMPREPLY[i]=${COMPREPLY[i]#"$colon_word"}
         done
     fi
 } # __ltrim_colon_completions()
 
-
 # This function quotes the argument in a way so that readline dequoting
 # results in the original argument.  This is necessary for at least
 # `compgen' which requires its arguments quoted/escaped:
@@ -523,9 +536,8 @@ __ltrim_colon_completions()
 #     a\'b/c
 #
 # See also:
-# - http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
-# - http://www.mail-archive.com/bash-completion-devel@lists.alioth.\
-#   debian.org/msg01944.html
+# - https://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+# - https://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01944.html
 # @param $1  Argument to quote
 # @param $2  Name of variable to return result to
 _quote_readline_by_ref()
@@ -548,12 +560,11 @@ _quote_readline_by_ref()
     # and passed to this function as e.g.: file\ with\ spaces
     [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
     # If result becomes quoted like this: $'string', re-evaluate in order to
-    # drop the additional quoting.  See also: http://www.mail-archive.com/
-    # bash-completion-devel@lists.alioth.debian.org/msg01942.html
+    # drop the additional quoting.  See also:
+    # https://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01942.html
     [[ ${!2} == \$* ]] && eval $2=${!2}
 } # _quote_readline_by_ref()
 
-
 # This function performs file and directory completion. It's better than
 # simply using 'compgen -f', because it honours spaces in filenames.
 # @param $1  If `-d', complete only on directories.  Otherwise filter/pick only
@@ -564,51 +575,61 @@ _filedir()
 {
     local IFS=$'\n'
 
-    _tilde "$cur" || return
+    _tilde "${cur-}" || return
 
     local -a toks
-    local reset
+    local reset arg=${1-}
 
-    if [[ "$1" == -d ]]; then
-        reset=$(shopt -po noglob); set -o noglob
-        toks=( $(compgen -d -- "$cur") )
-        IFS=' '; $reset; IFS=$'\n'
+    if [[ $arg == -d ]]; then
+        reset=$(shopt -po noglob)
+        set -o noglob
+        toks=($(compgen -d -- "${cur-}"))
+        IFS=' '
+        $reset
+        IFS=$'\n'
     else
         local quoted
-        _quote_readline_by_ref "$cur" quoted
+        _quote_readline_by_ref "${cur-}" quoted
 
         # Munge xspec to contain uppercase version too
-        # http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306
-        local xspec=${1:+"!*.@($1|${1^^})"} plusdirs=()
+        # https://lists.gnu.org/archive/html/bug-bash/2010-09/msg00036.html
+        # news://news.gmane.io/4C940E1C.1010304@case.edu
+        local xspec=${arg:+"!*.@($arg|${arg^^})"} plusdirs=()
 
         # Use plusdirs to get dir completions if we have a xspec; if we don't,
         # there's no need, dirs come along with other completions. Don't use
         # plusdirs quite yet if fallback is in use though, in order to not ruin
         # the fallback condition with the "plus" dirs.
-        local opts=( -f -X "$xspec" )
+        local opts=(-f -X "$xspec")
         [[ $xspec ]] && plusdirs=(-o plusdirs)
-        [[ ${COMP_FILEDIR_FALLBACK-} ]] || opts+=( "${plusdirs[@]}" )
+        [[ ${COMP_FILEDIR_FALLBACK-} || -z ${plusdirs-} ]] ||
+            opts+=("${plusdirs[@]}")
 
-        reset=$(shopt -po noglob); set -o noglob
-        toks+=( $(compgen "${opts[@]}" -- $quoted) )
-        IFS=' '; $reset; IFS=$'\n'
+        reset=$(shopt -po noglob)
+        set -o noglob
+        toks+=($(compgen "${opts[@]}" -- $quoted))
+        IFS=' '
+        $reset
+        IFS=$'\n'
 
         # Try without filter if it failed to produce anything and configured to
-        [[ -n ${COMP_FILEDIR_FALLBACK:-} && -n "$1" && ${#toks[@]} -lt 1 ]] && {
-            reset=$(shopt -po noglob); set -o noglob
-            toks+=( $(compgen -f "${plusdirs[@]}" -- $quoted) )
-            IFS=' '; $reset; IFS=$'\n'
+        [[ -n ${COMP_FILEDIR_FALLBACK-} && -n $arg && ${#toks[@]} -lt 1 ]] && {
+            reset=$(shopt -po noglob)
+            set -o noglob
+            toks+=($(compgen -f ${plusdirs+"${plusdirs[@]}"} -- $quoted))
+            IFS=' '
+            $reset
+            IFS=$'\n'
         }
     fi
 
-    if [[ ${#toks[@]} -ne 0 ]]; then
+    if ((${#toks[@]} != 0)); then
         # 2>/dev/null for direct invocation, e.g. in the _filedir unit test
         compopt -o filenames 2>/dev/null
-        COMPREPLY+=( "${toks[@]}" )
+        COMPREPLY+=("${toks[@]}")
     fi
 } # _filedir()
 
-
 # This function splits $cur=--foo=bar into $prev=--foo, $cur=bar, making it
 # easier to support both "--foo bar" and "--foo=bar" style completions.
 # `=' should have been removed from COMP_WORDBREAKS when setting $cur for
@@ -617,7 +638,7 @@ _filedir()
 #
 _split_longopt()
 {
-    if [[ "$cur" == --?*=* ]]; then
+    if [[ $cur == --?*=* ]]; then
         # Cut also backslash before '=' in case it ended up there
         # for some reason.
         prev="${cur%%?(\\)=*}"
@@ -635,41 +656,41 @@ _variables()
 {
     if [[ $cur =~ ^(\$(\{[!#]?)?)([A-Za-z0-9_]*)$ ]]; then
         # Completing $var / ${var / ${!var / ${#var
-        if [[ $cur == \${* ]]; then
+        if [[ $cur == '${'* ]]; then
             local arrs vars
-            vars=( $(compgen -A variable -P ${BASH_REMATCH[1]} -S '}' -- ${BASH_REMATCH[3]}) ) && \
-            arrs=( $(compgen -A arrayvar -P ${BASH_REMATCH[1]} -S '[' -- ${BASH_REMATCH[3]}) )
-            if [[ ${#vars[@]} -eq 1 && $arrs ]]; then
+            vars=($(compgen -A variable -P ${BASH_REMATCH[1]} -S '}' -- ${BASH_REMATCH[3]}))
+            arrs=($(compgen -A arrayvar -P ${BASH_REMATCH[1]} -S '[' -- ${BASH_REMATCH[3]}))
+            if ((${#vars[@]} == 1 && ${#arrs[@]} != 0)); then
                 # Complete ${arr with ${array[ if there is only one match, and that match is an array variable
                 compopt -o nospace
-                COMPREPLY+=( ${arrs[*]} )
+                COMPREPLY+=(${arrs[*]})
             else
                 # Complete ${var with ${variable}
-                COMPREPLY+=( ${vars[*]} )
+                COMPREPLY+=(${vars[*]})
             fi
         else
             # Complete $var with $variable
-            COMPREPLY+=( $(compgen -A variable -P '$' -- "${BASH_REMATCH[3]}") )
+            COMPREPLY+=($(compgen -A variable -P '$' -- "${BASH_REMATCH[3]}"))
         fi
         return 0
     elif [[ $cur =~ ^(\$\{[#!]?)([A-Za-z0-9_]*)\[([^]]*)$ ]]; then
         # Complete ${array[i with ${array[idx]}
         local IFS=$'\n'
-        COMPREPLY+=( $(compgen -W '$(printf %s\\n "${!'${BASH_REMATCH[2]}'[@]}")' \
-            -P "${BASH_REMATCH[1]}${BASH_REMATCH[2]}[" -S ']}' -- "${BASH_REMATCH[3]}") )
+        COMPREPLY+=($(compgen -W '$(printf %s\\n "${!'${BASH_REMATCH[2]}'[@]}")' \
+            -P "${BASH_REMATCH[1]}${BASH_REMATCH[2]}[" -S ']}' -- "${BASH_REMATCH[3]}"))
         # Complete ${arr[@ and ${arr[*
         if [[ ${BASH_REMATCH[3]} == [@*] ]]; then
-            COMPREPLY+=( "${BASH_REMATCH[1]}${BASH_REMATCH[2]}[${BASH_REMATCH[3]}]}" )
+            COMPREPLY+=("${BASH_REMATCH[1]}${BASH_REMATCH[2]}[${BASH_REMATCH[3]}]}")
         fi
-        __ltrim_colon_completions "$cur"    # array indexes may have colons
+        __ltrim_colon_completions "$cur" # array indexes may have colons
         return 0
     elif [[ $cur =~ ^\$\{[#!]?[A-Za-z0-9_]*\[.*\]$ ]]; then
         # Complete ${array[idx] with ${array[idx]}
-        COMPREPLY+=( "$cur}" )
+        COMPREPLY+=("$cur}")
         __ltrim_colon_completions "$cur"
         return 0
     else
-        case $prev in
+        case ${prev-} in
             TZ)
                 cur=/usr/share/zoneinfo/$cur
                 _filedir
@@ -689,9 +710,9 @@ _variables()
                 _terms
                 return 0
                 ;;
-            LANG|LC_*)
-                COMPREPLY=( $(compgen -W '$(locale -a 2>/dev/null)' \
-                    -- "$cur" ) )
+            LANG | LC_*)
+                COMPREPLY=($(compgen -W '$(locale -a 2>/dev/null)' \
+                    -- "$cur"))
                 return 0
                 ;;
         esac
@@ -724,16 +745,17 @@ _init_completion()
             e) errx=$OPTARG ;;
             o) outx=$OPTARG ;;
             i) inx=$OPTARG ;;
-            s) split=false ; exclude+== ;;
+            s)
+                split=false
+                exclude+==
+                ;;
+            *)
+                echo "bash_completion: $FUNCNAME: usage error" >&2
+                return 1
+                ;;
         esac
     done
 
-    # For some reason completion functions are not invoked at all by
-    # bash (at least as of 4.1.7) after the command line contains an
-    # ampersand so we don't get a chance to deal with redirections
-    # containing them, but if we did, hopefully the below would also
-    # do the right thing with them...
-
     COMPREPLY=()
     local redir="@(?([0-9])<|?([0-9&])>?(>)|>&)"
     _get_comp_words_by_ref -n "$exclude<>&" cur prev words cword
@@ -743,17 +765,18 @@ _init_completion()
 
     # Complete on files if current is a redirect possibly followed by a
     # filename, e.g. ">foo", or previous is a "bare" redirect, e.g. ">".
-    if [[ $cur == $redir* || $prev == $redir ]]; then
+    # shellcheck disable=SC2053
+    if [[ $cur == $redir* || ${prev-} == $redir ]]; then
         local xspec
         case $cur in
-            2'>'*) xspec=$errx ;;
-            *'>'*) xspec=$outx ;;
-            *'<'*) xspec=$inx ;;
+            2'>'*) xspec=${errx-} ;;
+            *'>'*) xspec=${outx-} ;;
+            *'<'*) xspec=${inx-} ;;
             *)
                 case $prev in
-                    2'>'*) xspec=$errx ;;
-                    *'>'*) xspec=$outx ;;
-                    *'<'*) xspec=$inx ;;
+                    2'>'*) xspec=${errx-} ;;
+                    *'>'*) xspec=${outx-} ;;
+                    *'<'*) xspec=${inx-} ;;
                 esac
                 ;;
         esac
@@ -764,19 +787,20 @@ _init_completion()
 
     # Remove all redirections so completions don't have to deal with them.
     local i skip
-    for (( i=1; i < ${#words[@]}; )); do
+    for ((i = 1; i < ${#words[@]}; )); do
         if [[ ${words[i]} == $redir* ]]; then
             # If "bare" redirect, remove also the next word (skip=2).
+            # shellcheck disable=SC2053
             [[ ${words[i]} == $redir ]] && skip=2 || skip=1
-            words=( "${words[@]:0:i}" "${words[@]:i+skip}" )
-            [[ $i -le $cword ]] && (( cword -= skip ))
+            words=("${words[@]:0:i}" "${words[@]:i+skip}")
+            ((i <= cword)) && ((cword -= skip))
         else
-            (( i++ ))
+            ((i++))
         fi
     done
 
-    [[ $cword -le 0 ]] && return 1
-    prev=${words[cword-1]}
+    ((cword <= 0)) && return 1
+    prev=${words[cword - 1]}
 
     [[ ${split-} ]] && _split_longopt && split=true
 
@@ -790,13 +814,16 @@ __parse_options()
 
     # Take first found long option, or first one (short) if not found.
     option=
-    local -a array=( $1 )
+    local -a array=($1)
     for i in "${array[@]}"; do
         case "$i" in
             ---*) break ;;
-            --?*) option=$i ; break ;;
-            -?*)  [[ $option ]] || option=$i ;;
-            *)    break ;;
+            --?*)
+                option=$i
+                break
+                ;;
+            -?*) [[ $option ]] || option=$i ;;
+            *) break ;;
         esac
     done
     [[ $option ]] || return 0
@@ -821,23 +848,25 @@ __parse_options()
 #
 _parse_help()
 {
-    eval local cmd=$(quote "$1")
+    eval local cmd="$(quote "$1")"
     local line
-    { case $cmd in
-        -) cat ;;
-        *) LC_ALL=C "$(dequote "$cmd")" ${2:---help} 2>&1 ;;
-      esac } \
-    | while read -r line; do
+    {
+        case $cmd in
+            -) cat ;;
+            *) LC_ALL=C "$(dequote "$cmd")" ${2:---help} 2>&1 ;;
+        esac
+    } |
+        while read -r line; do
+
+            [[ $line == *([[:blank:]])-* ]] || continue
+            # transform "-f FOO, --foo=FOO" to "-f , --foo=FOO" etc
+            while [[ $line =~ \
+                ((^|[^-])-[A-Za-z0-9?][[:space:]]+)\[?[A-Z0-9]+([,_-]+[A-Z0-9]+)?(\.\.+)?\]? ]]; do
+                line=${line/"${BASH_REMATCH[0]}"/"${BASH_REMATCH[1]}"}
+            done
+            __parse_options "${line// or /, }"
 
-        [[ $line == *([[:blank:]])-* ]] || continue
-        # transform "-f FOO, --foo=FOO" to "-f , --foo=FOO" etc
-        while [[ $line =~ \
-            ((^|[^-])-[A-Za-z0-9?][[:space:]]+)\[?[A-Z0-9]+([,_-]+[A-Z0-9]+)?(\.\.+)?\]? ]]; do
-            line=${line/"${BASH_REMATCH[0]}"/"${BASH_REMATCH[1]}"}
         done
-        __parse_options "${line// or /, }"
-
-    done
 }
 
 # Parse BSD style usage output (options in brackets) of the given command.
@@ -846,41 +875,43 @@ _parse_help()
 #
 _parse_usage()
 {
-    eval local cmd=$(quote "$1")
+    eval local cmd="$(quote "$1")"
     local line match option i char
-    { case $cmd in
-        -) cat ;;
-        *) LC_ALL=C "$(dequote "$cmd")" ${2:---usage} 2>&1 ;;
-      esac } \
-    | while read -r line; do
+    {
+        case $cmd in
+            -) cat ;;
+            *) LC_ALL=C "$(dequote "$cmd")" ${2:---usage} 2>&1 ;;
+        esac
+    } |
+        while read -r line; do
+
+            while [[ $line =~ \[[[:space:]]*(-[^]]+)[[:space:]]*\] ]]; do
+                match=${BASH_REMATCH[0]}
+                option=${BASH_REMATCH[1]}
+                case $option in
+                    -?(\[)+([a-zA-Z0-9?]))
+                        # Treat as bundled short options
+                        for ((i = 1; i < ${#option}; i++)); do
+                            char=${option:i:1}
+                            [[ $char != '[' ]] && printf '%s\n' -$char
+                        done
+                        ;;
+                    *)
+                        __parse_options "$option"
+                        ;;
+                esac
+                line=${line#*"$match"}
+            done
 
-        while [[ $line =~ \[[[:space:]]*(-[^]]+)[[:space:]]*\] ]]; do
-            match=${BASH_REMATCH[0]}
-            option=${BASH_REMATCH[1]}
-            case $option in
-                -?(\[)+([a-zA-Z0-9?]))
-                    # Treat as bundled short options
-                    for (( i=1; i < ${#option}; i++ )); do
-                        char=${option:i:1}
-                        [[ $char != '[' ]] && printf '%s\n' -$char
-                    done
-                    ;;
-                *)
-                    __parse_options "$option"
-                    ;;
-            esac
-            line=${line#*"$match"}
         done
-
-    done
 }
 
 # This function completes on signal names (minus the SIG prefix)
 # @param $1 prefix
 _signals()
 {
-    local -a sigs=( $(compgen -P "$1" -A signal "SIG${cur#$1}") )
-    COMPREPLY+=( "${sigs[@]/#${1}SIG/${1}}" )
+    local -a sigs=($(compgen -P "${1-}" -A signal "SIG${cur#${1-}}"))
+    COMPREPLY+=("${sigs[@]/#${1-}SIG/${1-}}")
 }
 
 # This function completes on known mac addresses
@@ -894,24 +925,28 @@ _mac_addresses()
     # - ifconfig on Linux: HWaddr or ether
     # - ifconfig on FreeBSD: ether
     # - ip link: link/ether
-    COMPREPLY+=( $(\
-        { LC_ALL=C ifconfig -a || ip link show; } 2>/dev/null | command sed -ne \
-        "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]].*/\1/p" -ne \
-        "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]]*$/\1/p" -ne \
-        "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]].*|\2|p" -ne \
-        "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]]*$|\2|p"
-        ) )
+    COMPREPLY+=($(
+        {
+            LC_ALL=C ifconfig -a || ip link show
+        } 2>/dev/null | command sed -ne \
+            "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]].*/\1/p" -ne \
+            "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]]*$/\1/p" -ne \
+            "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]].*|\2|p" -ne \
+            "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]]*$|\2|p"
+    ))
 
     # ARP cache
-    COMPREPLY+=( $({ arp -an || ip neigh show; } 2>/dev/null | command sed -ne \
+    COMPREPLY+=($({
+        arp -an || ip neigh show
+    } 2>/dev/null | command sed -ne \
         "s/.*[[:space:]]\($re\)[[:space:]].*/\1/p" -ne \
-        "s/.*[[:space:]]\($re\)[[:space:]]*$/\1/p") )
+        "s/.*[[:space:]]\($re\)[[:space:]]*$/\1/p"))
 
     # /etc/ethers
-    COMPREPLY+=( $(command sed -ne \
-        "s/^[[:space:]]*\($re\)[[:space:]].*/\1/p" /etc/ethers 2>/dev/null) )
+    COMPREPLY+=($(command sed -ne \
+        "s/^[[:space:]]*\($re\)[[:space:]].*/\1/p" /etc/ethers 2>/dev/null))
 
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     __ltrim_colon_completions "$cur"
 }
 
@@ -921,24 +956,24 @@ _configured_interfaces()
 {
     if [[ -f /etc/debian_version ]]; then
         # Debian system
-        COMPREPLY=( $(compgen -W "$(command sed -ne 's|^iface \([^ ]\{1,\}\).*$|\1|p'\
+        COMPREPLY=($(compgen -W "$(command sed -ne 's|^iface \([^ ]\{1,\}\).*$|\1|p' \
             /etc/network/interfaces /etc/network/interfaces.d/* 2>/dev/null)" \
-            -- "$cur") )
+            -- "$cur"))
     elif [[ -f /etc/SuSE-release ]]; then
         # SuSE system
-        COMPREPLY=( $(compgen -W "$(printf '%s\n' \
-            /etc/sysconfig/network/ifcfg-* | \
-            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(printf '%s\n' \
+            /etc/sysconfig/network/ifcfg-* |
+            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur"))
     elif [[ -f /etc/pld-release ]]; then
         # PLD Linux
-        COMPREPLY=( $(compgen -W "$(command ls -B \
-            /etc/sysconfig/interfaces | \
-            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(command ls -B \
+            /etc/sysconfig/interfaces |
+            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur"))
     else
         # Assume Red Hat
-        COMPREPLY=( $(compgen -W "$(printf '%s\n' \
-            /etc/sysconfig/network-scripts/ifcfg-* | \
-            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(printf '%s\n' \
+            /etc/sysconfig/network-scripts/ifcfg-* |
+            command sed -ne 's|.*ifcfg-\([^*].*\)$|\1|p')" -- "$cur"))
     fi
 }
 
@@ -950,22 +985,25 @@ _configured_interfaces()
 _ip_addresses()
 {
     local n
-    case $1 in
+    case ${1-} in
         -a) n='6\?' ;;
         -6) n='6' ;;
+        *) n= ;;
     esac
     local PATH=$PATH:/sbin
-    local addrs=$({ LC_ALL=C ifconfig -a || ip addr show; } 2>/dev/null |
+    local addrs=$({
+        LC_ALL=C ifconfig -a || ip addr show
+    } 2>/dev/null |
         command sed -e 's/[[:space:]]addr:/ /' -ne \
             "s|.*inet${n}[[:space:]]\{1,\}\([^[:space:]/]*\).*|\1|p")
-    COMPREPLY+=( $(compgen -W "$addrs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$addrs" -- "${cur-}"))
 }
 
 # This function completes on available kernels
 #
 _kernel_versions()
 {
-    COMPREPLY=( $(compgen -W '$(command ls /lib/modules)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(command ls /lib/modules)' -- "$cur"))
 }
 
 # This function completes on all available network interfaces
@@ -976,7 +1014,7 @@ _available_interfaces()
 {
     local PATH=$PATH:/sbin
 
-    COMPREPLY=( $({
+    COMPREPLY=($({
         if [[ ${1:-} == -w ]]; then
             iwconfig
         elif [[ ${1:-} == -a ]]; then
@@ -985,9 +1023,9 @@ _available_interfaces()
             ifconfig -a || ip link show
         fi
     } 2>/dev/null | awk \
-        '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }') )
+        '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }'))
 
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]/%[[:punct:]]/}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]/%[[:punct:]]/}' -- "$cur"))
 }
 
 # Echo number of CPUs, falling back to 1 on failure.
@@ -1006,17 +1044,16 @@ _ncpus()
 _tilde()
 {
     local result=0
-    if [[ $1 == \~* && $1 != */* ]]; then
+    if [[ ${1-} == \~* && $1 != */* ]]; then
         # Try generate ~username completions
-        COMPREPLY=( $(compgen -P '~' -u -- "${1#\~}") )
+        COMPREPLY=($(compgen -P '~' -u -- "${1#\~}"))
         result=${#COMPREPLY[@]}
         # 2>/dev/null for direct invocation, e.g. in the _tilde unit test
-        [[ $result -gt 0 ]] && compopt -o filenames 2>/dev/null
+        ((result > 0)) && compopt -o filenames 2>/dev/null
     fi
     return $result
 }
 
-
 # Expand variable starting with tilde (~)
 # We want to expand ~foo/... to /home/foo/... to avoid problems when
 # word-to-complete starting with a tilde is fed to commands and ending up
@@ -1041,12 +1078,11 @@ _tilde()
 # @param $1  Name of variable (not the value of the variable) to expand
 __expand_tilde_by_ref()
 {
-    if [[ ${!1} == \~* ]]; then
-        eval $1=$(printf ~%q "${!1#\~}")
+    if [[ ${!1-} == \~* ]]; then
+        eval $1="$(printf ~%q "${!1#\~}")"
     fi
 } # __expand_tilde_by_ref()
 
-
 # This function expands tildes in pathnames
 #
 _expand()
@@ -1055,102 +1091,102 @@ _expand()
     # ~foo/... to /home/foo/... to avoid problems when $cur starting with
     # a tilde is fed to commands and ending up quoted instead of expanded.
 
-    if [[ "$cur" == \~*/* ]]; then
-        __expand_tilde_by_ref cur
-    elif [[ "$cur" == \~* ]]; then
-        _tilde "$cur" || eval COMPREPLY[0]=$(printf ~%q "${COMPREPLY[0]#\~}")
-        return ${#COMPREPLY[@]}
-    fi
+    case ${cur-} in
+        ~*/*)
+            __expand_tilde_by_ref cur
+            ;;
+        ~*)
+            _tilde "$cur" ||
+                eval COMPREPLY[0]="$(printf ~%q "${COMPREPLY[0]#\~}")"
+            return ${#COMPREPLY[@]}
+            ;;
+    esac
 }
 
-# This function completes on process IDs.
-# AIX and Solaris ps prefers X/Open syntax.
-[[ $OSTYPE == *@(solaris|aix)* ]] &&
-_pids()
-{
-    COMPREPLY=( $(compgen -W '$(command ps -efo pid | command sed 1d)' -- "$cur") )
-} ||
-_pids()
-{
-    COMPREPLY=( $(compgen -W '$(command ps axo pid=)' -- "$cur") )
-}
+# Process ID related functions.
+# for AIX and Solaris we use X/Open syntax, BSD for others.
+if [[ $OSTYPE == *@(solaris|aix)* ]]; then
+    # This function completes on process IDs.
+    _pids()
+    {
+        COMPREPLY=($(compgen -W '$(command ps -efo pid | command sed 1d)' -- "$cur"))
+    }
 
-# This function completes on process group IDs.
-# AIX and SunOS prefer X/Open, all else should be BSD.
-[[ $OSTYPE == *@(solaris|aix)* ]] &&
-_pgids()
-{
-    COMPREPLY=( $(compgen -W '$(command ps -efo pgid | command sed 1d)' -- "$cur") )
-} ||
-_pgids()
-{
-    COMPREPLY=( $(compgen -W '$(command ps axo pgid=)' -- "$cur") )
-}
-
-# This function completes on process names.
-# AIX and SunOS prefer X/Open, all else should be BSD.
-# @param $1 if -s, don't try to avoid truncated command names
-[[ $OSTYPE == *@(solaris|aix)* ]] &&
-_pnames()
-{
-    COMPREPLY=( $(compgen -X '<defunct>' -W '$(command ps -efo comm | \
-        command sed -e 1d -e "s:.*/::" -e "s/^-//" | sort -u)' -- "$cur") )
-} ||
-_pnames()
-{
-    local -a procs
-    if [[ "$1" == -s ]]; then
-        procs=( $(command ps axo comm | command sed -e 1d) )
-    else
-        local line i=-1 OIFS=$IFS
-        IFS=$'\n'
-        local -a psout=( $(command ps axo command=) )
-        IFS=$OIFS
-        for line in "${psout[@]}"; do
-            if [[ $i -eq -1 ]]; then
-                # First line, see if it has COMMAND column header. For example
-                # the busybox ps does that, i.e. doesn't respect axo command=
-                if [[ $line =~ ^(.*[[:space:]])COMMAND([[:space:]]|$) ]]; then
-                    # It does; store its index.
-                    i=${#BASH_REMATCH[1]}
-                else
-                    # Nope, fall through to "regular axo command=" parsing.
-                    break
-                fi
-            else
-                #
-                line=${line:$i}   # take command starting from found index
-                line=${line%% *}  # trim arguments
-                procs+=( $line )
-            fi
-        done
-        if [[ $i -eq -1 ]]; then
-            # Regular axo command= parsing
+    _pgids()
+    {
+        COMPREPLY=($(compgen -W '$(command ps -efo pgid | command sed 1d)' -- "$cur"))
+    }
+    _pnames()
+    {
+        COMPREPLY=($(compgen -X '<defunct>' -W '$(command ps -efo comm | \
+        command sed -e 1d -e "s:.*/::" -e "s/^-//" | sort -u)' -- "$cur"))
+    }
+else
+    _pids()
+    {
+        COMPREPLY=($(compgen -W '$(command ps axo pid=)' -- "$cur"))
+    }
+    _pgids()
+    {
+        COMPREPLY=($(compgen -W '$(command ps axo pgid=)' -- "$cur"))
+    }
+    # @param $1 if -s, don't try to avoid truncated command names
+    _pnames()
+    {
+        local -a procs
+        if [[ ${1-} == -s ]]; then
+            procs=($(command ps axo comm | command sed -e 1d))
+        else
+            local line i=-1 ifs=$IFS
+            IFS=$'\n'
+            local -a psout=($(command ps axo command=))
+            IFS=$ifs
             for line in "${psout[@]}"; do
-                if [[ $line =~ ^[[(](.+)[])]$ ]]; then
-                    procs+=( ${BASH_REMATCH[1]} )
+                if ((i == -1)); then
+                    # First line, see if it has COMMAND column header. For example
+                    # the busybox ps does that, i.e. doesn't respect axo command=
+                    if [[ $line =~ ^(.*[[:space:]])COMMAND([[:space:]]|$) ]]; then
+                        # It does; store its index.
+                        i=${#BASH_REMATCH[1]}
+                    else
+                        # Nope, fall through to "regular axo command=" parsing.
+                        break
+                    fi
                 else
-                    line=${line%% *}       # trim arguments
-                    line=${line##@(*/|-)}  # trim leading path and -
-                    procs+=( $line )
+                    #
+                    line=${line:i}   # take command starting from found index
+                    line=${line%% *} # trim arguments
+                    procs+=($line)
                 fi
             done
+            if ((i == -1)); then
+                # Regular axo command= parsing
+                for line in "${psout[@]}"; do
+                    if [[ $line =~ ^[[(](.+)[])]$ ]]; then
+                        procs+=(${BASH_REMATCH[1]})
+                    else
+                        line=${line%% *}      # trim arguments
+                        line=${line##@(*/|-)} # trim leading path and -
+                        procs+=($line)
+                    fi
+                done
+            fi
         fi
-    fi
-    COMPREPLY=( $(compgen -X "<defunct>" -W '${procs[@]}' -- "$cur" ) )
-}
+        COMPREPLY=($(compgen -X "<defunct>" -W '${procs[@]}' -- "$cur"))
+    }
+fi
 
 # This function completes on user IDs
 #
 _uids()
 {
     if type getent &>/dev/null; then
-        COMPREPLY=( $(compgen -W '$(getent passwd | cut -d: -f3)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(getent passwd | cut -d: -f3)' -- "$cur"))
     elif type perl &>/dev/null; then
-        COMPREPLY=( $(compgen -W '$(perl -e '"'"'while (($uid) = (getpwent)[2]) { print $uid . "\n" }'"'"')' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(perl -e '"'"'while (($uid) = (getpwent)[2]) { print $uid . "\n" }'"'"')' -- "$cur"))
     else
         # make do with /etc/passwd
-        COMPREPLY=( $(compgen -W '$(cut -d: -f3 /etc/passwd)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(cut -d: -f3 /etc/passwd)' -- "$cur"))
     fi
 }
 
@@ -1159,12 +1195,12 @@ _uids()
 _gids()
 {
     if type getent &>/dev/null; then
-        COMPREPLY=( $(compgen -W '$(getent group | cut -d: -f3)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(getent group | cut -d: -f3)' -- "$cur"))
     elif type perl &>/dev/null; then
-        COMPREPLY=( $(compgen -W '$(perl -e '"'"'while (($gid) = (getgrent)[2]) { print $gid . "\n" }'"'"')' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(perl -e '"'"'while (($gid) = (getgrent)[2]) { print $gid . "\n" }'"'"')' -- "$cur"))
     else
         # make do with /etc/group
-        COMPREPLY=( $(compgen -W '$(cut -d: -f3 /etc/group)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(cut -d: -f3 /etc/group)' -- "$cur"))
     fi
 }
 
@@ -1176,12 +1212,14 @@ _backup_glob='@(#*#|*@(~|.@(bak|orig|rej|swp|dpkg*|rpm@(orig|new|save))))'
 #
 _xinetd_services()
 {
-    local xinetddir=/etc/xinetd.d
+    local xinetddir=${BASHCOMP_XINETDDIR:-/etc/xinetd.d}
     if [[ -d $xinetddir ]]; then
-        local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
-        local -a svcs=( $(printf '%s\n' $xinetddir/!($_backup_glob)) )
+        local IFS=$' \t\n' reset=$(shopt -p nullglob)
+        shopt -s nullglob
+        local -a svcs=($(printf '%s\n' $xinetddir/!($_backup_glob)))
         $reset
-        COMPREPLY+=( $(compgen -W '${svcs[@]#$xinetddir/}' -- "$cur") )
+        ((!${#svcs[@]})) ||
+            COMPREPLY+=($(compgen -W '${svcs[@]#$xinetddir/}' -- "${cur-}"))
     fi
 }
 
@@ -1192,20 +1230,23 @@ _services()
     local sysvdirs
     _sysvdirs
 
-    local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
-    COMPREPLY=( \
-        $(printf '%s\n' ${sysvdirs[0]}/!($_backup_glob|functions|README)) )
+    local IFS=$' \t\n' reset=$(shopt -p nullglob)
+    shopt -s nullglob
+    COMPREPLY=(
+        $(printf '%s\n' ${sysvdirs[0]}/!($_backup_glob|functions|README)))
     $reset
 
-    COMPREPLY+=( $({ systemctl list-units --full --all || \
-                     systemctl list-unit-files; } 2>/dev/null | \
-        awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }') )
+    COMPREPLY+=($({
+        systemctl list-units --full --all ||
+            systemctl list-unit-files
+    } 2>/dev/null |
+        awk '$1 ~ /\.service$/ { sub("\\.service$", "", $1); print $1 }'))
 
     if [[ -x /sbin/upstart-udev-bridge ]]; then
-        COMPREPLY+=( $(initctl list 2>/dev/null | cut -d' ' -f1) )
+        COMPREPLY+=($(initctl list 2>/dev/null | cut -d' ' -f1))
     fi
 
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]#${sysvdirs[0]}/}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]#${sysvdirs[0]}/}' -- "$cur"))
 }
 
 # This completes on a list of all available service scripts for the
@@ -1218,7 +1259,7 @@ _service()
     _init_completion || return
 
     # don't complete past 2nd token
-    [[ $cword -gt 2 ]] && return
+    ((cword > 2)) && return
 
     if [[ $cword -eq 1 && $prev == ?(*/)service ]]; then
         _services
@@ -1226,12 +1267,12 @@ _service()
     else
         local sysvdirs
         _sysvdirs
-        COMPREPLY=( $(compgen -W '`command sed -e "y/|/ /" \
+        COMPREPLY=($(compgen -W '`command sed -e "y/|/ /" \
             -ne "s/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p" \
-            ${sysvdirs[0]}/${prev##*/} 2>/dev/null` start stop' -- "$cur") )
+            ${sysvdirs[0]}/${prev##*/} 2>/dev/null` start stop' -- "$cur"))
     fi
 } &&
-complete -F _service service
+    complete -F _service service
 _sysvdirs
 for svcdir in "${sysvdirs[@]}"; do
     for svc in $svcdir/!($_backup_glob); do
@@ -1246,16 +1287,16 @@ _modules()
 {
     local modpath
     modpath=/lib/modules/$1
-    COMPREPLY=( $(compgen -W "$(command ls -RL $modpath 2>/dev/null | \
-        command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(command ls -RL $modpath 2>/dev/null |
+        command sed -ne 's/^\(.*\)\.k\{0,1\}o\(\.[gx]z\)\{0,1\}$/\1/p')" -- "$cur"))
 }
 
 # This function completes on installed modules
 #
 _installed_modules()
 {
-    COMPREPLY=( $(compgen -W "$(PATH="$PATH:/sbin" lsmod | \
-        awk '{if (NR != 1) print $1}')" -- "$1") )
+    COMPREPLY=($(compgen -W "$(PATH="$PATH:/sbin" lsmod |
+        awk '{if (NR != 1) print $1}')" -- "$1"))
 }
 
 # This function completes on user or user:group format; as for chown and cpio.
@@ -1276,25 +1317,25 @@ _usergroup()
         # escape to the colon.
         local prefix
         prefix=${cur%%*([^:])}
-        prefix=${prefix//\\}
+        prefix=${prefix//\\/}
         local mycur="${cur#*[:]}"
-        if [[ $1 == -u ]]; then
+        if [[ ${1-} == -u ]]; then
             _allowed_groups "$mycur"
         else
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -g -- "$mycur") )
+            COMPREPLY=($(compgen -g -- "$mycur"))
         fi
-        COMPREPLY=( $(compgen -P "$prefix" -W "${COMPREPLY[@]}") )
+        COMPREPLY=($(compgen -P "$prefix" -W "${COMPREPLY[@]}"))
     elif [[ $cur == *:* ]]; then
         # Completing group after 'user:gr<TAB>'.
         # Reply with a list of unprefixed groups since readline with split on :
         # and only replace the 'gr' part
         local mycur="${cur#*:}"
-        if [[ $1 == -u ]]; then
+        if [[ ${1-} == -u ]]; then
             _allowed_groups "$mycur"
         else
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -g -- "$mycur") )
+            COMPREPLY=($(compgen -g -- "$mycur"))
         fi
     else
         # Completing a partial 'usernam<TAB>'.
@@ -1302,11 +1343,11 @@ _usergroup()
         # Don't suffix with a : because readline will escape it and add a
         # slash. It's better to complete into 'chown username ' than 'chown
         # username\:'.
-        if [[ $1 == -u ]]; then
+        if [[ ${1-} == -u ]]; then
             _allowed_users "$cur"
         else
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
         fi
     fi
 }
@@ -1315,11 +1356,11 @@ _allowed_users()
 {
     if _complete_as_root; then
         local IFS=$'\n'
-        COMPREPLY=( $(compgen -u -- "${1:-$cur}") )
+        COMPREPLY=($(compgen -u -- "${1:-$cur}"))
     else
         local IFS=$'\n '
-        COMPREPLY=( $(compgen -W \
-            "$(id -un 2>/dev/null || whoami 2>/dev/null)" -- "${1:-$cur}") )
+        COMPREPLY=($(compgen -W \
+            "$(id -un 2>/dev/null || whoami 2>/dev/null)" -- "${1:-$cur}"))
     fi
 }
 
@@ -1327,11 +1368,11 @@ _allowed_groups()
 {
     if _complete_as_root; then
         local IFS=$'\n'
-        COMPREPLY=( $(compgen -g -- "$1") )
+        COMPREPLY=($(compgen -g -- "$1"))
     else
         local IFS=$'\n '
-        COMPREPLY=( $(compgen -W \
-            "$(id -Gn 2>/dev/null || groups 2>/dev/null)" -- "$1") )
+        COMPREPLY=($(compgen -W \
+            "$(id -Gn 2>/dev/null || groups 2>/dev/null)" -- "$1"))
     fi
 }
 
@@ -1341,7 +1382,7 @@ _shells()
 {
     local shell rest
     while read -r shell rest; do
-        [[ $shell == /* && $shell == "$cur"* ]] && COMPREPLY+=( $shell )
+        [[ $shell == /* && $shell == "$cur"* ]] && COMPREPLY+=($shell)
     done 2>/dev/null </etc/shells
 }
 
@@ -1364,7 +1405,7 @@ _fstypes()
              $([[ -d /etc/fs ]] && command ls /etc/fs)"
     fi
 
-    [[ -n $fss ]] && COMPREPLY+=( $(compgen -W "$fss" -- "$cur") )
+    [[ -n $fss ]] && COMPREPLY+=($(compgen -W "$fss" -- "$cur"))
 }
 
 # Get real command.
@@ -1395,15 +1436,14 @@ _get_first_arg()
     local i
 
     arg=
-    for (( i=1; i < COMP_CWORD; i++ )); do
-        if [[ "${COMP_WORDS[i]}" != -* ]]; then
+    for ((i = 1; i < COMP_CWORD; i++)); do
+        if [[ ${COMP_WORDS[i]} != -* ]]; then
             arg=${COMP_WORDS[i]}
             break
         fi
     done
 }
 
-
 # This function counts the number of args, excluding options
 # @param $1 chars  Characters out of $COMP_WORDBREAKS which should
 #     NOT be considered word breaks. See __reassemble_comp_words_by_ref.
@@ -1412,13 +1452,14 @@ _get_first_arg()
 _count_args()
 {
     local i cword words
-    __reassemble_comp_words_by_ref "$1" words cword
+    __reassemble_comp_words_by_ref "${1-}" words cword
 
     args=1
-    for (( i=1; i < cword; i++ )); do
-        if [[ ${words[i]} != -* && ${words[i-1]} != $2 ||
-              ${words[i]} == $3 ]]; then
-            (( args++ ))
+    for ((i = 1; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && ${words[i - 1]} != ${2-} || \
+            ${words[i]} == ${3-} ]]; then
+            ((args++))
         fi
     done
 }
@@ -1427,39 +1468,53 @@ _count_args()
 #
 _pci_ids()
 {
-    COMPREPLY+=( $(compgen -W \
-        "$(PATH="$PATH:/sbin" lspci -n | awk '{print $3}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "$(PATH="$PATH:/sbin" lspci -n | awk '{print $3}')" -- "$cur"))
 }
 
 # This function completes on USB IDs
 #
 _usb_ids()
 {
-    COMPREPLY+=( $(compgen -W \
-        "$(PATH="$PATH:/sbin" lsusb | awk '{print $6}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "$(PATH="$PATH:/sbin" lsusb | awk '{print $6}')" -- "$cur"))
 }
 
 # CD device names
 _cd_devices()
 {
-    COMPREPLY+=( $(compgen -f -d -X "!*/?([amrs])cd*" -- "${cur:-/dev/}") )
+    COMPREPLY+=($(compgen -f -d -X "!*/?([amrs])cd*" -- "${cur:-/dev/}"))
 }
 
 # DVD device names
 _dvd_devices()
 {
-    COMPREPLY+=( $(compgen -f -d -X "!*/?(r)dvd*" -- "${cur:-/dev/}") )
+    COMPREPLY+=($(compgen -f -d -X "!*/?(r)dvd*" -- "${cur:-/dev/}"))
 }
 
 # TERM environment variable values
 _terms()
 {
-    COMPREPLY+=( $(compgen -W "$({ \
-        command sed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap;
-        { toe -a || toe; } | awk '{ print $1 }';
-        find /{etc,lib,usr/lib,usr/share}/terminfo/? -type f -maxdepth 1 \
-            | awk -F/ '{ print $NF }';
-    } 2>/dev/null)" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$({
+        command sed -ne 's/^\([^[:space:]#|]\{2,\}\)|.*/\1/p' /etc/termcap
+        {
+            toe -a || toe
+        } | awk '{ print $1 }'
+        find /{etc,lib,usr/lib,usr/share}/terminfo/? -type f -maxdepth 1 |
+            awk -F/ '{ print $NF }'
+    } 2>/dev/null)" -- "$cur"))
+}
+
+_bashcomp_try_faketty()
+{
+    if type unbuffer &>/dev/null; then
+        unbuffer -p "$@"
+    elif script --version 2>&1 | command grep -qF util-linux; then
+        # BSD and Solaris "script" do not seem to have required features
+        script -qaefc "$*" /dev/null
+    else
+        "$@" # no can do, fallback
+    fi
 }
 
 # a little help for FreeBSD ports users
@@ -1477,7 +1532,7 @@ _user_at_host()
     if [[ $cur == *@* ]]; then
         _known_hosts_real "$cur"
     else
-        COMPREPLY=( $(compgen -u -S @ -- "$cur") )
+        COMPREPLY=($(compgen -u -S @ -- "$cur"))
         compopt -o nospace
     fi
 }
@@ -1493,9 +1548,9 @@ _known_hosts()
     # NOTE: Using `_known_hosts' as a helper function and passing options
     #       to `_known_hosts' is deprecated: Use `_known_hosts_real' instead.
     local options
-    [[ "$1" == -a || "$2" == -a ]] && options=-a
-    [[ "$1" == -c || "$2" == -c ]] && options+=" -c"
-    _known_hosts_real $options -- "$cur"
+    [[ ${1-} == -a || ${2-} == -a ]] && options=-a
+    [[ ${1-} == -c || ${2-} == -c ]] && options+=" -c"
+    _known_hosts_real ${options-} -- "$cur"
 } # _known_hosts()
 
 # Helper function to locate ssh included files in configs
@@ -1503,18 +1558,24 @@ _known_hosts()
 # includes them recursively, adding each result to the config variable.
 _included_ssh_config_files()
 {
-    [[ $# -lt 1 ]] && \
+    (($# < 1)) &&
         echo "bash_completion: $FUNCNAME: missing mandatory argument CONFIG" >&2
     local configfile i f
     configfile=$1
-    local included=( $(command sed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\{1,\}\([^#%]*\)\(#.*\)\{0,1\}$/\1/p' "${configfile}") )
+
+    local reset=$(shopt -po noglob)
+    set -o noglob
+    local included=($(command sed -ne 's/^[[:blank:]]*[Ii][Nn][Cc][Ll][Uu][Dd][Ee][[:blank:]]\(.*\)$/\1/p' "${configfile}"))
+    $reset
+
+    [[ ${included-} ]] || return
     for i in "${included[@]}"; do
         # Check the origin of $configfile to complete relative included paths on included
         # files according to ssh_config(5):
         #  "[...] Files without absolute paths are assumed to be in ~/.ssh if included in a user
         #   configuration file or /etc/ssh if included from the system configuration file.[...]"
-        if ! [[ "$i" =~ ^\~.*|^\/.* ]]; then
-            if [[ "$configfile" =~ ^\/etc\/ssh.* ]]; then
+        if ! [[ $i =~ ^\~.*|^\/.* ]]; then
+            if [[ $configfile =~ ^\/etc\/ssh.* ]]; then
                 i="/etc/ssh/$i"
             else
                 i="$HOME/.ssh/$i"
@@ -1522,13 +1583,15 @@ _included_ssh_config_files()
         fi
         __expand_tilde_by_ref i
         # In case the expanded variable contains multiple paths
-        for f in ${i}; do
-            if [ -r $f ]; then
-                config+=( "$f" )
+        set +o noglob
+        for f in $i; do
+            if [[ -r $f ]]; then
+                config+=("$f")
                 # The Included file is processed to look for Included files in itself
                 _included_ssh_config_files $f
             fi
         done
+        $reset
     done
 } # _included_ssh_config_files()
 
@@ -1548,9 +1611,9 @@ _included_ssh_config_files()
 # Return: Completions, starting with CWORD, are added to COMPREPLY[]
 _known_hosts_real()
 {
-    local configfile flag prefix OIFS=$IFS
-    local cur user suffix aliases i host ipv4 ipv6
-    local -a kh tmpkh khd config
+    local configfile flag prefix="" ifs=$IFS
+    local cur suffix="" aliases i host ipv4 ipv6
+    local -a kh tmpkh=() khd=() config=()
 
     # TODO remove trailing %foo from entries
 
@@ -1563,75 +1626,96 @@ _known_hosts_real()
             p) prefix=$OPTARG ;;
             4) ipv4=1 ;;
             6) ipv6=1 ;;
+            *)
+                echo "bash_completion: $FUNCNAME: usage error" >&2
+                return 1
+                ;;
         esac
     done
-    [[ $# -lt $OPTIND ]] && \
+    if (($# < OPTIND)); then
         echo "bash_completion: $FUNCNAME: missing mandatory argument CWORD" >&2
-    cur=${!OPTIND}; (( OPTIND += 1 ))
-    [[ $# -ge $OPTIND ]] && \
+        return 1
+    fi
+    cur=${!OPTIND}
+    ((OPTIND += 1))
+    if (($# >= OPTIND)); then
         echo "bash_completion: $FUNCNAME($*): unprocessed arguments:" \
-    $(while [[ $# -ge $OPTIND ]]; do printf '%s\n' ${!OPTIND}; shift; done) >&2
+            "$(while (($# >= OPTIND)); do
+                printf '%s ' ${!OPTIND}
+                shift
+            done)" >&2
+        return 1
+    fi
 
-    [[ $cur == *@* ]] && user=${cur%@*}@ && cur=${cur#*@}
+    [[ $cur == *@* ]] && prefix=$prefix${cur%@*}@ && cur=${cur#*@}
     kh=()
 
     # ssh config files
-    if [[ -n $configfile ]]; then
-        [[ -r $configfile ]] && config+=( "$configfile" )
+    if [[ -v configfile ]]; then
+        [[ -r $configfile ]] && config+=("$configfile")
     else
         for i in /etc/ssh/ssh_config ~/.ssh/config ~/.ssh2/config; do
-            [[ -r $i ]] && config+=( "$i" )
+            [[ -r $i ]] && config+=("$i")
         done
     fi
 
+    local reset=$(shopt -po noglob)
+    set -o noglob
+
     # "Include" keyword in ssh config files
-    for i in "${config[@]}"; do
-        _included_ssh_config_files "$i"
-    done
+    if ((${#config[@]} > 0)); then
+        for i in "${config[@]}"; do
+            _included_ssh_config_files "$i"
+        done
+    fi
 
     # Known hosts files from configs
-    if [[ ${#config[@]} -gt 0 ]]; then
-        local IFS=$'\n' j
+    if ((${#config[@]} > 0)); then
+        local IFS=$'\n'
         # expand paths (if present) to global and user known hosts files
         # TODO(?): try to make known hosts files with more than one consecutive
         #          spaces in their name work (watch out for ~ expansion
         #          breakage! Alioth#311595)
-        tmpkh=( $(awk 'sub("^[ \t]*([Gg][Ll][Oo][Bb][Aa][Ll]|[Uu][Ss][Ee][Rr])[Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][ \t]+", "") { print $0 }' "${config[@]}" | sort -u) )
-        IFS=$OIFS
+        tmpkh=($(awk 'sub("^[ \t]*([Gg][Ll][Oo][Bb][Aa][Ll]|[Uu][Ss][Ee][Rr])[Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][ \t]+", "") { print $0 }' "${config[@]}" | sort -u))
+        IFS=$ifs
+    fi
+    if ((${#tmpkh[@]} != 0)); then
+        local j
         for i in "${tmpkh[@]}"; do
             # First deal with quoted entries...
             while [[ $i =~ ^([^\"]*)\"([^\"]*)\"(.*)$ ]]; do
                 i=${BASH_REMATCH[1]}${BASH_REMATCH[3]}
                 j=${BASH_REMATCH[2]}
                 __expand_tilde_by_ref j # Eval/expand possible `~' or `~user'
-                [[ -r $j ]] && kh+=( "$j" )
+                [[ -r $j ]] && kh+=("$j")
             done
             # ...and then the rest.
             for j in $i; do
                 __expand_tilde_by_ref j # Eval/expand possible `~' or `~user'
-                [[ -r $j ]] && kh+=( "$j" )
+                [[ -r $j ]] && kh+=("$j")
             done
         done
     fi
 
-    if [[ -z $configfile ]]; then
+    if [[ ! -v configfile ]]; then
         # Global and user known_hosts files
         for i in /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
             /etc/known_hosts /etc/known_hosts2 ~/.ssh/known_hosts \
             ~/.ssh/known_hosts2; do
-            [[ -r $i ]] && kh+=( "$i" )
+            [[ -r $i ]] && kh+=("$i")
         done
         for i in /etc/ssh2/knownhosts ~/.ssh2/hostkeys; do
-            [[ -d $i ]] && khd+=( "$i"/*pub )
+            [[ -d $i ]] && khd+=("$i"/*pub)
         done
     fi
 
     # If we have known_hosts files to use
-    if [[ ${#kh[@]} -gt 0 || ${#khd[@]} -gt 0 ]]; then
-        if [[ ${#kh[@]} -gt 0 ]]; then
+    if ((${#kh[@]} + ${#khd[@]} > 0)); then
+        if ((${#kh[@]} > 0)); then
             # https://man.openbsd.org/sshd.8#SSH_KNOWN_HOSTS_FILE_FORMAT
             for i in "${kh[@]}"; do
                 while read -ra tmpkh; do
+                    ((${#tmpkh[@]} == 0)) && continue
                     set -- "${tmpkh[@]}"
                     # Skip entries starting with | (hashed) and # (comment)
                     [[ $1 == [\|\#]* ]] && continue
@@ -1647,78 +1731,84 @@ _known_hosts_real()
                         # Remove trailing ] + optional :port
                         host="${host%]?(:+([0-9]))}"
                         # Add host to candidates
-                        COMPREPLY+=( $host )
+                        COMPREPLY+=($host)
                     done
-                    IFS=$OIFS
+                    IFS=$ifs
                 done <"$i"
             done
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
         fi
-        if [[ ${#khd[@]} -gt 0 ]]; then
+        if ((${#khd[@]} > 0)); then
             # Needs to look for files called
             # .../.ssh2/key_22_<hostname>.pub
             # dont fork any processes, because in a cluster environment,
             # there can be hundreds of hostkeys
-            for i in "${khd[@]}" ; do
-                if [[ "$i" == *key_22_$cur*.pub && -r "$i" ]]; then
+            for i in "${khd[@]}"; do
+                if [[ $i == *key_22_$cur*.pub && -r $i ]]; then
                     host=${i/#*key_22_/}
                     host=${host/%.pub/}
-                    COMPREPLY+=( $host )
+                    COMPREPLY+=($host)
                 fi
             done
         fi
 
         # apply suffix and prefix
-        for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-            COMPREPLY[i]=$prefix$user${COMPREPLY[i]}$suffix
+        for i in ${!COMPREPLY[*]}; do
+            COMPREPLY[i]=$prefix${COMPREPLY[i]}$suffix
         done
     fi
 
     # append any available aliases from ssh config files
-    if [[ ${#config[@]} -gt 0 && -n "$aliases" ]]; then
-        local hosts=$(command sed -ne 's/^[[:blank:]]*[Hh][Oo][Ss][Tt][[:blank:]]\{1,\}\([^#*?%]*\)\(#.*\)\{0,1\}$/\1/p' "${config[@]}")
-        COMPREPLY+=( $(compgen -P "$prefix$user" \
-            -S "$suffix" -W "$hosts" -- "$cur") )
+    if [[ ${#config[@]} -gt 0 && -v aliases ]]; then
+        local -a hosts=($(command sed -ne 's/^[[:blank:]]*[Hh][Oo][Ss][Tt][[:blank:]]\(.*\)$/\1/p' "${config[@]}"))
+        if ((${#hosts[@]} != 0)); then
+            COMPREPLY+=($(compgen -P "$prefix" \
+                -S "$suffix" -W '${hosts[@]%%[*?%]*}' -X '\!*' -- "$cur"))
+        fi
     fi
 
     # Add hosts reported by avahi-browse, if desired and it's available.
-    if [[ ${COMP_KNOWN_HOSTS_WITH_AVAHI:-} ]] && \
+    if [[ ${COMP_KNOWN_HOSTS_WITH_AVAHI-} ]] &&
         type avahi-browse &>/dev/null; then
         # The original call to avahi-browse also had "-k", to avoid lookups
         # into avahi's services DB. We don't need the name of the service, and
         # if it contains ";", it may mistify the result. But on Gentoo (at
         # least), -k wasn't available (even if mentioned in the manpage) some
         # time ago, so...
-        COMPREPLY+=( $(compgen -P "$prefix$user" -S "$suffix" -W \
-            "$(avahi-browse -cpr _workstation._tcp 2>/dev/null | \
-               awk -F';' '/^=/ { print $7 }' | sort -u)" -- "$cur") )
+        COMPREPLY+=($(compgen -P "$prefix" -S "$suffix" -W \
+            "$(avahi-browse -cpr _workstation._tcp 2>/dev/null |
+                awk -F';' '/^=/ { print $7 }' | sort -u)" -- "$cur"))
     fi
 
     # Add hosts reported by ruptime.
-    COMPREPLY+=( $(compgen -W \
-        "$(ruptime 2>/dev/null | awk '!/^ruptime:/ { print $1 }')" \
-        -- "$cur") )
+    if type ruptime &>/dev/null; then
+        COMPREPLY+=($(compgen -W \
+            "$(ruptime 2>/dev/null | awk '!/^ruptime:/ { print $1 }')" \
+            -- "$cur"))
+    fi
 
     # Add results of normal hostname completion, unless
     # `COMP_KNOWN_HOSTS_WITH_HOSTFILE' is set to an empty value.
     if [[ -n ${COMP_KNOWN_HOSTS_WITH_HOSTFILE-1} ]]; then
         COMPREPLY+=(
-            $(compgen -A hostname -P "$prefix$user" -S "$suffix" -- "$cur") )
+            $(compgen -A hostname -P "$prefix" -S "$suffix" -- "$cur"))
     fi
 
-    if [[ $ipv4 ]]; then
-        COMPREPLY=( "${COMPREPLY[@]/*:*$suffix/}" )
+    $reset
+
+    if [[ -v ipv4 ]]; then
+        COMPREPLY=("${COMPREPLY[@]/*:*$suffix/}")
     fi
-    if [[ $ipv6 ]]; then
-        COMPREPLY=( "${COMPREPLY[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}" )
+    if [[ -v ipv6 ]]; then
+        COMPREPLY=("${COMPREPLY[@]/+([0-9]).+([0-9]).+([0-9]).+([0-9])$suffix/}")
     fi
-    if [[ $ipv4 || $ipv6 ]]; then
+    if [[ -v ipv4 || -v ipv6 ]]; then
         for i in "${!COMPREPLY[@]}"; do
-            [[ ${COMPREPLY[i]} ]] || unset -v COMPREPLY[i]
+            [[ ${COMPREPLY[i]} ]] || unset -v "COMPREPLY[i]"
         done
     fi
 
-    __ltrim_colon_completions "$prefix$user$cur"
+    __ltrim_colon_completions "$prefix$cur"
 
 } # _known_hosts_real()
 complete -F _known_hosts traceroute traceroute6 \
@@ -1738,7 +1828,7 @@ _cd()
 
     # Use standard dir completion if no CDPATH or parameter starts with /,
     # ./ or ../
-    if [[ -z "${CDPATH:-}" || "$cur" == ?(.)?(.)/* ]]; then
+    if [[ -z ${CDPATH:-} || $cur == ?(.)?(.)/* ]]; then
         _filedir -d
         return
     fi
@@ -1751,7 +1841,7 @@ _cd()
         # create an array of matched subdirs
         k="${#COMPREPLY[@]}"
         for j in $(compgen -d -- $i/$cur); do
-            if [[ ( $mark_symdirs && -h $j || $mark_dirs && ! -h $j ) && ! -d ${j#$i/} ]]; then
+            if [[ ($mark_symdirs && -L $j || $mark_dirs && ! -L $j) && ! -d ${j#$i/} ]]; then
                 j+="/"
             fi
             COMPREPLY[k++]=${j#$i/}
@@ -1760,9 +1850,9 @@ _cd()
 
     _filedir -d
 
-    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+    if ((${#COMPREPLY[@]} == 1)); then
         i=${COMPREPLY[0]}
-        if [[ "$i" == "$cur" && $i != "*/" ]]; then
+        if [[ $i == "$cur" && $i != "*/" ]]; then
             COMPREPLY[0]="${i}/"
         fi
     fi
@@ -1775,15 +1865,18 @@ else
     complete -F _cd -o nospace cd pushd
 fi
 
-# a wrapper method for the next one, when the offset is unknown
+# A _command_offset wrapper function for use when the offset is unknown.
+# Only intended to be used as a completion function directly associated
+# with a command, not to be invoked from within other completion functions.
+#
 _command()
 {
     local offset i
 
     # find actual offset, as position of the first non-option
     offset=1
-    for (( i=1; i <= COMP_CWORD; i++ )); do
-        if [[ "${COMP_WORDS[i]}" != -* ]]; then
+    for ((i = 1; i <= COMP_CWORD; i++)); do
+        if [[ ${COMP_WORDS[i]} != -* ]]; then
             offset=$i
             break
         fi
@@ -1803,33 +1896,33 @@ _command_offset()
     # find new first word position, then
     # rewrite COMP_LINE and adjust COMP_POINT
     local word_offset=$1 i j
-    for (( i=0; i < $word_offset; i++ )); do
-        for (( j=0; j <= ${#COMP_LINE}; j++ )); do
-            [[ "$COMP_LINE" == "${COMP_WORDS[i]}"* ]] && break
+    for ((i = 0; i < word_offset; i++)); do
+        for ((j = 0; j <= ${#COMP_LINE}; j++)); do
+            [[ $COMP_LINE == "${COMP_WORDS[i]}"* ]] && break
             COMP_LINE=${COMP_LINE:1}
             ((COMP_POINT--))
         done
         COMP_LINE=${COMP_LINE#"${COMP_WORDS[i]}"}
-        ((COMP_POINT-=${#COMP_WORDS[i]}))
+        ((COMP_POINT -= ${#COMP_WORDS[i]}))
     done
 
     # shift COMP_WORDS elements and adjust COMP_CWORD
-    for (( i=0; i <= COMP_CWORD - $word_offset; i++ )); do
-        COMP_WORDS[i]=${COMP_WORDS[i+$word_offset]}
+    for ((i = 0; i <= COMP_CWORD - word_offset; i++)); do
+        COMP_WORDS[i]=${COMP_WORDS[i + word_offset]}
     done
-    for (( i; i <= COMP_CWORD; i++ )); do
+    for ((i; i <= COMP_CWORD; i++)); do
         unset 'COMP_WORDS[i]'
     done
-    ((COMP_CWORD -= $word_offset))
+    ((COMP_CWORD -= word_offset))
 
     COMPREPLY=()
     local cur
     _get_comp_words_by_ref cur
 
-    if [[ $COMP_CWORD -eq 0 ]]; then
+    if ((COMP_CWORD == 0)); then
         local IFS=$'\n'
         compopt -o filenames
-        COMPREPLY=( $(compgen -d -c -- "$cur") )
+        COMPREPLY=($(compgen -d -c -- "$cur"))
     else
         local cmd=${COMP_WORDS[0]} compcmd=${COMP_WORDS[0]}
         local cspec=$(complete -p $cmd 2>/dev/null)
@@ -1847,17 +1940,17 @@ _command_offset()
         fi
 
         if [[ -n $cspec ]]; then
-            if [[ ${cspec#* -F } != $cspec ]]; then
+            if [[ ${cspec#* -F } != "$cspec" ]]; then
                 # complete -F <function>
 
                 # get function name
                 local func=${cspec#*-F }
                 func=${func%% *}
 
-                if [[ ${#COMP_WORDS[@]} -ge 2 ]]; then
-                    $func $cmd "${COMP_WORDS[${#COMP_WORDS[@]}-1]}" "${COMP_WORDS[${#COMP_WORDS[@]}-2]}"
+                if ((${#COMP_WORDS[@]} >= 2)); then
+                    $func $cmd "${COMP_WORDS[-1]}" "${COMP_WORDS[-2]}"
                 else
-                    $func $cmd "${COMP_WORDS[${#COMP_WORDS[@]}-1]}"
+                    $func $cmd "${COMP_WORDS[-1]}"
                 fi
 
                 # restore initial compopts
@@ -1872,9 +1965,9 @@ _command_offset()
             else
                 cspec=${cspec#complete}
                 cspec=${cspec%%$compcmd}
-                COMPREPLY=( $(eval compgen "$cspec" -- '$cur') )
+                COMPREPLY=($(eval compgen "$cspec" -- '$cur'))
             fi
-        elif [[ ${#COMPREPLY[@]} -eq 0 ]]; then
+        elif ((${#COMPREPLY[@]} == 0)); then
             # XXX will probably never happen as long as completion loader loads
             #     *something* for every command thrown at it ($cspec != empty)
             _minimal
@@ -1904,7 +1997,7 @@ _longopt()
     _init_completion -s || return
 
     case "${prev,,}" in
-        --help|--usage|--version)
+        --help | --usage | --version)
             return
             ;;
         --!(no-*)dir*)
@@ -1923,7 +2016,7 @@ _longopt()
                     _filedir -d
                     return
                     ;;
-                *file*|*path*)
+                *file* | *path*)
                     _filedir
                     return
                     ;;
@@ -1933,17 +2026,17 @@ _longopt()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(LC_ALL=C $1 --help 2>&1 | \
-            while read -r line; do \
-                [[ $line =~ --[-A-Za-z0-9]+=? ]] && \
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W "$(LC_ALL=C $1 --help 2>&1 |
+            while read -r line; do
+                [[ $line =~ --[A-Za-z0-9]+([-_][A-Za-z0-9]+)*=? ]] &&
                     printf '%s\n' ${BASH_REMATCH[0]}
-            done)" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ "$1" == *@(rmdir|chroot) ]]; then
+            done)" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ $1 == *@(rmdir|chroot) ]]; then
         _filedir -d
     else
-        [[ "$1" == *mkdir ]] && compopt -o nospace
+        [[ $1 == *mkdir ]] && compopt -o nospace
         _filedir
     fi
 }
@@ -1955,12 +2048,8 @@ complete -F _longopt a2ps awk base64 bash bc bison cat chroot colordiff cp \
     sed seq sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
     texindex touch tr uname unexpand uniq units vdir wc who
 
-# declare only knows -g in bash >= 4.2.
-if [[ ${BASH_VERSINFO[0]} -gt 4 || ${BASH_VERSINFO[1]} -ge 2 ]]; then
-    declare -Ag _xspecs
-else
-    declare -A _xspecs
-fi
+declare -Ag _xspecs
+
 _filedir_xspec()
 {
     local cur prev words cword
@@ -1971,16 +2060,17 @@ _filedir_xspec()
     local IFS=$'\n' xspec=${_xspecs[${1##*/}]} tmp
     local -a toks
 
-    toks=( $(
+    toks=($(
         compgen -d -- "$(quote_readline "$cur")" | {
-        while read -r tmp; do
-            printf '%s\n' $tmp
-        done
+            while read -r tmp; do
+                printf '%s\n' $tmp
+            done
         }
-        ))
+    ))
 
     # Munge xspec to contain uppercase version too
-    # http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306
+    # https://lists.gnu.org/archive/html/bug-bash/2010-09/msg00036.html
+    # news://news.gmane.io/4C940E1C.1010304@case.edu
     eval xspec="${xspec}"
     local matchop=!
     if [[ $xspec == !* ]]; then
@@ -1989,24 +2079,27 @@ _filedir_xspec()
     fi
     xspec="$matchop($xspec|${xspec^^})"
 
-    toks+=( $(
-        eval compgen -f -X "'!$xspec'" -- "\$(quote_readline "\$cur")" | {
-        while read -r tmp; do
-            [[ -n $tmp ]] && printf '%s\n' $tmp
-        done
+    toks+=($(
+        eval compgen -f -X "'!$xspec'" -- '$(quote_readline "$cur")' | {
+            while read -r tmp; do
+                [[ -n $tmp ]] && printf '%s\n' $tmp
+            done
         }
-        ))
+    ))
 
     # Try without filter if it failed to produce anything and configured to
     [[ -n ${COMP_FILEDIR_FALLBACK:-} && ${#toks[@]} -lt 1 ]] && {
-        local reset=$(shopt -po noglob); set -o noglob
-        toks+=( $(compgen -f -- "$(quote_readline "$cur")") )
-        IFS=' '; $reset; IFS=$'\n'
+        local reset=$(shopt -po noglob)
+        set -o noglob
+        toks+=($(compgen -f -- "$(quote_readline "$cur")"))
+        IFS=' '
+        $reset
+        IFS=$'\n'
     }
 
-    if [[ ${#toks[@]} -ne 0 ]]; then
+    if ((${#toks[@]} != 0)); then
         compopt -o filenames
-        COMPREPLY=( "${toks[@]}" )
+        COMPREPLY=("${toks[@]}")
     fi
 }
 
@@ -2020,7 +2113,7 @@ _install_xspec()
 }
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
 _install_xspec '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat lbunzip2 lbzcat
-_install_xspec '!*.@(zip|[egjswx]ar|exe|pk3|wsz|zargo|xpi|s[tx][cdiw]|sx[gm]|o[dt][tspgfc]|od[bm]|oxt|epub|apk|aab|ipa|do[ct][xm]|p[op]t[mx]|xl[st][xm]|pyz|whl)' unzip zipinfo
+_install_xspec '!*.@(zip|[aegjswx]ar|exe|pk3|wsz|zargo|xpi|s[tx][cdiw]|sx[gm]|o[dt][tspgfc]|od[bm]|oxt|epub|apk|aab|ipa|do[ct][xm]|p[op]t[mx]|xl[st][xm]|pyz|whl)' unzip zipinfo
 _install_xspec '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
 _install_xspec '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat
@@ -2046,7 +2139,7 @@ _install_xspec '!*.texi*' makeinfo texi2html
 _install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi xetex xelatex luatex lualatex
 _install_xspec '!*.mp3' mpg123 mpg321 madplay
 _install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' xine aaxine fbxine
-_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon
+_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|web[am]|WEB[AM]|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|mkv|MKV|og[agmv]|OG[AGMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|mts|MTS|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.@(crdownload|part))' kaffeine dragon totem
 _install_xspec '!*.@(avi|asf|wmv)' aviplay
 _install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
 _install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
@@ -2086,37 +2179,48 @@ _minimal()
     _filedir
 }
 # Complete the empty string to allow completion of '>', '>>', and '<' on < 4.3
-# http://lists.gnu.org/archive/html/bug-bash/2012-01/msg00045.html
+# https://lists.gnu.org/archive/html/bug-bash/2012-01/msg00045.html
 complete -F _minimal ''
 
-
 __load_completion()
 {
-    local -a dirs=( ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions )
-    local OIFS=$IFS IFS=: dir cmd="${1##*/}" compfile
+    local -a dirs=(${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions)
+    local ifs=$IFS IFS=: dir cmd="${1##*/}" compfile
     [[ -n $cmd ]] || return 1
     for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
-        dirs+=( $dir/bash-completion/completions )
+        dirs+=($dir/bash-completion/completions)
     done
-    IFS=$OIFS
+    IFS=$ifs
 
     if [[ $BASH_SOURCE == */* ]]; then
-        dirs+=( "${BASH_SOURCE%/*}/completions" )
+        dirs+=("${BASH_SOURCE%/*}/completions")
     else
-        dirs+=( ./completions )
+        dirs+=(./completions)
+    fi
+
+    local backslash=
+    if [[ $cmd == \\* ]]; then
+        cmd="${cmd:1}"
+        # If we already have a completion for the "real" command, use it
+        $(complete -p "$cmd" 2>/dev/null || echo false) "\\$cmd" && return 0
+        backslash=\\
     fi
 
     for dir in "${dirs[@]}"; do
-        [[ -d "$dir" ]] || continue
+        [[ -d $dir ]] || continue
         for compfile in "$cmd" "$cmd.bash" "_$cmd"; do
             compfile="$dir/$compfile"
             # Avoid trying to source dirs; https://bugzilla.redhat.com/903540
-            [[ -f "$compfile" ]] && . "$compfile" &>/dev/null && return 0
+            if [[ -f $compfile ]] && . "$compfile" &>/dev/null; then
+                [[ $backslash ]] && $(complete -p "$cmd") "\\$cmd"
+                return 0
+            fi
         done
     done
 
     # Look up simple "xspec" completions
-    [[ "${_xspecs[$cmd]}" ]] && complete -F _filedir_xspec "$cmd" && return 0
+    [[ -v _xspecs[$cmd] ]] &&
+        complete -F _filedir_xspec "$cmd" "$backslash$cmd" && return 0
 
     return 1
 }
@@ -2132,7 +2236,7 @@ _completion_loader()
     # Need to define *something*, otherwise there will be no completion at all.
     complete -F _minimal -- "$cmd" && return 124
 } &&
-complete -D -F _completion_loader
+    complete -D -F _completion_loader
 
 # Function for loading and calling functions from dynamically loaded
 # completion files that may not have been sourced yet.
@@ -2143,9 +2247,7 @@ _xfunc()
     set -- "$@"
     local srcfile=$1
     shift
-    declare -F $1 &>/dev/null || {
-        __load_completion "$srcfile"
-    }
+    declare -F $1 &>/dev/null || __load_completion "$srcfile"
     "$@"
 }
 
@@ -2153,16 +2255,16 @@ _xfunc()
 compat_dir=${BASH_COMPLETION_COMPAT_DIR:-/etc/bash_completion.d}
 if [[ -d $compat_dir && -r $compat_dir && -x $compat_dir ]]; then
     for i in "$compat_dir"/*; do
-        [[ ${i##*/} != @($_backup_glob|Makefile*|$_blacklist_glob) \
-            && -f $i && -r $i ]] && . "$i"
+        [[ ${i##*/} != @($_backup_glob|Makefile*|$_blacklist_glob) && -f \
+        $i && -r $i ]] && . "$i"
     done
 fi
 unset compat_dir i _blacklist_glob
 
 # source user completion file
 user_completion=${BASH_COMPLETION_USER_FILE:-~/.bash_completion}
-[[ ${BASH_SOURCE[0]} != $user_completion && -r $user_completion ]] \
-    && . $user_completion
+[[ ${BASH_SOURCE[0]} != "$user_completion" && -r $user_completion && -f $user_completion ]] &&
+    . $user_completion
 unset user_completion
 
 unset -f have
diff --git a/msys2/usr/share/bash-completion/completions/2to3 b/msys2/usr/share/bash-completion/completions/2to3
index 049ba65b2..7c5b3303a 100644
--- a/msys2/usr/share/bash-completion/completions/2to3
+++ b/msys2/usr/share/bash-completion/completions/2to3
@@ -6,19 +6,19 @@ _2to3()
     _init_completion -s || return
 
     case $prev in
-        -h|--help|--add-suffix)
+        -h | --help | --add-suffix)
             return
             ;;
-        -f|--fix|-x|--nofix)
-            COMPREPLY=( $(compgen -W \
-                "$($1 --list-fixes 2>/dev/null | command sed -e 1d)" -- "$cur") )
+        -f | --fix | -x | --nofix)
+            COMPREPLY=($(compgen -W \
+                "$($1 --list-fixes 2>/dev/null | command sed -e 1d)" -- "$cur"))
             return
             ;;
-        -j|--processes)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        -j | --processes)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        -o|--output-dir)
+        -o | --output-dir)
             _filedir -d
             return
             ;;
@@ -27,13 +27,13 @@ _2to3()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir py
 } &&
-complete -F _2to3 2to3
+    complete -F _2to3 2to3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/7z b/msys2/usr/share/bash-completion/completions/7z
index 96a64f1f3..a8acbc593 100644
--- a/msys2/usr/share/bash-completion/completions/7z
+++ b/msys2/usr/share/bash-completion/completions/7z
@@ -5,8 +5,8 @@ _7z()
     local cur prev words cword
     _init_completion -n = || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'a b d e l t u x' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'a b d e l t u x' -- "$cur"))
         return
     fi
 
@@ -15,7 +15,7 @@ _7z()
 
     case $cur in
         -ao*)
-            COMPREPLY=( $(compgen -P${cur:0:3} -W 'a s t u' -- "${cur:3}") )
+            COMPREPLY=($(compgen -P${cur:0:3} -W 'a s t u' -- "${cur:3}"))
             return
             ;;
         -?(a)[ix]*)
@@ -26,74 +26,79 @@ _7z()
                 opt=${cur:0:2} cur=${cur:2}
             fi
             if [[ $cur != *[@\!]* ]]; then
-                COMPREPLY=( $(compgen -P$opt -W '@ ! r@ r-@ r0@ r! r-! r0!' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -P$opt -W '@ ! r@ r-@ r0@ r! r-! r0!' \
+                    -- "$cur"))
             elif [[ $cur == ?(r@(-|0|))@* ]]; then
-                local IFS=$' \t\n' reset=$(shopt -po noglob); set -o noglob
-                COMPREPLY=( $(compgen -P"${opt}${cur%%@*}@" -f -- "${cur#*@}") )
+                local IFS=$' \t\n' reset=$(shopt -po noglob)
+                set -o noglob
+                COMPREPLY=($(compgen -P"${opt}${cur%%@*}@" -f -- "${cur#*@}"))
                 $reset
                 compopt -o filenames
             fi
             return
             ;;
-        -mhe=*|-mhc=*|-ms=*|-mt=*)
-            COMPREPLY=( $(compgen -W 'on off' -- "${cur#*=}") )
+        -mhe=* | -mhc=* | -ms=* | -mt=*)
+            COMPREPLY=($(compgen -W 'on off' -- "${cur#*=}"))
             return
             ;;
         -mx=*)
-            COMPREPLY=( $(compgen -W '0 1 3 5 7 9' -- "${cur#*=}") )
+            COMPREPLY=($(compgen -W '0 1 3 5 7 9' -- "${cur#*=}"))
             return
             ;;
-        -o*|-w?*)
-            local IFS=$' \t\n' reset=$(shopt -po noglob); set -o noglob
-            COMPREPLY=( $(compgen -P${cur:0:2} -S/ -d -- "${cur:2}") )
+        -o* | -w?*)
+            local reset=$(shopt -po noglob)
+            set -o noglob
+            compopt -o filenames
+            local ifs=$IFS IFS=$'\n'
+            COMPREPLY=($(compgen -d -P${cur:0:2} -S/ -- "${cur:2}"))
+            IFS=$ifs
             $reset
-            compopt -o nospace -o filenames
+            compopt -o nospace
             return
             ;;
         -r?*)
-            COMPREPLY=( $(compgen -P${cur:0:2} -W '- 0' -- "${cur:2}") )
+            COMPREPLY=($(compgen -P${cur:0:2} -W '- 0' -- "${cur:2}"))
             return
             ;;
         -scs*)
-            COMPREPLY=( $(compgen -P${cur:0:4} -W 'UTF-8 WIN DOS' \
-                -- "${cur:4}") )
+            COMPREPLY=($(compgen -P${cur:0:4} -W 'UTF-8 WIN DOS' \
+                -- "${cur:4}"))
             return
             ;;
         -ssc?*)
-            COMPREPLY=( $(compgen -P${cur:0:4} -W '-' -- "${cur:4}") )
+            COMPREPLY=($(compgen -P${cur:0:4} -W '-' -- "${cur:4}"))
             return
             ;;
         -t*)
             if [[ $mode == w ]]; then
-                COMPREPLY=( $(compgen -P${cur:0:2} -W '7z bzip2 gzip swfc
-                    tar wim xz zip' -- "${cur:2}") )
+                COMPREPLY=($(compgen -P${cur:0:2} -W '7z bzip2 gzip swfc
+                    tar wim xz zip' -- "${cur:2}"))
             else
-                COMPREPLY=( $(compgen -P${cur:0:2} -W '7z apm arj bzip2 cab
+                COMPREPLY=($(compgen -P${cur:0:2} -W '7z apm arj bzip2 cab
                     chm cpio cramfs deb dmg elf fat flv gzip hfs iso lzh lzma
                     lzma86 macho mbr mslz mub nsis ntfs pe ppmd rar rpm
                     squashfs swf swfc tar udf vhd wim xar xz z zip' \
-                    -- "${cur:2}") )
+                    -- "${cur:2}"))
             fi
             return
             ;;
-        -m*=*|-p*|-u*|-v*)
+        -m*=* | -p* | -u* | -v*)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-ai -an -ao -ax -bd -i -m{x,s,f,he,hc,mt}=
+        COMPREPLY=($(compgen -W '-ai -an -ao -ax -bd -i -m{x,s,f,he,hc,mt}=
             -o -p -r -scs -sfx -si -slp -slt -so -ssc -t -u -v -w -x -y' \
-            -- "$cur") )
-        [[ $COMPREPLY == -@(an|bd|sfx|si|slt|so|ssc|[rwy]) ]] ||
+            -- "$cur"))
+        [[ ${COMPREPLY-} == -@(an|bd|sfx|si|slt|so|ssc|[rwy]) ]] ||
             compopt -o nospace
         return
     fi
 
     local args
     _count_args =
-    if [[ $args -eq 2 ]]; then
+    if ((args == 2)); then
         _filedir_xspec unzip
         # TODO: parsing 7z i output?
         # - how to figure out if the format is input or output?
@@ -109,15 +114,15 @@ _7z()
     else
         if [[ ${words[1]} == d ]]; then
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -W "$(printf '%s\n' $($1 l ${words[2]} \
+            COMPREPLY=($(compgen -W "$(printf '%s\n' "$($1 l ${words[2]} \
                 -slt 2>/dev/null | command sed -n '/^Path =/s/^Path = \(.*\)$/\1/p' \
-                2>/dev/null | tail -n+2))" -- "$cur") )
+                2>/dev/null | tail -n+2)")" -- "$cur"))
             compopt -o filenames
         else
             _filedir
         fi
     fi
 } &&
-complete -F _7z 7z 7za
+    complete -F _7z 7z 7za
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/7za b/msys2/usr/share/bash-completion/completions/7za
index 96a64f1f3..a8acbc593 100644
--- a/msys2/usr/share/bash-completion/completions/7za
+++ b/msys2/usr/share/bash-completion/completions/7za
@@ -5,8 +5,8 @@ _7z()
     local cur prev words cword
     _init_completion -n = || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'a b d e l t u x' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'a b d e l t u x' -- "$cur"))
         return
     fi
 
@@ -15,7 +15,7 @@ _7z()
 
     case $cur in
         -ao*)
-            COMPREPLY=( $(compgen -P${cur:0:3} -W 'a s t u' -- "${cur:3}") )
+            COMPREPLY=($(compgen -P${cur:0:3} -W 'a s t u' -- "${cur:3}"))
             return
             ;;
         -?(a)[ix]*)
@@ -26,74 +26,79 @@ _7z()
                 opt=${cur:0:2} cur=${cur:2}
             fi
             if [[ $cur != *[@\!]* ]]; then
-                COMPREPLY=( $(compgen -P$opt -W '@ ! r@ r-@ r0@ r! r-! r0!' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -P$opt -W '@ ! r@ r-@ r0@ r! r-! r0!' \
+                    -- "$cur"))
             elif [[ $cur == ?(r@(-|0|))@* ]]; then
-                local IFS=$' \t\n' reset=$(shopt -po noglob); set -o noglob
-                COMPREPLY=( $(compgen -P"${opt}${cur%%@*}@" -f -- "${cur#*@}") )
+                local IFS=$' \t\n' reset=$(shopt -po noglob)
+                set -o noglob
+                COMPREPLY=($(compgen -P"${opt}${cur%%@*}@" -f -- "${cur#*@}"))
                 $reset
                 compopt -o filenames
             fi
             return
             ;;
-        -mhe=*|-mhc=*|-ms=*|-mt=*)
-            COMPREPLY=( $(compgen -W 'on off' -- "${cur#*=}") )
+        -mhe=* | -mhc=* | -ms=* | -mt=*)
+            COMPREPLY=($(compgen -W 'on off' -- "${cur#*=}"))
             return
             ;;
         -mx=*)
-            COMPREPLY=( $(compgen -W '0 1 3 5 7 9' -- "${cur#*=}") )
+            COMPREPLY=($(compgen -W '0 1 3 5 7 9' -- "${cur#*=}"))
             return
             ;;
-        -o*|-w?*)
-            local IFS=$' \t\n' reset=$(shopt -po noglob); set -o noglob
-            COMPREPLY=( $(compgen -P${cur:0:2} -S/ -d -- "${cur:2}") )
+        -o* | -w?*)
+            local reset=$(shopt -po noglob)
+            set -o noglob
+            compopt -o filenames
+            local ifs=$IFS IFS=$'\n'
+            COMPREPLY=($(compgen -d -P${cur:0:2} -S/ -- "${cur:2}"))
+            IFS=$ifs
             $reset
-            compopt -o nospace -o filenames
+            compopt -o nospace
             return
             ;;
         -r?*)
-            COMPREPLY=( $(compgen -P${cur:0:2} -W '- 0' -- "${cur:2}") )
+            COMPREPLY=($(compgen -P${cur:0:2} -W '- 0' -- "${cur:2}"))
             return
             ;;
         -scs*)
-            COMPREPLY=( $(compgen -P${cur:0:4} -W 'UTF-8 WIN DOS' \
-                -- "${cur:4}") )
+            COMPREPLY=($(compgen -P${cur:0:4} -W 'UTF-8 WIN DOS' \
+                -- "${cur:4}"))
             return
             ;;
         -ssc?*)
-            COMPREPLY=( $(compgen -P${cur:0:4} -W '-' -- "${cur:4}") )
+            COMPREPLY=($(compgen -P${cur:0:4} -W '-' -- "${cur:4}"))
             return
             ;;
         -t*)
             if [[ $mode == w ]]; then
-                COMPREPLY=( $(compgen -P${cur:0:2} -W '7z bzip2 gzip swfc
-                    tar wim xz zip' -- "${cur:2}") )
+                COMPREPLY=($(compgen -P${cur:0:2} -W '7z bzip2 gzip swfc
+                    tar wim xz zip' -- "${cur:2}"))
             else
-                COMPREPLY=( $(compgen -P${cur:0:2} -W '7z apm arj bzip2 cab
+                COMPREPLY=($(compgen -P${cur:0:2} -W '7z apm arj bzip2 cab
                     chm cpio cramfs deb dmg elf fat flv gzip hfs iso lzh lzma
                     lzma86 macho mbr mslz mub nsis ntfs pe ppmd rar rpm
                     squashfs swf swfc tar udf vhd wim xar xz z zip' \
-                    -- "${cur:2}") )
+                    -- "${cur:2}"))
             fi
             return
             ;;
-        -m*=*|-p*|-u*|-v*)
+        -m*=* | -p* | -u* | -v*)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-ai -an -ao -ax -bd -i -m{x,s,f,he,hc,mt}=
+        COMPREPLY=($(compgen -W '-ai -an -ao -ax -bd -i -m{x,s,f,he,hc,mt}=
             -o -p -r -scs -sfx -si -slp -slt -so -ssc -t -u -v -w -x -y' \
-            -- "$cur") )
-        [[ $COMPREPLY == -@(an|bd|sfx|si|slt|so|ssc|[rwy]) ]] ||
+            -- "$cur"))
+        [[ ${COMPREPLY-} == -@(an|bd|sfx|si|slt|so|ssc|[rwy]) ]] ||
             compopt -o nospace
         return
     fi
 
     local args
     _count_args =
-    if [[ $args -eq 2 ]]; then
+    if ((args == 2)); then
         _filedir_xspec unzip
         # TODO: parsing 7z i output?
         # - how to figure out if the format is input or output?
@@ -109,15 +114,15 @@ _7z()
     else
         if [[ ${words[1]} == d ]]; then
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -W "$(printf '%s\n' $($1 l ${words[2]} \
+            COMPREPLY=($(compgen -W "$(printf '%s\n' "$($1 l ${words[2]} \
                 -slt 2>/dev/null | command sed -n '/^Path =/s/^Path = \(.*\)$/\1/p' \
-                2>/dev/null | tail -n+2))" -- "$cur") )
+                2>/dev/null | tail -n+2)")" -- "$cur"))
             compopt -o filenames
         else
             _filedir
         fi
     fi
 } &&
-complete -F _7z 7z 7za
+    complete -F _7z 7z 7za
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_adb b/msys2/usr/share/bash-completion/completions/_adb
index 52b2cb96e..e8ebab132 100644
--- a/msys2/usr/share/bash-completion/completions/_adb
+++ b/msys2/usr/share/bash-completion/completions/_adb
@@ -5,9 +5,9 @@
 
 _adb_command_usage()
 {
-    COMPREPLY=( $(compgen -W \
+    COMPREPLY=($(compgen -W \
         '$("$1" help 2>&1 | command grep "^ *\(adb \)\? *$2 " \
-            | command sed -e "s/[]|[]/\n/g" | _parse_help -)' -- "$cur") )
+            | command sed -e "s/[]|[]/\n/g" | _parse_help -)' -- "$cur"))
 }
 
 _adb()
@@ -16,7 +16,7 @@ _adb()
     _init_completion || return
 
     case $prev in
-        -s|-p|--algo|--key|--iv)
+        -s | -p | --algo | --key | --iv)
             return
             ;;
         -f)
@@ -26,23 +26,23 @@ _adb()
     esac
 
     local cmd i
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && "${words[i-1]}" != -[sp] ]]; then
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} != -* && ${words[i - 1]} != -[sp] ]]; then
             cmd="${words[i]}"
             break
         fi
     done
 
-    if [[ ! "$cmd" ]]; then
+    if [[ ! -v cmd ]]; then
         local tmp=()
         if [[ ! $cur || $cur == -* ]]; then
-            tmp+=( $(compgen -W '$(_parse_help "$1" help)' -- "$cur") )
+            tmp+=($(compgen -W '$(_parse_help "$1" help)' -- "$cur"))
         fi
         if [[ ! $cur || $cur != -* ]]; then
-            tmp+=( $($1 help 2>&1 | awk '$1 == "adb" { print $2 }') )
-            tmp+=( devices connect disconnect sideload )
+            tmp+=($($1 help 2>&1 | awk '$1 == "adb" { print $2 }'))
+            tmp+=(devices connect disconnect sideload)
         fi
-        COMPREPLY=( $(compgen -W '${tmp[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${tmp[@]}' -- "$cur"))
         return
     fi
 
@@ -51,19 +51,19 @@ _adb()
     _adb_command_usage "$1" $cmd
 
     case $cmd in
-        push|restore|sideload)
+        push | restore | sideload)
             _filedir
             ;;
         forward)
-            COMPREPLY=( $(compgen -W \
+            COMPREPLY=($(compgen -W \
                 '$("$1" help 2>&1 | command sed -ne "s/^ *adb  *forward  *-/-/p" | \
-                    _parse_help -)' -- "$cur") )
+                    _parse_help -)' -- "$cur"))
             ;;
         reboot)
-            COMPREPLY=( $(compgen -W 'bootloader recovery' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bootloader recovery' -- "$cur"))
             ;;
     esac
 } &&
-complete -F _adb adb
+    complete -F _adb adb
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_cal b/msys2/usr/share/bash-completion/completions/_cal
index ed304aa71..1eec2674e 100644
--- a/msys2/usr/share/bash-completion/completions/_cal
+++ b/msys2/usr/share/bash-completion/completions/_cal
@@ -11,28 +11,28 @@ _cal()
     case $prev in
         -m)
             if [[ $OSTYPE == *bsd* ]]; then
-                COMPREPLY=( $(compgen -W '{1..12}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
                 return
             fi
             ;;
         -s)
             [[ $OSTYPE == *bsd* ]] && return
             ;;
-        -A|-B|-d|-H)
+        -A | -B | -d | -H)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     local args
     _count_args
-    [[ $args -eq 1 ]] && COMPREPLY=( $(compgen -W '{1..12}' -- "$cur") )
+    ((args == 1)) && COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
 } &&
-complete -F _cal cal ncal
+    complete -F _cal cal ncal
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_chsh b/msys2/usr/share/bash-completion/completions/_chsh
index 64ce5a1b1..8f8a8077d 100644
--- a/msys2/usr/share/bash-completion/completions/_chsh
+++ b/msys2/usr/share/bash-completion/completions/_chsh
@@ -9,23 +9,23 @@ _chsh()
     _init_completion || return
 
     case $prev in
-        --list-shells|--help|-v|--version)
+        --list-shells | --help | -v | --version)
             return
             ;;
-        -s|--shell)
+        -s | --shell)
             _shells
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
     else
         _allowed_users
     fi
 
 } &&
-complete -F _chsh chsh
+    complete -F _chsh chsh
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_dmesg b/msys2/usr/share/bash-completion/completions/_dmesg
index 1dff7db20..830665411 100644
--- a/msys2/usr/share/bash-completion/completions/_dmesg
+++ b/msys2/usr/share/bash-completion/completions/_dmesg
@@ -11,23 +11,23 @@ _dmesg()
     _init_completion || return
 
     case $prev in
-        -h|--help|-V|--version|-s|--buffer-size|-M|-N)
+        -h | --help | -V | --version | -s | --buffer-size | -M | -N)
             return
             ;;
-        -f|--facility)
-            COMPREPLY=( $(compgen -W 'kern user mail daemon auth syslog lpr
-                news' -- "$cur") )
+        -f | --facility)
+            COMPREPLY=($(compgen -W 'kern user mail daemon auth syslog lpr
+                news' -- "$cur"))
             return
             ;;
-        -l|--level|-n|--console-level)
-            COMPREPLY=( $(compgen -W '{1..8}' -- "$cur") )
+        -l | --level | -n | --console-level)
+            COMPREPLY=($(compgen -W '{1..8}' -- "$cur"))
             return
             ;;
     esac
 
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
 } &&
-complete -F _dmesg dmesg
+    complete -F _dmesg dmesg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_eject b/msys2/usr/share/bash-completion/completions/_eject
index 3c5838dc9..52168f741 100644
--- a/msys2/usr/share/bash-completion/completions/_eject
+++ b/msys2/usr/share/bash-completion/completions/_eject
@@ -9,17 +9,17 @@ _eject()
     _init_completion || return
 
     case $prev in
-        -h|--help|-V|--version|-c|--changerslot|-x|--cdspeed)
+        -h | --help | -V | --version | -c | --changerslot | -x | --cdspeed)
             return
             ;;
-        -a|--auto|-i|--manualeject)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        -a | --auto | -i | --manualeject)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     elif [[ $prev == @(-d|--default) ]]; then
         return
@@ -28,6 +28,6 @@ _eject()
     _cd_devices
     _dvd_devices
 } &&
-complete -F _eject eject
+    complete -F _eject eject
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_hexdump b/msys2/usr/share/bash-completion/completions/_hexdump
index a3c2a839c..785f5976c 100644
--- a/msys2/usr/share/bash-completion/completions/_hexdump
+++ b/msys2/usr/share/bash-completion/completions/_hexdump
@@ -9,7 +9,7 @@ _hexdump()
     _init_completion || return
 
     case $prev in
-        -V|-e|-n|-s)
+        -V | -e | -n | -s)
             return
             ;;
         -f)
@@ -20,12 +20,12 @@ _hexdump()
 
     if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _hexdump hexdump hd
+    complete -F _hexdump hexdump hd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_hwclock b/msys2/usr/share/bash-completion/completions/_hwclock
index 86a293460..ef437a26e 100644
--- a/msys2/usr/share/bash-completion/completions/_hwclock
+++ b/msys2/usr/share/bash-completion/completions/_hwclock
@@ -9,18 +9,18 @@ _hwclock()
     _init_completion || return
 
     case $prev in
-        -h|--help|-V|--version|--date|--epoch)
+        -h | --help | -V | --version | --date | --epoch)
             return
             ;;
-        -f|--rtc|--adjfile)
+        -f | --rtc | --adjfile)
             _filedir
             return
             ;;
     esac
 
     COMPREPLY=(
-        $(PATH="$PATH:/sbin" compgen -W '$(_parse_help "$1")' -- "$cur") )
+        $(PATH="$PATH:/sbin" compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _hwclock hwclock
+    complete -F _hwclock hwclock
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_ionice b/msys2/usr/share/bash-completion/completions/_ionice
index 1aa51f2ab..b0d96a13a 100644
--- a/msys2/usr/share/bash-completion/completions/_ionice
+++ b/msys2/usr/share/bash-completion/completions/_ionice
@@ -9,7 +9,7 @@ _ionice()
     _init_completion || return
 
     local offset=0 i
-    for (( i=1; i <= cword; i++ )); do
+    for ((i = 1; i <= cword; i++)); do
         case ${words[i]} in
             -h)
                 return
@@ -18,8 +18,8 @@ _ionice()
                 offset=0
                 break
                 ;;
-            -c|-n)
-                (( i++ ))
+            -c | -n)
+                ((i++))
                 continue
                 ;;
             -*)
@@ -30,18 +30,18 @@ _ionice()
         break
     done
 
-    if [[ $offset -gt 0 ]]; then
+    if ((offset > 0)); then
         _command_offset $offset
         return
     fi
 
     case $prev in
         -c)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
         -n)
-            COMPREPLY=( $(compgen -W '{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
             return
             ;;
         -p)
@@ -51,10 +51,10 @@ _ionice()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 } &&
-complete -F _ionice ionice
+    complete -F _ionice ionice
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_look b/msys2/usr/share/bash-completion/completions/_look
index 074e924a8..9788dec5a 100644
--- a/msys2/usr/share/bash-completion/completions/_look
+++ b/msys2/usr/share/bash-completion/completions/_look
@@ -8,10 +8,10 @@ _look()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur"))
     fi
 } &&
-complete -F _look -o default look
+    complete -F _look -o default look
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_mock b/msys2/usr/share/bash-completion/completions/_mock
index e596a4c45..b468148d1 100644
--- a/msys2/usr/share/bash-completion/completions/_mock
+++ b/msys2/usr/share/bash-completion/completions/_mock
@@ -11,27 +11,27 @@ _mock()
     local plugins='tmpfs root_cache yum_cache bind_mount ccache'
     local cfgdir=/etc/mock count=0 i
 
-    for i in "${words[@]}" ; do
-        [[ $count -eq $cword ]] && break
-        if [[ "$i" == --configdir ]]; then
-            cfgdir="${words[((count+1))]}"
-        elif [[ "$i" == --configdir=* ]]; then
+    for i in "${words[@]}"; do
+        ((count == cword)) && break
+        if [[ $i == --configdir ]]; then
+            cfgdir="${words[count + 1]}"
+        elif [[ $i == --configdir=* ]]; then
             cfgdir=${i/*=/}
         fi
-        (( count++ ))
+        ((count++))
     done
 
     case $prev in
-        -h|--help|--copyin|--copyout|--arch|-D|--define|--with|--without|\
-        --uniqueext|--rpmbuild_timeout|--sources|--cwd)
+        -h | --help | --copyin | --copyout | --arch | -D | --define | --with | --without | \
+            --uniqueext | --rpmbuild_timeout | --sources | --cwd)
             return
             ;;
-        -r|--root)
-            COMPREPLY=( $(compgen -W "$(command ls $cfgdir)" -- "$cur") )
-            COMPREPLY=( ${COMPREPLY[@]/%.cfg/} )
+        -r | --root)
+            COMPREPLY=($(compgen -W "$(command ls $cfgdir)" -- "$cur"))
+            COMPREPLY=(${COMPREPLY[@]/%.cfg/})
             return
             ;;
-        --configdir|--resultdir)
+        --configdir | --resultdir)
             _filedir -d
             return
             ;;
@@ -44,26 +44,26 @@ _mock()
             # (e.g. ix86 chroot builds in x86_64 mock host)
             # This would actually depend on what the target root
             # can be used to build for...
-            COMPREPLY=( $(compgen -W "$(command rpm --showrc | \
+            COMPREPLY=($(compgen -W "$(command rpm --showrc |
                 command sed -ne 's/^\s*compatible\s\s*archs\s*:\s*\(.*\)/\1/i p')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
-        --enable-plugin|--disable-plugin)
-            COMPREPLY=( $(compgen -W "$plugins" -- "$cur") )
+        --enable-plugin | --disable-plugin)
+            COMPREPLY=($(compgen -W "$plugins" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir '@(?(no)src.r|s)pm'
     fi
 } &&
-complete -F _mock mock
+    complete -F _mock mock
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_modules b/msys2/usr/share/bash-completion/completions/_modules
index 36fffdf60..4f7c4d481 100644
--- a/msys2/usr/share/bash-completion/completions/_modules
+++ b/msys2/usr/share/bash-completion/completions/_modules
@@ -5,8 +5,8 @@
 #
 # Completion for Environment Modules `module' alias.
 #
-# See http://sourceforge.net/projects/modules/
-#     http://modules.sourceforge.net/
+# See https://sourceforge.net/projects/modules/
+#     https://modules.sourceforge.net/
 #
 # There are several versions of modules that are commonly used.  Older
 # Cray UNICOS systems and many other sites use 2.2.2b.  The latest GPL'd
@@ -21,64 +21,65 @@
 # being sourced before it and thus before the `module' alias has been defined.
 [ -f /etc/profile.d/modules.sh ] || return 1
 
-_module_list ()
+_module_list()
 {
     local modules="$(command sed 's/:/ /g' <<<$LOADEDMODULES | sort)"
     compgen -W "$modules" -- $1
 }
 
-_module_path ()
+_module_path()
 {
     local modules="$(command sed 's/:/ /g' <<<$MODULEPATH | sort)"
     compgen -W "$modules" -- $1
 }
 
-_module_avail ()
+_module_avail()
 {
-    local modules="$(\
-        module avail 2>&1 | \
-        command grep -E -v '^(-|$)' | \
-        xargs printf '%s\n' | command sed -e 's/(default)//g' | sort)"
+    local modules="$(
+        module avail 2>&1 |
+            command grep -E -v '^(-|$)' |
+            xargs printf '%s\n' | command sed -e 's/(default)//g' | sort
+    )"
 
     compgen -W "$modules" -- $1
 }
 
 # A completion function for the module alias
-_module ()
+_module()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         # First parameter on line -- we expect it to be a mode selection
 
         local options
-        options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' | \
-                   awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
+        options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' |
+            awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
 
-        COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+        COMPREPLY=($(compgen -W "$options" -- "$cur"))
 
-    elif [[ $cword -eq 2 ]]; then
+    elif ((cword == 2)); then
         case $prev in
-            add|display|help|load|show|whatis)
-                COMPREPLY=( $(_module_avail "$cur") )
+            add | display | help | load | show | whatis)
+                COMPREPLY=($(_module_avail "$cur"))
                 ;;
-            rm|switch|swap|unload|update)
-                COMPREPLY=( $(_module_list "$cur") )
+            rm | switch | swap | unload | update)
+                COMPREPLY=($(_module_list "$cur"))
                 ;;
             unuse)
-                COMPREPLY=( $(_module_path "$cur") )
+                COMPREPLY=($(_module_path "$cur"))
                 ;;
         esac
-    elif [[ $cword -eq 3 ]]; then
+    elif ((cword == 3)); then
         case ${words[1]} in
-            swap|switch)
-                COMPREPLY=( $(_module_avail "$cur") )
+            swap | switch)
+                COMPREPLY=($(_module_avail "$cur"))
                 ;;
         esac
     fi
 
 } &&
-complete -F _module -o default module
+    complete -F _module -o default module
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_mount b/msys2/usr/share/bash-completion/completions/_mount
index 494f97ba9..85f549077 100644
--- a/msys2/usr/share/bash-completion/completions/_mount
+++ b/msys2/usr/share/bash-completion/completions/_mount
@@ -22,44 +22,44 @@ _mount()
     local sm host
 
     case $prev in
-        -t|--types)
+        -t | --types)
             _fstypes
             return
             ;;
     esac
 
-    [[ "$cur" == \\ ]] && cur="/"
+    [[ $cur == \\ ]] && cur="/"
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
             [[ -x $sm ]] || continue
-            COMPREPLY=( $(compgen -W "$("$sm" -e ${cur%%:*} | \
-                awk 'NR>1 {print $1}')" -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W "$("$sm" -e ${cur%%:*} |
+                awk 'NR>1 {print $1}')" -- "${cur#*:}"))
             return
         done
     fi
 
-    if [[ "$cur" == //* ]]; then
+    if [[ $cur == //* ]]; then
         host=${cur#//}
         host=${host%%/*}
         if [[ -n $host ]]; then
-            COMPREPLY=( $(compgen -P "//$host" -W \
+            COMPREPLY=($(compgen -P "//$host" -W \
                 "$(smbclient -d 0 -NL $host 2>/dev/null |
-                command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
-                command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p')" \
-                    -- "${cur#//$host}") )
+                    command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
+                    command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p')" \
+                -- "${cur#//$host}"))
         fi
     elif [[ -r /etc/vfstab ]]; then
         # Solaris
-        COMPREPLY=( $(compgen -W "$(awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab)" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}' /etc/vfstab)" -- "$cur"))
     elif [[ ! -e /etc/fstab ]]; then
         # probably Cygwin
-        COMPREPLY=( $(compgen -W "$($1 | awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$($1 | awk '! /^[ \t]*#/ {if ($3 ~ /\//) print $3}')" -- "$cur"))
     else
         # probably BSD
-        COMPREPLY=( $(compgen -W "$(awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab)" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(awk '! /^[ \t]*#/ {if ($2 ~ /\//) print $2}' /etc/fstab)" -- "$cur"))
     fi
 } &&
-complete -F _mount -o default -o dirnames mount
+    complete -F _mount -o default -o dirnames mount
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_mount.linux b/msys2/usr/share/bash-completion/completions/_mount.linux
index c74aaec60..f40865ea7 100644
--- a/msys2/usr/share/bash-completion/completions/_mount.linux
+++ b/msys2/usr/share/bash-completion/completions/_mount.linux
@@ -10,239 +10,243 @@ _mount()
 
     local split=false
     case "$prev" in
-        -t|--types)
+        -t | --types)
             # find /lib/modules/$(uname -r)/ -type f -path '*/fs/*.ko' -printf '%f\n' | cut -d. -f1
             # FIXME: no<fstype>
-            if [[ "$cur" == ?*,* ]]; then
+            if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
                 split=true
             fi
-            COMPREPLY=( $(compgen -W 'auto adfs affs autofs btrfs cifs coda
+            COMPREPLY=($(compgen -W 'auto adfs affs autofs btrfs cifs coda
                 cramfs davfs debugfs devpts efs ext2 ext3 ext4 fuse hfs hfsplus
                 hpfs iso9660 jffs2 jfs minix msdos ncpfs nfs nfs4 ntfs ntfs-3g
                 proc qnx4 ramfs reiserfs romfs squashfs smbfs sysv tmpfs ubifs
-                udf ufs umsdos usbfs vfat xfs' -- "$cur") )
+                udf ufs umsdos usbfs vfat xfs' -- "$cur"))
             _fstypes
-            $split && COMPREPLY=( ${COMPREPLY[@]/#/$prev,} )
+            $split && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
             return
             ;;
-        --bind|-B|--rbind|-R)
+        --bind | -B | --rbind | -R)
             _filedir -d
             return
             ;;
-        -p|--pass-fd)
-            COMPREPLY=( $(compgen -W '{0..9}') )
+        -p | --pass-fd)
+            COMPREPLY=($(compgen -W '{0..9}'))
             compopt -o nospace
             return
             ;;
         -L)
-            COMPREPLY=( $(cd "/dev/disk/by-label/" 2>/dev/null || return; \
-                compgen -f -- "$cur") )
+            COMPREPLY=($(
+                cd "/dev/disk/by-label/" 2>/dev/null || return
+                compgen -f -- "$cur"
+            ))
             return
             ;;
         -U)
-            COMPREPLY=( $(cd "/dev/disk/by-uuid/" 2>/dev/null || return; \
-                compgen -f -- "$cur") )
+            COMPREPLY=($(
+                cd "/dev/disk/by-uuid/" 2>/dev/null || return
+                compgen -f -- "$cur"
+            ))
             return
             ;;
-        -O|--test-opts)
+        -O | --test-opts)
             # argument required but no completions available
             return
             ;;
-        -o|--options)
+        -o | --options)
             local fstype=auto # default fstype
-            for (( i=${#words[@]}-1; i>0; i-- )); do
-                if [[ "${words[i]}" == -@(t|-types)* ]]; then
-                    if [[ "${words[i]}" == *=* ]]; then
-                        [[ "${words[i]}" == ?*,* ]] && break
+            for ((i = ${#words[@]} - 1; i > 0; i--)); do
+                if [[ ${words[i]} == -@(t|-types)* ]]; then
+                    if [[ ${words[i]} == *=* ]]; then
+                        [[ ${words[i]} == ?*,* ]] && break
                         fstype="${words[i]#-*=}"
                     else
-                        [[ "${words[i+1]}" == ?*,* ]] && break
-                        fstype="${words[i+1]}"
+                        [[ ${words[i + 1]} == ?*,* ]] && break
+                        fstype="${words[i + 1]}"
                     fi
                     break
                 fi
             done
             # no<fstype> is not a real fstype, reset to "auto"
-            [[ "$fstype" == no?* ]] && fstype=auto
+            [[ $fstype == no?* ]] && fstype=auto
             # split options list
-            if [[ "$cur" == ?*,* ]]; then
+            if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
                 split=true
             fi
             # no completion if $cur is opt=smth
-            [[ "$cur" == *=* ]] && return
+            [[ $cur == *=* ]] && return
             # mount options
-            COMPREPLY=( $(compgen -W 'loop {,a}sync {,no}atime {,no}auto
+            COMPREPLY=($(compgen -W 'loop {,a}sync {,no}atime {,no}auto
                 {,fs,def,root}context= defaults {,no}dev {,no}diratime dirsync
                 {,no}exec group {,no}iversion {,no}mand _netdev nofail
                 {,no}relatime {,no}strictatime {,no}suid owner remount ro rw
-                {,no}user users' -- "$cur") )
+                {,no}user users' -- "$cur"))
             case "$fstype" in
-            adfs|auto)
-                COMPREPLY+=( $(compgen -W '{u,g}id= {own,oth}mask=' -- "$cur") )
-                ;;&
-            affs|auto)
-                COMPREPLY+=( $(compgen -W '{u,g}id= set{u,g}id= mode= protect
+                adfs | auto)
+                    COMPREPLY+=($(compgen -W '{u,g}id= {own,oth}mask=' -- "$cur"))
+                    ;;&
+                affs | auto)
+                    COMPREPLY+=($(compgen -W '{u,g}id= set{u,g}id= mode= protect
                     usemp verbose prefix= volume= reserved= root= bs=
-                    {,no,usr,grp}quota' -- "$cur") )
-                ;;&
-            btrfs|auto)
-                COMPREPLY+=( $(compgen -W 'degraded subvol= subvolid= device=
+                    {,no,usr,grp}quota' -- "$cur"))
+                    ;;&
+                btrfs | auto)
+                    COMPREPLY+=($(compgen -W 'degraded subvol= subvolid= device=
                     nodatasum nodatacow nobarrier max_inline= alloc_start=
                     thread_pool= compress= compress-force= ssd noacl notreelog
                     flushoncommit metadata_ratio= {,no}space_cache clear_cache
-                    user_subvol_rm_allowed autodefrag inode_cache' -- "$cur") )
-                ;;&
-            cifs|auto)
-                COMPREPLY+=( $(compgen -W 'user= password= credentials= {u,g}id=
+                    user_subvol_rm_allowed autodefrag inode_cache' -- "$cur"))
+                    ;;&
+                cifs | auto)
+                    COMPREPLY+=($(compgen -W 'user= password= credentials= {u,g}id=
                     force{u,g}id port= servern= netbiosname= {file,dir}_mode=
                     ip= domain= guest iocharset {,no}setuids {,no,dyn}perm
                     directio {,no}mapchars {,no}intr hard soft noacl nocase sec=
                     nobrl sfu {,no}serverino nounix nouser_xattr {r,w}size=
-                    rwpidforward backup{u,g}id cache=' -- "$cur") )
-                ;;&
-            davfs|auto)
-                COMPREPLY+=( $(compgen -W 'conf= {file,dir}_mode= {u,g}id=
-                    username=' -- "$cur") )
-                ;;&
-            ext[2-4]|auto)
-                COMPREPLY+=( $(compgen -W '{,no}acl bsddf minixdf check= debug
+                    rwpidforward backup{u,g}id cache=' -- "$cur"))
+                    ;;&
+                davfs | auto)
+                    COMPREPLY+=($(compgen -W 'conf= {file,dir}_mode= {u,g}id=
+                    username=' -- "$cur"))
+                    ;;&
+                ext[2-4] | auto)
+                    COMPREPLY+=($(compgen -W '{,no}acl bsddf minixdf check= debug
                     errors= {,no}grpid {bsd,sysv}groups {,no,usr,grp}quota
                     nobh nouid32 oldalloc orlov res{u,g}id= sb=
-                    {,no}user_xattr' -- "$cur") )
-                ;;&
-            ext[34]|auto)
-                COMPREPLY+=( $(compgen -W 'journal= journal_dev= norecovery
-                    noload data= barrier= commit=' -- "$cur") )
-                ;;&
-            ext4|auto)
-                COMPREPLY+=( $(compgen -W 'journal_checksum journal_async_commit
+                    {,no}user_xattr' -- "$cur"))
+                    ;;&
+                ext[34] | auto)
+                    COMPREPLY+=($(compgen -W 'journal= journal_dev= norecovery
+                    noload data= barrier= commit=' -- "$cur"))
+                    ;;&
+                ext4 | auto)
+                    COMPREPLY+=($(compgen -W 'journal_checksum journal_async_commit
                     nobarrier inode_readahead= stripe= {,no}delalloc abort
                     {max,min}_batch_time= journal_ioprio= {,no}auto_da_alloc
                     {,no}discard nouid32 resize {,no}block_validity
-                    dioread_{,no}lock max_dir_size_kb= i_version' -- "$cur") )
-                ;;&
-            msdos|umsdos|vfat|auto)
-                COMPREPLY+=( $(compgen -W 'blocksize= {u,g}id= {u,d,f}mask=
+                    dioread_{,no}lock max_dir_size_kb= i_version' -- "$cur"))
+                    ;;&
+                msdos | umsdos | vfat | auto)
+                    COMPREPLY+=($(compgen -W 'blocksize= {u,g}id= {u,d,f}mask=
                     allow_utime= check= codepage= conv= cvf_format= cvf_option=
                     debug fat= iocharset= tz= quiet showexec sys_immutable flush
-                    usefree {,no}dots dotsOK=' -- "$cur") )
-                ;;&
-            vfat|auto)
-                COMPREPLY+=( $(compgen -W 'uni_xlate posix nonumtail utf8
-                    shortname=' -- "$cur") )
-                ;;&
-            iso9660|auto)
-                COMPREPLY+=( $(compgen -W 'norock nojoliet check= {u,g}id= map=
+                    usefree {,no}dots dotsOK=' -- "$cur"))
+                    ;;&
+                vfat | auto)
+                    COMPREPLY+=($(compgen -W 'uni_xlate posix nonumtail utf8
+                    shortname=' -- "$cur"))
+                    ;;&
+                iso9660 | auto)
+                    COMPREPLY+=($(compgen -W 'norock nojoliet check= {u,g}id= map=
                     mode= unhide block= conv= cruft session= sbsector=
-                    iocharset= utf8' -- "$cur") )
-                ;;&
-            jffs2|auto)
-                COMPREPLY+=( $(compgen -W 'compr= rp_size=' -- "$cur") )
-                ;;&
-            jfs|auto)
-                COMPREPLY+=( $(compgen -W 'iocharset= resize= {,no}integrity
-                    errors= {,no,usr,grp}quota' -- "$cur") )
-                ;;&
-            nfs|nfs4|auto)
-                COMPREPLY+=( $(compgen -W 'soft hard timeo= retrans= {r,w}size=
+                    iocharset= utf8' -- "$cur"))
+                    ;;&
+                jffs2 | auto)
+                    COMPREPLY+=($(compgen -W 'compr= rp_size=' -- "$cur"))
+                    ;;&
+                jfs | auto)
+                    COMPREPLY+=($(compgen -W 'iocharset= resize= {,no}integrity
+                    errors= {,no,usr,grp}quota' -- "$cur"))
+                    ;;&
+                nfs | nfs4 | auto)
+                    COMPREPLY+=($(compgen -W 'soft hard timeo= retrans= {r,w}size=
                     {,no}ac acreg{min,max}= acdir{min,max}= actimeo= bg fg
                     retry= sec= {,no}sharecache {,no}resvport lookupcache=
-                    proto= port= {,no}intr {,no}cto  {,nfs}vers= ' -- "$cur") )
-                ;;&
-            nfs|auto)
-                COMPREPLY+=( $(compgen -W 'udp tcp rdma mount{port,proto,host}=
+                    proto= port= {,no}intr {,no}cto  {,nfs}vers= ' -- "$cur"))
+                    ;;&
+                nfs | auto)
+                    COMPREPLY+=($(compgen -W 'udp tcp rdma mount{port,proto,host}=
                     mountvers= namlen={,no}lock {,no}acl {,no}rdirplus
-                    {,no}fsc' -- "$cur") )
-                ;;&
-            nfs4|auto)
-                COMPREPLY+=( $(compgen -W 'clientaddr= {,no}migration' \
-                    -- "$cur") )
-                ;;&
-            ntfs-3g)
-                COMPREPLY+=( $(compgen -W '{u,g}id= {u,f,d}mask= usermapping=
+                    {,no}fsc' -- "$cur"))
+                    ;;&
+                nfs4 | auto)
+                    COMPREPLY+=($(compgen -W 'clientaddr= {,no}migration' \
+                        -- "$cur"))
+                    ;;&
+                ntfs-3g)
+                    COMPREPLY+=($(compgen -W '{u,g}id= {u,f,d}mask= usermapping=
                     permissions inherit locale= force {,no}recover
                     ignore_case remove_hiberfile show_sys_files
                     hide_{hid,dot}_files windows_names allow_other max_read=
                     silent no_def_opts streams_interface= user_xattr efs_raw
-                    {,no}compression debug no_detach' -- "$cur") )
-                ;;&
-            proc|auto)
-                COMPREPLY+=( $(compgen -W '{u,g}id=' -- "$cur") )
-                ;;&
-            reiserfs|auto)
-                COMPREPLY+=( $(compgen -W 'conv hash= {,no_un}hashed_relocation
+                    {,no}compression debug no_detach' -- "$cur"))
+                    ;;&
+                proc | auto)
+                    COMPREPLY+=($(compgen -W '{u,g}id=' -- "$cur"))
+                    ;;&
+                reiserfs | auto)
+                    COMPREPLY+=($(compgen -W 'conv hash= {,no_un}hashed_relocation
                     noborder nolog notail replayonly resize= user_xattr acl
-                    barrier=' -- "$cur") )
-                ;;&
-            tmpfs|auto)
-                COMPREPLY+=( $(compgen -W 'size= nr_blocks= nr_inodes= mode=
-                    {u,g}id= mpol=' -- "$cur") )
-                ;;&
-            udf|auto)
-                COMPREPLY+=( $(compgen -W '{u,g}id= umask= unhide undelete
+                    barrier=' -- "$cur"))
+                    ;;&
+                tmpfs | auto)
+                    COMPREPLY+=($(compgen -W 'size= nr_blocks= nr_inodes= mode=
+                    {u,g}id= mpol=' -- "$cur"))
+                    ;;&
+                udf | auto)
+                    COMPREPLY+=($(compgen -W '{u,g}id= umask= unhide undelete
                     nostrict iocharset bs= novrs session= anchor= volume=
-                    partition= lastblock= fileset= rootdir=' -- "$cur") )
-                ;;&
-            usbfs|auto)
-                COMPREPLY+=( $(compgen -W 'dev{u,g}id= devmode= bus{u,g}id=
-                    busmode= list{u,g}id= listmode=' -- "$cur") )
-                ;;&
-            xfs|auto)
-                COMPREPLY+=( $(compgen -W 'allocsize= {,no}attr2 barrier dmapi
+                    partition= lastblock= fileset= rootdir=' -- "$cur"))
+                    ;;&
+                usbfs | auto)
+                    COMPREPLY+=($(compgen -W 'dev{u,g}id= devmode= bus{u,g}id=
+                    busmode= list{u,g}id= listmode=' -- "$cur"))
+                    ;;&
+                xfs | auto)
+                    COMPREPLY+=($(compgen -W 'allocsize= {,no}attr2 barrier dmapi
                     {,no}grpid {bsd,sysv}groups ihashsize= {,no}ikeep
                     inode{32,64} {,no}largeio logbufs= logbsize= logdev=
                     rtdev= mtpt= noalign norecovery nouuid osyncisosync
                     {u,g,p}qnoenforce {,u,usr,g,grp,p,prj}quota sunit= swidth=
-                    swalloc' -- "$cur") )
-                ;;&
+                    swalloc' -- "$cur"))
+                    ;;&
             esac
             # COMP_WORDBREAKS is a real pain in the ass
             prev="${prev##*[$COMP_WORDBREAKS]}"
-            $split && COMPREPLY=( ${COMPREPLY[@]/#/"$prev,"} )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            $split && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--version --help --verbose --all --fork
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--version --help --verbose --all --fork
             --fake --internal-only -l --no-mtab --no-canonicalize --pass-fd -s
             --read-only --rw -L -U --types --test-opts --options --bind --rbind
-            --move' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+            --move' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
-    [[ "$cur" == \\ ]] && cur="/"
+    [[ $cur == \\ ]] && cur="/"
 
     local sm host
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         for sm in "$(type -P showmount)" {,/usr}/{,s}bin/showmount; do
             [[ -x $sm ]] || continue
-            COMPREPLY=( $(compgen -W "$("$sm" -e ${cur%%:*} | \
-                awk 'NR>1 {print $1}')" -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W "$("$sm" -e ${cur%%:*} |
+                awk 'NR>1 {print $1}')" -- "${cur#*:}"))
             return
         done
     fi
 
-    if [[ "$cur" == //* ]]; then
+    if [[ $cur == //* ]]; then
         host=${cur#//}
         host=${host%%/*}
         if [[ -n $host ]]; then
-            COMPREPLY=( $(compgen -P "//$host" -W \
+            COMPREPLY=($(compgen -P "//$host" -W \
                 "$(smbclient -d 0 -NL $host 2>/dev/null |
-                command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
-                command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p' )" \
-                    -- "${cur#//$host}") )
+                    command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |
+                    command sed -ne '3,$s|^[^A-Za-z]*\([^[:blank:]]*\).*$|/\1|p')" \
+                -- "${cur#//$host}"))
         fi
     fi
 
     _filedir
 } &&
-complete -F _mount mount
+    complete -F _mount mount
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_newgrp b/msys2/usr/share/bash-completion/completions/_newgrp
index 0f0d3f937..a2dc3edae 100644
--- a/msys2/usr/share/bash-completion/completions/_newgrp
+++ b/msys2/usr/share/bash-completion/completions/_newgrp
@@ -8,12 +8,12 @@ _newgrp()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == "-" ]]; then
-        COMPREPLY=( - )
+    if [[ $cur == "-" ]]; then
+        COMPREPLY=(-)
     else
         _allowed_groups "$cur"
     fi
 } &&
-complete -F _newgrp newgrp
+    complete -F _newgrp newgrp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_nmcli b/msys2/usr/share/bash-completion/completions/_nmcli
index 780a477f8..eac285b08 100644
--- a/msys2/usr/share/bash-completion/completions/_nmcli
+++ b/msys2/usr/share/bash-completion/completions/_nmcli
@@ -5,33 +5,33 @@
 
 _nmcli_list()
 {
-    COMPREPLY=( $(compgen -W '$1' -- "$cur") )
+    COMPREPLY=($(compgen -W '$1' -- "$cur"))
 }
 
 _nmcli_con_id()
 {
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W "$(nmcli con list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(nmcli con list 2>/dev/null |
+        tail -n +2 | awk -F ' {2,}' '{print $1 }')" -- "$cur"))
 }
 
 _nmcli_con_uuid()
 {
-    COMPREPLY=( $(compgen -W "$(nmcli con list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(nmcli con list 2>/dev/null |
+        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur"))
 }
 
 _nmcli_ap_ssid()
 {
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W "$(nmcli dev wifi list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $1}')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(nmcli dev wifi list 2>/dev/null |
+        tail -n +2 | awk -F ' {2,}' '{print $1}')" -- "$cur"))
 }
 
 _nmcli_ab_bssid()
 {
-    COMPREPLY=( $(compgen -W "$(nmcli dev wifi list 2>/dev/null | \
-        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(nmcli dev wifi list 2>/dev/null |
+        tail -n +2 | awk -F ' {2,}' '{print $2}')" -- "$cur"))
 }
 
 _nmcli()
@@ -40,15 +40,15 @@ _nmcli()
     _init_completion || return
 
     case $prev in
-        -m|--mode)
-            COMPREPLY=( $(compgen -W 'tabular multiline' -- "$cur") )
+        -m | --mode)
+            COMPREPLY=($(compgen -W 'tabular multiline' -- "$cur"))
             return
             ;;
-        -f|--fields)
-            COMPREPLY=( $(compgen -W 'all common' -- "$cur") )
+        -f | --fields)
+            COMPREPLY=($(compgen -W 'all common' -- "$cur"))
             return
             ;;
-        -e|--escape)
+        -e | --escape)
             _nmcli_list "yes no"
             return
             ;;
@@ -74,12 +74,12 @@ _nmcli()
             ;;
     esac
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--terse --pretty --mode --fields
-                --escape --version --help' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--terse --pretty --mode --fields
+                --escape --version --help' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W "nm con dev" -- "$cur") )
+            COMPREPLY=($(compgen -W "nm con dev" -- "$cur"))
         fi
     else
         local object=${words[1]}
@@ -110,50 +110,50 @@ _nmcli()
                         ;;
                 esac
 
-                COMPREPLY=( $(compgen -W 'status permissions enable sleep
-                    wifi wwan wimax' -- "$cur") )
+                COMPREPLY=($(compgen -W 'status permissions enable sleep
+                    wifi wwan wimax' -- "$cur"))
                 ;;
             con)
                 case $command in
                     list)
-                        COMPREPLY=( $(compgen -W 'id uuid' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'id uuid' -- "$cur"))
                         return
                         ;;
                     up)
-                        if [[ "$cur" == -* ]]; then
-                            COMPREPLY=( $(compgen -W '--nowait --timeout' \
-                                -- "$cur") )
+                        if [[ $cur == -* ]]; then
+                            COMPREPLY=($(compgen -W '--nowait --timeout' \
+                                -- "$cur"))
                         else
-                            COMPREPLY=( $(compgen -W 'id uuid iface ap nsp' \
-                                -- "$cur") )
+                            COMPREPLY=($(compgen -W 'id uuid iface ap nsp' \
+                                -- "$cur"))
                         fi
                         return
                         ;;
                     down)
-                        COMPREPLY=( $(compgen -W 'id uuid' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'id uuid' -- "$cur"))
                         return
                         ;;
                     delete)
-                        COMPREPLY=( $(compgen -W 'id uuid' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'id uuid' -- "$cur"))
                         return
                         ;;
                 esac
 
-                COMPREPLY=( $(compgen -W 'list status up down delete' \
-                        -- "$cur") )
+                COMPREPLY=($(compgen -W 'list status up down delete' \
+                    -- "$cur"))
                 ;;
             dev)
                 case $command in
                     list)
-                        COMPREPLY=( $(compgen -W 'iface' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'iface' -- "$cur"))
                         return
                         ;;
                     disconnect)
-                        if [[ "$cur" == -* ]]; then
-                            COMPREPLY=( $(compgen -W '--nowait --timeout' \
-                                -- "$cur") )
+                        if [[ $cur == -* ]]; then
+                            COMPREPLY=($(compgen -W '--nowait --timeout' \
+                                -- "$cur"))
                         else
-                            COMPREPLY=( $(compgen -W 'iface' -- "$cur") )
+                            COMPREPLY=($(compgen -W 'iface' -- "$cur"))
                         fi
                         return
                         ;;
@@ -162,40 +162,40 @@ _nmcli()
 
                         case $subcommand in
                             list)
-                                COMPREPLY=( $(compgen -W 'iface bssid' \
-                                    -- "$cur") )
+                                COMPREPLY=($(compgen -W 'iface bssid' \
+                                    -- "$cur"))
                                 return
                                 ;;
                             connect)
-                                if [[ "$cur" == -* ]]; then
-                                    COMPREPLY=( $(compgen -W '--private
-                                        --nowait --timeout' -- "$cur") )
+                                if [[ $cur == -* ]]; then
+                                    COMPREPLY=($(compgen -W '--private
+                                        --nowait --timeout' -- "$cur"))
                                 else
-                                    if [[ "$prev" == "connect" ]]; then
+                                    if [[ $prev == "connect" ]]; then
                                         _nmcli_ap_ssid
                                     else
-                                        COMPREPLY=( $(compgen -W 'password
+                                        COMPREPLY=($(compgen -W 'password
                                             wep-key-type iface bssid name' \
-                                            -- "$cur") )
+                                            -- "$cur"))
                                     fi
                                 fi
                                 return
                                 ;;
                         esac
 
-                        COMPREPLY=( $(compgen -W 'list connect' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'list connect' -- "$cur"))
                         return
                         ;;
                 esac
 
-                COMPREPLY=( $(compgen -W 'status list disconnect wifi' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'status list disconnect wifi' \
+                    -- "$cur"))
                 ;;
         esac
 
     fi
 
 } &&
-complete -F _nmcli nmcli
+    complete -F _nmcli nmcli
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_renice b/msys2/usr/share/bash-completion/completions/_renice
index 2598533de..a4167440e 100644
--- a/msys2/usr/share/bash-completion/completions/_renice
+++ b/msys2/usr/share/bash-completion/completions/_renice
@@ -11,8 +11,8 @@ _renice()
     local command=$1 curopt i=0
 
     # walk back through command line and find last option
-    while [[ $i -le $cword && ${#COMPREPLY[@]} -eq 0 ]]; do
-        curopt=${words[cword-$i]}
+    while ((i <= cword && ${#COMPREPLY[@]} == 0)); do
+        curopt=${words[cword - i]}
         case "$curopt" in
             -u)
                 _allowed_users
@@ -20,13 +20,13 @@ _renice()
             -g)
                 _pgids
                 ;;
-            -p|$command)
+            -p | "$command")
                 _pids
                 ;;
         esac
-        (( i++ ))
+        ((i++))
     done
 } &&
-complete -F _renice renice
+    complete -F _renice renice
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_repomanage b/msys2/usr/share/bash-completion/completions/_repomanage
index ea27f07e3..ba0787e70 100644
--- a/msys2/usr/share/bash-completion/completions/_repomanage
+++ b/msys2/usr/share/bash-completion/completions/_repomanage
@@ -8,17 +8,17 @@ _repomanage()
     local cur prev words cword split
     _init_completion -s || return
 
-    [[ "$prev" == -@([hk]|-help|-keep) ]] && return
+    [[ $prev == -@([hk]|-help|-keep) ]] && return
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir -d
     fi
 } &&
-complete -F _repomanage repomanage
+    complete -F _repomanage repomanage
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_reptyr b/msys2/usr/share/bash-completion/completions/_reptyr
index 00cccddd4..01d61b2ae 100644
--- a/msys2/usr/share/bash-completion/completions/_reptyr
+++ b/msys2/usr/share/bash-completion/completions/_reptyr
@@ -15,12 +15,12 @@ _reptyr()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     [[ $prev != +([0-9]) ]] && _pids
 } &&
-complete -F _reptyr reptyr
+    complete -F _reptyr reptyr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_rfkill b/msys2/usr/share/bash-completion/completions/_rfkill
index a14a3eaf6..96a6c0983 100644
--- a/msys2/usr/share/bash-completion/completions/_rfkill
+++ b/msys2/usr/share/bash-completion/completions/_rfkill
@@ -8,24 +8,24 @@ _rfkill()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--version' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--version' -- "$cur"))
     else
         case $cword in
             1)
-                COMPREPLY=( $(compgen -W "help event list block unblock" \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W "help event list block unblock" \
+                    -- "$cur"))
                 ;;
             2)
                 if [[ $prev == block || $prev == unblock ]]; then
-                    COMPREPLY=( $(compgen -W "$($1 list | awk -F: \
+                    COMPREPLY=($(compgen -W "$($1 list | awk -F: \
                         '/^[0-9]/ {print $1}') all wifi bluetooth uwb wimax \
-                        wwan gps" -- "$cur") )
+                        wwan gps" -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _rfkill rfkill
+    complete -F _rfkill rfkill
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_rtcwake b/msys2/usr/share/bash-completion/completions/_rtcwake
index 43d264c91..4ca452d9e 100644
--- a/msys2/usr/share/bash-completion/completions/_rtcwake
+++ b/msys2/usr/share/bash-completion/completions/_rtcwake
@@ -9,24 +9,24 @@ _rtcwake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|-h|--version|-V|--seconds|-s|--time|-t)
+        --help | -h | --version | -V | --seconds | -s | --time | -t)
             return
             ;;
-        --mode|-m)
-            COMPREPLY=( $(compgen -W 'standby mem disk on no off' -- "$cur") )
+        --mode | -m)
+            COMPREPLY=($(compgen -W 'standby mem disk on no off' -- "$cur"))
             return
             ;;
-        --device|-d)
-            COMPREPLY=( $(command ls -d /dev/rtc?* 2>/dev/null) )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]#/dev/}' -- "$cur") )
+        --device | -d)
+            COMPREPLY=($(command ls -d /dev/rtc?* 2>/dev/null))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]#/dev/}' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _rtcwake rtcwake
+    complete -F _rtcwake rtcwake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_su b/msys2/usr/share/bash-completion/completions/_su
index 9c0f59c19..1a03c8f7e 100644
--- a/msys2/usr/share/bash-completion/completions/_su
+++ b/msys2/usr/share/bash-completion/completions/_su
@@ -8,34 +8,34 @@ if [[ $OSTYPE != *linux* ]]; then
     return
 fi
 
-_su() # linux-specific completion
-{
+_su()
+{ # linux-specific completion
     local cur prev words cword split
     _init_completion -s || return
 
     case "$prev" in
-        -s|--shell)
+        -s | --shell)
             _shells
             return
             ;;
-        -c|--command|--session-command)
+        -c | --command | --session-command)
             local IFS=$'\n'
             compopt -o filenames
-            COMPREPLY=( $(compgen -d -c -- "$cur") )
+            COMPREPLY=($(compgen -d -c -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _su su
+    complete -F _su su
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_svn b/msys2/usr/share/bash-completion/completions/_svn
index 42e2dbe79..5d85c2b4b 100644
--- a/msys2/usr/share/bash-completion/completions/_svn
+++ b/msys2/usr/share/bash-completion/completions/_svn
@@ -16,11 +16,11 @@ _svn()
                 proplist plist pl propset pset ps resolved revert \
                 status stat st switch sw unlock update up'
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--version' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            COMPREPLY=($(compgen -W "$commands" -- "$cur"))
         fi
     else
 
@@ -29,7 +29,7 @@ _svn()
                 _filedir -d
                 return
                 ;;
-            -F|--file|--targets)
+            -F | --file | --targets)
                 _filedir
                 return
                 ;;
@@ -37,17 +37,16 @@ _svn()
                 _xfunc iconv _iconv_charsets
                 return
                 ;;
-            --editor-cmd|--diff-cmd|--diff3-cmd)
-                words=(words[0] $cur)
-                cword=1
-                _command
+            --editor-cmd | --diff-cmd | --diff3-cmd)
+                compopt -o filenames
+                COMPREPLY=($(compgen -c -- "$cur"))
                 return
                 ;;
         esac
 
         local command=${words[1]}
 
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
             local options
             case $command in
@@ -55,7 +54,7 @@ _svn()
                     options='--auto-props --no-auto-props --force --targets
                         --no-ignore --non-recursive --quiet'
                     ;;
-                blame|annotate|ann|praise)
+                blame | annotate | ann | praise)
                     options='--revision --username --password --no-auth-cache
                         --non-interactive --verbose --incremental --xml'
                     ;;
@@ -63,7 +62,7 @@ _svn()
                     options='--revision --username --password --no-auth-cache
                         --non-interactive'
                     ;;
-                checkout|co)
+                checkout | co)
                     options='--revision --quiet --non-recursive --username
                         --password --no-auth-cache --non-interactive
                         --ignore-externals'
@@ -71,23 +70,23 @@ _svn()
                 cleanup)
                     options='--diff3-cmd'
                     ;;
-                commit|ci)
+                commit | ci)
                     options='--message --file --encoding --force-log --quiet
                         --non-recursive --targets --editor-cmd --username
                         --password --no-auth-cache --non-interactive
                         --no-unlock'
                     ;;
-                copy|cp)
+                copy | cp)
                     options='--message --file --encoding --force-log --revision
                         --quiet --editor-cmd -username --password
                         --no-auth-cache --non-interactive'
                     ;;
-                delete|del|remove|rm)
+                delete | del | remove | rm)
                     options='--force --message --file --encoding --force-log
                         --quiet --targets --editor-cmd --username
                         --password --no-auth-cache --non-interactive'
                     ;;
-                diff|di)
+                diff | di)
                     options='--revision --extensions --diff-cmd
                         --no-diff-deleted --non-recursive --username
                         --password --no-auth-cache --non-interactive
@@ -109,7 +108,7 @@ _svn()
                         --non-interactive --revision --xml --targets
                         --recursive --incremental'
                     ;;
-                list|ls)
+                list | ls)
                     options='--revision --verbose --recursive --username
                         --password --no-auth-cache --non-interactive
                         --incremental --xml'
@@ -136,32 +135,32 @@ _svn()
                         --editor-cmd --username --password --no-auth-cache
                         --non-interactive'
                     ;;
-                move|mv|rename|ren)
+                move | mv | rename | ren)
                     options='--message --file --encoding --force-log --revision
                         --quiet --force --editor-cmd --username --password
                         --no-auth-cache --non-interactive'
                     ;;
-                propdel|pdel|pd)
+                propdel | pdel | pd)
                     options='--quiet --recursive --revision --revprop
                         --username --password --no-auth-cache
                         --non-interactive'
                     ;;
-                propedit|pedit|pe)
+                propedit | pedit | pe)
                     options='--revision --revprop --encoding --editor-cmd
                         --username --password --no-auth-cache
                         --non-interactive --force'
                     ;;
-                propget|pget|pg)
+                propget | pget | pg)
                     options='--recursive --revision --revprop --strict
                         --username --password --no-auth-cache
                         --non-interactive'
                     ;;
-                proplist|plist|pl)
+                proplist | plist | pl)
                     options='--verbose --recursive --revision --revprop --quiet
                         --username --password --no-auth-cache
                         --non-interactive'
                     ;;
-                propset|pset|ps)
+                propset | pset | ps)
                     options='--file --quiet --targets --recursive --revprop
                         --encoding --username --password --no-auth-cache
                         --non-interactive --revision --force'
@@ -172,13 +171,13 @@ _svn()
                 revert)
                     options='--targets --recursive --quiet'
                     ;;
-                status|stat|st)
+                status | stat | st)
                     options='--show-updates --verbose --non-recursive --quiet
                         --username --password --no-auth-cache
                         --non-interactive --no-ignore --ignore-externals
                         --incremental --xml'
                     ;;
-                switch|sw)
+                switch | sw)
                     options='--relocate --revision --non-recursive --quiet
                         --username --password --no-auth-cache
                         --non-interactive --diff3-cmd'
@@ -187,7 +186,7 @@ _svn()
                     options='--targets --force --username --password
                         --no-auth-cache --non-interactive'
                     ;;
-                update|up)
+                update | up)
                     options='--revision --non-recursive --quiet --username
                         --password --no-auth-cache --non-interactive
                         --diff3-cmd --ignore-externals'
@@ -195,10 +194,10 @@ _svn()
             esac
             options+=" --help --config-dir"
 
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
-            if [[ "$command" == @(help|[h?]) ]]; then
-                COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            if [[ $command == @(help|[h?]) ]]; then
+                COMPREPLY=($(compgen -W "$commands" -- "$cur"))
             else
                 _filedir
             fi
@@ -206,6 +205,6 @@ _svn()
     fi
 
 } &&
-complete -F _svn svn
+    complete -F _svn svn
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_svnadmin b/msys2/usr/share/bash-completion/completions/_svnadmin
index 7a86c43ec..654fd3ecd 100644
--- a/msys2/usr/share/bash-completion/completions/_svnadmin
+++ b/msys2/usr/share/bash-completion/completions/_svnadmin
@@ -12,11 +12,11 @@ _svnadmin()
     commands='create deltify dump help ? hotcopy list-dblogs list-unused-dblogs
         load lslocks lstxns recover rmlocks rmtxns setlog verify'
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--version' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            COMPREPLY=($(compgen -W "$commands" -- "$cur"))
         fi
     else
         case $prev in
@@ -25,14 +25,14 @@ _svnadmin()
                 return
                 ;;
             --fs-type)
-                COMPREPLY=( $(compgen -W 'fsfs bdb' -- "$cur") )
+                COMPREPLY=($(compgen -W 'fsfs bdb' -- "$cur"))
                 return
                 ;;
         esac
 
         local command=${words[1]}
 
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
             local options
             case $command in
@@ -62,10 +62,10 @@ _svnadmin()
             esac
 
             options+=" --help"
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
-            if [[ "$command" == @(help|[h?]) ]]; then
-                COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            if [[ $command == @(help|[h?]) ]]; then
+                COMPREPLY=($(compgen -W "$commands" -- "$cur"))
             else
                 _filedir
             fi
@@ -73,6 +73,6 @@ _svnadmin()
     fi
 
 } &&
-complete -F _svnadmin -o default svnadmin
+    complete -F _svnadmin -o default svnadmin
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_svnlook b/msys2/usr/share/bash-completion/completions/_svnlook
index 2cbd134bd..36188a576 100644
--- a/msys2/usr/share/bash-completion/completions/_svnlook
+++ b/msys2/usr/share/bash-completion/completions/_svnlook
@@ -12,20 +12,20 @@ _svnlook()
     commands='author cat changed date diff dirs-changed help ? h history info
         lock log propget pget pg proplist plist pl tree uuid youngest'
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--version' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            COMPREPLY=($(compgen -W "$commands" -- "$cur"))
         fi
     else
         local command=${words[1]}
 
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
             local options
             case $command in
-                author|cat|date|dirs-changed|info|log)
+                author | cat | date | dirs-changed | info | log)
                     options='--revision --transaction'
                     ;;
                 changed)
@@ -38,7 +38,7 @@ _svnlook()
                 history)
                     options='--revision --show-ids'
                     ;;
-                propget|proplist)
+                propget | proplist)
                     options='--revision --transaction --revprop'
                     ;;
                 tree)
@@ -47,10 +47,10 @@ _svnlook()
             esac
 
             options+=" --help"
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
-            if [[ "$command" == @(help|[h?]) ]]; then
-                COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            if [[ $command == @(help|[h?]) ]]; then
+                COMPREPLY=($(compgen -W "$commands" -- "$cur"))
             else
                 _filedir
             fi
@@ -58,6 +58,6 @@ _svnlook()
     fi
 
 } &&
-complete -F _svnlook -o default svnlook
+    complete -F _svnlook -o default svnlook
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_udevadm b/msys2/usr/share/bash-completion/completions/_udevadm
index ce43f1ad5..19624be98 100644
--- a/msys2/usr/share/bash-completion/completions/_udevadm
+++ b/msys2/usr/share/bash-completion/completions/_udevadm
@@ -9,7 +9,7 @@ _udevadm()
     _init_completion -s || return
 
     local i udevcmd
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* ]]; then
             udevcmd=${words[i]}
             break
@@ -17,19 +17,19 @@ _udevadm()
     done
 
     case $prev in
-        --help|--version|--property|--children-max|--timeout|--seq-start|\
-        --seq-end|--attr-match|--attr-nomatch|--parent-match|--property-match|\
-        --tag-match|--subsystem-match|--subsystem-nomatch|--sysname-match|\
-        --path)
+        --help | --version | --property | --children-max | --timeout | --seq-start | \
+            --seq-end | --attr-match | --attr-nomatch | --parent-match | --property-match | \
+            --tag-match | --subsystem-match | --subsystem-nomatch | --sysname-match | \
+            --path)
             return
             ;;
         --log-priority)
-            COMPREPLY=( $(compgen -W 'err info debug' -- "$cur") )
+            COMPREPLY=($(compgen -W 'err info debug' -- "$cur"))
             return
             ;;
         --query)
-            COMPREPLY=( $(compgen -W 'name symlink path property all' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'name symlink path property all' \
+                -- "$cur"))
             return
             ;;
         --name)
@@ -37,41 +37,41 @@ _udevadm()
             _filedir
             return
             ;;
-        --device-id-of-file|--exit-if-exists)
+        --device-id-of-file | --exit-if-exists)
             _filedir
             return
             ;;
         --action)
-            COMPREPLY=( $(compgen -W 'add change remove' -- "$cur") )
+            COMPREPLY=($(compgen -W 'add change remove' -- "$cur"))
             return
             ;;
         --type)
-            COMPREPLY=( $(compgen -W 'devices subsystems failed' -- "$cur") )
+            COMPREPLY=($(compgen -W 'devices subsystems failed' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ -z $udevcmd ]]; then
+    if [[ ! -v udevcmd ]]; then
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '--help --version --debug' -- "$cur") )
+                COMPREPLY=($(compgen -W '--help --version --debug' -- "$cur"))
                 ;;
             *)
-                COMPREPLY=( $(compgen -W "$("$1" --help 2>/dev/null |
-                    awk '/^[ \t]/ { print $1 }')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$("$1" --help 2>/dev/null |
+                    awk '/^[ \t]/ { print $1 }')" -- "$cur"))
                 ;;
         esac
         return
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$("$1" $udevcmd --help 2>/dev/null | _parse_help -)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W \
+            '$("$1" ${udevcmd-} --help 2>/dev/null | _parse_help -)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _udevadm udevadm
+    complete -F _udevadm udevadm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_umount b/msys2/usr/share/bash-completion/completions/_umount
index a5d338bc9..36d5703f6 100644
--- a/msys2/usr/share/bash-completion/completions/_umount
+++ b/msys2/usr/share/bash-completion/completions/_umount
@@ -17,8 +17,8 @@ _umount()
     _init_completion || return
 
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur"))
 } &&
-complete -F _umount -o dirnames umount
+    complete -F _umount -o dirnames umount
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_umount.linux b/msys2/usr/share/bash-completion/completions/_umount.linux
index 59727b4bc..cf8a25959 100644
--- a/msys2/usr/share/bash-completion/completions/_umount.linux
+++ b/msys2/usr/share/bash-completion/completions/_umount.linux
@@ -15,7 +15,7 @@ _reply_compgen_array()
     # argument.
     local i wlist
     for i in ${!COMPREPLY[*]}; do
-        local q=$(quote "$(printf %q "${COMPREPLY[$i]}")")
+        local q=$(quote "$(printf %q "${COMPREPLY[i]}")")
         wlist+=$q$'\n'
     done
 
@@ -25,13 +25,14 @@ _reply_compgen_array()
     ecur=${ecur//\'/\\\'}
 
     # Actually generate completions.
-    local oldifs=$IFS
+    local ifs=$IFS
     IFS=$'\n' eval 'COMPREPLY=(`compgen -W "$wlist" -- "${ecur}"`)'
-    IFS=$oldifs
+    IFS=$ifs
 }
 
 # Unescape strings in the linux fstab(5) format (with octal escapes).
-__linux_fstab_unescape() {
+__linux_fstab_unescape()
+{
     eval $1="'${!1//\'/\\047}'"
     eval $1="'${!1/%\\/\\\\}'"
     eval "$1=$'${!1}'"
@@ -40,23 +41,24 @@ __linux_fstab_unescape() {
 # Complete linux fstab entries.
 #
 # Reads a file from stdin in the linux fstab(5) format; as used by /etc/fstab
-# and /proc/mounts.
+# and /proc/mounts. With 1st arg -L, look for entries by label.
+# shellcheck disable=SC2120
 _linux_fstab()
 {
     COMPREPLY=()
 
     # Read and unescape values into COMPREPLY
     local fs_spec fs_file fs_other
-    local oldifs="$IFS"
+    local ifs="$IFS"
     while read -r fs_spec fs_file fs_other; do
         if [[ $fs_spec == [#]* ]]; then continue; fi
-        if [[ $1 == -L ]]; then
-            local fs_label=${fs_spec/#LABEL=}
+        if [[ ${1-} == -L ]]; then
+            local fs_label=${fs_spec/#LABEL=/}
             if [[ $fs_label != "$fs_spec" ]]; then
                 __linux_fstab_unescape fs_label
                 IFS=$'\0'
                 COMPREPLY+=("$fs_label")
-                IFS=$oldifs
+                IFS=$ifs
             fi
         else
             __linux_fstab_unescape fs_spec
@@ -64,7 +66,7 @@ _linux_fstab()
             IFS=$'\0'
             [[ $fs_spec == */* ]] && COMPREPLY+=("$fs_spec")
             [[ $fs_file == */* ]] && COMPREPLY+=("$fs_file")
-            IFS=$oldifs
+            IFS=$ifs
         fi
     done
 
@@ -81,12 +83,12 @@ _linux_fstab()
                 dircur="${cur%/*}/"
             fi
             basecur=${cur#"$dircur"}
-            local i n=${#COMPREPLY[@]}
-            for (( i=0; i < $n; i++ )); do
-                [[ "${COMPREPLY[i]}" == "$realcur"* ]] &&
-                    COMPREPLY+=( $(cd "$dircur" 2>/dev/null &&
+            local i
+            for i in ${!COMPREPLY[*]}; do
+                [[ ${COMPREPLY[i]} == "$realcur"* ]] &&
+                    COMPREPLY+=($(cd "$dircur" 2>/dev/null &&
                         compgen -f -d -P "$dircur" \
-                        -X "!${COMPREPLY[i]##"$dirrealcur"}" -- "$basecur") )
+                            -X "!${COMPREPLY[i]##"$dirrealcur"}" -- "$basecur"))
             done
         fi
     fi
@@ -103,18 +105,18 @@ _umount()
         -t)
             # FIXME: no<fstype>
             local split=false
-            if [[ "$cur" == ?*,* ]]; then
+            if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
                 split=true
             fi
-            COMPREPLY=( $(compgen -W 'adfs affs autofs btrfs cifs coda
+            COMPREPLY=($(compgen -W 'adfs affs autofs btrfs cifs coda
                 cramfs debugfs devpts efs ext2 ext3 ext4 fuse hfs hfsplus hpfs
                 iso9660 jfs minix msdos ncpfs nfs nfs4 ntfs ntfs-3g proc qnx4
                 ramfs reiserfs romfs squashfs smbfs sysv tmpfs ubifs udf ufs
-                umsdos usbfs vfat xfs' -- "$cur") )
+                umsdos usbfs vfat xfs' -- "$cur"))
             _fstypes
-            $split && COMPREPLY=( ${COMPREPLY[@]/#/$prev,} )
+            $split && COMPREPLY=(${COMPREPLY[@]/#/$prev,})
             return
             ;;
         -O)
@@ -123,10 +125,10 @@ _umount()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-V -h -v -n -r -d -i -a -t -O -f -l
-            --no-canonicalize --fake' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-V -h -v -n -r -d -i -a -t -O -f -l
+            --no-canonicalize --fake' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
     if [[ -r /proc/mounts ]]; then
@@ -135,9 +137,9 @@ _umount()
         _linux_fstab </proc/mounts
     else
         local IFS=$'\n'
-        COMPREPLY=( $(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur"))
     fi
 } &&
-complete -F _umount -o dirnames umount
+    complete -F _umount -o dirnames umount
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_xm b/msys2/usr/share/bash-completion/completions/_xm
index d7b74b890..06b25d3c5 100644
--- a/msys2/usr/share/bash-completion/completions/_xm
+++ b/msys2/usr/share/bash-completion/completions/_xm
@@ -6,14 +6,14 @@
 
 _xen_domain_names()
 {
-    COMPREPLY=( $(compgen -W "$(xm list 2>/dev/null | \
-        awk '!/Name|Domain-0/ { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(xm list 2>/dev/null |
+        awk '!/Name|Domain-0/ { print $1 }')" -- "$cur"))
 }
 
 _xen_domain_ids()
 {
-    COMPREPLY=( $(compgen -W "$(xm list 2>/dev/null | \
-        awk '!/Name|Domain-0/ { print $2 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(xm list 2>/dev/null |
+        awk '!/Name|Domain-0/ { print $2 }')" -- "$cur"))
 }
 
 _xm()
@@ -36,16 +36,16 @@ _xm()
         labels addlabel rmlabel getlabel dry-run resources dumppolicy setpolicy
         resetpolicy getpolicy shell help'
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W "$commands" -- "$cur"))
     else
-        if [[ "$cur" == *=* ]]; then
+        if [[ $cur == *=* ]]; then
             prev=${cur/=*/}
             cur=${cur/*=/}
         fi
 
         command=${words[1]}
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
             case $command in
                 create)
@@ -66,7 +66,7 @@ _xm()
                 sched-credit)
                     options='-d -w -c'
                     ;;
-                block-list|network-list|vtpm-list|vnet-list)
+                block-list | network-list | vtpm-list | vnet-list)
                     options='-l --long'
                     ;;
                 getpolicy)
@@ -78,12 +78,12 @@ _xm()
                         -s --skipdtd -p --paused -c --console_autoconnect'
                     ;;
             esac
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
             case $command in
-                console|destroy|domname|domid|list|mem-set|mem-max| \
-                pause|reboot|rename|shutdown|unpause|vcpu-list|vcpu-pin| \
-                vcpu-set|block-list|network-list|vtpm-list)
+                console | destroy | domname | domid | list | mem-set | mem-max | \
+                    pause | reboot | rename | shutdown | unpause | vcpu-list | vcpu-pin | \
+                    vcpu-set | block-list | network-list | vtpm-list)
                     _count_args
                     case $args in
                         2)
@@ -93,7 +93,7 @@ _xm()
                     ;;
                 migrate)
                     _count_args
-                        case $args in
+                    case $args in
                         2)
                             _xen_domain_names
                             ;;
@@ -102,7 +102,7 @@ _xm()
                             ;;
                     esac
                     ;;
-                restore|dry-run|vnet-create)
+                restore | dry-run | vnet-create)
                     _filedir
                     ;;
                 save)
@@ -123,7 +123,7 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "r s e i u b" -- "$cur") )
+                            COMPREPLY=($(compgen -W "r s e i u b" -- "$cur"))
                             ;;
                     esac
                     ;;
@@ -134,10 +134,10 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "phy: file:" -- "$cur") )
+                            COMPREPLY=($(compgen -W "phy: file:" -- "$cur"))
                             ;;
                         5)
-                            COMPREPLY=( $(compgen -W "w r" -- "$cur") )
+                            COMPREPLY=($(compgen -W "w r" -- "$cur"))
                             ;;
                         6)
                             _xen_domain_names
@@ -151,9 +151,9 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "$(xm block-list $prev \
+                            COMPREPLY=($(compgen -W "$(xm block-list $prev \
                                 2>/dev/null | awk '!/Vdev/ { print $1 }')" \
-                                -- "$cur") )
+                                -- "$cur"))
                             ;;
                     esac
                     ;;
@@ -164,8 +164,8 @@ _xm()
                             _xen_domain_names
                             ;;
                         *)
-                            COMPREPLY=( $(compgen -W "script= ip= mac= bridge=
-                                backend=" -- "$cur") )
+                            COMPREPLY=($(compgen -W "script= ip= mac= bridge=
+                                backend=" -- "$cur"))
                             ;;
                     esac
                     ;;
@@ -176,9 +176,9 @@ _xm()
                             _xen_domain_names
                             ;;
                         3)
-                            COMPREPLY=( $(compgen -W "$(xm network-list $prev \
+                            COMPREPLY=($(compgen -W "$(xm network-list $prev \
                                 2>/dev/null | awk '!/Idx/ { print $1 }')" \
-                                -- "$cur") )
+                                -- "$cur"))
                             ;;
                     esac
                     ;;
@@ -192,13 +192,13 @@ _xm()
                     ;;
                 create)
                     _filedir
-                    COMPREPLY+=( \
+                    COMPREPLY+=(
                         $(compgen -W '$(command ls /etc/xen 2>/dev/null)' \
-                        -- "$cur") )
+                            -- "$cur"))
                     ;;
                 new)
                     case $prev in
-                        -f|-F|--defconfig|--config)
+                        -f | -F | --defconfig | --config)
                             _filedir
                             return
                             ;;
@@ -209,7 +209,7 @@ _xm()
                     esac
 
                     _count_args
-                        case $args in
+                    case $args in
                         2)
                             _xen_domain_names
                             ;;
@@ -219,6 +219,6 @@ _xm()
         fi
     fi
 } &&
-complete -F _xm xm
+    complete -F _xm xm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/_yum b/msys2/usr/share/bash-completion/completions/_yum
index d5e06eca0..224ea2543 100644
--- a/msys2/usr/share/bash-completion/completions/_yum
+++ b/msys2/usr/share/bash-completion/completions/_yum
@@ -5,16 +5,16 @@
 
 _yum_list()
 {
-    if [[ "$1" == all ]]; then
+    if [[ $1 == all ]]; then
         # Try to strip in between headings like "Available Packages"
         # This will obviously only work for English :P
-        COMPREPLY=( $(yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
+        COMPREPLY=($(yum -d 0 -C list $1 "$cur*" 2>/dev/null |
             command sed -ne '/^Available /d' -e '/^Installed /d' -e '/^Updated /d' \
-            -e 's/[[:space:]].*//p') )
+                -e 's/[[:space:]].*//p'))
     else
         # Drop first line (e.g. "Updated Packages")
-        COMPREPLY=( $(yum -d 0 -C list $1 "$cur*" 2>/dev/null | \
-            command sed -ne 1d -e 's/[[:space:]].*//p') )
+        COMPREPLY=($(yum -d 0 -C list $1 "$cur*" 2>/dev/null |
+            command sed -ne 1d -e 's/[[:space:]].*//p'))
     fi
 }
 
@@ -23,14 +23,14 @@ _yum_repolist()
     # -d 0 causes repolist to output nothing as of yum 3.2.22:
     # http://yum.baseurl.org/ticket/83
     # Drop first ("repo id      repo name") and last ("repolist: ...") rows
-    yum --noplugins -C repolist $1 2>/dev/null | \
+    yum --noplugins -C repolist $1 2>/dev/null |
         command sed -ne '/^repo\s\s*id/d' -e '/^repolist:/d' -e 's/[[:space:]].*//p'
 }
 
 _yum_plugins()
 {
-    command ls /usr/lib/yum-plugins/*.py{,c,o} 2>/dev/null \
-        | command sed -ne 's|.*/\([^./]*\)\.py[co]\{0,1\}$|\1|p' | sort -u
+    command ls /usr/lib/yum-plugins/*.py{,c,o} 2>/dev/null |
+        command sed -ne 's|.*/\([^./]*\)\.py[co]\{0,1\}$|\1|p' | sort -u
 }
 
 _yum()
@@ -39,16 +39,17 @@ _yum()
     _init_completion -s || return
 
     local special i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(install|update|upgrade|remove|erase|deplist|info) ]]; then
             special=${words[i]}
+            break
         fi
     done
 
-    if [[ -n $special ]]; then
+    if [[ -v special ]]; then
         # TODO: install|update|upgrade should not match *src.rpm
-        if [[ "$cur" == @(*/|[.~])* && \
-            "$special" == @(deplist|install|update|upgrade) ]]; then
+        if [[ $cur == @(*/|[.~])* && \
+            $special == @(deplist|install|update|upgrade) ]]; then
             _filedir rpm
             return
         fi
@@ -57,15 +58,15 @@ _yum()
                 _yum_list available
                 return
                 ;;
-            deplist|info)
+            deplist | info)
                 _yum_list all
                 return
                 ;;
-            upgrade|update)
+            upgrade | update)
                 _yum_list updates
                 return
                 ;;
-            remove|erase)
+            remove | erase)
                 # _rpm_installed_packages is not arch-qualified
                 _yum_list installed
                 return
@@ -75,22 +76,22 @@ _yum()
 
     case $prev in
         list)
-            COMPREPLY=( $(compgen -W 'all available updates installed extras
-                obsoletes recent' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all available updates installed extras
+                obsoletes recent' -- "$cur"))
             ;;
         clean)
-            COMPREPLY=( $(compgen -W 'packages headers metadata cache dbcache
-                all' -- "$cur") )
+            COMPREPLY=($(compgen -W 'packages headers metadata cache dbcache
+                all' -- "$cur"))
             ;;
         repolist)
-            COMPREPLY=( $(compgen -W 'all enabled disabled' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all enabled disabled' -- "$cur"))
             ;;
-        localinstall|localupdate)
+        localinstall | localupdate)
             # TODO: should not match *src.rpm
             _filedir rpm
             ;;
-        -d|-e)
-            COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+        -d | -e)
+            COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
             ;;
         -c)
             _filedir
@@ -99,45 +100,45 @@ _yum()
             _filedir -d
             ;;
         --enablerepo)
-            COMPREPLY=( $(compgen -W '$(_yum_repolist disabled)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_yum_repolist disabled)' -- "$cur"))
             ;;
         --disablerepo)
-            COMPREPLY=( $(compgen -W '$(_yum_repolist enabled)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_yum_repolist enabled)' -- "$cur"))
             ;;
         --disableexcludes)
-            COMPREPLY=( $(compgen -W '$(_yum_repolist all) all main' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_yum_repolist all) all main' \
+                -- "$cur"))
             ;;
-        --enableplugin|--disableplugin)
-            COMPREPLY=( $(compgen -W '$(_yum_plugins)' -- "$cur") )
+        --enableplugin | --disableplugin)
+            COMPREPLY=($(compgen -W '$(_yum_plugins)' -- "$cur"))
             ;;
         --color)
-            COMPREPLY=( $(compgen -W 'always auto never' -- "$cur") )
+            COMPREPLY=($(compgen -W 'always auto never' -- "$cur"))
             ;;
-        -R|-x|--exclude)
+        -R | -x | --exclude)
             # argument required but no completions available
             return
             ;;
-        -h|--help|--version)
+        -h | --help | --version)
             # no other options useful with these
             return
             ;;
         *)
-            COMPREPLY=( $(compgen -W 'install update check-update upgrade
+            COMPREPLY=($(compgen -W 'install update check-update upgrade
                 remove erase list info provides whatprovides clean makecache
                 groupinstall groupupdate grouplist groupremove groupinfo
                 search shell resolvedep localinstall localupdate deplist
-                repolist help' -- "$cur") )
+                repolist help' -- "$cur"))
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _yum yum
+    complete -F _yum yum
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/a2x b/msys2/usr/share/bash-completion/completions/a2x
index cf9f9516b..b59c7861b 100644
--- a/msys2/usr/share/bash-completion/completions/a2x
+++ b/msys2/usr/share/bash-completion/completions/a2x
@@ -6,15 +6,15 @@ _a2x()
     _init_completion -s || return
 
     case $prev in
-        --attribute|--asciidoc-opts|--dblatex-opts|--fop-opts|--help|\
-        --version|--xsltproc-opts|-!(-*)[ah])
+        --attribute | --asciidoc-opts | --dblatex-opts | --fop-opts | --help | \
+            --version | --xsltproc-opts | -!(-*)[ah])
             return
             ;;
-        --destination-dir|--icons-dir|-!(-*)D)
+        --destination-dir | --icons-dir | -!(-*)D)
             _filedir -d
             return
             ;;
-        --doctype|-!(-*)d)
+        --doctype | -!(-*)d)
             _xfunc asciidoc _asciidoc_doctype
             return
             ;;
@@ -27,13 +27,13 @@ _a2x()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _a2x a2x
+    complete -F _a2x a2x
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/abook b/msys2/usr/share/bash-completion/completions/abook
index 29d326b95..42197d10d 100644
--- a/msys2/usr/share/bash-completion/completions/abook
+++ b/msys2/usr/share/bash-completion/completions/abook
@@ -6,12 +6,12 @@ _abook()
     _init_completion || return
 
     # abook only takes options, tabbing after command name adds a single dash
-    [[ $cword -eq 1 && -z "$cur" ]] &&
-    {
-        compopt -o nospace
-        COMPREPLY=( "-" )
-        return
-    }
+    [[ $cword -eq 1 && -z $cur ]] &&
+        {
+            compopt -o nospace
+            COMPREPLY=("-")
+            return
+        }
 
     case $cur in
         -*)
@@ -22,28 +22,28 @@ _abook()
 
     case $prev in
         --informat)
-            COMPREPLY=( $(compgen -W "$($1 --formats | \
+            COMPREPLY=($(compgen -W "$($1 --formats |
                 command sed -n -e 's/^'$'\t''\([a-z]*\).*/\1/p' -e '/^$/q')" \
-                -- "$cur") )
+                -- "$cur"))
             ;;
         --outformat)
-            COMPREPLY=( $(compgen -W "$($1 --formats | \
+            COMPREPLY=($(compgen -W "$($1 --formats |
                 command sed -n -e '/^$/,$s/^'$'\t''\([a-z]*\).*/\1/p')" \
-                -- "$cur") )
+                -- "$cur"))
             ;;
         --infile)
-            COMPREPLY=( $(compgen -W stdin -- "$cur") )
+            COMPREPLY=($(compgen -W stdin -- "$cur"))
             _filedir
             ;;
         --outfile)
-            COMPREPLY=( $(compgen -W stdout -- "$cur") )
+            COMPREPLY=($(compgen -W stdout -- "$cur"))
             _filedir
             ;;
-        --config|--datafile)
+        --config | --datafile)
             _filedir
             ;;
     esac
 } &&
-complete -F _abook abook
+    complete -F _abook abook
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal b/msys2/usr/share/bash-completion/completions/aclocal
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal
+++ b/msys2/usr/share/bash-completion/completions/aclocal
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.10 b/msys2/usr/share/bash-completion/completions/aclocal-1.10
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.10
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.10
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.11 b/msys2/usr/share/bash-completion/completions/aclocal-1.11
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.11
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.11
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.12 b/msys2/usr/share/bash-completion/completions/aclocal-1.12
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.12
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.12
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.13 b/msys2/usr/share/bash-completion/completions/aclocal-1.13
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.13
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.13
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.14 b/msys2/usr/share/bash-completion/completions/aclocal-1.14
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.14
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.14
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.15 b/msys2/usr/share/bash-completion/completions/aclocal-1.15
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.15
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.15
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aclocal-1.16 b/msys2/usr/share/bash-completion/completions/aclocal-1.16
index f0cc61140..010862fb8 100644
--- a/msys2/usr/share/bash-completion/completions/aclocal-1.16
+++ b/msys2/usr/share/bash-completion/completions/aclocal-1.16
@@ -6,10 +6,10 @@ _aclocal()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--print-ac-dir|--version)
+        --help | --print-ac-dir | --version)
             return
             ;;
-        --acdir|-I)
+        --acdir | -I)
             _filedir -d
             return
             ;;
@@ -17,19 +17,19 @@ _aclocal()
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _aclocal aclocal aclocal-1.1{0..6}
+    complete -F _aclocal aclocal aclocal-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/acpi b/msys2/usr/share/bash-completion/completions/acpi
index 745b8f78e..f2c38b210 100644
--- a/msys2/usr/share/bash-completion/completions/acpi
+++ b/msys2/usr/share/bash-completion/completions/acpi
@@ -6,17 +6,17 @@ _acpi()
     _init_completion || return
 
     case $prev in
-        --help|--version|-!(-*)[hv])
+        --help | --version | -!(-*)[hv])
             return
             ;;
-        --directory|-!(-*)d)
+        --directory | -!(-*)d)
             _filedir -d
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _acpi acpi
+    complete -F _acpi acpi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/add_members b/msys2/usr/share/bash-completion/completions/add_members
index 75ae417cf..efa4f1e28 100644
--- a/msys2/usr/share/bash-completion/completions/add_members
+++ b/msys2/usr/share/bash-completion/completions/add_members
@@ -6,26 +6,26 @@ _add_members()
     _init_completion -s || return
 
     case $prev in
-        -r|-d|--regular-members-file|--digest-members-file)
+        -r | -d | --regular-members-file | --digest-members-file)
             _filedir
             return
             ;;
-        -w|-a|--welcome-msg|--admin-notify)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        -w | -a | --welcome-msg | --admin-notify)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--regular-members-file --digest-members-file
-            --welcome-msg --admin-notify --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--regular-members-file --digest-members-file
+            --welcome-msg --admin-notify --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _add_members add_members
+    complete -F _add_members add_members
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/alias b/msys2/usr/share/bash-completion/completions/alias
index af39302ac..92211d839 100644
--- a/msys2/usr/share/bash-completion/completions/alias
+++ b/msys2/usr/share/bash-completion/completions/alias
@@ -7,14 +7,14 @@ _alias()
 
     case ${words[@]} in
         *[^=])
-            COMPREPLY=( $(compgen -A alias -- "$cur") )
+            COMPREPLY=($(compgen -A alias -- "$cur"))
             ;;
         *=)
-            COMPREPLY=( "$(alias ${cur%=} 2>/dev/null | command sed \
-                -e 's|^alias '"$cur"'\(.*\)$|\1|')" )
+            COMPREPLY=("$(alias ${cur%=} 2>/dev/null | command sed \
+                -e 's|^alias '"$cur"'\(.*\)$|\1|')")
             ;;
     esac
 } &&
-complete -F _alias -o nospace alias
+    complete -F _alias -o nospace alias
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/alpine b/msys2/usr/share/bash-completion/completions/alpine
index bf6056e00..319c8d5c7 100644
--- a/msys2/usr/share/bash-completion/completions/alpine
+++ b/msys2/usr/share/bash-completion/completions/alpine
@@ -6,27 +6,27 @@ _pine()
     _init_completion || return
 
     case $prev in
-        -help|-d|-f|-c|-I|-n|-url|-copy_pinerc|-copy_abook)
+        -help | -d | -f | -c | -I | -n | -url | -copy_pinerc | -copy_abook)
             return
             ;;
-        -attach|-attachlist|-attach_and_delete|-p|-P|-pinerc|-passfile|-x)
+        -attach | -attachlist | -attach_and_delete | -p | -P | -pinerc | -passfile | -x)
             _filedir
             return
             ;;
         -sort)
-            COMPREPLY=( $(compgen -W 'arrival subject threaded orderedsubject
-                date from size score to cc' -- "$cur") )
+            COMPREPLY=($(compgen -W 'arrival subject threaded orderedsubject
+                date from size score to cc' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W '$(awk "{print \$1}" ~/.addressbook \
-            2>/dev/null)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(awk "{print \$1}" ~/.addressbook \
+            2>/dev/null)' -- "$cur"))
     fi
 } &&
-complete -F _pine pine alpine
+    complete -F _pine pine alpine
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/alternatives b/msys2/usr/share/bash-completion/completions/alternatives
index 17b687a77..25d2ce6b4 100644
--- a/msys2/usr/share/bash-completion/completions/alternatives
+++ b/msys2/usr/share/bash-completion/completions/alternatives
@@ -7,13 +7,13 @@ _installed_alternatives()
     for i in alternatives dpkg/alternatives rpm/alternatives; do
         [[ -d /var/lib/$i ]] && admindir=/var/lib/$i && break
     done
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --admindir ]]; then
-            admindir=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --admindir ]]; then
+            admindir=${words[i + 1]}
             break
         fi
     done
-    COMPREPLY=( $(compgen -W '$(command ls $admindir)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(command ls $admindir)' -- "$cur"))
 }
 
 _update_alternatives()
@@ -22,11 +22,11 @@ _update_alternatives()
     _init_completion || return
 
     case $prev in
-        --altdir|--admindir)
+        --altdir | --admindir)
             _filedir -d
             return
             ;;
-        --help|--usage|--version)
+        --help | --usage | --version)
             return
             ;;
     esac
@@ -34,18 +34,18 @@ _update_alternatives()
     local mode args i
 
     # find which mode to use and how many real args used so far
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --@(install|remove|auto|display|config|remove-all|set) ]]; then
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --@(install|remove|auto|display|config|remove-all|set) ]]; then
             mode=${words[i]}
-            args=$(($cword - i))
+            args=$((cword - i))
             break
         fi
     done
 
-    case $mode in
+    case ${mode-} in
         --install)
             case $args in
-                1|3)
+                1 | 3)
                     _filedir
                     ;;
                 2)
@@ -56,19 +56,20 @@ _update_alternatives()
                     ;;
                 *)
                     case $((args % 4)) in
-                        0|2)
+                        0 | 2)
                             _filedir
                             ;;
                         1)
-                            COMPREPLY=( $(compgen -W '--slave' -- "$cur") )
+                            COMPREPLY=($(compgen -W '--slave' -- "$cur"))
                             ;;
                         3)
                             _installed_alternatives
                             ;;
                     esac
+                    ;;
             esac
             ;;
-        --remove|--set)
+        --remove | --set)
             case $args in
                 1)
                     _installed_alternatives
@@ -78,13 +79,14 @@ _update_alternatives()
                     ;;
             esac
             ;;
-        --auto|--remove-all|--display|--config)
+        --auto | --remove-all | --display | --config)
             _installed_alternatives
             ;;
         *)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            ;;
     esac
 } &&
-complete -F _update_alternatives update-alternatives alternatives
+    complete -F _update_alternatives update-alternatives alternatives
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/animate b/msys2/usr/share/bash-completion/completions/animate
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/animate
+++ b/msys2/usr/share/bash-completion/completions/animate
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ant b/msys2/usr/share/bash-completion/completions/ant
index ba141965d..197c0e96f 100644
--- a/msys2/usr/share/bash-completion/completions/ant
+++ b/msys2/usr/share/bash-completion/completions/ant
@@ -31,14 +31,14 @@ _ant()
     _init_completion || return
 
     case $prev in
-        -h|-help|--h|--help|-projecthelp|-p|-version|-diagnostics)
+        -h | -help | --h | --help | -projecthelp | -p | -version | -diagnostics)
             return
             ;;
-        -buildfile|-file|-f)
+        -buildfile | -file | -f)
             _filedir 'xml'
             return
             ;;
-        -logfile|-l)
+        -logfile | -l)
             [[ $1 != *phing || $prev != -l ]] && _filedir
             return
             ;;
@@ -47,37 +47,37 @@ _ant()
             return
             ;;
         -nice)
-            COMPREPLY=( $(compgen -W '{1..10}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..10}' -- "$cur"))
             return
             ;;
         -lib)
             _filedir -d
             return
             ;;
-        -logger|-listener|-inputhandler|-main|-find|-s)
+        -logger | -listener | -inputhandler | -main | -find | -s)
             return
             ;;
     esac
 
     if [[ $cur == -D* ]]; then
         return
-    elif [[ "$cur" == -* ]]; then
+    elif [[ $cur == -* ]]; then
         # The </dev/null prevents "phing -" weirdness/getting just a literal
         # tab displayed on complete on CentOS 6 with phing 2.6.1.
         COMPREPLY=(
-            $(compgen -W '$(_parse_help "$1" -h </dev/null)' -- "$cur") )
+            $(compgen -W '$(_parse_help "$1" -h </dev/null)' -- "$cur"))
     else
         # available targets completion
         # find which buildfile to use
         local buildfile=build.xml i
-        for (( i=1; i < cword; i++ )); do
-            if [[ "${words[i]}" == -@(?(build)file|f) ]]; then
-                buildfile=${words[i+1]}
+        for ((i = 1; i < cword; i++)); do
+            if [[ ${words[i]} == -@(?(build)file|f) ]]; then
+                buildfile=${words[i + 1]}
                 break
             fi
         done
-        if [[ $i -eq $cword ]]; then
-            for i in $ANT_ARGS; do
+        if ((i == cword)); then
+            for i in ${ANT_ARGS-}; do
                 if [[ $prev == -@(?(build)file|f) ]]; then
                     buildfile=$i
                     break
@@ -92,11 +92,11 @@ _ant()
         # fill targets
         _ant_parse_targets $buildfile
 
-        COMPREPLY=( $(compgen -W '$targets' -- "$cur") )
+        COMPREPLY=($(compgen -W '$targets' -- "$cur"))
     fi
 } &&
-complete -F _ant ant phing
-type complete-ant-cmd.pl &>/dev/null && \
+    complete -F _ant ant phing
+type complete-ant-cmd.pl &>/dev/null &&
     complete -C complete-ant-cmd.pl -F _ant ant || :
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/apache2ctl b/msys2/usr/share/bash-completion/completions/apache2ctl
index fe2a2d7b8..980b3c58c 100644
--- a/msys2/usr/share/bash-completion/completions/apache2ctl
+++ b/msys2/usr/share/bash-completion/completions/apache2ctl
@@ -6,11 +6,11 @@ _apache2ctl()
     _init_completion || return
 
     local APWORDS
-    APWORDS=$($1 2>&1 >/dev/null | awk 'NR<2 { print $3; exit }' | \
+    APWORDS=$($1 2>&1 >/dev/null | awk 'NR<2 { print $3; exit }' |
         tr "|" " ")
 
-    COMPREPLY=( $(compgen -W "$APWORDS" -- "$cur") )
+    COMPREPLY=($(compgen -W "$APWORDS" -- "$cur"))
 } &&
-complete -F _apache2ctl apache2ctl
+    complete -F _apache2ctl apache2ctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/appdata-validate b/msys2/usr/share/bash-completion/completions/appdata-validate
index e6c6ddd6e..03d8cc9a0 100644
--- a/msys2/usr/share/bash-completion/completions/appdata-validate
+++ b/msys2/usr/share/bash-completion/completions/appdata-validate
@@ -6,13 +6,13 @@ _appdata_validate()
     _init_completion -s || return
 
     case $prev in
-        -h|--help|--version)
+        -h | --help | --version)
             return
             ;;
         --output-format)
-            COMPREPLY=( $(compgen -W "$($1 --help |
+            COMPREPLY=($(compgen -W "$($1 --help |
                 command sed -ne 's/--output-format.*\[\(.*\)\]/\1/' -e 's/|/ /gp')" \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -20,13 +20,13 @@ _appdata_validate()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir appdata.xml
 } &&
-complete -F _appdata_validate appdata-validate
+    complete -F _appdata_validate appdata-validate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/apropos b/msys2/usr/share/bash-completion/completions/apropos
index e5a473617..81d06f513 100644
--- a/msys2/usr/share/bash-completion/completions/apropos
+++ b/msys2/usr/share/bash-completion/completions/apropos
@@ -10,29 +10,29 @@ _man()
     local mansect="@([0-9lnp]|[0-9][px]|3?(gl|pm))"
 
     case $prev in
-        --config-file|-!(-*)C)
+        --config-file | -!(-*)C)
             _filedir conf
             return
             ;;
-        --local-file|-!(-*)l)
+        --local-file | -!(-*)l)
             _filedir "$manext"
             return
             ;;
-        --manpath|-!(-*)M)
+        --manpath | -!(-*)M)
             _filedir -d
             return
             ;;
-        --pager|-!(-*)P)
+        --pager | -!(-*)P)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
-        --preprocessor|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'e p t g r v' -- "$cur") )
+        --preprocessor | -!(-*)p)
+            COMPREPLY=($(compgen -W 'e p t g r v' -- "$cur"))
             return
             ;;
-        --locale|--systems|--extension|--prompt|--recode|--encoding|\
-        -!(-*)[LmerRE])
+        --locale | --systems | --extension | --prompt | --recode | --encoding | \
+            -!(-*)[LmerRE])
             return
             ;;
     esac
@@ -41,13 +41,13 @@ _man()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1" -h)
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     # file based completion if parameter looks like a path
-    if [[ "$cur" == @(*/|[.~])* ]]; then
+    if [[ $cur == @(*/|[.~])* ]]; then
         _filedir "$manext"
         return
     fi
@@ -57,7 +57,8 @@ _man()
 
     # determine manual section to search
     local sect
-    [[ "$prev" == $mansect ]] && sect=$prev || sect='*'
+    # shellcheck disable=SC2053
+    [[ $prev == $mansect ]] && sect=$prev || sect='*'
 
     _expand || return
 
@@ -68,29 +69,33 @@ _man()
         manpath="${manpath//://*man$sect/ } ${manpath//://*cat$sect/ }"
     fi
 
-    local IFS=$' \t\n' reset=$(shopt -p failglob); shopt -u failglob
+    local IFS=$' \t\n' reset=$(shopt -p failglob)
+    shopt -u failglob
     # redirect stderr for when path doesn't exist
-    COMPREPLY=( $(eval command ls "$manpath" 2>/dev/null) )
+    COMPREPLY=($(eval command ls "$manpath" 2>/dev/null))
     $reset
 
-    # weed out directory path names and paths to man pages
-    COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
-    # strip suffix from man pages
-    COMPREPLY=( ${COMPREPLY[@]%$comprsuffix} )
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}") )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # weed out directory path names and paths to man pages
+        COMPREPLY=(${COMPREPLY[@]##*/?(:)})
+        # strip suffix from man pages
+        COMPREPLY=(${COMPREPLY[@]%$comprsuffix})
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}"))
+    fi
 
-    if [[ "$prev" != $mansect ]]; then
+    # shellcheck disable=SC2053
+    if [[ $prev != $mansect ]]; then
         # File based completion for the rest, prepending ./ if needed
         # (man 1.6f needs that for man pages in current dir)
         local i start=${#COMPREPLY[@]}
         _filedir "$manext"
-        for (( i=$start; i < ${#COMPREPLY[@]}; i++ )); do
+        for ((i = start; i < ${#COMPREPLY[@]}; i++)); do
             [[ ${COMPREPLY[i]} == */* ]] || COMPREPLY[i]=./${COMPREPLY[i]}
         done
     fi
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _man man apropos whatis
+    complete -F _man man apropos whatis
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/apt-build b/msys2/usr/share/bash-completion/completions/apt-build
index b6cf8eff0..713f4c394 100644
--- a/msys2/usr/share/bash-completion/completions/apt-build
+++ b/msys2/usr/share/bash-completion/completions/apt-build
@@ -6,48 +6,49 @@ _apt_build()
     _init_completion || return
 
     local special i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(install|remove|source|info|clean) ]]; then
             special=${words[i]}
+            break
         fi
     done
 
-    if [[ -n $special ]]; then
+    if [[ -v special ]]; then
         case $special in
-            install|source|info)
-                COMPREPLY=( $(apt-cache pkgnames "$cur" 2>/dev/null) )
+            install | source | info)
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
                 ;;
             remove)
-                COMPREPLY=( \
-                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur") )
+                COMPREPLY=(
+                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur"))
                 ;;
         esac
         return
     fi
 
     case $prev in
-        --patch|--build-dir|--repository-dir)
+        --patch | --build-dir | --repository-dir)
             _filedir
             return
             ;;
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--help --show-upgraded -u --build-dir
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--help --show-upgraded -u --build-dir
             --repository-dir --build-only --build-command --reinstall --rebuild
             --remove-builddep --no-wrapper --purge --patch --patch-strip -p
-            --yes -y --version -v --no-source' -- "$cur") )
+            --yes -y --version -v --no-source' -- "$cur"))
 
     else
-        COMPREPLY=( $(compgen -W 'update upgrade install remove source
+        COMPREPLY=($(compgen -W 'update upgrade install remove source
             dist-upgrade world clean info clean-build update-repository' \
-            -- "$cur") )
+            -- "$cur"))
     fi
 
 } &&
-complete -F _apt_build apt-build
+    complete -F _apt_build apt-build
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/apt-cache b/msys2/usr/share/bash-completion/completions/apt-cache
index 5bd85e904..61aa07bee 100644
--- a/msys2/usr/share/bash-completion/completions/apt-cache
+++ b/msys2/usr/share/bash-completion/completions/apt-cache
@@ -1,18 +1,21 @@
 # Debian apt-cache(8) completion                           -*- shell-script -*-
 
 # List APT binary packages
-_apt_cache_packages() {
-    apt-cache --no-generate pkgnames "$cur" 2>/dev/null
+_apt_cache_packages()
+{
+    apt-cache --no-generate pkgnames "$cur" 2>/dev/null || :
 }
 
 # List APT source packages
-_apt_cache_sources() {
-    compgen -W "$(apt-cache dumpavail | \
+_apt_cache_sources()
+{
+    compgen -W "$(apt-cache dumpavail |
         awk '$1 == "Source:" { print $2 }' | sort -u)" -- "$1"
 }
 
 # List APT source packages
-_apt_cache_src_packages() {
+_apt_cache_src_packages()
+{
     compgen -W '$(_apt_cache_sources "$cur")' -- "$cur"
 }
 
@@ -21,63 +24,62 @@ _apt_cache()
     local cur prev words cword
     _init_completion || return
 
-    local special i
+    local special ispecial
     if [[ $cur != show ]]; then
-        for (( i=0; i < ${#words[@]}-1; i++ )); do
-            if [[ ${words[i]} == @(add|depends|dotty|madison|policy|rdepends|show?(pkg|src|)) ]]; then
-                special=${words[i]}
+        for ((ispecial = 1; ispecial < ${#words[@]} - 1; ispecial++)); do
+            if [[ ${words[ispecial]} == @(add|depends|dotty|madison|policy|rdepends|show?(pkg|src|)) ]]; then
+                special=${words[ispecial]}
+                break
             fi
         done
     fi
 
-
-    if [[ -n $special ]]; then
+    if [[ -v special && $ispecial -lt $cword ]]; then
         case $special in
-        add)
-            _filedir
-            ;;
+            add)
+                _filedir
+                ;;
 
-        showsrc)
-            COMPREPLY=( $(_apt_cache_sources "$cur") )
-            ;;
+            showsrc)
+                COMPREPLY=($(_apt_cache_sources "$cur"))
+                ;;
 
-        *)
-            COMPREPLY=( $(_apt_cache_packages) )
-            ;;
+            *)
+                COMPREPLY=($(_apt_cache_packages))
+                ;;
 
         esac
         return
     fi
 
-
     case $prev in
-        --config-file|--pkg-cache|--src-cache|-!(-*)[cps])
+        --config-file | --pkg-cache | --src-cache | -!(-*)[cps])
             _filedir
             return
             ;;
         search)
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 return
             fi
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
 
-        COMPREPLY=( $(compgen -W '-h -v -p -s -q -i -f -a -g -c -o --help
+        COMPREPLY=($(compgen -W '-h -v -p -s -q -i -f -a -g -c -o --help
                 --version --pkg-cache --src-cache --quiet --important --full
                 --all-versions --no-all-versions --generate --no-generate
                 --names-only --all-names --recurse --config-file --option
-                --installed' -- "$cur") )
-    else
+                --installed' -- "$cur"))
+    elif [[ ! -v special ]]; then
 
-        COMPREPLY=( $(compgen -W 'add gencaches show showpkg showsrc stats
+        COMPREPLY=($(compgen -W 'add gencaches show showpkg showsrc stats
                 dump dumpavail unmet search search depends rdepends pkgnames
-                dotty xvcg policy madison' -- "$cur") )
+                dotty xvcg policy madison' -- "$cur"))
 
     fi
 
 } &&
-complete -F _apt_cache apt-cache
+    complete -F _apt_cache apt-cache
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/apt-get b/msys2/usr/share/bash-completion/completions/apt-get
index 9c88fe60a..4aee26397 100644
--- a/msys2/usr/share/bash-completion/completions/apt-get
+++ b/msys2/usr/share/bash-completion/completions/apt-get
@@ -6,28 +6,30 @@ _apt_get()
     _init_completion -n ':=' || return
 
     local special i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(install|remove|autoremove|purge|source|build-dep|download|changelog) ]]; then
             special=${words[i]}
+            break
         fi
     done
 
-    if [[ -n $special ]]; then
+    if [[ -v special ]]; then
         case $special in
-            remove|autoremove|purge)
+            remove | autoremove | purge)
                 if [[ -f /etc/debian_version ]]; then
                     # Debian system
-                    COMPREPLY=( $(\
-                        _xfunc dpkg _comp_dpkg_installed_packages $cur) )
+                    COMPREPLY=($(
+                        _xfunc dpkg _comp_dpkg_installed_packages $cur
+                    ))
                 else
                     # assume RPM based
                     _xfunc rpm _rpm_installed_packages
                 fi
                 ;;
             source)
-                COMPREPLY=( $(apt-cache --no-generate pkgnames "$cur" \
-                    2>/dev/null) $(compgen -W "$(apt-cache dumpavail |
-                    awk '$1 == "Source:" { print $2 }' | sort -u)" -- "$cur") )
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages)
+                $(compgen -W "$(apt-cache dumpavail |
+                    awk '$1 == "Source:" { print $2 }' | sort -u)" -- "$cur"))
                 ;;
             install)
                 if [[ $cur == */* ]]; then
@@ -36,42 +38,46 @@ _apt_get()
                 elif [[ $cur == *=* ]]; then
                     package="${cur%%=*}"
                     cur="${cur#*=}"
-                    COMPREPLY=($(IFS=$'\n' compgen -W "$( \
-                        apt-cache --no-generate madison "$package" 2>/dev/null | \
-                        while IFS=' |' read -r _ version _; do
-                            echo "$version"
-                        done )" \
-                            -- "$cur"))
+                    COMPREPLY=($(IFS=$'\n' compgen -W "$(
+                        apt-cache --no-generate madison "$package" 2>/dev/null |
+                            while IFS=' |' read -r _ version _; do
+                                echo "$version"
+                            done
+                    )" \
+                        -- "$cur"))
                     __ltrim_colon_completions "$cur"
                     return
                 fi
                 ;;&
+            build-dep)
+                _filedir -d
+                [[ $cur != */* ]] || return
+                ;;&
             *)
-                COMPREPLY=( $(apt-cache --no-generate pkgnames "$cur" \
-                    2>/dev/null) )
+                COMPREPLY+=($(_xfunc apt-cache _apt_cache_packages))
                 ;;
         esac
         return
     fi
 
     case $prev in
-        --help|--version|--option|-!(-*)[hvo])
+        --help | --version | --option | -!(-*)[hvo])
             return
             ;;
-        --config-file|-!(-*)c)
+        --config-file | -!(-*)c)
             _filedir
             return
             ;;
-        --target-release|--default-release|-!(-*)t)
-            COMPREPLY=( $(compgen -W "$(apt-cache policy | command sed -ne \
+        --target-release | --default-release | -!(-*)t)
+            COMPREPLY=($(compgen -W "$(apt-cache policy | command sed -ne \
                 's/^ *release.*[ ,]o=\(Debian\|Ubuntu\),a=\(\w*\).*/\2/p')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--no-install-recommends --install-suggests
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--no-install-recommends --install-suggests
             --download-only --fix-broken --ignore-missing --fix-missing
             --no-download --quiet --simulate --just-print --dry-run --recon
             --no-act --yes --assume-yes --assume-no --no-show-upgraded
@@ -84,15 +90,15 @@ _apt_get()
             --diff-only --dsc-only --tar-only --arch-only --indep-only
             --allow-unauthenticated --no-allow-insecure-repositories
             --allow-releaseinfo-change --show-progress --with-source --help
-            --version --config-file --option' -- "$cur") )
+            --version --config-file --option' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'update upgrade dist-upgrade
+        COMPREPLY=($(compgen -W 'update upgrade dist-upgrade
             dselect-upgrade install remove purge source build-dep check
             download clean autoclean autoremove changelog indextargets' \
-            -- "$cur") )
+            -- "$cur"))
     fi
 
 } &&
-complete -F _apt_get apt-get
+    complete -F _apt_get apt-get
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aptitude b/msys2/usr/share/bash-completion/completions/aptitude
index 3f4e55007..e5ea16360 100644
--- a/msys2/usr/share/bash-completion/completions/aptitude
+++ b/msys2/usr/share/bash-completion/completions/aptitude
@@ -1,16 +1,16 @@
 # Debian aptitude(1) completion                            -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_hold_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
-}
+    _comp_dpkg_hold_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
+    }
 } || {
-_comp_dpkg_hold_packages()
-{
-    command grep -B 2 'hold' /var/lib/dpkg/status | \
-        awk "/Package: $1/ { print \$2 }"
-}
+    _comp_dpkg_hold_packages()
+    {
+        command grep -B 2 'hold' /var/lib/dpkg/status |
+            awk "/Package: $1/ { print \$2 }"
+    }
 }
 
 _aptitude()
@@ -18,37 +18,29 @@ _aptitude()
     local cur prev words cword
     _init_completion || return
 
-    local dashoptions='-S -u -i -h --help --version -s --simulate -d
-        --download-only -P --prompt -y --assume-yes -F --display-format -O
-        --sort -w --width -f -r -g --with-recommends -R -G --without-recommends
-        -t --target-release -V --show-versions -D --show-deps -Z -v --verbose
-        --purge-unused --schedule-only'
-
     local special i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full|safe)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
             special=${words[i]}
+            break
         fi
-        #exclude some mutually exclusive options
-        [[ ${words[i]} == '-u' ]] && dashoptions=${dashoptions/-i}
-        [[ ${words[i]} == '-i' ]] && dashoptions=${dashoptions/-u}
     done
 
-    if [[ -n "$special" ]]; then
+    if [[ -v special ]]; then
         case $special in
-            install|hold|markauto|unmarkauto|dist-upgrade|full-upgrade| \
-            safe-upgrade|download|show|changelog|why|why-not|build-dep| \
-            add-user-tag|remove-user-tag|versions)
-                COMPREPLY=( $(_xfunc apt-cache _apt_cache_packages) )
+            install | hold | markauto | unmarkauto | dist-upgrade | full-upgrade | \
+                safe-upgrade | download | show | changelog | why | why-not | build-dep | \
+                add-user-tag | remove-user-tag | versions)
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
                 return
                 ;;
-            purge|remove|reinstall|forbid-version)
-                COMPREPLY=( \
-                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur") )
+            purge | remove | reinstall | forbid-version)
+                COMPREPLY=(
+                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur"))
                 return
                 ;;
             unhold)
-                COMPREPLY=( $(_comp_dpkg_hold_packages "$cur") )
+                COMPREPLY=($(_comp_dpkg_hold_packages "$cur"))
                 return
                 ;;
         esac
@@ -56,32 +48,72 @@ _aptitude()
 
     case $prev in
         # don't complete anything if these options are found
-        autoclean|clean|forget-new|search|upgrade|update|keep-all)
+        autoclean | clean | forget-new | search | upgrade | update | keep-all)
             return
             ;;
         -!(-*)S)
             _filedir
             return
             ;;
-        --target-release|--default-release|-!(-*)t)
-            COMPREPLY=( $(apt-cache policy | \
-                command grep "release.o=Debian,a=$cur" | \
-                command sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2>/dev/null) )
+        --display-format | --width | -!(-*)[wFo])
+            return
+            ;;
+        --sort | -!(-*)O)
+            COMPREPLY=($(compgen -W 'installsize installsizechange debsize
+                name priority version' -- "$cur"))
+            return
+            ;;
+        --target-release | --default-release | -!(-*)t)
+            COMPREPLY=($(apt-cache policy |
+                command grep "release.o=Debian,a=$cur" |
+                command sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2>/dev/null))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$dashoptions" -- "$cur") )
+    if [[ $cur == -* ]]; then
+        local opts=" $($1 --help 2>&1 | command sed -e \
+            's/--with(out)-recommends/--without-recommends\n--with-recommends/' |
+            _parse_help - | tr '\n' ' ') "
+
+        # Exclude some mutually exclusive options
+        for i in "${words[@]}"; do
+            [[ $i == -u ]] && opts=${opts/ -i / }
+            [[ $i == -i ]] && opts=${opts/ -u / }
+        done
+
+        # Do known short -> long replacements; at least up to 0.8.12, --help
+        # outputs mostly only short ones.
+        COMPREPLY=($opts)
+        for i in "${!COMPREPLY[@]}"; do
+            case ${COMPREPLY[i]} in
+                -h) COMPREPLY[i]=--help ;;
+                -s) COMPREPLY[i]=--simulate ;;
+                -d) COMPREPLY[i]=--download-only ;;
+                -P) COMPREPLY[i]=--prompt ;;
+                -y) COMPREPLY[i]=--assume-yes ;;
+                -F) COMPREPLY[i]=--display-format ;;
+                -O) COMPREPLY[i]=--sort ;;
+                -W) COMPREPLY[i]=--show-why ;;
+                -w) COMPREPLY[i]=--width ;;
+                -V) COMPREPLY[i]=--show-versions ;;
+                -D) COMPREPLY[i]=--show-deps ;;
+                -v) COMPREPLY[i]=--verbose ;;
+                -t) COMPREPLY[i]=--target-release ;;
+                -q) COMPREPLY[i]=--quiet ;;
+            esac
+        done
+
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'update upgrade safe-upgrade forget-new
+        COMPREPLY=($(compgen -W 'update upgrade safe-upgrade forget-new
             clean autoclean install reinstall remove hold unhold purge markauto
             unmarkauto why why-not dist-upgrade full-upgrade download search
             show forbid-version changelog keep keep-all build-dep add-user-tag
-            remove-user-tag versions' -- "$cur") )
+            remove-user-tag versions' -- "$cur"))
     fi
 
 } &&
-complete -F _aptitude -o default aptitude aptitude-curses
+    complete -F _aptitude -o default aptitude aptitude-curses
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aptitude-curses b/msys2/usr/share/bash-completion/completions/aptitude-curses
index 3f4e55007..e5ea16360 100644
--- a/msys2/usr/share/bash-completion/completions/aptitude-curses
+++ b/msys2/usr/share/bash-completion/completions/aptitude-curses
@@ -1,16 +1,16 @@
 # Debian aptitude(1) completion                            -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_hold_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
-}
+    _comp_dpkg_hold_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
+    }
 } || {
-_comp_dpkg_hold_packages()
-{
-    command grep -B 2 'hold' /var/lib/dpkg/status | \
-        awk "/Package: $1/ { print \$2 }"
-}
+    _comp_dpkg_hold_packages()
+    {
+        command grep -B 2 'hold' /var/lib/dpkg/status |
+            awk "/Package: $1/ { print \$2 }"
+    }
 }
 
 _aptitude()
@@ -18,37 +18,29 @@ _aptitude()
     local cur prev words cword
     _init_completion || return
 
-    local dashoptions='-S -u -i -h --help --version -s --simulate -d
-        --download-only -P --prompt -y --assume-yes -F --display-format -O
-        --sort -w --width -f -r -g --with-recommends -R -G --without-recommends
-        -t --target-release -V --show-versions -D --show-deps -Z -v --verbose
-        --purge-unused --schedule-only'
-
     local special i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full|safe)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
             special=${words[i]}
+            break
         fi
-        #exclude some mutually exclusive options
-        [[ ${words[i]} == '-u' ]] && dashoptions=${dashoptions/-i}
-        [[ ${words[i]} == '-i' ]] && dashoptions=${dashoptions/-u}
     done
 
-    if [[ -n "$special" ]]; then
+    if [[ -v special ]]; then
         case $special in
-            install|hold|markauto|unmarkauto|dist-upgrade|full-upgrade| \
-            safe-upgrade|download|show|changelog|why|why-not|build-dep| \
-            add-user-tag|remove-user-tag|versions)
-                COMPREPLY=( $(_xfunc apt-cache _apt_cache_packages) )
+            install | hold | markauto | unmarkauto | dist-upgrade | full-upgrade | \
+                safe-upgrade | download | show | changelog | why | why-not | build-dep | \
+                add-user-tag | remove-user-tag | versions)
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
                 return
                 ;;
-            purge|remove|reinstall|forbid-version)
-                COMPREPLY=( \
-                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur") )
+            purge | remove | reinstall | forbid-version)
+                COMPREPLY=(
+                    $(_xfunc dpkg _comp_dpkg_installed_packages "$cur"))
                 return
                 ;;
             unhold)
-                COMPREPLY=( $(_comp_dpkg_hold_packages "$cur") )
+                COMPREPLY=($(_comp_dpkg_hold_packages "$cur"))
                 return
                 ;;
         esac
@@ -56,32 +48,72 @@ _aptitude()
 
     case $prev in
         # don't complete anything if these options are found
-        autoclean|clean|forget-new|search|upgrade|update|keep-all)
+        autoclean | clean | forget-new | search | upgrade | update | keep-all)
             return
             ;;
         -!(-*)S)
             _filedir
             return
             ;;
-        --target-release|--default-release|-!(-*)t)
-            COMPREPLY=( $(apt-cache policy | \
-                command grep "release.o=Debian,a=$cur" | \
-                command sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2>/dev/null) )
+        --display-format | --width | -!(-*)[wFo])
+            return
+            ;;
+        --sort | -!(-*)O)
+            COMPREPLY=($(compgen -W 'installsize installsizechange debsize
+                name priority version' -- "$cur"))
+            return
+            ;;
+        --target-release | --default-release | -!(-*)t)
+            COMPREPLY=($(apt-cache policy |
+                command grep "release.o=Debian,a=$cur" |
+                command sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2>/dev/null))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$dashoptions" -- "$cur") )
+    if [[ $cur == -* ]]; then
+        local opts=" $($1 --help 2>&1 | command sed -e \
+            's/--with(out)-recommends/--without-recommends\n--with-recommends/' |
+            _parse_help - | tr '\n' ' ') "
+
+        # Exclude some mutually exclusive options
+        for i in "${words[@]}"; do
+            [[ $i == -u ]] && opts=${opts/ -i / }
+            [[ $i == -i ]] && opts=${opts/ -u / }
+        done
+
+        # Do known short -> long replacements; at least up to 0.8.12, --help
+        # outputs mostly only short ones.
+        COMPREPLY=($opts)
+        for i in "${!COMPREPLY[@]}"; do
+            case ${COMPREPLY[i]} in
+                -h) COMPREPLY[i]=--help ;;
+                -s) COMPREPLY[i]=--simulate ;;
+                -d) COMPREPLY[i]=--download-only ;;
+                -P) COMPREPLY[i]=--prompt ;;
+                -y) COMPREPLY[i]=--assume-yes ;;
+                -F) COMPREPLY[i]=--display-format ;;
+                -O) COMPREPLY[i]=--sort ;;
+                -W) COMPREPLY[i]=--show-why ;;
+                -w) COMPREPLY[i]=--width ;;
+                -V) COMPREPLY[i]=--show-versions ;;
+                -D) COMPREPLY[i]=--show-deps ;;
+                -v) COMPREPLY[i]=--verbose ;;
+                -t) COMPREPLY[i]=--target-release ;;
+                -q) COMPREPLY[i]=--quiet ;;
+            esac
+        done
+
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'update upgrade safe-upgrade forget-new
+        COMPREPLY=($(compgen -W 'update upgrade safe-upgrade forget-new
             clean autoclean install reinstall remove hold unhold purge markauto
             unmarkauto why why-not dist-upgrade full-upgrade download search
             show forbid-version changelog keep keep-all build-dep add-user-tag
-            remove-user-tag versions' -- "$cur") )
+            remove-user-tag versions' -- "$cur"))
     fi
 
 } &&
-complete -F _aptitude -o default aptitude aptitude-curses
+    complete -F _aptitude -o default aptitude aptitude-curses
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/arch b/msys2/usr/share/bash-completion/completions/arch
index e275577bc..afeed05d4 100644
--- a/msys2/usr/share/bash-completion/completions/arch
+++ b/msys2/usr/share/bash-completion/completions/arch
@@ -3,44 +3,44 @@
 # Try to detect whether this is the mailman "arch" to avoid installing
 # it for the coreutils/util-linux-ng one.
 _have mailmanctl &&
-_arch()
-{
-    local cur prev words cword split
-    _init_completion -s || return
+    _arch()
+    {
+        local cur prev words cword split
+        _init_completion -s || return
 
-    case $prev in
-        -w|-g|-d|--welcome-msg|--goodbye-msg|--digest)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
-            return
-            ;;
-        -d|--file)
-            _filedir
-            return
-            ;;
-    esac
-
-    $split && return
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    else
-        local args=$cword
-        for (( i=1; i < cword; i++ )); do
-            if [[ "${words[i]}" == -* ]]; then
-                (( args-- ))
-            fi
-        done
-        case $args in
-            1)
-                _xfunc list_lists _mailman_lists
+        case $prev in
+            -w | -g | -d | --welcome-msg | --goodbye-msg | --digest)
+                COMPREPLY=($(compgen -W 'y n' -- "$cur"))
+                return
                 ;;
-            2)
+            --file)
                 _filedir
+                return
                 ;;
         esac
-    fi
 
-} &&
-complete -F _arch arch
+        $split && return
+
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        else
+            local args=$cword
+            for ((i = 1; i < cword; i++)); do
+                if [[ ${words[i]} == -* ]]; then
+                    ((args--))
+                fi
+            done
+            case $args in
+                1)
+                    _xfunc list_lists _mailman_lists
+                    ;;
+                2)
+                    _filedir
+                    ;;
+            esac
+        fi
+
+    } &&
+        complete -F _arch arch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/arm-koji b/msys2/usr/share/bash-completion/completions/arm-koji
index be43f0a24..8efef9a7f 100644
--- a/msys2/usr/share/bash-completion/completions/arm-koji
+++ b/msys2/usr/share/bash-completion/completions/arm-koji
@@ -2,8 +2,8 @@
 
 _koji_search()
 {
-    COMPREPLY+=( $(compgen -W \
-        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur"))
 }
 
 _koji_build()
@@ -23,13 +23,13 @@ _koji_user()
 
 _koji_tag()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur"))
 }
 
 _koji_target()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-targets 2>/dev/null |
-        awk "{ print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-targets 2>/dev/null |
+        awk "{ print \$1 }")' -- "$cur"))
 }
 
 _koji()
@@ -38,7 +38,7 @@ _koji()
     _init_completion -s || return
 
     local commandix command
-    for (( commandix=1; commandix < cword; commandix++ )); do
+    for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
             break
@@ -46,19 +46,19 @@ _koji()
     done
 
     case $prev in
-        --help|--help-commands|-!(-*)h*)
+        --help | --help-commands | -!(-*)h*)
             return
             ;;
-        --config|--keytab|-!(-*)[co])
+        --config | --keytab | -!(-*)[co])
             _filedir
             return
             ;;
-        --runas|--user|--editor|--by)
+        --runas | --user | --editor | --by)
             _koji_user "$1"
             return
             ;;
         --authtype)
-            COMPREPLY=( $(compgen -W 'noauth ssl password kerberos' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noauth ssl password kerberos' -- "$cur"))
             return
             ;;
         --topdir)
@@ -66,15 +66,15 @@ _koji()
             return
             ;;
         --type)
-            case $command in
-                latest-pkg|list-tagged)
-                    COMPREPLY=( $(compgen -W 'maven' -- "$cur") )
+            case ${command-} in
+                latest-pkg | list-tagged)
+                    COMPREPLY=($(compgen -W 'maven' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --name)
-            case $command in
+            case ${command-} in
                 list-targets)
                     _koji_target "$1"
                     ;;
@@ -85,7 +85,7 @@ _koji()
             _koji_user "$1"
             return
             ;;
-        --tag|--latestfrom)
+        --tag | --latestfrom)
             _koji_tag "$1"
             return
             ;;
@@ -105,22 +105,22 @@ _koji()
 
     $split && return
 
-    if [[ $command ]]; then
+    if [[ -v command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
 
         # How many'th non-option arg (1-based) for $command are we completing?
         local i nth=1
-        for (( i=commandix+1; i < cword; i++ )); do
-            [[ ${words[i]} == -* ]] || (( nth++ ))
+        for ((i = commandix + 1; i < cword; i++)); do
+            [[ ${words[i]} == -* ]] || ((nth++))
         done
 
         case $command in
-            build|maven-build|win-build)
+            build | maven-build | win-build)
                 case $nth in
                     1)
                         _koji_target "$1"
@@ -160,7 +160,7 @@ _koji()
             latest-by-tag)
                 _koji_package "$1"
                 ;;
-            latest-pkg|list-groups|list-tag-inheritance|show-groups)
+            latest-pkg | list-groups | list-tag-inheritance | show-groups)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -186,7 +186,7 @@ _koji()
                 ;;
             move-pkg)
                 case $nth in
-                    1|2)
+                    1 | 2)
                         _koji_tag "$1"
                         ;;
                     *)
@@ -197,12 +197,12 @@ _koji()
             search)
                 case $nth in
                     1)
-                        COMPREPLY=( $(compgen -W 'package build tag target
-                            user host rpm' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'package build tag target
+                            user host rpm' -- "$cur"))
                         ;;
                 esac
                 ;;
-            tag-pkg|untag-pkg)
+            tag-pkg | untag-pkg)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -218,7 +218,7 @@ _koji()
             wait-repo)
                 case $nth in
                     1)
-                        for (( i=commandix+1; i < cword; i++ )); do
+                        for ((i = commandix + 1; i < cword; i++)); do
                             if [[ ${words[i]} == --target ]]; then
                                 _koji_target "$1"
                                 return
@@ -233,13 +233,13 @@ _koji()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ ! $command ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help-commands 2>/dev/null | \
-            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v command ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
+            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
+    complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/arp b/msys2/usr/share/bash-completion/completions/arp
index e83f05d3c..922e800aa 100644
--- a/msys2/usr/share/bash-completion/completions/arp
+++ b/msys2/usr/share/bash-completion/completions/arp
@@ -6,28 +6,28 @@ _arp()
     _init_completion || return
 
     case $prev in
-        --device|-!(-*)i)
+        --device | -!(-*)i)
             _available_interfaces -a
             return
             ;;
-        --protocol|-!(-*)[Ap])
+        --protocol | -!(-*)[Ap])
             # TODO protocol/address family
             return
             ;;
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --hw-type|-!(-*)[Ht])
+        --hw-type | -!(-*)[Ht])
             # TODO: parse from --help output?
-            COMPREPLY=( $(compgen -W 'ash ether ax25 netrom rose arcnet \
-                dlci fddi hippi irda x25 eui64' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ash ether ax25 netrom rose arcnet \
+                dlci fddi hippi irda x25 eui64' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
@@ -37,7 +37,7 @@ _arp()
         1)
             local ips=$("$1" -an | command sed -ne \
                 's/.*(\([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{3\}\)).*/\1/p')
-            COMPREPLY=( $(compgen -W '$ips' -- "$cur") )
+            COMPREPLY=($(compgen -W '$ips' -- "$cur"))
             ;;
         2)
             # TODO if -d mode: "pub"; if not -f mode: hw_addr
@@ -54,6 +54,6 @@ _arp()
             ;;
     esac
 } &&
-complete -F _arp arp
+    complete -F _arp arp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/arping b/msys2/usr/share/bash-completion/completions/arping
index 6adcde7c6..57e1e19b4 100644
--- a/msys2/usr/share/bash-completion/completions/arping
+++ b/msys2/usr/share/bash-completion/completions/arping
@@ -6,7 +6,7 @@ _arping()
     _init_completion || return
 
     case $prev in
-        -*c|-*w)
+        -*c | -*w)
             return
             ;;
         -*I)
@@ -20,12 +20,12 @@ _arping()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 
     _known_hosts_real -- "$cur"
 } &&
-complete -F _arping arping
+    complete -F _arping arping
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/arpspoof b/msys2/usr/share/bash-completion/completions/arpspoof
index 6275a667d..d1a137359 100644
--- a/msys2/usr/share/bash-completion/completions/arpspoof
+++ b/msys2/usr/share/bash-completion/completions/arpspoof
@@ -16,13 +16,13 @@ _arpspoof()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 
 } &&
-complete -F _arpspoof arpspoof
+    complete -F _arpspoof arpspoof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/asciidoc b/msys2/usr/share/bash-completion/completions/asciidoc
index 2ddcdfe90..1ea4abf2e 100644
--- a/msys2/usr/share/bash-completion/completions/asciidoc
+++ b/msys2/usr/share/bash-completion/completions/asciidoc
@@ -2,7 +2,7 @@
 
 _asciidoc_doctype()
 {
-    COMPREPLY+=( $(compgen -W 'article book manpage' -- "$cur") )
+    COMPREPLY+=($(compgen -W 'article book manpage' -- "$cur"))
 }
 
 _asciidoc()
@@ -11,26 +11,26 @@ _asciidoc()
     _init_completion -s || return
 
     case $prev in
-        --attribute|-!(-*)a)
+        --attribute | -!(-*)a)
             return
             ;;
-        --backend|-!(-*)b)
-            COMPREPLY=( $(compgen -W 'docbook html4 xhtml11' -- "$cur") )
+        --backend | -!(-*)b)
+            COMPREPLY=($(compgen -W 'docbook html4 xhtml11' -- "$cur"))
             return
             ;;
-        --conf-file|-!(-*)f)
+        --conf-file | -!(-*)f)
             _filedir conf
             return
             ;;
-        --doctype|-!(-*)d)
+        --doctype | -!(-*)d)
             _asciidoc_doctype
             return
             ;;
-        --help|-!(-*)h)
-            COMPREPLY=( $(compgen -W 'manpage syntax topics' -- "$cur") )
+        --help | -!(-*)h)
+            COMPREPLY=($(compgen -W 'manpage syntax topics' -- "$cur"))
             return
             ;;
-        --out-file|-!(-*)o)
+        --out-file | -!(-*)o)
             _filedir
             return
             ;;
@@ -39,14 +39,14 @@ _asciidoc()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" "--help manpage")' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help manpage")' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _asciidoc asciidoc asciidoc.py
+    complete -F _asciidoc asciidoc asciidoc.py
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/asciidoc.py b/msys2/usr/share/bash-completion/completions/asciidoc.py
index 2ddcdfe90..1ea4abf2e 100644
--- a/msys2/usr/share/bash-completion/completions/asciidoc.py
+++ b/msys2/usr/share/bash-completion/completions/asciidoc.py
@@ -2,7 +2,7 @@
 
 _asciidoc_doctype()
 {
-    COMPREPLY+=( $(compgen -W 'article book manpage' -- "$cur") )
+    COMPREPLY+=($(compgen -W 'article book manpage' -- "$cur"))
 }
 
 _asciidoc()
@@ -11,26 +11,26 @@ _asciidoc()
     _init_completion -s || return
 
     case $prev in
-        --attribute|-!(-*)a)
+        --attribute | -!(-*)a)
             return
             ;;
-        --backend|-!(-*)b)
-            COMPREPLY=( $(compgen -W 'docbook html4 xhtml11' -- "$cur") )
+        --backend | -!(-*)b)
+            COMPREPLY=($(compgen -W 'docbook html4 xhtml11' -- "$cur"))
             return
             ;;
-        --conf-file|-!(-*)f)
+        --conf-file | -!(-*)f)
             _filedir conf
             return
             ;;
-        --doctype|-!(-*)d)
+        --doctype | -!(-*)d)
             _asciidoc_doctype
             return
             ;;
-        --help|-!(-*)h)
-            COMPREPLY=( $(compgen -W 'manpage syntax topics' -- "$cur") )
+        --help | -!(-*)h)
+            COMPREPLY=($(compgen -W 'manpage syntax topics' -- "$cur"))
             return
             ;;
-        --out-file|-!(-*)o)
+        --out-file | -!(-*)o)
             _filedir
             return
             ;;
@@ -39,14 +39,14 @@ _asciidoc()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" "--help manpage")' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help manpage")' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _asciidoc asciidoc asciidoc.py
+    complete -F _asciidoc asciidoc asciidoc.py
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/aspell b/msys2/usr/share/bash-completion/completions/aspell
index 040853cb1..e080a07d3 100644
--- a/msys2/usr/share/bash-completion/completions/aspell
+++ b/msys2/usr/share/bash-completion/completions/aspell
@@ -5,12 +5,12 @@ _aspell_dictionary()
     local datadir aspell=${1:-aspell}
     datadir=$($aspell config data-dir 2>/dev/null || echo /usr/lib/aspell)
     # First, get aliases (dicts dump does not list them)
-    COMPREPLY=( $(printf '%s\n' $datadir/*.alias) )
-    COMPREPLY=( "${COMPREPLY[@]%.alias}" )
-    COMPREPLY=( "${COMPREPLY[@]#$datadir/}" )
+    COMPREPLY=($(printf '%s\n' $datadir/*.alias))
+    COMPREPLY=("${COMPREPLY[@]%.alias}")
+    COMPREPLY=("${COMPREPLY[@]#$datadir/}")
     # Then, add the canonical dicts
-    COMPREPLY+=( $($aspell dicts 2>/dev/null) )
-    COMPREPLY=( $(compgen -X '\*' -W '${COMPREPLY[@]}' -- "$cur") )
+    COMPREPLY+=($($aspell dicts 2>/dev/null))
+    COMPREPLY=($(compgen -X '\*' -W '${COMPREPLY[@]}' -- "$cur"))
 }
 
 _aspell()
@@ -19,47 +19,47 @@ _aspell()
     _init_completion -s || return
 
     case $prev in
-        -c|-p|check|--conf|--personal|--repl|--per-conf)
+        -c | -p | check | --conf | --personal | --repl | --per-conf)
             _filedir
             return
             ;;
-        --conf-dir|--data-dir|--dict-dir|--home-dir|--local-data-dir|--prefix)
+        --conf-dir | --data-dir | --dict-dir | --home-dir | --local-data-dir | --prefix)
             _filedir -d
             return
             ;;
-        dump|create|merge)
-            COMPREPLY=( $(compgen -W 'master personal repl' -- "$cur") )
+        dump | create | merge)
+            COMPREPLY=($(compgen -W 'master personal repl' -- "$cur"))
             return
             ;;
         --mode)
-            COMPREPLY=( $(compgen -W "$($1 modes 2>/dev/null | \
-                awk '{ print $1 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 modes 2>/dev/null |
+                awk '{ print $1 }')" -- "$cur"))
             return
             ;;
         --sug-mode)
-            COMPREPLY=( $(compgen -W 'ultra fast normal bad-speller' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'ultra fast normal bad-speller' \
+                -- "$cur"))
             return
             ;;
         --keymapping)
-            COMPREPLY=( $(compgen -W 'aspell ispell' -- "$cur") )
+            COMPREPLY=($(compgen -W 'aspell ispell' -- "$cur"))
             return
             ;;
-        -d|--master)
+        -d | --master)
             _aspell_dictionary "$1"
             return
             ;;
-        --add-filter|--rem-filter)
-            COMPREPLY=( $(compgen -W "$($1 filters 2>/dev/null | \
-                awk '{ print $1 }')" -- "$cur") )
+        --add-filter | --rem-filter)
+            COMPREPLY=($(compgen -W "$($1 filters 2>/dev/null |
+                awk '{ print $1 }')" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--conf= --conf-dir= --data-dir= --dict-dir=
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--conf= --conf-dir= --data-dir= --dict-dir=
             --encoding= --add-filter= --rem-filter= --mode= --add-extra-dicts=
             --rem-extra-dicts= --home-dir= --ignore= --ignore-accents
             --dont-ignore-accents --ignore-case --dont-ignore-case
@@ -76,13 +76,13 @@ _aspell()
             --add-tex-command= --rem-tex-command= --tex-check-comments
             --dont-tex-check-comments --add-tex-extension --rem-tex-extension
             --add-sgml-check= --rem-sgml-check= --add-sgml-extension
-            --rem-sgml-extension' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+            --rem-sgml-extension' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        COMPREPLY=( $(compgen -W 'usage help check pipe list config soundslike
-            filter version dump create merge' -- "$cur") )
+        COMPREPLY=($(compgen -W 'usage help check pipe list config soundslike
+            filter version dump create merge' -- "$cur"))
     fi
 } &&
-complete -F _aspell aspell
+    complete -F _aspell aspell
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autoconf b/msys2/usr/share/bash-completion/completions/autoconf
index 94a014ff6..b51e797e0 100644
--- a/msys2/usr/share/bash-completion/completions/autoconf
+++ b/msys2/usr/share/bash-completion/completions/autoconf
@@ -6,20 +6,20 @@ _autoconf()
     _init_completion -s || return
 
     case "$prev" in
-        --help|-h|--version|-V|--trace|-t)
+        --help | -h | --version | -V | --trace | -t)
             return
             ;;
-        --output|-o)
+        --output | -o)
             _filedir
             return
             ;;
-        --warnings|-W)
-            local cats=( cross obsolete syntax )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(cross obsolete syntax)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
-        --prepend-include|-B|--include|-I)
+        --prepend-include | -B | --include | -I)
             _filedir -d
             return
             ;;
@@ -27,14 +27,14 @@ _autoconf()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir '@(ac|in)'
 } &&
-complete -F _autoconf autoconf
+    complete -F _autoconf autoconf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autoheader b/msys2/usr/share/bash-completion/completions/autoheader
index cf983312b..9b0f0dc94 100644
--- a/msys2/usr/share/bash-completion/completions/autoheader
+++ b/msys2/usr/share/bash-completion/completions/autoheader
@@ -6,17 +6,17 @@ _autoreconf()
     _init_completion -s || return
 
     case "$prev" in
-        --help|-h|--version|-V)
+        --help | -h | --version | -V)
             return
             ;;
-        --warnings|-W)
-            local cats=( cross gnu obsolete override portability syntax \
-                unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(cross gnu obsolete override portability syntax
+                unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
-        --prepend-include|-B|--include|-I)
+        --prepend-include | -B | --include | -I)
             _filedir -d
             return
             ;;
@@ -24,9 +24,9 @@ _autoreconf()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -36,6 +36,6 @@ _autoreconf()
         _filedir -d
     fi
 } &&
-complete -F _autoreconf autoreconf autoheader
+    complete -F _autoreconf autoreconf autoheader
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake b/msys2/usr/share/bash-completion/completions/automake
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake
+++ b/msys2/usr/share/bash-completion/completions/automake
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.10 b/msys2/usr/share/bash-completion/completions/automake-1.10
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.10
+++ b/msys2/usr/share/bash-completion/completions/automake-1.10
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.11 b/msys2/usr/share/bash-completion/completions/automake-1.11
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.11
+++ b/msys2/usr/share/bash-completion/completions/automake-1.11
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.12 b/msys2/usr/share/bash-completion/completions/automake-1.12
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.12
+++ b/msys2/usr/share/bash-completion/completions/automake-1.12
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.13 b/msys2/usr/share/bash-completion/completions/automake-1.13
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.13
+++ b/msys2/usr/share/bash-completion/completions/automake-1.13
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.14 b/msys2/usr/share/bash-completion/completions/automake-1.14
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.14
+++ b/msys2/usr/share/bash-completion/completions/automake-1.14
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.15 b/msys2/usr/share/bash-completion/completions/automake-1.15
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.15
+++ b/msys2/usr/share/bash-completion/completions/automake-1.15
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/automake-1.16 b/msys2/usr/share/bash-completion/completions/automake-1.16
index ff3d45235..5fe5f4f86 100644
--- a/msys2/usr/share/bash-completion/completions/automake-1.16
+++ b/msys2/usr/share/bash-completion/completions/automake-1.16
@@ -6,13 +6,13 @@ _automake()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version)
+        --help | --version)
             return
             ;;
-        --warnings|-W)
-            local cats=( gnu obsolete override portability syntax unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(gnu obsolete override portability syntax unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
         --libdir)
@@ -23,14 +23,14 @@ _automake()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _automake automake automake-1.1{0..6}
+    complete -F _automake automake automake-1.1{0..6}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autoreconf b/msys2/usr/share/bash-completion/completions/autoreconf
index cf983312b..9b0f0dc94 100644
--- a/msys2/usr/share/bash-completion/completions/autoreconf
+++ b/msys2/usr/share/bash-completion/completions/autoreconf
@@ -6,17 +6,17 @@ _autoreconf()
     _init_completion -s || return
 
     case "$prev" in
-        --help|-h|--version|-V)
+        --help | -h | --version | -V)
             return
             ;;
-        --warnings|-W)
-            local cats=( cross gnu obsolete override portability syntax \
-                unsupported )
-            COMPREPLY=( $(compgen -W \
-                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur") )
+        --warnings | -W)
+            local cats=(cross gnu obsolete override portability syntax
+                unsupported)
+            COMPREPLY=($(compgen -W \
+                '${cats[@]} ${cats[@]/#/no-} all none error' -- "$cur"))
             return
             ;;
-        --prepend-include|-B|--include|-I)
+        --prepend-include | -B | --include | -I)
             _filedir -d
             return
             ;;
@@ -24,9 +24,9 @@ _autoreconf()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -36,6 +36,6 @@ _autoreconf()
         _filedir -d
     fi
 } &&
-complete -F _autoreconf autoreconf autoheader
+    complete -F _autoreconf autoreconf autoheader
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autorpm b/msys2/usr/share/bash-completion/completions/autorpm
index 7a0bbe18e..d55322ab8 100644
--- a/msys2/usr/share/bash-completion/completions/autorpm
+++ b/msys2/usr/share/bash-completion/completions/autorpm
@@ -5,10 +5,10 @@ _autorpm()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W '--notty --debug --help --version auto add
-        fullinfo info help install list remove set' -- "$cur") )
+    COMPREPLY=($(compgen -W '--notty --debug --help --version auto add
+        fullinfo info help install list remove set' -- "$cur"))
 
 } &&
-complete -F _autorpm autorpm
+    complete -F _autorpm autorpm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autoscan b/msys2/usr/share/bash-completion/completions/autoscan
index 5f70a5082..e00714371 100644
--- a/msys2/usr/share/bash-completion/completions/autoscan
+++ b/msys2/usr/share/bash-completion/completions/autoscan
@@ -6,10 +6,10 @@ _autoscan()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --prepend-include|--include|-!(-*)[BI])
+        --prepend-include | --include | -!(-*)[BI])
             _filedir -d
             return
             ;;
@@ -17,9 +17,9 @@ _autoscan()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -29,6 +29,6 @@ _autoscan()
         _filedir -d
     fi
 } &&
-complete -F _autoscan autoscan autoupdate
+    complete -F _autoscan autoscan autoupdate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autossh b/msys2/usr/share/bash-completion/completions/autossh
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/autossh
+++ b/msys2/usr/share/bash-completion/completions/autossh
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/autoupdate b/msys2/usr/share/bash-completion/completions/autoupdate
index 5f70a5082..e00714371 100644
--- a/msys2/usr/share/bash-completion/completions/autoupdate
+++ b/msys2/usr/share/bash-completion/completions/autoupdate
@@ -6,10 +6,10 @@ _autoscan()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --prepend-include|--include|-!(-*)[BI])
+        --prepend-include | --include | -!(-*)[BI])
             _filedir -d
             return
             ;;
@@ -17,9 +17,9 @@ _autoscan()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -29,6 +29,6 @@ _autoscan()
         _filedir -d
     fi
 } &&
-complete -F _autoscan autoscan autoupdate
+    complete -F _autoscan autoscan autoupdate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/avctrl b/msys2/usr/share/bash-completion/completions/avctrl
index 2ef499f3d..89c24e470 100644
--- a/msys2/usr/share/bash-completion/completions/avctrl
+++ b/msys2/usr/share/bash-completion/completions/avctrl
@@ -5,16 +5,16 @@ _avctrl()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--help --quiet' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--help --quiet' -- "$cur"))
     else
         local args
         _count_args
-        if [[ $args -eq 1 ]]; then
-            COMPREPLY=( $(compgen -W 'discover switch' -- "$cur") )
+        if ((args == 1)); then
+            COMPREPLY=($(compgen -W 'discover switch' -- "$cur"))
         fi
     fi
 } &&
-complete -F _avctrl avctrl
+    complete -F _avctrl avctrl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/badblocks b/msys2/usr/share/bash-completion/completions/badblocks
index 221f42b92..29c4e00d6 100644
--- a/msys2/usr/share/bash-completion/completions/badblocks
+++ b/msys2/usr/share/bash-completion/completions/badblocks
@@ -15,15 +15,15 @@ _badblocks()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # Filter out -w (dangerous) and -X (internal use)
-        COMPREPLY=( $(compgen -X -[wX] -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -X -[wX] -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _badblocks badblocks
+    complete -F _badblocks badblocks
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bind b/msys2/usr/share/bash-completion/completions/bind
index c06654b10..2ee428b21 100644
--- a/msys2/usr/share/bash-completion/completions/bind
+++ b/msys2/usr/share/bash-completion/completions/bind
@@ -10,8 +10,8 @@ _bind()
             return
             ;;
         -*m)
-            COMPREPLY=( $(compgen -W "emacs emacs-standard emacs-meta
-                emacs-ctlx vi vi-move vi-command vi-insert" -- "$cur") )
+            COMPREPLY=($(compgen -W "emacs emacs-standard emacs-meta
+                emacs-ctlx vi vi-move vi-command vi-insert" -- "$cur"))
             return
             ;;
         -*f)
@@ -19,18 +19,18 @@ _bind()
             return
             ;;
         -*[qu])
-            COMPREPLY=( $(compgen -W '$("$1" -l)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$("$1" -l)' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -A binding -- "$cur") )
+    COMPREPLY=($(compgen -A binding -- "$cur"))
 } &&
-complete -F _bind bind
+    complete -F _bind bind
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bk b/msys2/usr/share/bash-completion/completions/bk
index 73b5bb1c6..4e4d140ae 100644
--- a/msys2/usr/share/bash-completion/completions/bk
+++ b/msys2/usr/share/bash-completion/completions/bk
@@ -6,13 +6,13 @@ _bk()
     local cur prev words cword
     _init_completion || return
 
-    local BKCMDS="$(bk help topics 2>/dev/null | \
+    local BKCMDS="$(bk help topics 2>/dev/null |
         awk '/^  bk/ { print $2 }' | xargs printf '%s ')"
 
-    COMPREPLY=( $(compgen -W "$BKCMDS" -- "$cur") )
+    COMPREPLY=($(compgen -W "$BKCMDS" -- "$cur"))
     _filedir
 
 } &&
-complete -F _bk bk
+    complete -F _bk bk
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bmake b/msys2/usr/share/bash-completion/completions/bmake
new file mode 100644
index 000000000..96517c217
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/bmake
@@ -0,0 +1,170 @@
+# bash completion for GNU make                             -*- shell-script -*-
+
+_make_target_extract_script()
+{
+    local mode="$1"
+    shift
+
+    local prefix="$1"
+    local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
+    local basename=${prefix##*/}
+    local dirname_len=$((${#prefix} - ${#basename}))
+
+    if [[ $mode == -d ]]; then
+        # display mode, only output current path component to the next slash
+        local output="\2"
+    else
+        # completion mode, output full path to the next slash
+        local output="\1\2"
+    fi
+
+    cat <<EOF
+    1,/^# * Make data base/           d;        # skip any makefile output
+    /^# * Finished Make data base/,/^# * Make data base/{
+                                      d;        # skip any makefile output
+    }
+    /^# * Variables/,/^# * Files/     d;        # skip until files section
+    /^# * Not a target/,/^$/          d;        # skip not target blocks
+    /^${prefix_pat}/,/^$/!            d;        # skip anything user dont want
+
+    # The stuff above here describes lines that are not
+    #  explicit targets or not targets other than special ones
+    # The stuff below here decides whether an explicit target
+    #  should be output.
+
+    /^# * File is an intermediate prerequisite/ {
+      s/^.*$//;x;                               # unhold target
+      d;                                        # delete line
+    }
+
+    /^$/ {                                      # end of target block
+      x;                                        # unhold target
+      /^$/d;                                    # dont print blanks
+      s|^\(.\{${dirname_len}\}\)\(.\{${#basename}\}[^:/]*/\{0,1\}\)[^:]*:.*$|${output}|p;
+      d;                                        # hide any bugs
+    }
+
+    # This pattern includes a literal tab character as \t is not a portable
+    # representation and fails with BSD sed
+    /^[^#	:%]\{1,\}:/ {         # found target block
+      /^\.PHONY:/                 d;            # special target
+      /^\.SUFFIXES:/              d;            # special target
+      /^\.DEFAULT:/               d;            # special target
+      /^\.PRECIOUS:/              d;            # special target
+      /^\.INTERMEDIATE:/          d;            # special target
+      /^\.SECONDARY:/             d;            # special target
+      /^\.SECONDEXPANSION:/       d;            # special target
+      /^\.DELETE_ON_ERROR:/       d;            # special target
+      /^\.IGNORE:/                d;            # special target
+      /^\.LOW_RESOLUTION_TIME:/   d;            # special target
+      /^\.SILENT:/                d;            # special target
+      /^\.EXPORT_ALL_VARIABLES:/  d;            # special target
+      /^\.NOTPARALLEL:/           d;            # special target
+      /^\.ONESHELL:/              d;            # special target
+      /^\.POSIX:/                 d;            # special target
+      /^\.NOEXPORT:/              d;            # special target
+      /^\.MAKE:/                  d;            # special target
+EOF
+
+    # don't complete with hidden targets unless we are doing a partial completion
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
+      /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
+EOF
+    fi
+
+    cat <<EOF
+      h;                                        # hold target
+      d;                                        # delete line
+    }
+
+EOF
+}
+
+_make()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    local makef makef_dir=("-C" ".") i
+
+    case $prev in
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
+            _filedir
+            return
+            ;;
+        --include-dir | --directory | -!(-*)[ICm])
+            _filedir -d
+            return
+            ;;
+        -!(-*)E)
+            COMPREPLY=($(compgen -v -- "$cur"))
+            return
+            ;;
+        --eval | -!(-*)[DVx])
+            return
+            ;;
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        local opts="$(_parse_help "$1")"
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ $cur == *=* ]]; then
+        prev=${cur%%=*}
+        cur=${cur#*=}
+        local diropt
+        [[ ${prev,,} == *dir?(ectory) ]] && diropt=-d
+        _filedir $diropt
+    else
+        # before we check for makefiles, see if a path was specified
+        # with -C/--directory
+        for ((i = 1; i < ${#words[@]}; i++)); do
+            if [[ ${words[i]} == -@(C|-directory) ]]; then
+                # eval for tilde expansion
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
+                break
+            fi
+        done
+
+        # before we scan for targets, see if a Makefile name was
+        # specified with -f/--file/--makefile
+        for ((i = 1; i < ${#words[@]}; i++)); do
+            if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
+                # eval for tilde expansion
+                eval "makef=( -f \"${words[i + 1]}\" )"
+                break
+            fi
+        done
+
+        # recognise that possible completions are only going to be displayed
+        # so only the base name is shown
+        local mode=--
+        if ((COMP_TYPE != 9)); then
+            mode=-d # display-only mode
+        fi
+
+        local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
+        COMPREPLY=($(LC_ALL=C \
+            $1 -npq __BASH_MAKE_COMPLETION__=1 \
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
+
+        if [[ $mode != -d ]]; then
+            # Completion will occur if there is only one suggestion
+            # so set options for completion based on the first one
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
+        fi
+
+    fi
+} &&
+    complete -F _make make gmake gnumake pmake colormake bmake
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/brctl b/msys2/usr/share/bash-completion/completions/brctl
index 755812d35..14569b648 100644
--- a/msys2/usr/share/bash-completion/completions/brctl
+++ b/msys2/usr/share/bash-completion/completions/brctl
@@ -9,31 +9,32 @@ _brctl()
 
     case $cword in
         1)
-            COMPREPLY=( $(compgen -W "addbr delbr addif delif setageing
+            COMPREPLY=($(compgen -W "addbr delbr addif delif setageing
                 setbridgeprio setfd sethello setmaxage setpathcost setportprio
-                show showmacs showstp stp" -- "$cur") )
+                show showmacs showstp stp" -- "$cur"))
             ;;
         2)
             case $command in
-                show)
-                    ;;
+                show) ;;
+
                 *)
-                    COMPREPLY=( $(compgen -W "$($1 show | \
-                        awk 'NR>1 {print $1}' )" -- "$cur") )
+                    COMPREPLY=($(compgen -W "$($1 show |
+                        awk 'NR>1 {print $1}')" -- "$cur"))
+                    ;;
             esac
             ;;
         3)
             case $command in
-                addif|delif)
+                addif | delif)
                     _configured_interfaces
                     ;;
                 stp)
-                    COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'on off' -- "$cur"))
                     ;;
             esac
             ;;
     esac
 } &&
-complete -F _brctl -o default brctl
+    complete -F _brctl -o default brctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bsdtar b/msys2/usr/share/bash-completion/completions/bsdtar
index fda739c40..04b7fc078 100644
--- a/msys2/usr/share/bash-completion/completions/bsdtar
+++ b/msys2/usr/share/bash-completion/completions/bsdtar
@@ -47,10 +47,11 @@ __gtar_parse_help_opt()
     separator=" "
 
     case "$opt" in
-        --*)
-            ;;
+        --*) ;;
+
         -\?)
-            return ;;
+            return
+            ;;
         -*)
             opttype=short
             opt=${opt##-}
@@ -76,7 +77,6 @@ __gtar_parse_help_opt()
     eval "$optvar=\"\$$optvar$separator\"\"$opt\""
 }
 
-
 __gtar_parse_help_line()
 {
     local i
@@ -84,18 +84,18 @@ __gtar_parse_help_line()
     for i in $1; do
         case "$i" in
             # regular options
-            --*|-*)
+            --* | -*)
                 __gtar_parse_help_opt "$i" "$2"
                 ;;
 
             # end once there is single non-option word
             *)
                 break
+                ;;
         esac
     done
 }
 
-
 __gnu_tar_parse_help()
 {
     local str line arg
@@ -104,7 +104,7 @@ __gnu_tar_parse_help()
         # options on lines beginning with spaces.  After that, there is one
         # or more options separated by ', ' separator string.  We are matching
         # like this then:  ^<spaces>(<separator>?<option>)+<whatever>$
-        if [[ "$line" =~ \
+        if [[ $line =~ \
             ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
 
             line=${BASH_REMATCH[1]}
@@ -115,8 +115,8 @@ __gnu_tar_parse_help()
             # description in GNU help output mentions arguments.  So the $line
             # variable may contain e.g. '-X, --XXX[=NAME], -XXX2[=NAME]'.
             arg=none
-            if [[ "$line" =~ --[A-Za-z0-9-]+(\[?)= ]]; then
-                [[ -n "${BASH_REMATCH[1]}" ]] && arg=opt || arg=req
+            if [[ $line =~ --[A-Za-z0-9-]+(\[?)= ]]; then
+                [[ -n ${BASH_REMATCH[1]} ]] && arg=opt || arg=req
             fi
 
             __gtar_parse_help_line "$str" "$arg"
@@ -124,14 +124,11 @@ __gnu_tar_parse_help()
     done <<<"$(tar --help)"
 
     long_opts="\
-        $long_arg_none\
-        $long_arg_opt\
-        $long_arg_req"
+        $long_arg_none        $long_arg_opt        $long_arg_req"
 
     short_opts="$short_arg_none$short_arg_opt$short_arg_req"
 }
 
-
 # Hack: parse --warning keywords from tar's error output
 __gtar_parse_warnings()
 {
@@ -143,32 +140,30 @@ __gtar_parse_warnings()
     done
 }
 
-
 # Helper to obtain last character of string.
 __tar_last_char()
 {
-    echo "${1: $(( ${#1} - 1))}"
+    echo "${1:$((${#1} - 1))}"
 }
 
-
 __tar_parse_old_opt()
 {
     local first_word char
 
     # current word is the first word
-    [[ "$cword" -eq 1 && -n "$cur" && "${cur:0:1}" != '-' ]] \
-        && old_opt_progress=1
+    [[ $cword -eq 1 && -n $cur && ${cur:0:1} != '-' ]] &&
+        old_opt_progress=1
 
     # check that first argument does not begin with "-"
     first_word=${words[1]}
-    [[ -n "$first_word" && "${first_word:0:1}" != "-" ]] \
-        && old_opt_used=1
+    [[ -n $first_word && ${first_word:0:1} != "-" ]] &&
+        old_opt_used=1
 
     # parse the old option (if present) contents to allow later code expect
     # corresponding arguments
-    if [[ $old_opt_used -eq 1 ]]; then
+    if ((old_opt_used == 1)); then
         char=${first_word:0:1}
-        while [[ -n "$char" ]]; do
+        while [[ -n $char ]]; do
             if __tar_is_argreq "$char"; then
                 old_opt_parsed+=("$char")
             fi
@@ -178,11 +173,10 @@ __tar_parse_old_opt()
     fi
 }
 
-
 # Make the analysis of whole command line.
 __tar_preparse_cmdline()
 {
-    local first_arg my_args tmparg i modes="ctxurdA"
+    local first_arg i modes="ctxurdA"
 
     shift # progname
 
@@ -191,7 +185,7 @@ __tar_preparse_cmdline()
     first_arg=1
     for i in "$@"; do
         case "$i" in
-            --delete|--test-label)
+            --delete | --test-label)
                 tar_mode=${i:2:100}
                 tar_mode_arg=$i
                 break
@@ -207,7 +201,7 @@ __tar_preparse_cmdline()
                 ;;
             *[$modes]*)
                 # Only the first arg may be "MODE" without leading dash
-                if [[ $first_arg -eq 1 ]]; then
+                if ((first_arg == 1)); then
                     tar_mode=${i//[^$modes]/}
                     tar_mode=${tar_mode:0:1}
                     tar_mode_arg=$i
@@ -218,7 +212,6 @@ __tar_preparse_cmdline()
     done
 }
 
-
 # Generate completions for -f/--file.
 __tar_file_option()
 {
@@ -235,7 +228,6 @@ __tar_file_option()
     esac
 }
 
-
 # Returns truth if option requires argument.  No equal sign must be pasted.
 # Accepts option in format: 'c', '-c', '--create'
 __tar_is_argreq()
@@ -244,29 +236,28 @@ __tar_is_argreq()
     opt=$1
     case "$opt" in
         -[A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt##-} ]] && return 0
+            [[ $short_arg_req =~ ${opt##-} ]] && return 0
             ;;
         [A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt} ]] && return 0
+            [[ $short_arg_req =~ ${opt} ]] && return 0
             ;;
         --*)
-            [[ "$long_arg_req" =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
+            [[ $long_arg_req =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
             ;;
     esac
 
     return 1
 }
 
-
 # Called only for short parameter
 __tar_complete_mode()
 {
-    local short_modes has_mode rawopt generated \
-          allshort_raw_unused allshort_raw \
-          filler i
+    local short_modes rawopt generated \
+        allshort_raw_unused allshort_raw \
+        filler i
 
     short_modes="ctx"
-    [[ -z "$basic_tar" ]] && short_modes="ctxurdA"
+    [[ ! -v basic_tar ]] && short_modes="ctxurdA"
 
     # Remove prefix when needed
     rawopt=${cur#-}
@@ -275,95 +266,92 @@ __tar_complete_mode()
     allshort_raw=${short_opts//[- ]/}
 
     # init the 'mode' option if no option is in ${cur}
-    if [[ "$tar_mode" == none ]]; then
+    if [[ $tar_mode == none ]]; then
 
         # when user passed something like 'tar cf' do not put the '-' before
         filler=
-        if [[ -z "$cur" && -z "$basic_tar" ]]; then
+        if [[ -z $cur && ! -v basic_tar ]]; then
             filler=-
         fi
 
         generated=""
-        for (( i=0 ; 1; i++ )); do
-            local c="${short_modes:$i:1}"
-            [[ -z "$c" ]] && break
+        for ((i = 0; 1; i++)); do
+            local c="${short_modes:i:1}"
+            [[ -z $c ]] && break
             generated+=" $filler$cur$c"
         done
 
-        COMPREPLY=( $(compgen -W "$generated" ) )
+        COMPREPLY=($(compgen -W "$generated"))
         return 0
     fi
 
     # The last short option requires argument, like '-cf<TAB>'.  Cut the
     # completion here to enforce argument processing.
-    if [[ "$old_opt_progress" -eq 0 ]] \
-        && __tar_is_argreq "$(__tar_last_char "$cur")"; then
-        COMPREPLY=( "$cur" ) && return 0
+    if ((old_opt_progress == 0)) &&
+        __tar_is_argreq "$(__tar_last_char "$cur")"; then
+        COMPREPLY=("$cur") && return 0
     fi
 
     allshort_raw_unused=${allshort_raw//[$rawopt]/}
-    if [[ "$tar_mode" != none ]]; then
-        allshort_raw_unused=${allshort_raw_unused//[$short_modes]}
+    if [[ $tar_mode != none ]]; then
+        allshort_raw_unused=${allshort_raw_unused//[$short_modes]/}
     fi
 
     generated=
-    for (( i=0 ; 1; i++ )); do
-        local c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        local c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated") )
+    COMPREPLY=($(compgen -W "$generated"))
 
     return 0
 }
 
-
 __gtar_complete_lopts()
 {
     local rv
-    COMPREPLY=( $(compgen -W "$long_opts" -- "$cur") )
+    COMPREPLY=($(compgen -W "$long_opts" -- "$cur"))
     rv=$?
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     return $rv
 }
 
-
 __gtar_complete_sopts()
 {
     local generated short_mode_opts i c
     short_mode_opts="ctxurdA"
     generated=${short_opts//[$short_mode_opts]/}
 
-    for (( i=0 ; 1; i++ )); do
-        c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated" -- "$cur") )
+    COMPREPLY=($(compgen -W "$generated" -- "$cur"))
 }
 
-
 __tar_try_mode()
 {
     case "$cur" in
         --*)
             # posix tar does not support long opts
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
             __gtar_complete_lopts
             return $?
             ;;
 
         -*)
             # posix tar does not support short optios
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
 
             __tar_complete_mode && return 0
             ;;
 
         *)
-            if [[ "$cword" -eq 1 || "$tar_mode" == none ]]; then
+            if [[ $cword -eq 1 || $tar_mode == none ]]; then
                 __tar_complete_mode && return 0
             fi
             ;;
@@ -371,31 +359,27 @@ __tar_try_mode()
     return 1
 }
 
-
 __tar_adjust_PREV_from_old_option()
 {
     # deal with old style arguments here
     # $ tar cfTC # expects this sequence of arguments:
     # $ tar cfTC ARCHIVE_FILE PATTERNS_FILE CHANGE_DIR
-    if [[ "$old_opt_used" -eq 1 && "$cword" -gt 1 \
-        && "$cword" -lt $(( ${#old_opt_parsed[@]} + 2 )) ]];
-    then
+    if ((old_opt_used == 1 && cword > 1 && \
+        cword < ${#old_opt_parsed[@]} + 2)); then
         # make e.g. 'C' option from 'cffCT'
-        prev="-${old_opt_parsed[ $cword - 2 ]}"
+        prev="-${old_opt_parsed[cword - 2]}"
     fi
 }
 
-
 __tar_extract_like_mode()
 {
     local i
     for i in x d t delete; do
-        [[ "$tar_mode" == "$i" ]] && return 0
+        [[ $tar_mode == "$i" ]] && return 0
     done
     return 1
 }
 
-
 __tar_try_list_archive()
 {
     local tarball tarbin untar i
@@ -416,13 +400,13 @@ __tar_try_list_archive()
             break
         fi
     done
-    if [[ -n "$tarball" ]]; then
+    if [[ -n $tarball ]]; then
         local IFS=$'\n'
         COMPREPLY=($(compgen -o filenames -W "$(
             $tarbin $untar "$tarball" 2>/dev/null |
-            while read line; do
-                printf "%q\n" "$(printf %q"\n" "$line")"
-            done
+                while read line; do
+                    printf "%q\n" "$(printf %q"\n" "$line")"
+                done
         )" -- "$(printf "%q\n" "$cur")"))
         return 0
     fi
@@ -430,7 +414,7 @@ __tar_try_list_archive()
 
 __tar_cleanup_prev()
 {
-    if [[ "$prev" =~ ^-[a-zA-Z0-9?]*$ ]]; then
+    if [[ $prev =~ ^-[a-zA-Z0-9?]*$ ]]; then
         # transform '-caf' ~> '-f'
         prev="-$(__tar_last_char "$prev")"
     fi
@@ -448,11 +432,11 @@ __tar_detect_ext()
         ?(-)*[cr]*f)
             ext='@(tar|gem|spkg)'
             case ${words[1]} in
-                *a*)    ext="$tars"               ;;
-                *z*)    ext='t?(ar.)gz'           ;;
-                *Z*)    ext='ta@(r.Z|z)'          ;;
+                *a*) ext="$tars" ;;
+                *z*) ext='t?(ar.)gz' ;;
+                *Z*) ext='ta@(r.Z|z)' ;;
                 *[jy]*) ext='t@(?(ar.)bz?(2)|b2)' ;;
-                *J*)    ext='t?(ar.)xz'           ;;
+                *J*) ext='t?(ar.)xz' ;;
             esac
             ;;
         +([^ZzJjy])f)
@@ -470,14 +454,13 @@ __tar_detect_ext()
     esac
 }
 
-
 _gtar()
 {
-    local long_opts short_opts                          \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=0 old_opt_parsed=()
+    local long_opts short_opts \
+        long_arg_none="" long_arg_opt="" long_arg_req="" \
+        short_arg_none="" short_arg_opt="" short_arg_req="" \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=0 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -486,9 +469,9 @@ _gtar()
     # FIXME: handle long options
     local tar_mode_arg=
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set -x
-        PS4="\$BASH_SOURCE:\$LINENO: "
+        PS4='$BASH_SOURCE:$LINENO: '
     fi
 
     local cur prev words cword split
@@ -500,7 +483,7 @@ _gtar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -513,53 +496,53 @@ _gtar()
         # user (TODO: is there any sane way to deal with this?).  This case
         # statement successes only if there already is PREV.
         case $prev in
-            --directory|-!(-*)C)
+            --directory | -!(-*)C)
                 _filedir -d
                 break
                 ;;
             --atime-preserve)
-                COMPREPLY=( $(compgen -W 'replace system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'replace system' -- "$cur"))
                 break
                 ;;
             --group)
-                COMPREPLY=( $(compgen -g -- "$cur") )
+                COMPREPLY=($(compgen -g -- "$cur"))
                 break
                 ;;
             --owner)
-                COMPREPLY=( $(compgen -u -- "$cur") )
+                COMPREPLY=($(compgen -u -- "$cur"))
                 break
                 ;;
-            --info-script|--new-volume-script|--rmt-command|--rsh-command|\
-            --use-compress-program|-!(-*)[FI])
+            --info-script | --new-volume-script | --rmt-command | --rsh-command | \
+                --use-compress-program | -!(-*)[FI])
                 compopt -o filenames
-                COMPREPLY=( $(compgen -c -- "$cur") )
+                COMPREPLY=($(compgen -c -- "$cur"))
                 break
                 ;;
-            --volno-file|--add-file|--files-from|--exclude-from|\
-            --index-file|--listed-incremental|-!(-*)[TXg])
+            --volno-file | --add-file | --files-from | --exclude-from | \
+                --index-file | --listed-incremental | -!(-*)[TXg])
                 _filedir
                 break
                 ;;
-            --format|-!(-*)H)
-                COMPREPLY=( $(compgen -W 'gnu oldgnu pax posix ustar v7' \
-                    -- "$cur") )
+            --format | -!(-*)H)
+                COMPREPLY=($(compgen -W 'gnu oldgnu pax posix ustar v7' \
+                    -- "$cur"))
                 break
                 ;;
             --quoting-style)
-                COMPREPLY=( $(compgen -W 'literal shell shell-always c c-maybe
-                    escape locale clocale' -- "$cur") )
+                COMPREPLY=($(compgen -W 'literal shell shell-always c c-maybe
+                    escape locale clocale' -- "$cur"))
                 break
                 ;;
             --totals)
-                COMPREPLY=( $(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
+                    -- "$cur"))
                 break
                 ;;
             --warning)
-                COMPREPLY=( $(compgen -W "$(__gtar_parse_warnings)" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(__gtar_parse_warnings)" -- "$cur"))
                 break
                 ;;
-            --file|-!(-*)f)
+            --file | -!(-*)f)
                 __tar_file_option "$ext"
                 break
                 ;;
@@ -581,7 +564,7 @@ _gtar()
                 ;;
             -!(-*)[a-zA-Z0-9?])
                 # argument required but no completion yet
-                [[ "$short_arg_req" =~ ${prev##-} ]] && break
+                [[ $short_arg_req =~ ${prev##-} ]] && break
                 ;;
         esac
 
@@ -612,7 +595,7 @@ _gtar()
 
         # the first argument must be "mode" argument or --param, if any of those
         # was truth - the 'break' statement would have been already called
-        [[ "$cword" -eq 1 ]] && break
+        ((cword == 1)) && break
 
         __tar_try_list_archive && break
 
@@ -624,13 +607,12 @@ _gtar()
         break
     done # just-for-easy-break while
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set +x
         unset PS4
     fi
 }
 
-
 __tar_posix_prev_handle()
 {
     case "$prev" in
@@ -640,19 +622,19 @@ __tar_posix_prev_handle()
             ;;
         -b)
             return 0
+            ;;
     esac
 
     return 1
 }
 
-
 _posix_tar()
 {
-    local long_opts short_opts basic_tar                \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=1 old_opt_parsed=()
+    local long_opts short_opts basic_tar \
+        long_arg_none="" long_arg_opt long_arg_req="" \
+        short_arg_none short_arg_opt short_arg_req \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=1 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -675,7 +657,7 @@ _posix_tar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -691,23 +673,22 @@ _posix_tar()
     _filedir
 }
 
-
 _tar()
 {
     local cmd=${COMP_WORDS[0]} func line
     line="$($cmd --version 2>/dev/null)"
     case "$line" in
-    *GNU*)
-        func=_gtar
-        ;;
-    *)
-        func=_posix_tar
-        ;;
+        *GNU*)
+            func=_gtar
+            ;;
+        *)
+            func=_posix_tar
+            ;;
     esac
     $func "$@"
 
     # Install real completion for subsequent completions
-    if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
+    if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
         complete -F $func -o dirnames tar
     else
         complete -F $func tar
@@ -715,17 +696,16 @@ _tar()
     unset -f _tar
 }
 
-
-if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
-    complete -F _tar        -o dirnames tar
-    complete -F _gtar       -o dirnames gtar
-    complete -F _posix_tar  -o dirnames bsdtar
-    complete -F _posix_tar  -o dirnames star
+if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
+    complete -F _tar -o dirnames tar
+    complete -F _gtar -o dirnames gtar
+    complete -F _posix_tar -o dirnames bsdtar
+    complete -F _posix_tar -o dirnames star
 else
-    complete -F _tar        tar
-    complete -F _gtar       gtar
-    complete -F _posix_tar  bsdtar
-    complete -F _posix_tar  star
+    complete -F _tar tar
+    complete -F _gtar gtar
+    complete -F _posix_tar bsdtar
+    complete -F _posix_tar star
 fi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/btdownloadcurses.py b/msys2/usr/share/bash-completion/completions/btdownloadcurses.py
index c15de1a47..a470e5357 100644
--- a/msys2/usr/share/bash-completion/completions/btdownloadcurses.py
+++ b/msys2/usr/share/bash-completion/completions/btdownloadcurses.py
@@ -6,14 +6,14 @@ _btdownload()
     _init_completion || return
 
     case $prev in
-        --responsefile|--saveas)
+        --responsefile | --saveas)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--max_uploads --keepalive_interval
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--max_uploads --keepalive_interval
             --download_slice_size --request_backlog --max_message_length
             --ip --minport --maxport --responsefile --url --saveas --timeout
             --timeout_check_interval --max_slice_length --max_rate_period
@@ -21,12 +21,12 @@ _btdownload()
             --min_peers --http_timeout --max_initiate --max_allow_in
             --check_hashes --max_upload_rate --snub_time --spew
             --rarest_first_cutoff --min_uploads --report_hash_failures' \
-            -- "$cur") )
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
-    btdownloadgui.py
+    complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
+        btdownloadgui.py
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/btdownloadgui.py b/msys2/usr/share/bash-completion/completions/btdownloadgui.py
index c15de1a47..a470e5357 100644
--- a/msys2/usr/share/bash-completion/completions/btdownloadgui.py
+++ b/msys2/usr/share/bash-completion/completions/btdownloadgui.py
@@ -6,14 +6,14 @@ _btdownload()
     _init_completion || return
 
     case $prev in
-        --responsefile|--saveas)
+        --responsefile | --saveas)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--max_uploads --keepalive_interval
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--max_uploads --keepalive_interval
             --download_slice_size --request_backlog --max_message_length
             --ip --minport --maxport --responsefile --url --saveas --timeout
             --timeout_check_interval --max_slice_length --max_rate_period
@@ -21,12 +21,12 @@ _btdownload()
             --min_peers --http_timeout --max_initiate --max_allow_in
             --check_hashes --max_upload_rate --snub_time --spew
             --rarest_first_cutoff --min_uploads --report_hash_failures' \
-            -- "$cur") )
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
-    btdownloadgui.py
+    complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
+        btdownloadgui.py
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/btdownloadheadless.py b/msys2/usr/share/bash-completion/completions/btdownloadheadless.py
index c15de1a47..a470e5357 100644
--- a/msys2/usr/share/bash-completion/completions/btdownloadheadless.py
+++ b/msys2/usr/share/bash-completion/completions/btdownloadheadless.py
@@ -6,14 +6,14 @@ _btdownload()
     _init_completion || return
 
     case $prev in
-        --responsefile|--saveas)
+        --responsefile | --saveas)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--max_uploads --keepalive_interval
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--max_uploads --keepalive_interval
             --download_slice_size --request_backlog --max_message_length
             --ip --minport --maxport --responsefile --url --saveas --timeout
             --timeout_check_interval --max_slice_length --max_rate_period
@@ -21,12 +21,12 @@ _btdownload()
             --min_peers --http_timeout --max_initiate --max_allow_in
             --check_hashes --max_upload_rate --snub_time --spew
             --rarest_first_cutoff --min_uploads --report_hash_failures' \
-            -- "$cur") )
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
-    btdownloadgui.py
+    complete -F _btdownload btdownloadheadless.py btdownloadcurses.py \
+        btdownloadgui.py
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bts b/msys2/usr/share/bash-completion/completions/bts
index c87b51e17..d535d13ed 100644
--- a/msys2/usr/share/bash-completion/completions/bts
+++ b/msys2/usr/share/bash-completion/completions/bts
@@ -1,92 +1,89 @@
 # bts completion                                      -*- shell-script -*-
 
 # List bug numbers from bugs cache in ~/.devscripts_cache/bts
-_cached_bugs() {
-    [[ -d $HOME/.devscripts_cache/bts ]] && \
+_cached_bugs()
+{
+    [[ -d $HOME/.devscripts_cache/bts ]] &&
         find $HOME/.devscripts_cache/bts -maxdepth 1 -name "${cur}[0-9]*.html" \
             -printf "%f\n" | cut -d'.' -f1
 }
 
 # List APT source packages prefixed with "src:"
-_src_packages_with_prefix() {
+_src_packages_with_prefix()
+{
     ppn=${cur:4} # partial package name, after stripping "src:"
     compgen -P "src:" -W '$(_xfunc apt-cache _apt_cache_sources "$ppn")' \
         -- "$ppn"
 }
 
-
 _bts()
 {
     local cur prev words cword split
     _init_completion -s || return
 
     case $prev in
-        show|bugs)
-            COMPREPLY=( $(compgen -W 'release-critical RC from: tag:
+        show | bugs)
+            COMPREPLY=($(compgen -W 'release-critical RC from: tag:
                 usertag:' -- "$cur") $(_cached_bugs)
-                $(_src_packages_with_prefix) )
+            $(_src_packages_with_prefix))
             return
             ;;
         select)
-            COMPREPLY=( $(compgen -W 'package: source: maintainer: submitter:
+            COMPREPLY=($(compgen -W 'package: source: maintainer: submitter:
                 severity: status: tag: owner: correspondent: affects: bugs:
-                users:  archive:' -- "$cur") )
+                users:  archive:' -- "$cur"))
             return
             ;;
         status)
-            COMPREPLY=( $(compgen -W 'file: fields: verbose' -- "$cur")
-                        $(_cached_bugs) )
+            COMPREPLY=($(compgen -W 'file: fields: verbose' -- "$cur")
+            $(_cached_bugs))
             return
             ;;
-        block|unblock)
-            COMPREPLY=( $(compgen -W 'by with' -- "$cur") )
+        block | unblock)
+            COMPREPLY=($(compgen -W 'by with' -- "$cur"))
             return
             ;;
         severity)
-            COMPREPLY=( $(compgen -W 'wishlist minor normal important serious
-                grave critical' -- "$cur") )
+            COMPREPLY=($(compgen -W 'wishlist minor normal important serious
+                grave critical' -- "$cur"))
             return
             ;;
         limit)
-            COMPREPLY=( $(compgen -W 'submitter date subject msgid package
-                source tag severity owner affects archive' -- "$cur") )
+            COMPREPLY=($(compgen -W 'submitter date subject msgid package
+                source tag severity owner affects archive' -- "$cur"))
             return
             ;;
-        clone|"done"|reopen|archive|unarchive|retitle|summary|submitter|found\
-            |notfound|fixed|notfixed|merge|forcemerge|unmerge|claim|unclaim\
-            |forwarded|notforwarded|owner|noowner|subscribe|unsubscribe\
-            |reportspam|spamreport|affects|usertag|usertags|reassign|tag\
-            |tags)
-            COMPREPLY=( $(_cached_bugs) )
+        clone | "done" | reopen | archive | unarchive | retitle | summary | submitter | found | notfound | fixed | notfixed | merge | forcemerge | unmerge | claim | unclaim | forwarded | notforwarded | owner | noowner | subscribe | unsubscribe | reportspam | spamreport | affects | usertag | usertags | reassign | tag | tags)
+            COMPREPLY=($(_cached_bugs))
             return
             ;;
         package)
-            COMPREPLY=( $(_xfunc apt-cache _apt_cache_packages) )
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
             return
             ;;
         cache)
-            COMPREPLY=( $(_xfunc apt-cache _apt_cache_packages)
-                        $(_src_packages_with_prefix)
-                        $(compgen -W 'from: release-critical RC' -- "$cur") )
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages)
+            $(_src_packages_with_prefix)
+            $(compgen -W 'from: release-critical RC' -- "$cur"))
             return
             ;;
         cleancache)
-            COMPREPLY=( $(_xfunc apt-cache _apt_cache_packages)
-                        $(_src_packages_with_prefix)
-                        $(compgen -W 'from: tag: usertag: ALL' -- "$cur") )
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages)
+            $(_src_packages_with_prefix)
+            $(compgen -W 'from: tag: usertag: ALL' -- "$cur"))
             return
             ;;
         user)
             # non-predicible arguments
-            COMPREPLY=( )
+            COMPREPLY=()
             return
             ;;
         :)
             # Chances are that "src:<src_package>" is being completed
             # COMP_WORDS would be: "bts cleancache src : <partial_pkg_name>"
             pos=$((COMP_CWORD - 2))
-            if [[ $pos -gt 0 && "${COMP_WORDS[$pos]}" == "src" ]]; then
-                COMPREPLY=( $(_xfunc apt-cache _apt_cache_src_packages) )
+            if [[ $pos -gt 0 && ${COMP_WORDS[pos]} == "src" ]]; then
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_src_packages))
                 return
             fi
             ;;
@@ -94,7 +91,7 @@ _bts()
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '--offline --online --no-offline
+    COMPREPLY=($(compgen -W '--offline --online --no-offline
         --no-action --cache --no-cache --cache-mode --cache-delay --mbox
         --mailreader --cc-addr --use-default-cc --no-use-default-cc
         --sendmail --mutt --no-mutt --smtp-host --smtp-username
@@ -107,9 +104,9 @@ _bts()
         merge forcemerge unmerge tag tags affects user usertag usertags claim
         unclaim severity forwarded notforwarded package limit owner noowner
         subscribe unsubscribe reportspam spamreport cache cleancache version
-        help' -- "$cur") )
+        help' -- "$cur"))
 
 } &&
-complete -F _bts bts
+    complete -F _bts bts
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/bzip2 b/msys2/usr/share/bash-completion/completions/bzip2
index 8bd72cc98..40e50fe32 100644
--- a/msys2/usr/share/bash-completion/completions/bzip2
+++ b/msys2/usr/share/bash-completion/completions/bzip2
@@ -6,37 +6,37 @@ _bzip2()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)[bhp])
+        --help | -!(-*)[bhp])
             return
             ;;
         -!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local helpopts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
-            -- "$cur") )
+        COMPREPLY=($(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
+            -- "$cur"))
         return
     fi
 
     local IFS=$'\n' xspec="*.?(t)bz2"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --compress ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*z* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --compress ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dt]* ]] && xspec="!"$xspec
+        [[ $prev == -*z* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _bzip2 bzip2 pbzip2 lbzip2
+    complete -F _bzip2 bzip2 pbzip2 lbzip2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/c++ b/msys2/usr/share/bash-completion/completions/c++
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/c++
+++ b/msys2/usr/share/bash-completion/completions/c++
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cancel b/msys2/usr/share/bash-completion/completions/cancel
index b903517bb..3e0c1d527 100644
--- a/msys2/usr/share/bash-completion/completions/cancel
+++ b/msys2/usr/share/bash-completion/completions/cancel
@@ -14,14 +14,14 @@ _cancel()
             return
             ;;
         -u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W \
-        "$(lpstat 2>/dev/null | cut -d' ' -f1)" -- "$cur") )
+    COMPREPLY=($(compgen -W \
+        "$(lpstat 2>/dev/null | cut -d' ' -f1)" -- "$cur"))
 } &&
-complete -F _cancel cancel
+    complete -F _cancel cancel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cardctl b/msys2/usr/share/bash-completion/completions/cardctl
index 588ea4670..bb3a0dba5 100644
--- a/msys2/usr/share/bash-completion/completions/cardctl
+++ b/msys2/usr/share/bash-completion/completions/cardctl
@@ -5,11 +5,11 @@ _cardctl()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'status config ident suspend resume reset
-            eject insert scheme' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'status config ident suspend resume reset
+            eject insert scheme' -- "$cur"))
     fi
 } &&
-complete -F _cardctl cardctl pccardctl
+    complete -F _cardctl cardctl pccardctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/carton b/msys2/usr/share/bash-completion/completions/carton
index 0cf6e2cac..5d700c890 100644
--- a/msys2/usr/share/bash-completion/completions/carton
+++ b/msys2/usr/share/bash-completion/completions/carton
@@ -2,15 +2,15 @@
 
 _carton_commands()
 {
-    local cmds=$("${1:-carton}" usage 2>&1 | \
-                     command sed -ne '/.*command.* is one of/{n;p;q}')
-    COMPREPLY+=( $(IFS="$IFS," compgen -W "$cmds" -- "$cur") )
+    local cmds=$("${1:-carton}" usage 2>&1 |
+        command sed -ne '/.*command.* is one of/{n;p;q;}')
+    COMPREPLY+=($(IFS="$IFS," compgen -W "$cmds" -- "$cur"))
 }
 
 _carton_command_help()
 {
     local help=$(PERLDOC_PAGER=cat PERLDOC=-otext "${1:-carton}" -h $2 2>&1)
-    COMPREPLY+=( $(compgen -W '$help' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$help' -- "$cur"))
 }
 
 _carton()
@@ -19,24 +19,27 @@ _carton()
     _init_completion -s || return
 
     local i command
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
             -*) ;;
-            *) command=${words[i]}; break ;;
+            *)
+                command=${words[i]}
+                break
+                ;;
         esac
     done
 
-    if [[ -z "$command" ]]; then
+    if [[ ! -v command ]]; then
         _carton_commands "$1"
         return
     fi
 
     case $prev in
-        --version|-v)
+        --version | -v)
             return
             ;;
-        --help|-h)
-            [[ -n "$command" ]] || _carton_commands "$1"
+        --help | -h)
+            [[ -n $command ]] || _carton_commands "$1"
             return
             ;;
         --cpanfile)
@@ -54,7 +57,7 @@ _carton()
         --without)
             if [[ $command == install ]]; then
                 local phases="configure build test runtime develop"
-                COMPREPLY+=( $(compgen -W '$phases' -- "$cur") )
+                COMPREPLY+=($(compgen -W '$phases' -- "$cur"))
                 return
             fi
             ;;
@@ -68,11 +71,11 @@ _carton()
     fi
 
     case $command in
-        show|update)
-            :  # TODO modules completion
+        show | update)
+            : # TODO modules completion
             ;;
     esac
 } &&
-complete -F _carton carton
+    complete -F _carton carton
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cc b/msys2/usr/share/bash-completion/completions/cc
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/cc
+++ b/msys2/usr/share/bash-completion/completions/cc
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ccache b/msys2/usr/share/bash-completion/completions/ccache
index 7dbec9fec..80c39de05 100644
--- a/msys2/usr/share/bash-completion/completions/ccache
+++ b/msys2/usr/share/bash-completion/completions/ccache
@@ -6,7 +6,7 @@ _ccache()
     _init_completion -s || return
 
     local i
-    for (( i=1; i <= COMP_CWORD; i++ )); do
+    for ((i = 1; i <= COMP_CWORD; i++)); do
         if [[ ${COMP_WORDS[i]} != -* ]]; then
             _command_offset $i
             return
@@ -15,14 +15,14 @@ _ccache()
     done
 
     case $prev in
-        --help|--version|--max-files|--max-size|-!(-*)[hVFM])
+        --help | --version | --max-files | --max-size | -!(-*)[hVFM])
             return
             ;;
-        --set-config|-!(-*)o)
+        --set-config | -!(-*)o)
             if [[ $cur != *=* ]]; then
-                COMPREPLY=( $(compgen -S = -W "$($1 -p 2>/dev/null | \
-                    awk '$3 = "=" { print $2 }')" -- "$cur") )
-                [[ $COMPREPLY == *= ]] && compopt -o nospace
+                COMPREPLY=($(compgen -S = -W "$($1 -p 2>/dev/null |
+                    awk '$3 = "=" { print $2 }')" -- "$cur"))
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             fi
             return
             ;;
@@ -30,9 +30,9 @@ _ccache()
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _ccache ccache
+    complete -F _ccache ccache
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ccze b/msys2/usr/share/bash-completion/completions/ccze
index 7c17f364e..35f4c3f33 100644
--- a/msys2/usr/share/bash-completion/completions/ccze
+++ b/msys2/usr/share/bash-completion/completions/ccze
@@ -6,38 +6,39 @@ _ccze()
     _init_completion -s || return
 
     case $prev in
-        -'?'|--help|--usage|-V|--version)
+        -'?' | --help | --usage | -V | --version)
             return
             ;;
-        --argument|--color|-!(-*)[ac])
+        --argument | --color | -!(-*)[ac])
             # TODO?
             return
             ;;
-        --rcfile|-!(-*)F)
+        --rcfile | -!(-*)F)
             _filedir
             return
             ;;
-        --mode|-!(-*)m)
-            COMPREPLY=( $(compgen -W "curses ansi html" -- "$cur") )
+        --mode | -!(-*)m)
+            COMPREPLY=($(compgen -W "curses ansi html" -- "$cur"))
             return
             ;;
-        --option|-!(-*)o)
+        --option | -!(-*)o)
             local -a opts=(scroll wordcolor lookups transparent cssfile)
-            COMPREPLY=( $(compgen -W '${opts[@]} ${opts[@]/#/no}' -- "$cur") )
+            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]/#/no}' -- "$cur"))
             return
             ;;
-        --plugin|-!(-*)p)
-            COMPREPLY=( $(compgen -W '$("$1" --list-plugins | command \
+        --plugin | -!(-*)p)
+            COMPREPLY=($(compgen -W '$("$1" --list-plugins | command \
                 sed -ne "s/^\([a-z0-9]\{1,\}\)[[:space:]]\{1,\}|.*/\1/p")' \
-                -- "$cur") )
+                -- "$cur"))
             return
+            ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _ccze ccze
+    complete -F _ccze ccze
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cdrecord b/msys2/usr/share/bash-completion/completions/cdrecord
index ac1dc5a9b..b308291d3 100644
--- a/msys2/usr/share/bash-completion/completions/cdrecord
+++ b/msys2/usr/share/bash-completion/completions/cdrecord
@@ -5,19 +5,19 @@ _cdrecord()
     local cur prev words cword
     _init_completion -n = || return
 
-    local i generic_options track_options track_mode
+    local generic_options track_options track_mode
 
     # foo=bar style option
-    if [[ "$cur" == *=* ]]; then
+    if [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
         case $prev in
-            textfile|cuefile|msifile)
+            textfile | cuefile | msifile)
                 _filedir
                 ;;
             blank)
-                COMPREPLY=( $(compgen -W 'help all fast track unreserve trtail
-                    unclose session' -- "$cur") )
+                COMPREPLY=($(compgen -W 'help all fast track unreserve trtail
+                    unclose session' -- "$cur"))
                 ;;
             driveropts)
                 if [[ $cur == *=* ]]; then
@@ -25,53 +25,55 @@ _cdrecord()
                     cur=${cur#*=}
                     case $prev in
                         varirec)
-                            COMPREPLY=( $(compgen -W "-2 -1 0 1 2" -- "$cur") )
+                            COMPREPLY=($(compgen -W "-2 -1 0 1 2" -- "$cur"))
                             ;;
                         gigarec)
-                            COMPREPLY=( $(compgen -W "0.6 0.7 0.8 1.0 1.2 1.3
-                                1.4" -- "$cur") )
+                            COMPREPLY=($(compgen -W "0.6 0.7 0.8 1.0 1.2 1.3
+                                1.4" -- "$cur"))
                             ;;
                         tattoofile)
                             _filedir
                             ;;
                     esac
                 else
-                    COMPREPLY=( $(compgen -W 'burnfree noburnfree varirec=
+                    COMPREPLY=($(compgen -W 'burnfree noburnfree varirec=
                         gigarec= audiomaster forcespeed noforcespeed speedread
                         nospeedread singlesession nosinglesession hidecdr
-                        nohidecdr tattooinfo tattoofile=' -- "$cur") )
-                    [[ $COMPREPLY == *= ]] && compopt -o nospace
+                        nohidecdr tattooinfo tattoofile=' -- "$cur"))
+                    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
                 fi
                 ;;
             driver)
-                COMPREPLY=( $(compgen -W "$($1 driver=help 2>&1 | \
-                    awk 'NR > 1 { print $1 }') help" -- "$cur") )
+                COMPREPLY=($(compgen -W "$($1 driver=help 2>&1 |
+                    awk 'NR > 1 { print $1 }') help" -- "$cur"))
                 ;;
             minbuf)
-                COMPREPLY=( $(compgen -W '{25..95}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{25..95}' -- "$cur"))
                 ;;
         esac
         return
     fi
 
-    generic_options=( -version -v -V -d -silent -force -immed -dummy -clone \
-        -dao -sao -tao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip \
-        -fix -nofix -waiti -load -lock -eject -format -setdropts -checkdrive \
-        -prcap -inq -scanbus --devices -reset -abort -overburn -ignsize \
-        -useinfo -packet -noclose -text debug= kdebug= minbuf= msifile= \
-        speed= blank= fs= ts= dev= gracetime= timeout= driver= driveropts= \
-        defpregap= pktsize= mcn= textfile= cuefile= )
-    track_options=( -audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi \
-        -isosize -pad -nopad -shorttrack -noshorttrack -preemp -nopreemp \
-        -copy -nocopy -scms isrc= index= padsize= pregap= tsize= )
+    generic_options=(-version -v -V -d -silent -force -immed -dummy -clone
+        -dao -sao -tao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip
+        -fix -nofix -waiti -load -lock -eject -format -setdropts -checkdrive
+        -prcap -inq -scanbus --devices -reset -abort -overburn -ignsize
+        -useinfo -packet -noclose -text "debug=" "kdebug=" "minbuf="
+        "msifile=" "speed=" "blank=" "fs=" "ts=" "dev=" "gracetime="
+        "timeout=" "driver=" "driveropts=" "defpregap=" "pktsize=" "mcn="
+        "textfile=" "cuefile=")
+    track_options=(-audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi
+        -isosize -pad -nopad -shorttrack -noshorttrack -preemp -nopreemp
+        -copy -nocopy -scms "isrc=" "index=" "padsize=" "pregap=" "tsize=")
     # look if previous was either a file or a track option
     track_mode=0
-    if [[ $cword -gt 1 ]]; then
+    if ((cword > 1)); then
         if [[ -f $prev ]]; then
             track_mode=1
         else
-            for (( i=0; i < ${#track_options[@]}; i++ )); do
-                if [[ "${track_options[i]}" == "$prev" ]]; then
+            local opt
+            for opt in "${track_options[@]}"; do
+                if [[ $opt == "$prev" ]]; then
                     track_mode=1
                     break
                 fi
@@ -82,13 +84,13 @@ _cdrecord()
     # files are always eligible completion
     _filedir
     # track options are always available
-    COMPREPLY+=( $(compgen -W '${track_options[@]}' -- "$cur") )
+    COMPREPLY+=($(compgen -W '${track_options[@]}' -- "$cur"))
     # general options are no more available after file or track option
-    if [[ $track_mode -eq 0 ]]; then
-        COMPREPLY+=( $(compgen -W '${generic_options[@]}' -- "$cur") )
+    if ((track_mode == 0)); then
+        COMPREPLY+=($(compgen -W '${generic_options[@]}' -- "$cur"))
     fi
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _cdrecord cdrecord wodim
+    complete -F _cdrecord cdrecord wodim
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cfagent b/msys2/usr/share/bash-completion/completions/cfagent
index 14987723e..e7ba04de0 100644
--- a/msys2/usr/share/bash-completion/completions/cfagent
+++ b/msys2/usr/share/bash-completion/completions/cfagent
@@ -6,16 +6,16 @@ _cfagent()
     _init_completion || return
 
     case $prev in
-        -f|--file)
+        -f | --file)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _cfagent cfagent
+    complete -F _cfagent cfagent
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cfrun b/msys2/usr/share/bash-completion/completions/cfrun
index 0a7d0542a..72b613890 100644
--- a/msys2/usr/share/bash-completion/completions/cfrun
+++ b/msys2/usr/share/bash-completion/completions/cfrun
@@ -6,9 +6,9 @@ _cfrun()
     _init_completion || return
 
     local i section=1
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -- ]]; then
-            (( section++ ))
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -- ]]; then
+            ((section++))
         fi
     done
 
@@ -21,27 +21,27 @@ _cfrun()
                     ;;
             esac
 
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W '-f -h -d -S -T -v' -- "$cur") )
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '-f -h -d -S -T -v' -- "$cur"))
             else
-                hostfile=${CFINPUTS:-/var/lib/cfengine/inputs}/cfrun.hosts
-                for (( i=1; i < cword; i++ )); do
-                    if [[ "${words[i]}" == -f ]]; then
-                        hostfile=${words[i+1]}
+                local hostfile=${CFINPUTS:-/var/lib/cfengine/inputs}/cfrun.hosts
+                for ((i = 1; i < cword; i++)); do
+                    if [[ ${words[i]} == -f ]]; then
+                        hostfile=${words[i + 1]}
                         break
                     fi
                 done
                 [[ ! -f $hostfile ]] && return
 
-                COMPREPLY=( $(compgen -W  "$(command grep -v \
-                    -E '(=|^$|^#)' $hostfile )" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(command grep -v \
+                    -E '(=|^$|^#)' $hostfile)" -- "$cur"))
             fi
             ;;
         2)
-            COMPREPLY=( $(compgen -W '$(_parse_help cfagent)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help cfagent)' -- "$cur"))
             ;;
     esac
 } &&
-complete -F _cfrun cfrun
+    complete -F _cfrun cfrun
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chage b/msys2/usr/share/bash-completion/completions/chage
index cb9d8fcf3..fcf87cd49 100644
--- a/msys2/usr/share/bash-completion/completions/chage
+++ b/msys2/usr/share/bash-completion/completions/chage
@@ -6,11 +6,11 @@ _chage()
     _init_completion -s || return
 
     case $prev in
-        --lastday|--expiredate|--help|--inactive|--mindays|--maxdays|\
-        --warndays|-!(-*)[dEhImMW])
+        --lastday | --expiredate | --help | --inactive | --mindays | --maxdays | \
+            --warndays | -!(-*)[dEhImMW])
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
@@ -18,13 +18,13 @@ _chage()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _chage chage
+    complete -F _chage chage
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/change_pw b/msys2/usr/share/bash-completion/completions/change_pw
index 61c457684..04837ea96 100644
--- a/msys2/usr/share/bash-completion/completions/change_pw
+++ b/msys2/usr/share/bash-completion/completions/change_pw
@@ -6,7 +6,7 @@ _change_pw()
     _init_completion -s || return
 
     case $prev in
-        -l|--listname)
+        -l | --listname)
             _xfunc list_lists _mailman_lists
             return
             ;;
@@ -14,12 +14,12 @@ _change_pw()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--all --domain --listname --password --quiet
-            --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--all --domain --listname --password --quiet
+            --help' -- "$cur"))
     fi
 
 } &&
-complete -F _change_pw change_pw
+    complete -F _change_pw change_pw
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/check_db b/msys2/usr/share/bash-completion/completions/check_db
index ade03a5a9..aaec99fde 100644
--- a/msys2/usr/share/bash-completion/completions/check_db
+++ b/msys2/usr/share/bash-completion/completions/check_db
@@ -5,13 +5,13 @@ _check_db()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--all --verbose --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--all --verbose --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _check_db check_db
+    complete -F _check_db check_db
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/check_perms b/msys2/usr/share/bash-completion/completions/check_perms
index d53b22a6d..8ff276ef3 100644
--- a/msys2/usr/share/bash-completion/completions/check_perms
+++ b/msys2/usr/share/bash-completion/completions/check_perms
@@ -5,11 +5,11 @@ _check_perms()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-f -v -h' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-f -v -h' -- "$cur"))
     fi
 
 } &&
-complete -F _check_perms check_perms
+    complete -F _check_perms check_perms
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/checksec b/msys2/usr/share/bash-completion/completions/checksec
index e07d07d06..fc2fef790 100644
--- a/msys2/usr/share/bash-completion/completions/checksec
+++ b/msys2/usr/share/bash-completion/completions/checksec
@@ -6,10 +6,10 @@ _checksec()
     _init_completion || return
 
     case $prev in
-        --version|--help)
+        --version | --help)
             return
             ;;
-        --file|--fortify-file)
+        --file | --fortify-file)
             _filedir
             return
             ;;
@@ -21,17 +21,17 @@ _checksec()
             _pnames
             return
             ;;
-        --proc-libs|--fortify-proc)
+        --proc-libs | --fortify-proc)
             _pids
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 } &&
-complete -F _checksec checksec
+    complete -F _checksec checksec
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chgrp b/msys2/usr/share/bash-completion/completions/chgrp
index 0e39739c8..4793a4577 100644
--- a/msys2/usr/share/bash-completion/completions/chgrp
+++ b/msys2/usr/share/bash-completion/completions/chgrp
@@ -7,7 +7,7 @@ _chgrp()
 
     cur=${cur//\\\\/}
 
-    if [[ "$prev" == --reference ]]; then
+    if [[ $prev == --reference ]]; then
         _filedir
         return
     fi
@@ -15,25 +15,25 @@ _chgrp()
     $split && return
 
     # options completion
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local w opts
-        for w in "${words[@]}" ; do
-            [[ "$w" == -@(R|-recursive) ]] && opts="-H -L -P" && break
+        for w in "${words[@]}"; do
+            [[ $w == -@(R|-recursive) ]] && opts="-H -L -P" && break
         done
-        COMPREPLY=( $(compgen -W '-c -h -f -R -v --changes --dereference
+        COMPREPLY=($(compgen -W '-c -h -f -R -v --changes --dereference
             --no-dereference --silent --quiet --reference --recursive --verbose
-            --help --version $opts' -- "$cur") )
+            --help --version $opts' -- "$cur"))
         return
     fi
 
     # first parameter on line or first since an option?
-    if [[ $cword -eq 1 && "$cur" != -* || "$prev" == -* ]]; then
+    if [[ $cword -eq 1 && $cur != -* || $prev == -* ]]; then
         _allowed_groups "$cur"
     else
         _filedir
     fi
 
 } &&
-complete -F _chgrp chgrp
+    complete -F _chgrp chgrp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chkconfig b/msys2/usr/share/bash-completion/completions/chkconfig
index f1ee87044..8ff66376a 100644
--- a/msys2/usr/share/bash-completion/completions/chkconfig
+++ b/msys2/usr/share/bash-completion/completions/chkconfig
@@ -6,32 +6,32 @@ _chkconfig()
     _init_completion -s || return
 
     case $prev in
-        --level=[1-6]|[1-6]|--list|--add|--del|--override)
+        --level=[1-6] | [1-6] | --list | --add | --del | --override)
             _services
             _xinetd_services
             return
             ;;
         --level)
-            COMPREPLY=( $(compgen -W '{1..6}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..6}' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--list --add --del --override --level' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--list --add --del --override --level' \
+            -- "$cur"))
     else
-        if [[ $cword -eq 2 || $cword -eq 4 ]]; then
-            COMPREPLY=( $(compgen -W 'on off reset resetpriorities' \
-                -- "$cur") )
+        if ((cword == 2 || cword == 4)); then
+            COMPREPLY=($(compgen -W 'on off reset resetpriorities' \
+                -- "$cur"))
         else
             _services
             _xinetd_services
         fi
     fi
 } &&
-complete -F _chkconfig chkconfig
+    complete -F _chkconfig chkconfig
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chmod b/msys2/usr/share/bash-completion/completions/chmod
index 849da8511..d3fc34996 100644
--- a/msys2/usr/share/bash-completion/completions/chmod
+++ b/msys2/usr/share/bash-completion/completions/chmod
@@ -6,7 +6,7 @@ _chmod()
     _init_completion -s || return
 
     case $prev in
-        --help|--version)
+        --help | --version)
             return
             ;;
         --reference)
@@ -20,10 +20,11 @@ _chmod()
     # Adapted from coreutils 8.28 chmod man page
     local modearg="-@(@(+([rwxXst])|[ugo])|+([0-7]))"
 
+    # shellcheck disable=SC2053
     if [[ $cur == -* && $cur != $modearg ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -31,10 +32,10 @@ _chmod()
     _count_args "" "" "$modearg"
 
     case $args in
-        1) ;;  # mode
+        1) ;; # mode
         *) _filedir ;;
     esac
 } &&
-complete -F _chmod chmod
+    complete -F _chmod chmod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chown b/msys2/usr/share/bash-completion/completions/chown
index 6bfa264af..1d746b7a2 100644
--- a/msys2/usr/share/bash-completion/completions/chown
+++ b/msys2/usr/share/bash-completion/completions/chown
@@ -19,28 +19,28 @@ _chown()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # Complete -options
         local w opts
-        for w in "${words[@]}" ; do
-            [[ "$w" == -@(R|-recursive) ]] && opts="-H -L -P" && break
+        for w in "${words[@]}"; do
+            [[ $w == -@(R|-recursive) ]] && opts="-H -L -P" && break
         done
-        COMPREPLY=( $(compgen -W '-c -h -f -R -v --changes --dereference
+        COMPREPLY=($(compgen -W '-c -h -f -R -v --changes --dereference
             --no-dereference --from --silent --quiet --reference --recursive
-            --verbose --help --version $opts' -- "$cur") )
+            --verbose --help --version $opts' -- "$cur"))
     else
         local args
 
         # The first argument is an usergroup; the rest are filedir.
         _count_args :
 
-        if [[ $args -eq 1 ]]; then
+        if ((args == 1)); then
             _usergroup -u
         else
             _filedir
         fi
     fi
 } &&
-complete -F _chown chown
+    complete -F _chown chown
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chpasswd b/msys2/usr/share/bash-completion/completions/chpasswd
index 8c5a4dfd8..3abea9981 100644
--- a/msys2/usr/share/bash-completion/completions/chpasswd
+++ b/msys2/usr/share/bash-completion/completions/chpasswd
@@ -6,15 +6,15 @@ _chpasswd()
     _init_completion -s || return
 
     case $prev in
-        --crypt|-!(-*)c)
-            COMPREPLY=( $(compgen -W 'DES MD5 NONE SHA256 SHA512' \
-                -- "$cur") )
+        --crypt | -!(-*)c)
+            COMPREPLY=($(compgen -W 'DES MD5 NONE SHA256 SHA512' \
+                -- "$cur"))
             return
             ;;
-        --sha-rounds|-!(-*)s)
+        --sha-rounds | -!(-*)s)
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
@@ -22,9 +22,9 @@ _chpasswd()
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _chpasswd chpasswd
+    complete -F _chpasswd chpasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chrome b/msys2/usr/share/bash-completion/completions/chrome
index a26b04f22..9ee989629 100644
--- a/msys2/usr/share/bash-completion/completions/chrome
+++ b/msys2/usr/share/bash-completion/completions/chrome
@@ -6,7 +6,7 @@ _chromium_browser()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--app|--proxy-pac-url|-h)
+        --help | --app | --proxy-pac-url | -h)
             return
             ;;
         --user-data-dir)
@@ -18,18 +18,18 @@ _chromium_browser()
                 *://*)
                     local prefix="${cur%%://*}://"
                     _known_hosts_real -- "${cur#*://}"
-                    COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+                    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
                     __ltrim_colon_completions "$cur"
                     ;;
                 *)
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S :// -W 'http socks socks4 socks5' -- "$cur") )
+                    COMPREPLY=($(compgen -S :// -W 'http socks socks4 socks5' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --password-store)
-            COMPREPLY=( $(compgen -W 'basic gnome kwallet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'basic gnome kwallet' -- "$cur"))
             return
             ;;
     esac
@@ -37,14 +37,14 @@ _chromium_browser()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([mxs])htm?(l)|pdf)"
+    _filedir "@(?([mxs])htm?(l)|pdf|txt)"
 } &&
-complete -F _chromium_browser chromium-browser google-chrome \
-    google-chrome-stable chromium chrome
+    complete -F _chromium_browser chromium-browser google-chrome \
+        google-chrome-stable chromium chrome
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chromium b/msys2/usr/share/bash-completion/completions/chromium
index a26b04f22..9ee989629 100644
--- a/msys2/usr/share/bash-completion/completions/chromium
+++ b/msys2/usr/share/bash-completion/completions/chromium
@@ -6,7 +6,7 @@ _chromium_browser()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--app|--proxy-pac-url|-h)
+        --help | --app | --proxy-pac-url | -h)
             return
             ;;
         --user-data-dir)
@@ -18,18 +18,18 @@ _chromium_browser()
                 *://*)
                     local prefix="${cur%%://*}://"
                     _known_hosts_real -- "${cur#*://}"
-                    COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+                    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
                     __ltrim_colon_completions "$cur"
                     ;;
                 *)
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S :// -W 'http socks socks4 socks5' -- "$cur") )
+                    COMPREPLY=($(compgen -S :// -W 'http socks socks4 socks5' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --password-store)
-            COMPREPLY=( $(compgen -W 'basic gnome kwallet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'basic gnome kwallet' -- "$cur"))
             return
             ;;
     esac
@@ -37,14 +37,14 @@ _chromium_browser()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([mxs])htm?(l)|pdf)"
+    _filedir "@(?([mxs])htm?(l)|pdf|txt)"
 } &&
-complete -F _chromium_browser chromium-browser google-chrome \
-    google-chrome-stable chromium chrome
+    complete -F _chromium_browser chromium-browser google-chrome \
+        google-chrome-stable chromium chrome
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chromium-browser b/msys2/usr/share/bash-completion/completions/chromium-browser
index a26b04f22..9ee989629 100644
--- a/msys2/usr/share/bash-completion/completions/chromium-browser
+++ b/msys2/usr/share/bash-completion/completions/chromium-browser
@@ -6,7 +6,7 @@ _chromium_browser()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--app|--proxy-pac-url|-h)
+        --help | --app | --proxy-pac-url | -h)
             return
             ;;
         --user-data-dir)
@@ -18,18 +18,18 @@ _chromium_browser()
                 *://*)
                     local prefix="${cur%%://*}://"
                     _known_hosts_real -- "${cur#*://}"
-                    COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+                    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
                     __ltrim_colon_completions "$cur"
                     ;;
                 *)
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S :// -W 'http socks socks4 socks5' -- "$cur") )
+                    COMPREPLY=($(compgen -S :// -W 'http socks socks4 socks5' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --password-store)
-            COMPREPLY=( $(compgen -W 'basic gnome kwallet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'basic gnome kwallet' -- "$cur"))
             return
             ;;
     esac
@@ -37,14 +37,14 @@ _chromium_browser()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([mxs])htm?(l)|pdf)"
+    _filedir "@(?([mxs])htm?(l)|pdf|txt)"
 } &&
-complete -F _chromium_browser chromium-browser google-chrome \
-    google-chrome-stable chromium chrome
+    complete -F _chromium_browser chromium-browser google-chrome \
+        google-chrome-stable chromium chrome
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chronyc b/msys2/usr/share/bash-completion/completions/chronyc
index a59746aa9..e6bb8e9d2 100644
--- a/msys2/usr/share/bash-completion/completions/chronyc
+++ b/msys2/usr/share/bash-completion/completions/chronyc
@@ -2,12 +2,13 @@
 
 _chronyc_command_args()
 {
-    local -a args=( $(compgen -W "$($1 help 2>/dev/null | \
-        awk '/^'$prev'\s[^ []/ { gsub("\\|", " ", $2); print $2 }')") )
+    local -a args
+    args=($(compgen -W "$($1 help 2>/dev/null |
+        awk '/^'$prev'\s[^ []/ { gsub("\\|", " ", $2); print $2 }')"))
     case $args in
         \<address\>) _known_hosts_real -- "$cur" ;;
         \<*) ;;
-        *) COMPREPLY+=( $(compgen -W '${args[@]}' -- "$cur") ) ;;
+        *) COMPREPLY+=($(compgen -W '${args[@]}' -- "$cur")) ;;
     esac
 }
 
@@ -17,7 +18,7 @@ _chronyc()
     _init_completion || return
 
     case $prev in
-        --help|-*p)
+        --help | -*p)
             return
             ;;
         -*h)
@@ -27,26 +28,27 @@ _chronyc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1") -6' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -6' -- "$cur"))
         return
     fi
 
-    local i args=0
-    for (( i=1; i < cword; i++ )); do
-        [[ ${words[i]} != -* && ${words[i-1]} != @(-p|-h) ]] && (( args++ ))
+    local i args
+    args=0
+    for ((i = 1; i < cword; i++)); do
+        [[ ${words[i]} != -* && ${words[i - 1]} != @(-p|-h) ]] && ((args++))
     done
 
     case $args in
         0)
-            COMPREPLY=( $(compgen -W "$($1 help 2>/dev/null | \
+            COMPREPLY=($(compgen -W "$($1 help 2>/dev/null |
                 awk '!/(^ |: *$)/ { sub("\\|", " ", $1); print $1 }')" \
-                    -- "$cur") )
+                -- "$cur"))
             ;;
         1)
             _chronyc_command_args "$1"
-            if [[ ! $COMPREPLY && $prev == sources?(tats) ]]; then
+            if [[ ! ${COMPREPLY-} && $prev == sources?(tats) ]]; then
                 # [-v] not handled by _chronyc_command_args yet
-                COMPREPLY=( $(compgen -W '-v' -- "$cur") )
+                COMPREPLY=($(compgen -W '-v' -- "$cur"))
             fi
             ;;
         2)
@@ -54,6 +56,6 @@ _chronyc()
             ;;
     esac
 } &&
-complete -F _chronyc chronyc
+    complete -F _chronyc chronyc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/chrpath b/msys2/usr/share/bash-completion/completions/chrpath
index bcd0f91d8..2883967b1 100644
--- a/msys2/usr/share/bash-completion/completions/chrpath
+++ b/msys2/usr/share/bash-completion/completions/chrpath
@@ -6,22 +6,22 @@ _chrpath()
     _init_completion || return
 
     case $prev in
-        --version|--help|-!(-*)[vh])
+        --version | --help | -!(-*)[vh])
             return
             ;;
-        --replace|-!(-*)r)
+        --replace | -!(-*)r)
             _filedir -d
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _chrpath chrpath
+    complete -F _chrpath chrpath
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ci b/msys2/usr/share/bash-completion/completions/ci
index cfad02119..c04d89d2d 100644
--- a/msys2/usr/share/bash-completion/completions/ci
+++ b/msys2/usr/share/bash-completion/completions/ci
@@ -11,26 +11,26 @@ _rcs()
     dir=${cur%/*}
 
     # deal with relative directory
-    [[ $file == $dir ]] && dir=.
+    [[ $file == "$dir" ]] && dir=.
 
-    COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
+    COMPREPLY=($(compgen -f -- "$dir/RCS/$file"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        file=${COMPREPLY[$i]##*/}
-        dir=${COMPREPLY[$i]%RCS/*}
-        COMPREPLY[$i]=$dir$file
+    for i in ${!COMPREPLY[*]}; do
+        file=${COMPREPLY[i]##*/}
+        dir=${COMPREPLY[i]%RCS/*}
+        COMPREPLY[i]=$dir$file
     done
 
-    COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
+    COMPREPLY+=($(compgen -G "$dir/$file*,v"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        COMPREPLY[$i]=${COMPREPLY[$i]%,v}
+    for i in ${!COMPREPLY[*]}; do
+        COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 
     # default to files if nothing returned and we're checking in.
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ciptool b/msys2/usr/share/bash-completion/completions/ciptool
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/ciptool
+++ b/msys2/usr/share/bash-completion/completions/ciptool
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/civclient b/msys2/usr/share/bash-completion/completions/civclient
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/civclient
+++ b/msys2/usr/share/bash-completion/completions/civclient
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/civserver b/msys2/usr/share/bash-completion/completions/civserver
index 08f63158f..a34b5a29f 100644
--- a/msys2/usr/share/bash-completion/completions/civserver
+++ b/msys2/usr/share/bash-completion/completions/civserver
@@ -6,17 +6,17 @@ _civserver()
     _init_completion || return
 
     case $prev in
-        -f|-g|-l|-r|--file|--log|--gamelog|--read)
+        -f | -g | -l | -r | --file | --log | --gamelog | --read)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _civserver civserver freeciv-server
+    complete -F _civserver civserver freeciv-server
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cksfv b/msys2/usr/share/bash-completion/completions/cksfv
index 89ccc7b73..da404ddad 100644
--- a/msys2/usr/share/bash-completion/completions/cksfv
+++ b/msys2/usr/share/bash-completion/completions/cksfv
@@ -5,13 +5,13 @@ _cksfv()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     case "$prev" in
-        -*C|-*g)
+        -*C | -*g)
             _filedir -d
             return
             ;;
@@ -24,6 +24,6 @@ _cksfv()
     _filedir
 
 } &&
-complete -F _cksfv cksfv
+    complete -F _cksfv cksfv
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cleanarch b/msys2/usr/share/bash-completion/completions/cleanarch
index 5e57e5be5..0f7d5f572 100644
--- a/msys2/usr/share/bash-completion/completions/cleanarch
+++ b/msys2/usr/share/bash-completion/completions/cleanarch
@@ -5,12 +5,12 @@ _cleanarch()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--status --dry-run --quiet --help' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--status --dry-run --quiet --help' \
+            -- "$cur"))
     fi
 
 } &&
-complete -F _cleanarch cleanarch
+    complete -F _cleanarch cleanarch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/clisp b/msys2/usr/share/bash-completion/completions/clisp
index f9ccfbb88..c4259a00d 100644
--- a/msys2/usr/share/bash-completion/completions/clisp
+++ b/msys2/usr/share/bash-completion/completions/clisp
@@ -8,15 +8,15 @@ _clisp()
     _init_completion || return
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-h --help --version --license -B -K -M -m -L
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-h --help --version --license -B -K -M -m -L
             -N -E -q --quiet --silent -w -I -ansi -traditional -p -C -norc -i
-            -c -l -o -x ' -- "$cur") )
+            -c -l -o -x ' -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _clisp -o default clisp
+    complete -F _clisp -o default clisp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/clone_member b/msys2/usr/share/bash-completion/completions/clone_member
index 5a0797feb..a3ca2b31b 100644
--- a/msys2/usr/share/bash-completion/completions/clone_member
+++ b/msys2/usr/share/bash-completion/completions/clone_member
@@ -6,7 +6,7 @@ _clone_member()
     _init_completion -s || return
 
     case $prev in
-        -l|--listname)
+        -l | --listname)
             _xfunc list_lists _mailman_lists
             return
             ;;
@@ -14,12 +14,12 @@ _clone_member()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--listname --remove --admin --quiet
-            --nomodify --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--listname --remove --admin --quiet
+            --nomodify --help' -- "$cur"))
     fi
 
 } &&
-complete -F _clone_member clone_member
+    complete -F _clone_member clone_member
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/clzip b/msys2/usr/share/bash-completion/completions/clzip
index 0f95722cf..05f169c96 100644
--- a/msys2/usr/share/bash-completion/completions/clzip
+++ b/msys2/usr/share/bash-completion/completions/clzip
@@ -8,15 +8,15 @@ _lzip()
     local decompress=false
 
     case $prev in
-        --help|--version|--member-size|--match-length|--dictionary-size|\
-        --volume-size|--data-size|-!(-*)@([bmsSB]|[hV]*))
+        --help | --version | --member-size | --match-length | --dictionary-size | \
+            --volume-size | --data-size | -!(-*)@([bmsSB]|[hV]*))
             return
             ;;
         --decompress-!(-*)d)
             decompress=true
             ;;
         --threads-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --output-!(-*)o)
@@ -27,9 +27,9 @@ _lzip()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -40,8 +40,8 @@ _lzip()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzip clzip lzip pdlzip plzip
+    complete -F _lzip clzip lzip pdlzip plzip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/co b/msys2/usr/share/bash-completion/completions/co
index cfad02119..c04d89d2d 100644
--- a/msys2/usr/share/bash-completion/completions/co
+++ b/msys2/usr/share/bash-completion/completions/co
@@ -11,26 +11,26 @@ _rcs()
     dir=${cur%/*}
 
     # deal with relative directory
-    [[ $file == $dir ]] && dir=.
+    [[ $file == "$dir" ]] && dir=.
 
-    COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
+    COMPREPLY=($(compgen -f -- "$dir/RCS/$file"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        file=${COMPREPLY[$i]##*/}
-        dir=${COMPREPLY[$i]%RCS/*}
-        COMPREPLY[$i]=$dir$file
+    for i in ${!COMPREPLY[*]}; do
+        file=${COMPREPLY[i]##*/}
+        dir=${COMPREPLY[i]%RCS/*}
+        COMPREPLY[i]=$dir$file
     done
 
-    COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
+    COMPREPLY+=($(compgen -G "$dir/$file*,v"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        COMPREPLY[$i]=${COMPREPLY[$i]%,v}
+    for i in ${!COMPREPLY[*]}; do
+        COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 
     # default to files if nothing returned and we're checking in.
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/colormake b/msys2/usr/share/bash-completion/completions/colormake
index f119dcc3d..96517c217 100644
--- a/msys2/usr/share/bash-completion/completions/colormake
+++ b/msys2/usr/share/bash-completion/completions/colormake
@@ -8,7 +8,7 @@ _make_target_extract_script()
     local prefix="$1"
     local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
     local basename=${prefix##*/}
-    local dirname_len=$(( ${#prefix} - ${#basename} ))
+    local dirname_len=$((${#prefix} - ${#basename}))
 
     if [[ $mode == -d ]]; then
         # display mode, only output current path component to the next slash
@@ -67,8 +67,8 @@ _make_target_extract_script()
 EOF
 
     # don't complete with hidden targets unless we are doing a partial completion
-    if [[ -z "${prefix_pat}" || "${prefix_pat}" = */ ]]; then
-      cat <<EOF
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
       /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
 EOF
     fi
@@ -86,37 +86,37 @@ _make()
     local cur prev words cword split
     _init_completion -s || return
 
-    local file makef makef_dir=( "-C" "." ) makef_inc i
+    local makef makef_dir=("-C" ".") i
 
     case $prev in
-        --file|--makefile|--old-file|--assume-old|--what-if| --new-file|\
-        --assume-new|-!(-*)[foW])
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
             _filedir
             return
             ;;
-        --include-dir|--directory|-!(-*)[ICm])
+        --include-dir | --directory | -!(-*)[ICm])
             _filedir -d
             return
             ;;
         -!(-*)E)
-            COMPREPLY=( $(compgen -v -- "$cur") )
+            COMPREPLY=($(compgen -v -- "$cur"))
             return
             ;;
-        --eval|-!(-*)[DVx])
+        --eval | -!(-*)[DVx])
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(( $(_ncpus)*2 ))}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
@@ -126,20 +126,20 @@ _make()
     else
         # before we check for makefiles, see if a path was specified
         # with -C/--directory
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
-                eval "makef_dir=( -C \"${words[i+1]}\" )"
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
                 break
             fi
         done
 
         # before we scan for targets, see if a Makefile name was
         # specified with -f/--file/--makefile
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
-                eval "makef=( -f \"${words[i+1]}\" )"
+                eval "makef=( -f \"${words[i + 1]}\" )"
                 break
             fi
         done
@@ -147,24 +147,24 @@ _make()
         # recognise that possible completions are only going to be displayed
         # so only the base name is shown
         local mode=--
-        if (( COMP_TYPE != 9 )); then
+        if ((COMP_TYPE != 9)); then
             mode=-d # display-only mode
         fi
 
         local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
-        COMPREPLY=( $(LC_ALL=C \
+        COMPREPLY=($(LC_ALL=C \
             $1 -npq __BASH_MAKE_COMPLETION__=1 \
-                "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-            command sed -ne "$script") )
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
             # so set options for completion based on the first one
-            [[ $COMPREPLY == */ ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
         fi
 
     fi
 } &&
-complete -F _make make gmake gnumake pmake colormake
+    complete -F _make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/compare b/msys2/usr/share/bash-completion/completions/compare
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/compare
+++ b/msys2/usr/share/bash-completion/completions/compare
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/compgen b/msys2/usr/share/bash-completion/completions/compgen
index 0519744de..a57f366f7 100644
--- a/msys2/usr/share/bash-completion/completions/compgen
+++ b/msys2/usr/share/bash-completion/completions/compgen
@@ -7,43 +7,43 @@ _complete()
 
     case $prev in
         -*o)
-            COMPREPLY=( $(compgen -W 'bashdefault default dirnames filenames
-                nospace plusdirs' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bashdefault default dirnames filenames
+                nospace plusdirs' -- "$cur"))
             return
             ;;
 
         -*A)
-            COMPREPLY=( $(compgen -W 'alias arrayvar binding builtin command
+            COMPREPLY=($(compgen -W 'alias arrayvar binding builtin command
                 directory disabled enabled export file function group helptopic
                 hostname job keyword running service setopt shopt signal
-                stopped user variable' -- "$cur") )
+                stopped user variable' -- "$cur"))
             return
             ;;
 
         -*C)
-            COMPREPLY=( $(compgen -A command -- "$cur") )
+            COMPREPLY=($(compgen -A command -- "$cur"))
             return
             ;;
         -*F)
-            COMPREPLY=( $(compgen -A function -- "$cur") )
+            COMPREPLY=($(compgen -A function -- "$cur"))
             return
             ;;
-        -*p|-*r)
-            COMPREPLY=( $(complete -p | command sed -e 's|.* ||') )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        -*p | -*r)
+            COMPREPLY=($(complete -p | command sed -e 's|.* ||'))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # relevant options completion
         local opts="-a -b -c -d -e -f -g -j -k -o -s -u -v -A -G -W -P -S -X"
         [[ $1 != compgen ]] && opts+=" -F -C"
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     else
-        COMPREPLY=( $(compgen -A command -- "$cur") )
+        COMPREPLY=($(compgen -A command -- "$cur"))
     fi
 } &&
-complete -F _complete compgen complete
+    complete -F _complete compgen complete
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/complete b/msys2/usr/share/bash-completion/completions/complete
index 0519744de..a57f366f7 100644
--- a/msys2/usr/share/bash-completion/completions/complete
+++ b/msys2/usr/share/bash-completion/completions/complete
@@ -7,43 +7,43 @@ _complete()
 
     case $prev in
         -*o)
-            COMPREPLY=( $(compgen -W 'bashdefault default dirnames filenames
-                nospace plusdirs' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bashdefault default dirnames filenames
+                nospace plusdirs' -- "$cur"))
             return
             ;;
 
         -*A)
-            COMPREPLY=( $(compgen -W 'alias arrayvar binding builtin command
+            COMPREPLY=($(compgen -W 'alias arrayvar binding builtin command
                 directory disabled enabled export file function group helptopic
                 hostname job keyword running service setopt shopt signal
-                stopped user variable' -- "$cur") )
+                stopped user variable' -- "$cur"))
             return
             ;;
 
         -*C)
-            COMPREPLY=( $(compgen -A command -- "$cur") )
+            COMPREPLY=($(compgen -A command -- "$cur"))
             return
             ;;
         -*F)
-            COMPREPLY=( $(compgen -A function -- "$cur") )
+            COMPREPLY=($(compgen -A function -- "$cur"))
             return
             ;;
-        -*p|-*r)
-            COMPREPLY=( $(complete -p | command sed -e 's|.* ||') )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        -*p | -*r)
+            COMPREPLY=($(complete -p | command sed -e 's|.* ||'))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # relevant options completion
         local opts="-a -b -c -d -e -f -g -j -k -o -s -u -v -A -G -W -P -S -X"
         [[ $1 != compgen ]] && opts+=" -F -C"
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     else
-        COMPREPLY=( $(compgen -A command -- "$cur") )
+        COMPREPLY=($(compgen -A command -- "$cur"))
     fi
 } &&
-complete -F _complete compgen complete
+    complete -F _complete compgen complete
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/composite b/msys2/usr/share/bash-completion/completions/composite
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/composite
+++ b/msys2/usr/share/bash-completion/completions/composite
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/config_list b/msys2/usr/share/bash-completion/completions/config_list
index f86263d70..1807e3382 100644
--- a/msys2/usr/share/bash-completion/completions/config_list
+++ b/msys2/usr/share/bash-completion/completions/config_list
@@ -6,7 +6,7 @@ _config_list()
     _init_completion -s || return
 
     case $prev in
-        -i|-o|--inputfile|--outputfile)
+        -i | -o | --inputfile | --outputfile)
             _filedir
             return
             ;;
@@ -14,14 +14,14 @@ _config_list()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--inputfile --outputfile --checkonly
-            --verbose --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--inputfile --outputfile --checkonly
+            --verbose --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _config_list config_list
+    complete -F _config_list config_list
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/configure b/msys2/usr/share/bash-completion/completions/configure
index 726c7bda2..3f59a0124 100644
--- a/msys2/usr/share/bash-completion/completions/configure
+++ b/msys2/usr/share/bash-completion/completions/configure
@@ -6,15 +6,15 @@ _configure()
     _init_completion -s || return
 
     case $prev in
-        -h|--help|-V|--version|--program-prefix|--program-suffix|\
-        --program-transform-name)
+        -h | --help | -V | --version | --program-prefix | --program-suffix | \
+            --program-transform-name)
             return
             ;;
         --*file)
             _filedir
             return
             ;;
-        --*prefix|--*dir)
+        --*prefix | --*dir)
             _filedir -d
             return
             ;;
@@ -24,19 +24,19 @@ _configure()
 
     # if $COMP_CONFIGURE_HINTS is not null, then completions of the form
     # --option=SETTING will include 'SETTING' as a contextual hint
-    [[ "$cur" != -* ]] && return
+    [[ $cur != -* ]] && return
 
-    if [[ -n $COMP_CONFIGURE_HINTS ]]; then
-        COMPREPLY=( $(compgen -W "$($1 --help 2>&1 | \
+    if [[ ${COMP_CONFIGURE_HINTS-} ]]; then
+        COMPREPLY=($(compgen -W "$($1 --help 2>&1 |
             awk '/^  --[A-Za-z]/ { print $1; \
             if ($2 ~ /--[A-Za-z]/) print $2 }' | command sed -e 's/[[,].*//g')" \
-            -- "$cur") )
-        [[ $COMPREPLY == *=* ]] && compopt -o nospace
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *=* ]] && compopt -o nospace
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _configure configure
+    complete -F _configure configure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/conjure b/msys2/usr/share/bash-completion/completions/conjure
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/conjure
+++ b/msys2/usr/share/bash-completion/completions/conjure
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/convert b/msys2/usr/share/bash-completion/completions/convert
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/convert
+++ b/msys2/usr/share/bash-completion/completions/convert
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cowsay b/msys2/usr/share/bash-completion/completions/cowsay
index c6cbf813a..6ba1d0fb1 100644
--- a/msys2/usr/share/bash-completion/completions/cowsay
+++ b/msys2/usr/share/bash-completion/completions/cowsay
@@ -7,17 +7,17 @@ _cowsay()
 
     case $prev in
         -f)
-            COMPREPLY=( $(compgen -W \
-                '$(cowsay -l 2>/dev/null | tail -n +2)' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                '$(cowsay -l 2>/dev/null | tail -n +2)' -- "$cur"))
             return
             ;;
     esac
 
     # relevant options completion
-    COMPREPLY=( $(compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' \
+        -- "$cur"))
 
 } &&
-complete -F _cowsay -o default cowsay cowthink
+    complete -F _cowsay -o default cowsay cowthink
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cowthink b/msys2/usr/share/bash-completion/completions/cowthink
index c6cbf813a..6ba1d0fb1 100644
--- a/msys2/usr/share/bash-completion/completions/cowthink
+++ b/msys2/usr/share/bash-completion/completions/cowthink
@@ -7,17 +7,17 @@ _cowsay()
 
     case $prev in
         -f)
-            COMPREPLY=( $(compgen -W \
-                '$(cowsay -l 2>/dev/null | tail -n +2)' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                '$(cowsay -l 2>/dev/null | tail -n +2)' -- "$cur"))
             return
             ;;
     esac
 
     # relevant options completion
-    COMPREPLY=( $(compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W '-b -d -g -p -s -t -w -y -e -f -h -l -n -T -W' \
+        -- "$cur"))
 
 } &&
-complete -F _cowsay -o default cowsay cowthink
+    complete -F _cowsay -o default cowsay cowthink
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cpan2dist b/msys2/usr/share/bash-completion/completions/cpan2dist
index b24e068ce..b5e59dae9 100644
--- a/msys2/usr/share/bash-completion/completions/cpan2dist
+++ b/msys2/usr/share/bash-completion/completions/cpan2dist
@@ -8,30 +8,30 @@ _cpan2dist()
     case $prev in
         --format)
             # should remove ":" from COMP_WORDBREAKS, but doesn't work (?)
-            COMPREPLY=( $(compgen -W '$(perl -MCPANPLUS::Dist -e \
+            COMPREPLY=($(compgen -W '$(perl -MCPANPLUS::Dist -e \
                 "print map { \"\$_\n\" } CPANPLUS::Dist->dist_types")' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
-        --banlist|--ignorelist|--modulelist|--logfile)
+        --banlist | --ignorelist | --modulelist | --logfile)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
-        local cpandirs=( "$HOME/.cpanplus/" "$HOME/.cpan/source/modules/" )
+        local cpandirs=("$HOME/.cpanplus/" "$HOME/.cpan/source/modules/")
         local packagelist
         for dir in "${cpandirs[@]}"; do
-            [[ -d "$dir" && -r "$dir/02packages.details.txt.gz" ]] && \
+            [[ -d $dir && -r "$dir/02packages.details.txt.gz" ]] &&
                 packagelist="$dir/02packages.details.txt.gz"
         done
-        [[ $packagelist ]] && COMPREPLY=( $(zgrep "^${cur//-/::}" \
-            $packagelist 2>/dev/null | awk '{print $1}' | command sed -e 's/::/-/g') )
+        [[ -v packagelist ]] && COMPREPLY=($(zgrep "^${cur//-/::}" \
+            $packagelist 2>/dev/null | awk '{print $1}' | command sed -e 's/::/-/g'))
     fi
 } &&
-complete -F _cpan2dist -o default cpan2dist
+    complete -F _cpan2dist -o default cpan2dist
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cpio b/msys2/usr/share/bash-completion/completions/cpio
index bbb1ecf93..d6fde0c36 100644
--- a/msys2/usr/share/bash-completion/completions/cpio
+++ b/msys2/usr/share/bash-completion/completions/cpio
@@ -7,46 +7,46 @@ _cpio()
 
     # --name value style option
     case $prev in
-        --format|-!(-*)H)
-            COMPREPLY=( $(compgen -W \
-                'bin odc newc crc tar ustar hpbin hpodc' -- "$cur") )
+        --format | -!(-*)H)
+            COMPREPLY=($(compgen -W \
+                'bin odc newc crc tar ustar hpbin hpodc' -- "$cur"))
             return
             ;;
-        --file|--pattern-file|-!(-*)[EFI])
+        --file | --pattern-file | -!(-*)[EFI])
             _filedir
             return
             ;;
-        --owner|-!(-*)R)
+        --owner | -!(-*)R)
             _usergroup
             return
             ;;
         --rsh-command)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W '-o --create -i --extract -p --pass-through
-            -? --help --license --usage --version' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W '-o --create -i --extract -p --pass-through
+            -? --help --license --usage --version' -- "$cur"))
     else
         case ${words[1]} in
-            -o|--create)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '-0 -a -c -v -A -B -L -V -C -H -M
+            -o | --create)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '-0 -a -c -v -A -B -L -V -C -H -M
                         -O -F --file --format --message --null
                         --reset-access-time --verbose --dot --append
                         --block-size --dereference --io-size --quiet
                         --force-local --rsh-command --help --version' \
-                            -- "$cur") )
+                        -- "$cur"))
                 fi
                 ;;
-            -i|--extract)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '-b -c -d -f -m -n -r -t -s -u -v
+            -i | --extract)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '-b -c -d -f -m -n -r -t -s -u -v
                         -B -S -V -C -E -H -M -R -I -F --file --make-directories
                         --nonmatching --preserve-modification-time
                         --numeric-uid-gid --rename --list --swap-bytes --swap
@@ -55,17 +55,17 @@ _cpio()
                         --owner --no-preserve-owner --message --force-local
                         --no-absolute-filenames --sparse --only-verify-crc
                         --quiet --rsh-command --help --to-stdout --version' \
-                            -- "$cur") )
+                        -- "$cur"))
                 fi
                 ;;
-            -p*|--pass-through)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '-0 -a -d -l -m -u -v -L -V -R
+            -p* | --pass-through)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '-0 -a -d -l -m -u -v -L -V -R
                         --null --reset-access-time --make-directories --link
                         --quiet --preserve-modification-time --unconditional
                         --verbose --dot --dereference --owner
                         --no-preserve-owner --sparse --help --version' \
-                            -- "$cur") )
+                        -- "$cur"))
                 else
                     _filedir -d
                 fi
@@ -73,6 +73,6 @@ _cpio()
         esac
     fi
 } &&
-complete -F _cpio cpio
+    complete -F _cpio cpio
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cppcheck b/msys2/usr/share/bash-completion/completions/cppcheck
index ebc3ba3b6..8ea957153 100644
--- a/msys2/usr/share/bash-completion/completions/cppcheck
+++ b/msys2/usr/share/bash-completion/completions/cppcheck
@@ -6,36 +6,36 @@ _cppcheck()
     _init_completion -s || return
 
     case $prev in
-        --append|--exitcode-suppressions|--rule-file|--config-excludes-file|\
-        --suppressions-list|--includes-file|--include|-i)
+        --append | --exitcode-suppressions | --rule-file | --config-excludes-file | \
+            --suppressions-list | --includes-file | --include | -i)
             _filedir
             return
             ;;
-        -D|-U|--rule|--suppress|--template|--max-configs|-h|--help|--version|\
-        --errorlist|--config-exclude|-l)
+        -D | -U | --rule | --suppress | --template | --max-configs | -h | --help | --version | \
+            --errorlist | --config-exclude | -l)
             return
             ;;
         --enable)
             # split comma-separated list
             split=false
-            if [[ "$cur" == ?*,* ]]; then
+            if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
                 split=true
             fi
-            COMPREPLY=( $(compgen -W 'all warning style performance
+            COMPREPLY=($(compgen -W 'all warning style performance
                 portability information unusedFunction missingInclude' \
-                -- "$cur") )
-            $split && COMPREPLY=( ${COMPREPLY[@]/#/"$prev,"} )
+                -- "$cur"))
+            $split && COMPREPLY=(${COMPREPLY[@]/#/"$prev,"})
             return
             ;;
         --error-exitcode)
-            COMPREPLY=( $(compgen -W '{0..255}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..255}' -- "$cur"))
             return
             ;;
         --file-list)
             _filedir
-            [[ -z $cur || $cur == - ]] && COMPREPLY+=( - )
+            [[ -z $cur || $cur == - ]] && COMPREPLY+=(-)
             return
             ;;
         -I)
@@ -43,25 +43,25 @@ _cppcheck()
             return
             ;;
         -j)
-            COMPREPLY=( $(compgen -W "{2..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{2..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        --language|-x)
-            COMPREPLY=( $(compgen -W 'c c++' -- "$cur") )
+        --language | -x)
+            COMPREPLY=($(compgen -W 'c c++' -- "$cur"))
             return
             ;;
         --std)
-            COMPREPLY=( $(compgen -W 'c89 c99 c11 c++03 c++11 c++14 c++17
-                c++20' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c89 c99 c11 c++03 c++11 c++14 c++17
+                c++20' -- "$cur"))
             return
             ;;
         --platform)
             _filedir
-            COMPREPLY+=( $(compgen -W 'unix32 unix64 win32A win32W win64
-                native' -- "$cur") )
+            COMPREPLY+=($(compgen -W 'unix32 unix64 win32A win32W win64
+                native' -- "$cur"))
             return
             ;;
-        -rp|--relative-paths)
+        -rp | --relative-paths)
             if $split; then # -rp without argument is allowed
                 _filedir -d
                 return
@@ -72,7 +72,7 @@ _cppcheck()
             return
             ;;
         --xml-version)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
@@ -80,12 +80,12 @@ _cppcheck()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir '@([cht]pp|[cht]xx|cc|[ch]++|[ch])'
     fi
 } &&
-complete -F _cppcheck cppcheck
+    complete -F _cppcheck cppcheck
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/createdb b/msys2/usr/share/bash-completion/completions/createdb
index ceedf07e1..4bc6049f5 100644
--- a/msys2/usr/share/bash-completion/completions/createdb
+++ b/msys2/usr/share/bash-completion/completions/createdb
@@ -4,16 +4,16 @@ _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
     # "Access privileges" in output may contain linefeeds, hence the NF > 1
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \
-        awk 'NF > 1 { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null |
+        awk 'NF > 1 { print $1 }')" -- "$cur"))
 }
 
 _pg_users()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
-        template1 2>/dev/null)" -- "$cur") )
-    [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
+        template1 2>/dev/null)" -- "$cur"))
+    ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 # createdb(1) completion
@@ -24,29 +24,29 @@ _createdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|--owner|-!(-*)[UO])
+        --username | --owner | -!(-*)[UO])
             _pg_users
             return
             ;;
-        --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET])
+        --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _createdb createdb
+    complete -F _createdb createdb
 
 # createuser(1) completion
 #
@@ -56,14 +56,14 @@ _createuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|--connection-limit|-!(-*)[pc])
+        --help | --version | --port | --connection-limit | -!(-*)[pc])
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -71,12 +71,12 @@ _createuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _createuser createuser
+    complete -F _createuser createuser
 
 # dropdb(1) completion
 #
@@ -86,29 +86,29 @@ _dropdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _dropdb dropdb
+    complete -F _dropdb dropdb
 
 # dropuser(1) completion
 #
@@ -118,14 +118,14 @@ _dropuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|-!(-*)p)
+        --help | --version | --port | -!(-*)p)
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -133,14 +133,14 @@ _dropuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_users
     fi
 } &&
-complete -F _dropuser dropuser
+    complete -F _dropuser dropuser
 
 # psql(1) completion
 #
@@ -150,39 +150,39 @@ _psql()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --dbname|-!(-*)d)
+        --dbname | -!(-*)d)
             _pg_databases
             return
             ;;
-        --output|--file|--log-file|-!(-*)[ofL])
+        --output | --file | --log-file | -!(-*)[ofL])
             _filedir
             return
             ;;
-        --help|--version|--command|--field-separator|--port|--pset|\
-        --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv])
+        --help | --version | --command | --field-separator | --port | --pset | \
+            --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
         _pg_databases
     fi
 } &&
-complete -F _psql psql
+    complete -F _psql psql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/createuser b/msys2/usr/share/bash-completion/completions/createuser
index ceedf07e1..4bc6049f5 100644
--- a/msys2/usr/share/bash-completion/completions/createuser
+++ b/msys2/usr/share/bash-completion/completions/createuser
@@ -4,16 +4,16 @@ _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
     # "Access privileges" in output may contain linefeeds, hence the NF > 1
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \
-        awk 'NF > 1 { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null |
+        awk 'NF > 1 { print $1 }')" -- "$cur"))
 }
 
 _pg_users()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
-        template1 2>/dev/null)" -- "$cur") )
-    [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
+        template1 2>/dev/null)" -- "$cur"))
+    ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 # createdb(1) completion
@@ -24,29 +24,29 @@ _createdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|--owner|-!(-*)[UO])
+        --username | --owner | -!(-*)[UO])
             _pg_users
             return
             ;;
-        --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET])
+        --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _createdb createdb
+    complete -F _createdb createdb
 
 # createuser(1) completion
 #
@@ -56,14 +56,14 @@ _createuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|--connection-limit|-!(-*)[pc])
+        --help | --version | --port | --connection-limit | -!(-*)[pc])
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -71,12 +71,12 @@ _createuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _createuser createuser
+    complete -F _createuser createuser
 
 # dropdb(1) completion
 #
@@ -86,29 +86,29 @@ _dropdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _dropdb dropdb
+    complete -F _dropdb dropdb
 
 # dropuser(1) completion
 #
@@ -118,14 +118,14 @@ _dropuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|-!(-*)p)
+        --help | --version | --port | -!(-*)p)
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -133,14 +133,14 @@ _dropuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_users
     fi
 } &&
-complete -F _dropuser dropuser
+    complete -F _dropuser dropuser
 
 # psql(1) completion
 #
@@ -150,39 +150,39 @@ _psql()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --dbname|-!(-*)d)
+        --dbname | -!(-*)d)
             _pg_databases
             return
             ;;
-        --output|--file|--log-file|-!(-*)[ofL])
+        --output | --file | --log-file | -!(-*)[ofL])
             _filedir
             return
             ;;
-        --help|--version|--command|--field-separator|--port|--pset|\
-        --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv])
+        --help | --version | --command | --field-separator | --port | --pset | \
+            --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
         _pg_databases
     fi
 } &&
-complete -F _psql psql
+    complete -F _psql psql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/crontab b/msys2/usr/share/bash-completion/completions/crontab
index a5e5cc581..cac785331 100644
--- a/msys2/usr/share/bash-completion/completions/crontab
+++ b/msys2/usr/share/bash-completion/completions/crontab
@@ -12,13 +12,13 @@ _crontab()
             ;;
     esac
 
-    local -A opts=( [-u]= [-l]= [-r]= [-e]= )
+    local -A opts=([-u]="" [-l]="" [-r]="" [-e]="")
     [[ $OSTYPE == *linux* ]] && opts[-i]=
     [[ -d /sys/fs/selinux || -d /selinux ]] && opts[-s]=
 
     local i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
-        [[ ${words[i]} ]] && unset "opts[${words[i]}]"
+    for i in "${!words[@]}"; do
+        [[ ${words[i]} && $i -ne $cword ]] && unset "opts[${words[i]}]"
         case "${words[i]}" in
             -l)
                 unset 'opts[-r]' 'opts[-e]' 'opts[-i]' 'opts[-s]'
@@ -35,14 +35,14 @@ _crontab()
         esac
     done
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '${!opts[@]}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '${!opts[@]}' -- "$cur"))
         return
     fi
 
     # do filenames only if we did not have -l, -r, or -e
-    [[ "${words[*]}" == *\ -[lre]* ]] || _filedir
+    [[ ${words[*]} == *\ -[lre]* ]] || _filedir
 } &&
-complete -F _crontab crontab
+    complete -F _crontab crontab
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cryptsetup b/msys2/usr/share/bash-completion/completions/cryptsetup
index f8be116fc..e73e165e8 100644
--- a/msys2/usr/share/bash-completion/completions/cryptsetup
+++ b/msys2/usr/share/bash-completion/completions/cryptsetup
@@ -2,7 +2,7 @@
 
 _cryptsetup_name()
 {
-    COMPREPLY=( $(compgen -X control -W '$(command ls /dev/mapper)' -- "$cur") )
+    COMPREPLY=($(compgen -X control -W '$(command ls /dev/mapper)' -- "$cur"))
 }
 
 _cryptsetup_device()
@@ -17,16 +17,16 @@ _cryptsetup()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--cipher|--hash|--*-size|--key-slot|--size|--offset|\
-        --skip|--iter-time|--timeout|--tries|-!(-*)[chslSbopitT])
+        --help | --version | --cipher | --hash | --*-size | --key-slot | --size | --offset | \
+            --skip | --iter-time | --timeout | --tries | -!(-*)[chslSbopitT])
             return
             ;;
-        --key-file|--master-key-file|--header-backup-file|-!(-*)d)
+        --key-file | --master-key-file | --header-backup-file | -!(-*)d)
             _filedir
             return
             ;;
-        --type|-!(-*)M)
-            COMPREPLY=( $(compgen -W "luks plain loopaes tcrypt" -- "$cur") )
+        --type | -!(-*)M)
+            COMPREPLY=($(compgen -W "luks plain loopaes tcrypt" -- "$cur"))
             return
             ;;
     esac
@@ -36,19 +36,20 @@ _cryptsetup()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
-            COMPREPLY=( $(compgen -W 'open close resize status benchmark
+            COMPREPLY=($(compgen -W 'open close resize status benchmark
                 repair erase luksFormat luksAddKey luksRemoveKey luksChangeKey
                 luksKillSlot luksUUID isLuks luksDump tcryptDump luksSuspend
-                luksResume luksHeaderBackup luksHeaderRestore' -- "$cur") )
+                luksResume luksHeaderBackup luksHeaderRestore' -- "$cur"))
         fi
     else
-        local args; _count_args "" "-!(-*)[chslSbopitTdM]"
+        local args
+        _count_args "" "-!(-*)[chslSbopitTdM]"
         case $arg in
-            open|create|luksOpen|loopaesOpen|tcryptOpen)
+            open | create | luksOpen | loopaesOpen | tcryptOpen)
                 case $args in
                     2)
                         _cryptsetup_device
@@ -58,15 +59,15 @@ _cryptsetup()
                         ;;
                 esac
                 ;;
-            close|remove|luksClose|loopaesClose|tcryptClose|status|resize|\
-            luksSuspend|luksResume)
+            close | remove | luksClose | loopaesClose | tcryptClose | status | resize | \
+                luksSuspend | luksResume)
                 case $args in
                     2)
                         _cryptsetup_name
                         ;;
                 esac
                 ;;
-            luksFormat|luksAddKey|luksRemoveKey)
+            luksFormat | luksAddKey | luksRemoveKey | luksChangeKey)
                 case $args in
                     2)
                         _cryptsetup_device
@@ -76,27 +77,27 @@ _cryptsetup()
                         ;;
                 esac
                 ;;
-            luksKillSlot|luksDelKey|luksUUID|isLuks|luksDump)
+            luksKillSlot | luksDelKey | luksUUID | isLuks | luksDump)
                 case $args in
                     2)
                         _cryptsetup_device
                         ;;
                 esac
                 ;;
-            luksHeaderBackup|luksHeaderRestore)
+            luksHeaderBackup | luksHeaderRestore)
                 case $args in
                     2)
                         _cryptsetup_device
                         ;;
                     3)
-                        COMPREPLY=( '--header-backup-file' )
+                        COMPREPLY=('--header-backup-file')
                         ;;
-                    esac
+                esac
                 ;;
         esac
     fi
 
 } &&
-complete -F _cryptsetup cryptsetup
+    complete -F _cryptsetup cryptsetup
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/curl b/msys2/usr/share/bash-completion/completions/curl
index d744e49a8..6e842697a 100644
--- a/msys2/usr/share/bash-completion/completions/curl
+++ b/msys2/usr/share/bash-completion/completions/curl
@@ -6,24 +6,24 @@ _curl()
     _init_completion || return
 
     case $prev in
-        --ciphers|--connect-timeout|--continue-at|--form|--form-string|\
-        --ftp-account|--ftp-alternative-to-user|--ftp-port|--header|--help|\
-        --hostpubmd5|--keepalive-time|--krb|--limit-rate|--local-port|\
-        --mail-from|--mail-rcpt|--max-filesize|--max-redirs|--max-time|--pass|\
-        --proto|--proto-redir|--proxy-user|--proxy1.0|--quote|--range|\
-        --request|--retry|--retry-delay|--retry-max-time|\
-        --socks5-gssapi-service|--telnet-option|--tftp-blksize|--time-cond|\
-        --url|--user|--user-agent|--version|--write-out|--resolve|--tlsuser|\
-        --tlspassword|-!(-*)[CFPHhmQrXtzuAVw])
+        --ciphers | --connect-timeout | --continue-at | --form | --form-string | \
+            --ftp-account | --ftp-alternative-to-user | --ftp-port | --header | --help | \
+            --hostpubmd5 | --keepalive-time | --krb | --limit-rate | --local-port | \
+            --mail-from | --mail-rcpt | --max-filesize | --max-redirs | --max-time | --pass | \
+            --proto | --proto-redir | --proxy-user | --proxy1.0 | --quote | --range | \
+            --request | --retry | --retry-delay | --retry-max-time | \
+            --socks5-gssapi-service | --telnet-option | --tftp-blksize | --time-cond | \
+            --url | --user | --user-agent | --version | --write-out | --resolve | --tlsuser | \
+            --tlspassword | -!(-*)[CFPHhmQrXtzuAVw])
             return
             ;;
-        --config|--cookie|--cookie-jar|--dump-header|--egd-file|\
-        --key|--libcurl|--output|--random-file|--upload-file|--trace|\
-        --trace-ascii|--netrc-file|-!(-*)[KbcDoT])
+        --config | --cookie | --cookie-jar | --dump-header | --egd-file | \
+            --key | --libcurl | --output | --random-file | --upload-file | --trace | \
+            --trace-ascii | --netrc-file | -!(-*)[KbcDoT])
             _filedir
             return
             ;;
-        --cacert|--cert|-!(-*)E)
+        --cacert | --cert | -!(-*)E)
             _filedir '@(c?(e)rt|cer|pem|der)'
             return
             ;;
@@ -31,47 +31,47 @@ _curl()
             _filedir -d
             return
             ;;
-        --cert-type|--key-type)
-            COMPREPLY=( $(compgen -W 'DER PEM ENG' -- "$cur") )
+        --cert-type | --key-type)
+            COMPREPLY=($(compgen -W 'DER PEM ENG' -- "$cur"))
             return
             ;;
         --crlfile)
             _filedir crl
             return
             ;;
-        --data|--data-ascii|--data-binary|--data-urlencode|-!(-*)d)
+        --data | --data-ascii | --data-binary | --data-urlencode | -!(-*)d)
             if [[ $cur == \@* ]]; then
                 cur=${cur:1}
                 _filedir
-                if [[ ${#COMPREPLY[@]} -eq 1 && -d "${COMPREPLY[0]}" ]]; then
+                if [[ ${#COMPREPLY[@]} -eq 1 && -d ${COMPREPLY[0]} ]]; then
                     COMPREPLY[0]+=/
                     compopt -o nospace
                 fi
-                COMPREPLY=( "${COMPREPLY[@]/#/@}" )
+                COMPREPLY=("${COMPREPLY[@]/#/@}")
             fi
             return
             ;;
         --delegation)
-            COMPREPLY=( $(compgen -W 'none policy always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none policy always' -- "$cur"))
             return
             ;;
         --engine)
-            COMPREPLY=( $(compgen -W 'list' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list' -- "$cur"))
             return
             ;;
         --ftp-method)
-            COMPREPLY=( $(compgen -W 'multicwd nocwd singlecwd' -- "$cur") )
+            COMPREPLY=($(compgen -W 'multicwd nocwd singlecwd' -- "$cur"))
             return
             ;;
         --ftp-ssl-ccc-mode)
-            COMPREPLY=( $(compgen -W 'active passive' -- "$cur") )
+            COMPREPLY=($(compgen -W 'active passive' -- "$cur"))
             return
             ;;
         --interface)
             _available_interfaces -a
             return
             ;;
-        --proxy|--socks4|--socks4a|--socks5|--socks5-hostname|-!(-*)x)
+        --proxy | --socks4 | --socks4a | --socks5 | --socks5-hostname | -!(-*)x)
             _known_hosts_real -- "$cur"
             return
             ;;
@@ -80,20 +80,20 @@ _curl()
             return
             ;;
         --stderr)
-            COMPREPLY=( $(compgen -W '-' -- "$cur") )
+            COMPREPLY=($(compgen -W '-' -- "$cur"))
             _filedir
             return
             ;;
         --tlsauthtype)
-            COMPREPLY=( $(compgen -W 'SRP' -- "$cur") )
+            COMPREPLY=($(compgen -W 'SRP' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _curl curl
+    complete -F _curl curl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cvs b/msys2/usr/share/bash-completion/completions/cvs
index 0fb49f9ce..ba1f06229 100644
--- a/msys2/usr/share/bash-completion/completions/cvs
+++ b/msys2/usr/share/bash-completion/completions/cvs
@@ -4,9 +4,9 @@ _cvs_entries()
 {
     local prefix=${cur%/*}/ IFS=$'\n'
     [[ -e ${prefix:-}CVS/Entries ]] || prefix=""
-    entries=( $(cut -d/ -f2 -s ${prefix:-}CVS/Entries 2>/dev/null) )
+    entries=($(cut -d/ -f2 -s ${prefix:-}CVS/Entries 2>/dev/null))
     if [[ $entries ]]; then
-        entries=( "${entries[@]/#/${prefix:-}}" )
+        entries=("${entries[@]/#/${prefix:-}}")
         compopt -o filenames
     fi
 }
@@ -14,9 +14,9 @@ _cvs_entries()
 _cvs_modules()
 {
     if [[ -n $prefix ]]; then
-        COMPREPLY=( $(command ls -d ${cvsroot}/${prefix}/!(CVSROOT)) )
+        COMPREPLY=($(command ls -d ${cvsroot}/${prefix}/!(CVSROOT)))
     else
-        COMPREPLY=( $(command ls -d ${cvsroot}/!(CVSROOT)) )
+        COMPREPLY=($(command ls -d ${cvsroot}/!(CVSROOT)))
     fi
 }
 
@@ -27,21 +27,21 @@ _cvs_commands()
 
 _cvs_command_options()
 {
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1" "--help $2")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help $2")' -- "$cur"))
 }
 
 _cvs_kflags()
 {
-    COMPREPLY=( $(compgen -W 'kv kvl k o b v' -- "$cur") )
+    COMPREPLY=($(compgen -W 'kv kvl k o b v' -- "$cur"))
 }
 
 _cvs_roots()
 {
     local -a cvsroots
-    cvsroots=( $CVSROOT )
-    [[ -r ~/.cvspass ]] && cvsroots+=( $(awk '{ print $2 }' ~/.cvspass) )
+    [[ -v CVSROOT ]] && cvsroots=("$CVSROOT")
+    [[ -r ~/.cvspass ]] && cvsroots+=($(awk '{ print $2 }' ~/.cvspass))
     [[ -r CVS/Root ]] && mapfile -tO ${#cvsroots[@]} cvsroots <CVS/Root
-    COMPREPLY=( $(compgen -W '${cvsroots[@]}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${cvsroots[@]}' -- "$cur"))
     __ltrim_colon_completions "$cur"
 }
 
@@ -55,89 +55,89 @@ _cvs()
 
     count=0
     for i in "${words[@]}"; do
-        [[ $count -eq $cword ]] && break
+        ((count == cword)) && break
         # Last parameter was the CVSROOT, now go back to mode selection
-        if [[ "${words[((count))]}" == "$cvsroot" && "$mode" == cvsroot ]]; then
+        if [[ ${words[count]} == "${cvsroot-}" && ${mode-} == cvsroot ]]; then
             mode=""
         fi
-        if [[ -z $mode ]]; then
+        if [[ ! -v mode ]]; then
             case $i in
-                --help|-!(-*)H)
-                    COMPREPLY=( $(compgen -W "$(_cvs_commands)" -- "$cur") )
+                --help | -!(-*)H)
+                    COMPREPLY=($(compgen -W "$(_cvs_commands)" -- "$cur"))
                     return
                     ;;
                 -!(-*)d)
                     mode=cvsroot
-                    cvsroot=${words[((count+1))]}
+                    cvsroot=${words[count + 1]}
                     ;;
-                add|ad|new)
+                add | ad | new)
                     mode=add
                     ;;
-                admin|adm|rcs)
-                    mode=admin
+                admin | adm | rcs)
+                    mode="admin"
                     ;;
-                annotate|ann|blame|rannotate|rann|ra)
+                annotate | ann | blame | rannotate | rann | ra)
                     mode=annotate
                     ;;
-                checkout|co|get)
+                checkout | co | get)
                     mode=checkout
                     ;;
-                commit|ci|com)
+                commit | ci | com)
                     mode=commit
                     ;;
-                diff|di|dif)
-                    mode=diff
+                diff | di | dif)
+                    mode="diff"
                     ;;
-                export|ex|exp)
-                    mode=export
+                export | ex | exp)
+                    mode="export"
                     ;;
-                edit|unedit|editors|logout|pserver|server|watch|watchers)
+                edit | unedit | editors | logout | pserver | server | watch | watchers)
                     mode=$i
                     ;;
-                history|hi|his)
+                history | hi | his)
                     mode=history
                     ;;
-                import|im|imp)
+                import | im | imp)
                     mode=import
                     ;;
-                log|lo|rlog|rl)
+                log | lo | rlog | rl)
                     mode=log
                     ;;
-                login|logon|lgn)
+                login | logon | lgn)
                     mode=login
                     ;;
-                rdiff|patch|pa)
+                rdiff | patch | pa)
                     mode=rdiff
                     ;;
-                release|re|rel)
+                release | re | rel)
                     mode=release
                     ;;
-                remove|rm|delete)
+                remove | rm | delete)
                     mode=remove
                     ;;
-                rtag|rt|rfreeze)
+                rtag | rt | rfreeze)
                     mode=rtag
                     ;;
-                status|st|stat)
+                status | st | stat)
                     mode=status
                     ;;
-                tag|ta|freeze)
+                tag | ta | freeze)
                     mode=tag
                     ;;
-                update|up|upd)
+                update | up | upd)
                     mode=update
                     ;;
-                version|ve|ver)
+                version | ve | ver)
                     mode=version
                     ;;
             esac
-        elif [[ "$i" == -* ]]; then
-            flags+=( $i )
+        elif [[ $i == -* ]]; then
+            flags+=($i)
         fi
-        (( count++ ))
+        ((count++))
     done
 
-    case $mode in
+    case ${mode-} in
         add)
             case $prev in
                 --*) ;;
@@ -150,25 +150,25 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _cvs_entries
-                [[ -z $cur ]] && files=( !(CVS) ) || \
-                    files=( $(command ls -d ${cur}* 2>/dev/null) )
+                [[ -z $cur ]] && files=(!(CVS)) ||
+                    files=($(command ls -d ${cur}* 2>/dev/null))
                 local f
                 for i in "${!files[@]}"; do
                     if [[ ${files[i]} == ?(*/)CVS ]]; then
                         unset 'files[i]'
                     else
                         for f in "${entries[@]}"; do
-                            if [[ ${files[i]} == $f && ! -d $f ]]; then
+                            if [[ ${files[i]} == "$f" && ! -d $f ]]; then
                                 unset 'files[i]'
                                 break
                             fi
                         done
                     fi
                 done
-                COMPREPLY=( $(compgen -X "$_backup_glob" -W '${files[@]}' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -X "$_backup_glob" -W '${files[@]}' \
+                    -- "$cur"))
             else
                 _cvs_command_options "$1" $mode
             fi
@@ -189,21 +189,21 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" == -* ]]; then
+            if [[ $cur == -* ]]; then
                 _cvs_command_options "$1" $mode
             else
                 _cvs_entries
-                COMPREPLY=( $(compgen -W '${entries[@]}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]}' -- "$cur"))
             fi
             ;;
         annotate)
-            [[ "$prev" == -[rD] ]] && return
+            [[ $prev == -[rD] ]] && return
 
-            if [[ "$cur" == -* ]]; then
+            if [[ $cur == -* ]]; then
                 _cvs_command_options "$1" $mode
             else
                 _cvs_entries
-                COMPREPLY=( $(compgen -W '${entries[@]}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]}' -- "$cur"))
             fi
             ;;
         checkout)
@@ -222,11 +222,11 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" != -* ]]; then
-                [[ -z $cvsroot ]] && cvsroot=$CVSROOT
-                COMPREPLY=( $(cvs -d "$cvsroot" co -c 2>/dev/null | \
-                    awk '{print $1}') )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+            if [[ $cur != -* ]]; then
+                [[ ! -v cvsroot ]] && cvsroot=${CVSROOT-}
+                COMPREPLY=($(cvs -d "$cvsroot" co -c 2>/dev/null |
+                    awk '{print $1}'))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
             else
                 _cvs_command_options "$1" $mode
             fi
@@ -243,7 +243,7 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 # if $COMP_CVS_REMOTE is not null, 'cvs commit' will
                 # complete on remotely checked-out files (requires
                 # passwordless access to the remote repository
@@ -251,15 +251,15 @@ _cvs()
                     # this is the least computationally intensive way found so
                     # far, but other changes (something other than
                     # changed/removed/new) may be missing
-                    changed=( $(cvs -q diff --brief 2>&1 | \
-                        command sed -ne 's/^Files [^ ]* and \([^ ]*\) differ$/\1/p') )
-                    newremoved=( $(cvs -q diff --brief 2>&1 | \
-                        command sed -ne 's/^cvs diff: \([^ ]*\) .*, no comparison available$/\1/p') )
-                    COMPREPLY=( $(compgen -W '${changed[@]:-} \
-                        ${newremoved[@]:-}' -- "$cur") )
+                    changed=($(cvs -q diff --brief 2>&1 |
+                        command sed -ne 's/^Files [^ ]* and \([^ ]*\) differ$/\1/p'))
+                    newremoved=($(cvs -q diff --brief 2>&1 |
+                        command sed -ne 's/^cvs diff: \([^ ]*\) .*, no comparison available$/\1/p'))
+                    COMPREPLY=($(compgen -W '${changed[@]:-} \
+                        ${newremoved[@]:-}' -- "$cur"))
                 else
                     _cvs_entries
-                    COMPREPLY=( $(compgen -W '${entries[@]}' -- "$cur") )
+                    COMPREPLY=($(compgen -W '${entries[@]}' -- "$cur"))
                 fi
             else
                 _cvs_command_options "$1" $mode
@@ -268,21 +268,21 @@ _cvs()
         cvsroot)
             _cvs_roots
             ;;
-        diff|log)
-            if [[ "$cur" == -* ]]; then
+        diff | log)
+            if [[ $cur == -* ]]; then
                 _cvs_command_options "$1" $mode
-                [[ $COMPREPLY == *= ]] && compopt -o nospace
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             else
                 _cvs_entries
-                COMPREPLY=( $(compgen -W '${entries[@]:-}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]:-}' -- "$cur"))
             fi
             ;;
-        editors|watchers)
-            if [[ "$cur" == -* ]]; then
+        editors | watchers)
+            if [[ $cur == -* ]]; then
                 _cvs_command_options "$1" $mode
             else
                 _cvs_entries
-                COMPREPLY=( $(compgen -W '${entries[@]}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]}' -- "$cur"))
             fi
             ;;
         export)
@@ -301,10 +301,10 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" != -* ]]; then
-                [[ -z $cvsroot ]] && cvsroot=$CVSROOT
-                COMPREPLY=( $(cvs -d "$cvsroot" co -c | awk '{print $1}') )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+            if [[ $cur != -* ]]; then
+                [[ ! -v cvsroot ]] && cvsroot=${CVSROOT-}
+                COMPREPLY=($(cvs -d "$cvsroot" co -c | awk '{print $1}'))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
             else
                 _cvs_command_options "$1" $mode
             fi
@@ -321,32 +321,32 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 # starts with same algorithm as checkout
-                [[ -z $cvsroot ]] && cvsroot=$CVSROOT
+                [[ ! -v cvsroot ]] && cvsroot=${CVSROOT-}
                 local prefix=${cur%/*}
                 if [[ -r ${cvsroot}/${prefix} ]]; then
                     _cvs_modules
-                    COMPREPLY=( ${COMPREPLY[@]#$cvsroot} )
-                    COMPREPLY=( ${COMPREPLY[@]#\/} )
+                    COMPREPLY=(${COMPREPLY[@]#$cvsroot})
+                    COMPREPLY=(${COMPREPLY[@]#\/})
                 fi
                 pwd=$(pwd)
                 pwd=${pwd##*/}
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]} $pwd' -- "$cur") )
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]} $pwd' -- "$cur"))
             else
                 _cvs_command_options "$1" $mode
             fi
             ;;
         remove)
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _cvs_entries
-                if [[ "$prev" != -f ]]; then
+                if [[ $prev != -f ]]; then
                     # find out what files are missing
                     for i in "${!entries[@]}"; do
-                        [[ -r "${entries[i]}" ]] && unset 'entries[i]'
+                        [[ -r ${entries[i]} ]] && unset 'entries[i]'
                     done
                 fi
-                COMPREPLY=( $(compgen -W '${entries[@]:-}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]:-}' -- "$cur"))
             else
                 _cvs_command_options "$1" $mode
             fi
@@ -363,11 +363,11 @@ _cvs()
                     ;;
             esac
 
-            if [[ "$cur" == -* ]]; then
+            if [[ $cur == -* ]]; then
                 _cvs_command_options "$1" $mode
             else
                 _cvs_entries
-                COMPREPLY=( $(compgen -W '${entries[@]}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${entries[@]}' -- "$cur"))
             fi
             ;;
         "")
@@ -381,18 +381,18 @@ _cvs()
                     return
                     ;;
                 -*z)
-                    COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+                    COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
                     return
                     ;;
             esac
 
-            COMPREPLY=( $(compgen -W '$(_cvs_commands)
+            COMPREPLY=($(compgen -W '$(_cvs_commands)
                 $(_parse_help "$1" --help-options) --help --help-commands
-                --help-options --version' -- "$cur") )
+                --help-options --version' -- "$cur"))
             ;;
     esac
 
 } &&
-complete -F _cvs cvs
+    complete -F _cvs cvs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/cvsps b/msys2/usr/share/bash-completion/completions/cvsps
index 721a5b736..4fdfefc3a 100644
--- a/msys2/usr/share/bash-completion/completions/cvsps
+++ b/msys2/usr/share/bash-completion/completions/cvsps
@@ -6,27 +6,27 @@ _cvsps()
     _init_completion -n : || return
 
     case $prev in
-        -h|-z|-f|-d|-l|--diff-opts|--debuglvl)
+        -h | -z | -f | -d | -l | --diff-opts | --debuglvl)
             return
             ;;
         -s)
-            COMPREPLY=( $(compgen -W "$($1 2>/dev/null |
-                awk '/^PatchSet:?[ \t]/ { print $2 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 2>/dev/null |
+                awk '/^PatchSet:?[ \t]/ { print $2 }')" -- "$cur"))
             return
             ;;
         -a)
-            COMPREPLY=( $(compgen -W "$($1 2>/dev/null |
-                awk '/^Author:[ \t]/ { print $2 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 2>/dev/null |
+                awk '/^Author:[ \t]/ { print $2 }')" -- "$cur"))
             return
             ;;
         -b)
-            COMPREPLY=( $(compgen -W "$($1 2>/dev/null |
-                awk '/^Branch:[ \t]/ { print $2 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 2>/dev/null |
+                awk '/^Branch:[ \t]/ { print $2 }')" -- "$cur"))
             return
             ;;
         -r)
-            COMPREPLY=( $(compgen -W "$($1 2>/dev/null |
-                awk '/^Tag:[ \t]+[^(]/ { print $2 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 2>/dev/null |
+                awk '/^Tag:[ \t]+[^(]/ { print $2 }')" -- "$cur"))
             return
             ;;
         -p)
@@ -38,7 +38,7 @@ _cvsps()
             return
             ;;
         -Z)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             return
             ;;
         --root)
@@ -47,12 +47,12 @@ _cvsps()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
         _xfunc cvs _cvs_roots
     fi
 } &&
-complete -F _cvsps cvsps
+    complete -F _cvsps cvsps
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dcop b/msys2/usr/share/bash-completion/completions/dcop
index 9a22e8000..5b5a5e377 100644
--- a/msys2/usr/share/bash-completion/completions/dcop
+++ b/msys2/usr/share/bash-completion/completions/dcop
@@ -5,10 +5,10 @@ _qdbus()
     local cur prev words cword
     _init_completion || return
 
-    [[ -n $cur ]] && unset "words[$((${#words[@]}-1))]"
-    COMPREPLY=( $(compgen -W '$(command ${words[@]} 2>/dev/null | \
-        command sed "s/(.*)//")' -- "$cur") )
+    [[ -n $cur ]] && unset "words[$((${#words[@]} - 1))]"
+    COMPREPLY=($(compgen -W '$(command ${words[@]} 2>/dev/null | \
+        command sed "s/(.*)//")' -- "$cur"))
 } &&
-complete -F _qdbus qdbus dcop
+    complete -F _qdbus qdbus dcop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dd b/msys2/usr/share/bash-completion/completions/dd
index 5384dd5ee..04d876a0f 100644
--- a/msys2/usr/share/bash-completion/completions/dd
+++ b/msys2/usr/share/bash-completion/completions/dd
@@ -6,37 +6,37 @@ _dd()
     _init_completion -n = || return
 
     case $cur in
-        if=*|of=*)
+        if=* | of=*)
             cur=${cur#*=}
             _filedir
             return
             ;;
         conv=*)
             cur=${cur#*=}
-            COMPREPLY=( $(compgen -W 'ascii ebcdic ibm block unblock lcase
+            COMPREPLY=($(compgen -W 'ascii ebcdic ibm block unblock lcase
                 ucase sparse swab sync excl nocreat notrunc noerror fdatasync
-                fsync' -- "$cur") )
+                fsync' -- "$cur"))
             return
             ;;
-        iflag=*|oflag=*)
+        iflag=* | oflag=*)
             cur=${cur#*=}
-            COMPREPLY=( $(compgen -W 'append direct directory dsync sync
+            COMPREPLY=($(compgen -W 'append direct directory dsync sync
                 fullblock nonblock noatime nocache noctty nofollow count_bytes
-                skip_bytes seek_bytes' -- "$cur") )
+                skip_bytes seek_bytes' -- "$cur"))
             return
             ;;
         status=*)
             cur=${cur#*=}
-            COMPREPLY=( $(compgen -W 'none noxfer progress' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none noxfer progress' -- "$cur"))
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") \
-                $(compgen -W 'bs cbs conv count ibs if iflag obs of oflag
-                              seek skip status' -S '=' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")
+    $(compgen -W 'bs cbs conv count ibs if iflag obs of oflag
+                              seek skip status' -S '=' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _dd dd
+    complete -F _dd dd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/declare b/msys2/usr/share/bash-completion/completions/declare
index a97b5255c..6ae52718f 100644
--- a/msys2/usr/share/bash-completion/completions/declare
+++ b/msys2/usr/share/bash-completion/completions/declare
@@ -8,30 +8,30 @@ _function()
     if [[ $1 == @(declare|typeset) ]]; then
         if [[ $cur == [-+]* ]]; then
             local opts
-            opts=( $(_parse_usage "$1") )
+            opts=($(_parse_usage "$1"))
             # Most options also have a '+' form.  We'll exclude the ones that don't with compgen.
-            opts+=( ${opts[*]/-/+} )
-            COMPREPLY=( $(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur") )
+            opts+=(${opts[*]/-/+})
+            COMPREPLY=($(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur"))
         else
             local i=1
             while [[ ${words[i]} == [-+]* ]]; do
                 if [[ ${words[i]} == -*[fF]* ]]; then
-                    COMPREPLY=( $(compgen -A function -- "$cur") )
+                    COMPREPLY=($(compgen -A function -- "$cur"))
                     return
                 fi
                 ((i++))
             done
-            if [[ $i -gt 1 ]]; then
+            if ((i > 1)); then
                 # There was at least one option and it was not one that limited operations to functions
-                COMPREPLY=( $(compgen -A variable -- "$cur") )
+                COMPREPLY=($(compgen -A variable -- "$cur"))
             fi
         fi
-    elif [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -A function -- "$cur") )
+    elif ((cword == 1)); then
+        COMPREPLY=($(compgen -A function -- "$cur"))
     else
-        COMPREPLY=( "() $(type -- ${words[1]} | command sed -e 1,2d)" )
+        COMPREPLY=("() $(type -- ${words[1]} | command sed -e 1,2d)")
     fi
 } &&
-complete -F _function function declare typeset
+    complete -F _function function declare typeset
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/deja-dup b/msys2/usr/share/bash-completion/completions/deja-dup
index ad3baeb82..1854d6a40 100644
--- a/msys2/usr/share/bash-completion/completions/deja-dup
+++ b/msys2/usr/share/bash-completion/completions/deja-dup
@@ -6,7 +6,7 @@ _deja_dup()
     _init_completion -s || return
 
     case $prev in
-        -'?'|--help|--help-*)
+        -'?' | --help | --help-*)
             return
             ;;
         --restore)
@@ -21,12 +21,12 @@ _deja_dup()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _deja_dup deja-dup
+    complete -F _deja_dup deja-dup
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/desktop-file-validate b/msys2/usr/share/bash-completion/completions/desktop-file-validate
index 7d9f05b22..8f4e139d0 100644
--- a/msys2/usr/share/bash-completion/completions/desktop-file-validate
+++ b/msys2/usr/share/bash-completion/completions/desktop-file-validate
@@ -12,12 +12,12 @@ _desktop_file_validate()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir desktop
 } &&
-complete -F _desktop_file_validate desktop-file-validate
+    complete -F _desktop_file_validate desktop-file-validate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dfutool b/msys2/usr/share/bash-completion/completions/dfutool
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/dfutool
+++ b/msys2/usr/share/bash-completion/completions/dfutool
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dhclient b/msys2/usr/share/bash-completion/completions/dhclient
index b097bbac4..ce4b74526 100644
--- a/msys2/usr/share/bash-completion/completions/dhclient
+++ b/msys2/usr/share/bash-completion/completions/dhclient
@@ -6,11 +6,11 @@ _dhclient()
     _init_completion || return
 
     case $prev in
-        -p|-e)
+        -p | -e)
             return
             ;;
         -D)
-            COMPREPLY=( $(compgen -W 'LL LLT' -- "$cur") )
+            COMPREPLY=($(compgen -W 'LL LLT' -- "$cur"))
             return
             ;;
         -*f)
@@ -23,12 +23,12 @@ _dhclient()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _available_interfaces
     fi
 } &&
-complete -F _dhclient dhclient
+    complete -F _dhclient dhclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dict b/msys2/usr/share/bash-completion/completions/dict
index c3ea9906e..f3426ffd2 100644
--- a/msys2/usr/share/bash-completion/completions/dict
+++ b/msys2/usr/share/bash-completion/completions/dict
@@ -13,35 +13,35 @@ _dict()
 
     local host port db i
 
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            --host|-!(-*)h)
+            --host | -!(-*)h)
                 host=${words[++i]}
                 [[ -n $host ]] && host="-h $host"
                 ;;
-            --port|-!(-*)p)
+            --port | -!(-*)p)
                 port=${words[++i]}
                 [[ -n $port ]] && port="-p $port"
                 ;;
-            --database|-!(-*)d)
+            --database | -!(-*)d)
                 db=${words[++i]}
                 [[ -n $db ]] && host="-d $db"
                 ;;
         esac
     done
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     case $prev in
-        --database|-info|-!(-*)[di])
-            COMPREPLY=( $(compgen -W '$(_dictdata -D)' -- "$cur") )
+        --database | -info | -!(-*)[di])
+            COMPREPLY=($(compgen -W '$(_dictdata -D)' -- "$cur"))
             return
             ;;
-        --strategy|-!(-*)s)
-            COMPREPLY=( $(compgen -W '$(_dictdata -S)' -- "$cur") )
+        --strategy | -!(-*)s)
+            COMPREPLY=($(compgen -W '$(_dictdata -S)' -- "$cur"))
             return
             ;;
     esac
@@ -52,13 +52,13 @@ _dict()
         # it down with grep if $cur looks like something that's safe to embed
         # in a pattern instead.
         if [[ $cur == +([-A-Za-z0-9/.]) ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(command grep "^${cur//./\\.}" $dictfile)' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                '$(command grep "^${cur//./\\.}" $dictfile)' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W '$(cat $dictfile)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(cat $dictfile)' -- "$cur"))
         fi
     fi
 } &&
-complete -F _dict -o default dict rdict
+    complete -F _dict -o default dict rdict
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/display b/msys2/usr/share/bash-completion/completions/display
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/display
+++ b/msys2/usr/share/bash-completion/completions/display
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dmypy b/msys2/usr/share/bash-completion/completions/dmypy
index a8c074375..5abe37d77 100644
--- a/msys2/usr/share/bash-completion/completions/dmypy
+++ b/msys2/usr/share/bash-completion/completions/dmypy
@@ -6,7 +6,7 @@ _dmypy()
     _init_completion || return
 
     case $prev in
-        --help|--version|-[hV])
+        --help | --version | -[hV])
             return
             ;;
         --status-file)
@@ -16,32 +16,33 @@ _dmypy()
     esac
 
     local cmd i
-    for (( i=1; i < cword; i++ )); do
-        if [[ ${words[i]} != -* && ${words[i-1]} != --status-file ]]; then
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} != -* && ${words[i - 1]} != --status-file ]]; then
             cmd=${words[i]}
             break
         fi
     done
 
-    case $cmd in
-        check|run)
+    case ${cmd-} in
+        check | run)
             _filedir '@(py|pyi)'
             return
+            ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    if [[ ! $cmd ]]; then
-        local cmds=$($1 --help 2>&1 \
-                     | command sed -ne '/positional arguments/{p;n;p;q}' \
-                     | command sed -ne 's/{\(.*\)}/\1/p')
-        COMPREPLY=( $(IFS="," compgen -W '$cmds' -- "$cur") )
+    if [[ ! -v cmd ]]; then
+        local cmds=$($1 --help 2>&1 |
+            command sed -ne '/positional arguments/{p;n;p;q}' |
+            command sed -ne 's/{\(.*\)}/\1/p')
+        COMPREPLY=($(IFS="," compgen -W '$cmds' -- "$cur"))
         return
     fi
 } &&
-complete -F _dmypy dmypy
+    complete -F _dmypy dmypy
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dnssec-keygen b/msys2/usr/share/bash-completion/completions/dnssec-keygen
index 2ecfcdc5e..3f68a6873 100644
--- a/msys2/usr/share/bash-completion/completions/dnssec-keygen
+++ b/msys2/usr/share/bash-completion/completions/dnssec-keygen
@@ -2,11 +2,11 @@
 
 _dnssec_keygen_optarg()
 {
-    local args=$("$1" -h 2>&1 | \
+    local args=$("$1" -h 2>&1 |
         command sed -e 's/|/ /g' -e 's/(.*//' \
-                   -ne '/^[[:space:]]*'$2'/,/^[[:space:]]*[(-]/p' | \
+            -ne '/^[[:space:]]*'$2'/,/^[[:space:]]*[(-]/p' |
         command sed -e 's/^[[:space:]]*'$2'.*://' -e '/^[[:space:]]*-/d')
-    COMPREPLY+=( $(compgen -W '$args' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$args' -- "$cur"))
 }
 
 _dnssec_keygen()
@@ -32,17 +32,17 @@ _dnssec_keygen()
             return
             ;;
         -v)
-            COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" | \
-            command sed -e "s/:\$//")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" | \
+            command sed -e "s/:\$//")' -- "$cur"))
         return
     fi
 } &&
-complete -F _dnssec_keygen dnssec-keygen
+    complete -F _dnssec_keygen dnssec-keygen
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dnsspoof b/msys2/usr/share/bash-completion/completions/dnsspoof
index e45d48d6c..86ade91db 100644
--- a/msys2/usr/share/bash-completion/completions/dnsspoof
+++ b/msys2/usr/share/bash-completion/completions/dnsspoof
@@ -16,11 +16,11 @@ _dnsspoof()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _dnsspoof dnsspoof
+    complete -F _dnsspoof dnsspoof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dot b/msys2/usr/share/bash-completion/completions/dot
index bad82f2c9..812222925 100644
--- a/msys2/usr/share/bash-completion/completions/dot
+++ b/msys2/usr/share/bash-completion/completions/dot
@@ -8,38 +8,38 @@ _dot()
     [[ $prev == -[V?] ]] && return
 
     case $cur in
-        -G*|-N*|-E*|-l?*|-q?*|-s?*|-Ln*|-LU*|-LC*|-LT*)
+        -G* | -N* | -E* | -l?* | -q?* | -s?* | -Ln* | -LU* | -LC* | -LT*)
             return
             ;;
         -T*)
-            local langs=( $("$1" -TNON_EXISTENT 2>&1 | \
-                command sed -ne 's/.*one of://p') )
-            COMPREPLY=( $(compgen -P -T -W '${langs[@]}' -- "${cur#-T}") )
+            local langs=($("$1" -TNON_EXISTENT 2>&1 |
+                command sed -ne 's/.*one of://p'))
+            COMPREPLY=($(compgen -P -T -W '${langs[@]}' -- "${cur#-T}"))
             return
             ;;
         -K*)
-            local layouts=( $("$1" -KNON_EXISTENT 2>&1 | \
-                command sed -ne 's/.*one of://p') )
-            COMPREPLY=( $(compgen -P -K -W '${layouts[@]}' -- "${cur#-K}") )
+            local layouts=($("$1" -KNON_EXISTENT 2>&1 |
+                command sed -ne 's/.*one of://p'))
+            COMPREPLY=($(compgen -P -K -W '${layouts[@]}' -- "${cur#-K}"))
             return
             ;;
         -o*)
             cur=${cur#-o}
             _filedir
-            COMPREPLY=( $(compgen -P -o -W '${COMPREPLY[@]}' -- "$cur") )
+            COMPREPLY=($(compgen -P -o -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-V -v -G -N -E -T -K -l -o -O -P -q -s -y -n
-            -n1 -n2 -x -Lg -LO -Ln -LU -LC -LT -m -c -?' -- "$cur") )
-        [[ $COMPREPLY == -@([GNETKo]|L[nUCT]) ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '-V -v -G -N -E -T -K -l -o -O -P -q -s -y -n
+            -n1 -n2 -x -Lg -LO -Ln -LU -LC -LT -m -c -?' -- "$cur"))
+        [[ ${COMPREPLY-} == -@([GNETKo]|L[nUCT]) ]] && compopt -o nospace
         return
     fi
 
     _filedir dot
 } &&
-complete -F _dot dot
+    complete -F _dot dot
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dpkg b/msys2/usr/share/bash-completion/completions/dpkg
index 827d9cad9..0b90b14b7 100644
--- a/msys2/usr/share/bash-completion/completions/dpkg
+++ b/msys2/usr/share/bash-completion/completions/dpkg
@@ -1,35 +1,35 @@
 # This function is required by _dpkg and _dpkg-reconfigure -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_installed_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
-}
+    _comp_dpkg_installed_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
+    }
 } || {
-_comp_dpkg_installed_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_installed_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 _have grep-status && {
-_comp_dpkg_purgeable_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
-}
+    _comp_dpkg_purgeable_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
+    }
 } || {
-_comp_dpkg_purgeable_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_purgeable_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured|config-files" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 # Debian dpkg(1) completion
@@ -49,39 +49,47 @@ _dpkg()
     fi
 
     case $prev in
-        --install|--unpack|--record-avail|--contents|--info|--fsys-tarfile|\
-        --field|--control|--extract|--vextract|-!(-*)[ciAIfexW])
+        --install | --unpack | --record-avail | --contents | --info | --fsys-tarfile | \
+            --field | --control | --extract | --vextract | --raw-extract | -!(-*)[ciAIfexX])
             _filedir '?(u|d)deb'
             return
             ;;
-        --build|-!(-*)b)
+        --build | -!(-*)b)
             _filedir -d
             return
             ;;
-        --status|--print-avail|--list|--show|-!(-*)[splW])
-            COMPREPLY=( $(apt-cache pkgnames "$cur" 2>/dev/null) )
+        --status | --print-avail | --list | -!(-*)[spl])
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
             return
             ;;
-        --search|-!(-*)S)
+        --show | -!(-*)W)
+            if [[ $1 == *dpkg-query ]]; then
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
+            else
+                _filedir '?(u|d)deb'
+            fi
+            return
+            ;;
+        --search | -!(-*)S)
             _filedir
             return
             ;;
-        --remove|--verify|-!(-*)[rV])
-            COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        --remove | --verify | -!(-*)[rV])
+            COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
             return
             ;;
-        --listfiles|--purge|-!(-*)[LP])
-            COMPREPLY=( $(_comp_dpkg_purgeable_packages "$cur") )
+        --listfiles | --purge | -!(-*)[LP])
+            COMPREPLY=($(_comp_dpkg_purgeable_packages "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _dpkg dpkg dpkg-deb dpkg-query
+    complete -F _dpkg dpkg dpkg-deb dpkg-query
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
@@ -93,26 +101,26 @@ _dpkg_reconfigure()
     local opt
 
     case $prev in
-        --frontend|-!(-*)f)
-            opt=( $(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*) )
-            opt=( ${opt[@]##*/} )
-            opt=( ${opt[@]%.pm} )
-            COMPREPLY=( $(compgen -W '${opt[@]}' -- "$cur") )
+        --frontend | -!(-*)f)
+            opt=($(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*))
+            opt=(${opt[@]##*/})
+            opt=(${opt[@]%.pm})
+            COMPREPLY=($(compgen -W '${opt[@]}' -- "$cur"))
             return
             ;;
-        --priority|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'low medium high critical' -- "$cur") )
+        --priority | -!(-*)p)
+            COMPREPLY=($(compgen -W 'low medium high critical' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only
-            --help --showold --force --terse' -- "$cur" ) )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--frontend --priority --all --unseen-only
+            --help --showold --force --terse' -- "$cur"))
     else
-        COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
     fi
 } &&
-complete -F _dpkg_reconfigure -o default dpkg-reconfigure
+    complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dpkg-deb b/msys2/usr/share/bash-completion/completions/dpkg-deb
index 827d9cad9..0b90b14b7 100644
--- a/msys2/usr/share/bash-completion/completions/dpkg-deb
+++ b/msys2/usr/share/bash-completion/completions/dpkg-deb
@@ -1,35 +1,35 @@
 # This function is required by _dpkg and _dpkg-reconfigure -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_installed_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
-}
+    _comp_dpkg_installed_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
+    }
 } || {
-_comp_dpkg_installed_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_installed_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 _have grep-status && {
-_comp_dpkg_purgeable_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
-}
+    _comp_dpkg_purgeable_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
+    }
 } || {
-_comp_dpkg_purgeable_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_purgeable_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured|config-files" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 # Debian dpkg(1) completion
@@ -49,39 +49,47 @@ _dpkg()
     fi
 
     case $prev in
-        --install|--unpack|--record-avail|--contents|--info|--fsys-tarfile|\
-        --field|--control|--extract|--vextract|-!(-*)[ciAIfexW])
+        --install | --unpack | --record-avail | --contents | --info | --fsys-tarfile | \
+            --field | --control | --extract | --vextract | --raw-extract | -!(-*)[ciAIfexX])
             _filedir '?(u|d)deb'
             return
             ;;
-        --build|-!(-*)b)
+        --build | -!(-*)b)
             _filedir -d
             return
             ;;
-        --status|--print-avail|--list|--show|-!(-*)[splW])
-            COMPREPLY=( $(apt-cache pkgnames "$cur" 2>/dev/null) )
+        --status | --print-avail | --list | -!(-*)[spl])
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
             return
             ;;
-        --search|-!(-*)S)
+        --show | -!(-*)W)
+            if [[ $1 == *dpkg-query ]]; then
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
+            else
+                _filedir '?(u|d)deb'
+            fi
+            return
+            ;;
+        --search | -!(-*)S)
             _filedir
             return
             ;;
-        --remove|--verify|-!(-*)[rV])
-            COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        --remove | --verify | -!(-*)[rV])
+            COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
             return
             ;;
-        --listfiles|--purge|-!(-*)[LP])
-            COMPREPLY=( $(_comp_dpkg_purgeable_packages "$cur") )
+        --listfiles | --purge | -!(-*)[LP])
+            COMPREPLY=($(_comp_dpkg_purgeable_packages "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _dpkg dpkg dpkg-deb dpkg-query
+    complete -F _dpkg dpkg dpkg-deb dpkg-query
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
@@ -93,26 +101,26 @@ _dpkg_reconfigure()
     local opt
 
     case $prev in
-        --frontend|-!(-*)f)
-            opt=( $(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*) )
-            opt=( ${opt[@]##*/} )
-            opt=( ${opt[@]%.pm} )
-            COMPREPLY=( $(compgen -W '${opt[@]}' -- "$cur") )
+        --frontend | -!(-*)f)
+            opt=($(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*))
+            opt=(${opt[@]##*/})
+            opt=(${opt[@]%.pm})
+            COMPREPLY=($(compgen -W '${opt[@]}' -- "$cur"))
             return
             ;;
-        --priority|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'low medium high critical' -- "$cur") )
+        --priority | -!(-*)p)
+            COMPREPLY=($(compgen -W 'low medium high critical' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only
-            --help --showold --force --terse' -- "$cur" ) )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--frontend --priority --all --unseen-only
+            --help --showold --force --terse' -- "$cur"))
     else
-        COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
     fi
 } &&
-complete -F _dpkg_reconfigure -o default dpkg-reconfigure
+    complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dpkg-query b/msys2/usr/share/bash-completion/completions/dpkg-query
index 827d9cad9..0b90b14b7 100644
--- a/msys2/usr/share/bash-completion/completions/dpkg-query
+++ b/msys2/usr/share/bash-completion/completions/dpkg-query
@@ -1,35 +1,35 @@
 # This function is required by _dpkg and _dpkg-reconfigure -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_installed_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
-}
+    _comp_dpkg_installed_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
+    }
 } || {
-_comp_dpkg_installed_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_installed_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 _have grep-status && {
-_comp_dpkg_purgeable_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
-}
+    _comp_dpkg_purgeable_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
+    }
 } || {
-_comp_dpkg_purgeable_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_purgeable_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured|config-files" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 # Debian dpkg(1) completion
@@ -49,39 +49,47 @@ _dpkg()
     fi
 
     case $prev in
-        --install|--unpack|--record-avail|--contents|--info|--fsys-tarfile|\
-        --field|--control|--extract|--vextract|-!(-*)[ciAIfexW])
+        --install | --unpack | --record-avail | --contents | --info | --fsys-tarfile | \
+            --field | --control | --extract | --vextract | --raw-extract | -!(-*)[ciAIfexX])
             _filedir '?(u|d)deb'
             return
             ;;
-        --build|-!(-*)b)
+        --build | -!(-*)b)
             _filedir -d
             return
             ;;
-        --status|--print-avail|--list|--show|-!(-*)[splW])
-            COMPREPLY=( $(apt-cache pkgnames "$cur" 2>/dev/null) )
+        --status | --print-avail | --list | -!(-*)[spl])
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
             return
             ;;
-        --search|-!(-*)S)
+        --show | -!(-*)W)
+            if [[ $1 == *dpkg-query ]]; then
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
+            else
+                _filedir '?(u|d)deb'
+            fi
+            return
+            ;;
+        --search | -!(-*)S)
             _filedir
             return
             ;;
-        --remove|--verify|-!(-*)[rV])
-            COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        --remove | --verify | -!(-*)[rV])
+            COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
             return
             ;;
-        --listfiles|--purge|-!(-*)[LP])
-            COMPREPLY=( $(_comp_dpkg_purgeable_packages "$cur") )
+        --listfiles | --purge | -!(-*)[LP])
+            COMPREPLY=($(_comp_dpkg_purgeable_packages "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _dpkg dpkg dpkg-deb dpkg-query
+    complete -F _dpkg dpkg dpkg-deb dpkg-query
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
@@ -93,26 +101,26 @@ _dpkg_reconfigure()
     local opt
 
     case $prev in
-        --frontend|-!(-*)f)
-            opt=( $(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*) )
-            opt=( ${opt[@]##*/} )
-            opt=( ${opt[@]%.pm} )
-            COMPREPLY=( $(compgen -W '${opt[@]}' -- "$cur") )
+        --frontend | -!(-*)f)
+            opt=($(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*))
+            opt=(${opt[@]##*/})
+            opt=(${opt[@]%.pm})
+            COMPREPLY=($(compgen -W '${opt[@]}' -- "$cur"))
             return
             ;;
-        --priority|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'low medium high critical' -- "$cur") )
+        --priority | -!(-*)p)
+            COMPREPLY=($(compgen -W 'low medium high critical' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only
-            --help --showold --force --terse' -- "$cur" ) )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--frontend --priority --all --unseen-only
+            --help --showold --force --terse' -- "$cur"))
     else
-        COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
     fi
 } &&
-complete -F _dpkg_reconfigure -o default dpkg-reconfigure
+    complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dpkg-reconfigure b/msys2/usr/share/bash-completion/completions/dpkg-reconfigure
index 827d9cad9..0b90b14b7 100644
--- a/msys2/usr/share/bash-completion/completions/dpkg-reconfigure
+++ b/msys2/usr/share/bash-completion/completions/dpkg-reconfigure
@@ -1,35 +1,35 @@
 # This function is required by _dpkg and _dpkg-reconfigure -*- shell-script -*-
 
 _have grep-status && {
-_comp_dpkg_installed_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
-}
+    _comp_dpkg_installed_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -n -s Package
+    }
 } || {
-_comp_dpkg_installed_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_installed_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 _have grep-status && {
-_comp_dpkg_purgeable_packages()
-{
-    grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
-}
+    _comp_dpkg_purgeable_packages()
+    {
+        grep-status -P -e "^$1" -a -FStatus 'ok installed' -o -FStatus 'ok config-files' -n -s Package
+    }
 } || {
-_comp_dpkg_purgeable_packages()
-{
-    command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null | \
-        command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
+    _comp_dpkg_purgeable_packages()
+    {
+        command grep -A 1 "Package: $1" /var/lib/dpkg/status 2>/dev/null |
+            command grep -B 1 -Ee "ok installed|half-installed|unpacked| \
             half-configured|config-files" \
-            -Ee "^Essential: yes" | \
-        awk "/Package: $1/ { print \$2 }" 2>/dev/null
-}
+                -Ee "^Essential: yes" |
+            awk "/Package: $1/ { print \$2 }" 2>/dev/null
+    }
 }
 
 # Debian dpkg(1) completion
@@ -49,39 +49,47 @@ _dpkg()
     fi
 
     case $prev in
-        --install|--unpack|--record-avail|--contents|--info|--fsys-tarfile|\
-        --field|--control|--extract|--vextract|-!(-*)[ciAIfexW])
+        --install | --unpack | --record-avail | --contents | --info | --fsys-tarfile | \
+            --field | --control | --extract | --vextract | --raw-extract | -!(-*)[ciAIfexX])
             _filedir '?(u|d)deb'
             return
             ;;
-        --build|-!(-*)b)
+        --build | -!(-*)b)
             _filedir -d
             return
             ;;
-        --status|--print-avail|--list|--show|-!(-*)[splW])
-            COMPREPLY=( $(apt-cache pkgnames "$cur" 2>/dev/null) )
+        --status | --print-avail | --list | -!(-*)[spl])
+            COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
             return
             ;;
-        --search|-!(-*)S)
+        --show | -!(-*)W)
+            if [[ $1 == *dpkg-query ]]; then
+                COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))
+            else
+                _filedir '?(u|d)deb'
+            fi
+            return
+            ;;
+        --search | -!(-*)S)
             _filedir
             return
             ;;
-        --remove|--verify|-!(-*)[rV])
-            COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        --remove | --verify | -!(-*)[rV])
+            COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
             return
             ;;
-        --listfiles|--purge|-!(-*)[LP])
-            COMPREPLY=( $(_comp_dpkg_purgeable_packages "$cur") )
+        --listfiles | --purge | -!(-*)[LP])
+            COMPREPLY=($(_comp_dpkg_purgeable_packages "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _dpkg dpkg dpkg-deb dpkg-query
+    complete -F _dpkg dpkg dpkg-deb dpkg-query
 
 # Debian GNU dpkg-reconfigure(8) completion
 #
@@ -93,26 +101,26 @@ _dpkg_reconfigure()
     local opt
 
     case $prev in
-        --frontend|-!(-*)f)
-            opt=( $(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*) )
-            opt=( ${opt[@]##*/} )
-            opt=( ${opt[@]%.pm} )
-            COMPREPLY=( $(compgen -W '${opt[@]}' -- "$cur") )
+        --frontend | -!(-*)f)
+            opt=($(printf '%s\n' /usr/share/perl5/Debconf/FrontEnd/*))
+            opt=(${opt[@]##*/})
+            opt=(${opt[@]%.pm})
+            COMPREPLY=($(compgen -W '${opt[@]}' -- "$cur"))
             return
             ;;
-        --priority|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'low medium high critical' -- "$cur") )
+        --priority | -!(-*)p)
+            COMPREPLY=($(compgen -W 'low medium high critical' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--frontend --priority --all --unseen-only
-            --help --showold --force --terse' -- "$cur" ) )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--frontend --priority --all --unseen-only
+            --help --showold --force --terse' -- "$cur"))
     else
-        COMPREPLY=( $(_comp_dpkg_installed_packages "$cur") )
+        COMPREPLY=($(_comp_dpkg_installed_packages "$cur"))
     fi
 } &&
-complete -F _dpkg_reconfigure -o default dpkg-reconfigure
+    complete -F _dpkg_reconfigure -o default dpkg-reconfigure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dpkg-source b/msys2/usr/share/bash-completion/completions/dpkg-source
index ffc34c41b..05fa3a111 100644
--- a/msys2/usr/share/bash-completion/completions/dpkg-source
+++ b/msys2/usr/share/bash-completion/completions/dpkg-source
@@ -5,7 +5,7 @@ _dpkg_source()
     local cur prev words cword
     _init_completion || return
 
-    local options work i action packopts unpackopts fields
+    local options word action packopts unpackopts fields
 
     packopts="-c -l -F -V -T -D -U -W -E -sa -i -I -sk -sr -ss -sA -sK -sP \
         -sU -sR"
@@ -14,13 +14,13 @@ _dpkg_source()
     fields="Format Source Version Binary Maintainer Uploader Architecture \
             Standards-Version Build-Depends Files"
 
-    action="options"
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
-        if [[ ${words[$i]} == "-x" ]]; then
+    action=options
+    for word in "${words[@]:1}"; do
+        if [[ $word == -x ]]; then
             action=unpack
-        elif [[ ${words[$i]} == "-b" ]]; then
+        elif [[ $word == -b ]]; then
             action=pack
-        elif [[ ${words[$i]} == "-h" ]]; then
+        elif [[ $word == -h ]]; then
             action=help
         fi
     done
@@ -33,7 +33,7 @@ _dpkg_source()
                     _filedir 'dsc'
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W "$unpackopts" -- "$cur") )
+                    COMPREPLY=($(compgen -W "$unpackopts" -- "$cur"))
                     _filedir -d
                     _filedir
                     ;;
@@ -45,7 +45,7 @@ _dpkg_source()
                 -b)
                     _filedir -d
                     ;;
-                -c|-l|-T|-i|-I)
+                -c | -l | -T | -i | -I)
                     # -c: get controlfile
                     # -l: get per-version info from this file
                     # -T: read variables here, not debian/substvars
@@ -57,9 +57,9 @@ _dpkg_source()
                     ;;
                 -F)
                     # -F: force change log format
-                    COMPREPLY=( $(command ls /usr/lib/dpkg/parsechangelog) )
+                    COMPREPLY=($(command ls /usr/lib/dpkg/parsechangelog))
                     ;;
-                -V|-D)
+                -V)
                     # -V: set a substitution variable
                     # we don't know anything about possible variables or values
                     # so we don't try to suggest any completion.
@@ -68,31 +68,31 @@ _dpkg_source()
                 -D)
                     # -D: override or add a .dsc field and value
                     # if $cur doesn't contain a = yet, suggest variable names
-                    if [[ "$cur" == *=* ]]; then
+                    if [[ $cur == *=* ]]; then
                         # $cur contains a "="
                         COMPREPLY=()
                     else
-                        COMPREPLY=( $(compgen -W "$fields" -- "$cur") )
+                        COMPREPLY=($(compgen -W "$fields" -- "$cur"))
                     fi
                     ;;
                 -U)
                     # -U: remove a field
                     # Suggest possible fieldnames
-                    COMPREPLY=( $(compgen -W "$fields" -- "$cur") )
+                    COMPREPLY=($(compgen -W "$fields" -- "$cur"))
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W "$packopts $unpackopts" \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W "$packopts $unpackopts" \
+                        -- "$cur"))
                     ;;
             esac
             return
             ;;
         *)
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
             return
             ;;
     esac
 } &&
-complete -F _dpkg_source dpkg-source
+    complete -F _dpkg_source dpkg-source
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dropdb b/msys2/usr/share/bash-completion/completions/dropdb
index ceedf07e1..4bc6049f5 100644
--- a/msys2/usr/share/bash-completion/completions/dropdb
+++ b/msys2/usr/share/bash-completion/completions/dropdb
@@ -4,16 +4,16 @@ _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
     # "Access privileges" in output may contain linefeeds, hence the NF > 1
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \
-        awk 'NF > 1 { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null |
+        awk 'NF > 1 { print $1 }')" -- "$cur"))
 }
 
 _pg_users()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
-        template1 2>/dev/null)" -- "$cur") )
-    [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
+        template1 2>/dev/null)" -- "$cur"))
+    ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 # createdb(1) completion
@@ -24,29 +24,29 @@ _createdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|--owner|-!(-*)[UO])
+        --username | --owner | -!(-*)[UO])
             _pg_users
             return
             ;;
-        --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET])
+        --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _createdb createdb
+    complete -F _createdb createdb
 
 # createuser(1) completion
 #
@@ -56,14 +56,14 @@ _createuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|--connection-limit|-!(-*)[pc])
+        --help | --version | --port | --connection-limit | -!(-*)[pc])
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -71,12 +71,12 @@ _createuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _createuser createuser
+    complete -F _createuser createuser
 
 # dropdb(1) completion
 #
@@ -86,29 +86,29 @@ _dropdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _dropdb dropdb
+    complete -F _dropdb dropdb
 
 # dropuser(1) completion
 #
@@ -118,14 +118,14 @@ _dropuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|-!(-*)p)
+        --help | --version | --port | -!(-*)p)
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -133,14 +133,14 @@ _dropuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_users
     fi
 } &&
-complete -F _dropuser dropuser
+    complete -F _dropuser dropuser
 
 # psql(1) completion
 #
@@ -150,39 +150,39 @@ _psql()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --dbname|-!(-*)d)
+        --dbname | -!(-*)d)
             _pg_databases
             return
             ;;
-        --output|--file|--log-file|-!(-*)[ofL])
+        --output | --file | --log-file | -!(-*)[ofL])
             _filedir
             return
             ;;
-        --help|--version|--command|--field-separator|--port|--pset|\
-        --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv])
+        --help | --version | --command | --field-separator | --port | --pset | \
+            --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
         _pg_databases
     fi
 } &&
-complete -F _psql psql
+    complete -F _psql psql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dropuser b/msys2/usr/share/bash-completion/completions/dropuser
index ceedf07e1..4bc6049f5 100644
--- a/msys2/usr/share/bash-completion/completions/dropuser
+++ b/msys2/usr/share/bash-completion/completions/dropuser
@@ -4,16 +4,16 @@ _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
     # "Access privileges" in output may contain linefeeds, hence the NF > 1
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \
-        awk 'NF > 1 { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null |
+        awk 'NF > 1 { print $1 }')" -- "$cur"))
 }
 
 _pg_users()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
-        template1 2>/dev/null)" -- "$cur") )
-    [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
+        template1 2>/dev/null)" -- "$cur"))
+    ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 # createdb(1) completion
@@ -24,29 +24,29 @@ _createdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|--owner|-!(-*)[UO])
+        --username | --owner | -!(-*)[UO])
             _pg_users
             return
             ;;
-        --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET])
+        --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _createdb createdb
+    complete -F _createdb createdb
 
 # createuser(1) completion
 #
@@ -56,14 +56,14 @@ _createuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|--connection-limit|-!(-*)[pc])
+        --help | --version | --port | --connection-limit | -!(-*)[pc])
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -71,12 +71,12 @@ _createuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _createuser createuser
+    complete -F _createuser createuser
 
 # dropdb(1) completion
 #
@@ -86,29 +86,29 @@ _dropdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _dropdb dropdb
+    complete -F _dropdb dropdb
 
 # dropuser(1) completion
 #
@@ -118,14 +118,14 @@ _dropuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|-!(-*)p)
+        --help | --version | --port | -!(-*)p)
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -133,14 +133,14 @@ _dropuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_users
     fi
 } &&
-complete -F _dropuser dropuser
+    complete -F _dropuser dropuser
 
 # psql(1) completion
 #
@@ -150,39 +150,39 @@ _psql()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --dbname|-!(-*)d)
+        --dbname | -!(-*)d)
             _pg_databases
             return
             ;;
-        --output|--file|--log-file|-!(-*)[ofL])
+        --output | --file | --log-file | -!(-*)[ofL])
             _filedir
             return
             ;;
-        --help|--version|--command|--field-separator|--port|--pset|\
-        --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv])
+        --help | --version | --command | --field-separator | --port | --pset | \
+            --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
         _pg_databases
     fi
 } &&
-complete -F _psql psql
+    complete -F _psql psql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dselect b/msys2/usr/share/bash-completion/completions/dselect
index 6ad388428..4c1802671 100644
--- a/msys2/usr/share/bash-completion/completions/dselect
+++ b/msys2/usr/share/bash-completion/completions/dselect
@@ -10,20 +10,20 @@ _dselect()
             _filedir -d
             return
             ;;
-        -D|-debug)
+        -D | -debug)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'access update select install config remove
-            quit' -- "$cur") )
+        COMPREPLY=($(compgen -W 'access update select install config remove
+            quit' -- "$cur"))
     fi
 
 } &&
-complete -F _dselect dselect
+    complete -F _dselect dselect
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dsniff b/msys2/usr/share/bash-completion/completions/dsniff
index e8e5bf37b..749c533cb 100644
--- a/msys2/usr/share/bash-completion/completions/dsniff
+++ b/msys2/usr/share/bash-completion/completions/dsniff
@@ -6,7 +6,7 @@ _dsniff()
     _init_completion || return
 
     case $prev in
-        -r|-w|-f|-p)
+        -r | -w | -f | -p)
             _filedir
             return
             ;;
@@ -16,11 +16,11 @@ _dsniff()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1") -r -w -p' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -r -w -p' -- "$cur"))
     fi
 
 } &&
-complete -F _dsniff dsniff
+    complete -F _dsniff dsniff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dumpdb b/msys2/usr/share/bash-completion/completions/dumpdb
index 981211bbb..eb1927fa0 100644
--- a/msys2/usr/share/bash-completion/completions/dumpdb
+++ b/msys2/usr/share/bash-completion/completions/dumpdb
@@ -5,14 +5,14 @@ _dumpdb()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--marshal --pickle --noprint --help' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--marshal --pickle --noprint --help' \
+            -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _dumpdb dumpdb
+    complete -F _dumpdb dumpdb
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/dumpe2fs b/msys2/usr/share/bash-completion/completions/dumpe2fs
index f44ecc321..413a5bf67 100644
--- a/msys2/usr/share/bash-completion/completions/dumpe2fs
+++ b/msys2/usr/share/bash-completion/completions/dumpe2fs
@@ -15,14 +15,14 @@ _dumpe2fs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _dumpe2fs dumpe2fs
+    complete -F _dumpe2fs dumpe2fs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/e2freefrag b/msys2/usr/share/bash-completion/completions/e2freefrag
index 355ebb940..c89dc9cbc 100644
--- a/msys2/usr/share/bash-completion/completions/e2freefrag
+++ b/msys2/usr/share/bash-completion/completions/e2freefrag
@@ -6,19 +6,19 @@ _e2freefrag()
     _init_completion || return
 
     case $prev in
-        -c|-h)
+        -c | -h)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
         return
     fi
 
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _e2freefrag e2freefrag
+    complete -F _e2freefrag e2freefrag
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/e2label b/msys2/usr/share/bash-completion/completions/e2label
index c145c3a0d..ac8e4b5f7 100644
--- a/msys2/usr/share/bash-completion/completions/e2label
+++ b/msys2/usr/share/bash-completion/completions/e2label
@@ -5,11 +5,11 @@ _e2label()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         cur=${cur:=/dev/}
         _filedir
     fi
 } &&
-complete -F _e2label e2label
+    complete -F _e2label e2label
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ebtables b/msys2/usr/share/bash-completion/completions/ebtables
index 325962b56..de6bc5496 100644
--- a/msys2/usr/share/bash-completion/completions/ebtables
+++ b/msys2/usr/share/bash-completion/completions/ebtables
@@ -6,42 +6,42 @@ _ebtables()
     _init_completion -s || return
 
     local table chain='s/^Bridge chain: \([^ ,]\{1,\}\).*$/\1/p' \
-      targets='ACCEPT DROP CONTINUE RETURN'
+        targets='ACCEPT DROP CONTINUE RETURN'
 
-    [[ "${words[*]}" =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] \
-        && table="-t ${BASH_REMATCH[2]}"
+    [[ ${words[*]} =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] &&
+        table="-t ${BASH_REMATCH[2]}"
 
     case $prev in
-    -!(-*)[AIDPFXLZ])
-        COMPREPLY=( $(compgen -W '`"$1" $table -L 2>/dev/null | \
-                command sed -ne "$chain"`' -- "$cur") )
-        ;;
-    -!(-*)t)
-        COMPREPLY=( $(compgen -W 'nat filter broute' -- "$cur") )
-        ;;
-    -!(-*)j)
-        if [[ "$table" == "-t filter" || -z "$table" ]]; then
-            COMPREPLY=( $(compgen -W '$targets
+        -!(-*)[AIDPFXLZ])
+            COMPREPLY=($(compgen -W '`"$1" $table -L 2>/dev/null | \
+                command sed -ne "$chain"`' -- "$cur"))
+            ;;
+        -!(-*)t)
+            COMPREPLY=($(compgen -W 'nat filter broute' -- "$cur"))
+            ;;
+        -!(-*)j)
+            if [[ $table == "-t filter" || -z $table ]]; then
+                COMPREPLY=($(compgen -W '$targets
                 $("$1" $table -L 2>/dev/null | \
                   command sed -n -e "s/INPUT\|OUTPUT\|FORWARD//" \
                                  -e "$chain")' \
-                -- "$cur") )
-        elif [[ $table == "-t nat" ]]; then
-            COMPREPLY=( $(compgen -W '$targets
+                    -- "$cur"))
+            elif [[ $table == "-t nat" ]]; then
+                COMPREPLY=($(compgen -W '$targets
                 $("$1" $table -L 2>/dev/null | \
                   command sed -n -e "s/OUTPUT|PREROUTING|POSTROUTING//" \
                                  -e "$chain")' \
-                -- "$cur") )
-        elif [[ $table == "-t broute" ]]; then
-            COMPREPLY=( $(compgen -W 'ACCEPT DROP
+                    -- "$cur"))
+            elif [[ $table == "-t broute" ]]; then
+                COMPREPLY=($(compgen -W 'ACCEPT DROP
                 $("$1" $table -L 2>/dev/null | \
                   command sed -n -e "s/BROUTING//" -e "$chain")' \
-                -- "$cur") )
-        fi
-        ;;
-    *)
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--802_3-sap --802_3-type --among-dst
+                    -- "$cur"))
+            fi
+            ;;
+        *)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '--802_3-sap --802_3-type --among-dst
             --among-dst-file --among-src --among-src-file --append
             --arp-gratuitous --arp-htype --arp-ip-dst --arp-ip-src
             --arp-mac-dst --arp-mac-src --arp-opcode --arp-ptype --arpreply-mac
@@ -67,12 +67,12 @@ _ebtables()
             --stp-sender-prio --stp-type --table --to-destination --to-dst
             --to-source --to-src --ulog --ulog-cprange --ulog-nlgroup
             --ulog-prefix --ulog-qthreshold --version --vlan-encap --vlan-id
-            --vlan-prio --zero' -- "$cur") )
-        fi
-        ;;
+            --vlan-prio --zero' -- "$cur"))
+            fi
+            ;;
     esac
 
 } &&
-complete -F _ebtables ebtables
+    complete -F _ebtables ebtables
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ecryptfs-migrate-home b/msys2/usr/share/bash-completion/completions/ecryptfs-migrate-home
index bad0962e4..d2eeb381b 100644
--- a/msys2/usr/share/bash-completion/completions/ecryptfs-migrate-home
+++ b/msys2/usr/share/bash-completion/completions/ecryptfs-migrate-home
@@ -9,14 +9,14 @@ _ecryptfs_migrate_home()
         --help)
             return
             ;;
-        --user|-u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _ecryptfs_migrate_home ecryptfs-migrate-home
+    complete -F _ecryptfs_migrate_home ecryptfs-migrate-home
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/edquota b/msys2/usr/share/bash-completion/completions/edquota
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/edquota
+++ b/msys2/usr/share/bash-completion/completions/edquota
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/eog b/msys2/usr/share/bash-completion/completions/eog
index d10cbbae8..2330e1a21 100644
--- a/msys2/usr/share/bash-completion/completions/eog
+++ b/msys2/usr/share/bash-completion/completions/eog
@@ -6,7 +6,7 @@ _eog()
     _init_completion -s || return
 
     case $prev in
-        -'?'|--help|--help-all|--help-gtk)
+        -'?' | --help | --help-all | --help-gtk)
             return
             ;;
     esac
@@ -14,13 +14,13 @@ _eog()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir '@(ani|?(w)bmp|gif|ico|j2[ck]|jp[cefgx2]|jpeg|jpg2|pcx|p[gp]m|pn[gm]|ras|svg?(z)|tga|tif?(f)|x[bp]m)'
 } &&
-complete -F _eog eog
+    complete -F _eog eog
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ether-wake b/msys2/usr/share/bash-completion/completions/ether-wake
index a3e3e406e..d9526736c 100644
--- a/msys2/usr/share/bash-completion/completions/ether-wake
+++ b/msys2/usr/share/bash-completion/completions/ether-wake
@@ -16,12 +16,12 @@ _ether_wake()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur"))
         return
     fi
 
     _mac_addresses
 } &&
-complete -F _ether_wake ether-wake etherwake
+    complete -F _ether_wake ether-wake etherwake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/etherwake b/msys2/usr/share/bash-completion/completions/etherwake
index a3e3e406e..d9526736c 100644
--- a/msys2/usr/share/bash-completion/completions/etherwake
+++ b/msys2/usr/share/bash-completion/completions/etherwake
@@ -16,12 +16,12 @@ _ether_wake()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur"))
         return
     fi
 
     _mac_addresses
 } &&
-complete -F _ether_wake ether-wake etherwake
+    complete -F _ether_wake ether-wake etherwake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/evince b/msys2/usr/share/bash-completion/completions/evince
index d50f23c3a..1c97dd93c 100644
--- a/msys2/usr/share/bash-completion/completions/evince
+++ b/msys2/usr/share/bash-completion/completions/evince
@@ -6,9 +6,9 @@ _evince()
     _init_completion -s || return
 
     case $prev in
-        --help*|--sm-client-id|--class|--name|--screen|--gdk-debug|\
-        --gdk-no-debug|--gtk-module|--gtk-debug|--gtk-no-debug|--page-label|\
-        --page-index|--find|--display|-!(-*)[hpil])
+        --help* | --sm-client-id | --class | --name | --screen | --gdk-debug | \
+            --gdk-no-debug | --gtk-module | --gtk-debug | --gtk-no-debug | --page-label | \
+            --page-index | --find | --display | -!(-*)[hpil])
             return
             ;;
         --sm-client-state-file)
@@ -20,13 +20,13 @@ _evince()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir '@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2|.xz|.XZ)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx)'
 } &&
-complete -F _evince evince
+    complete -F _evince evince
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/export b/msys2/usr/share/bash-completion/completions/export
index 816182f63..8d823614a 100644
--- a/msys2/usr/share/bash-completion/completions/export
+++ b/msys2/usr/share/bash-completion/completions/export
@@ -6,7 +6,7 @@ _export()
     _init_completion -n = || return
 
     local i action=variable remove=false
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
             -p)
                 return
@@ -33,10 +33,10 @@ _export()
 
     case $cur in
         *=)
-            local pval=$(quote "$(eval printf %s \"\$${cur%=}\")")
+            local pval=$(quote "$(eval printf %s \"\$\{${cur%=}-\}\")")
             # Complete previous value if it's not empty.
             if [[ $pval != \'\' ]]; then
-                COMPREPLY=( "$pval" )
+                COMPREPLY=("$pval")
             else
                 cur=${cur#*=}
                 _filedir
@@ -48,18 +48,18 @@ _export()
             ;;
         *)
             if [[ $cword -eq 1 && $cur == -* ]]; then
-                COMPREPLY=( $(compgen -W '-p $(_parse_usage "$1")' -- "$cur") )
+                COMPREPLY=($(compgen -W '-p $(_parse_usage "$1")' -- "$cur"))
                 return
             fi
-            local suffix
+            local suffix=""
             if ! $remove; then
-                suffix+==
+                suffix="="
                 compopt -o nospace
             fi
-            COMPREPLY=( $(compgen -A $action -S "$suffix" -- "$cur") )
+            COMPREPLY=($(compgen -A $action -S "$suffix" -- "$cur"))
             ;;
     esac
 } &&
-complete -F _export export
+    complete -F _export export
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/f77 b/msys2/usr/share/bash-completion/completions/f77
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/f77
+++ b/msys2/usr/share/bash-completion/completions/f77
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/f95 b/msys2/usr/share/bash-completion/completions/f95
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/f95
+++ b/msys2/usr/share/bash-completion/completions/f95
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/faillog b/msys2/usr/share/bash-completion/completions/faillog
index 5e7d2ab2f..c8b81bd07 100644
--- a/msys2/usr/share/bash-completion/completions/faillog
+++ b/msys2/usr/share/bash-completion/completions/faillog
@@ -6,22 +6,22 @@ _faillog()
     _init_completion -s || return
 
     case $prev in
-        --help|--lock-time|--maximum|--time|-!(-*)[hlmt])
+        --help | --lock-time | --maximum | --time | -!(-*)[hlmt])
             return
             ;;
-        --user|-!(-*)u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -!(-*)u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _faillog faillog
+    complete -F _faillog faillog
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/fbgs b/msys2/usr/share/bash-completion/completions/fbgs
index 7a3ad7be1..1947b872c 100644
--- a/msys2/usr/share/bash-completion/completions/fbgs
+++ b/msys2/usr/share/bash-completion/completions/fbgs
@@ -6,45 +6,45 @@ _fbgs()
     _init_completion || return
 
     case "$prev" in
-        -f|--font)
+        -f | --font)
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -m|--mode)
-            COMPREPLY=( $(compgen -W '$(command sed \
+        -m | --mode)
+            COMPREPLY=($(compgen -W '$(command sed \
                 -n "/^mode/{s/^mode \{1,\}\"\([^\"]\{1,\}\)\"/\1/g;p}" \
-                /etc/fb.modes 2>/dev/null)' -- "$cur") )
+                /etc/fb.modes 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -d|--device)
-            COMPREPLY=( $(compgen -f -d -- "${cur:-/dev/}") )
+        -d | --device)
+            COMPREPLY=($(compgen -f -d -- "${cur:-/dev/}"))
             return
             ;;
-        -fp|--firstpage|-lp|--lastpage|-r|--resolution|-s|--scroll|-t|\
-        --timeout)
+        -fp | --firstpage | -lp | --lastpage | -r | --resolution | -s | --scroll | -t | \
+            --timeout)
             # expect integer value
-            COMPREPLY+=( $(compgen -W '{0..9}') )
+            COMPREPLY+=($(compgen -W '{0..9}'))
             compopt -o nospace
             return
             ;;
-        -T|--vt|-p|--password|-g|--gamma)
+        -T | --vt | -p | --password | -g | --gamma)
             # argument required but no completions available
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--bell --help --password -fp --firstpage
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--bell --help --password -fp --firstpage
             -lp --lastpage --color -l -xl -xxl --resolution --autozoom
             --{,no}autoup --{,no}autodown --{,no}fitwidth --{,no}verbose
             --{,no}random --vt --scroll --timeout --{,no}once --gamma --font
-            --device --mode' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+            --device --mode' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
     _filedir '?(e)ps|pdf'
 } &&
-complete -F _fbgs fbgs
+    complete -F _fbgs fbgs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/fbi b/msys2/usr/share/bash-completion/completions/fbi
index ac92e60f5..455887a37 100644
--- a/msys2/usr/share/bash-completion/completions/fbi
+++ b/msys2/usr/share/bash-completion/completions/fbi
@@ -6,49 +6,49 @@ _fbi()
     _init_completion || return
 
     case "$prev" in
-        -l|--list)
+        -l | --list)
             _filedir
             return
             ;;
-        -r|--resolution)
-            COMPREPLY+=( $(compgen -W '{1..5}') )
+        -r | --resolution)
+            COMPREPLY+=($(compgen -W '{1..5}'))
             return
             ;;
-        -f|--font)
+        -f | --font)
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -m|--mode)
-            COMPREPLY=( $(compgen -W '$(command sed \
+        -m | --mode)
+            COMPREPLY=($(compgen -W '$(command sed \
                 -n "/^mode/{s/^mode \{1,\}\"\([^\"]\{1,\}\)\"/\1/g;p}" \
-                /etc/fb.modes 2>/dev/null)' -- "$cur") )
+                /etc/fb.modes 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -d|--device)
-            COMPREPLY=( $(compgen -f -d -- "${cur:-/dev/}") )
+        -d | --device)
+            COMPREPLY=($(compgen -f -d -- "${cur:-/dev/}"))
             return
             ;;
-        --cachemem|--blend|-T|--vt|-s|--scroll|-t|--timeout|-g|--gamma)
+        --cachemem | --blend | -T | --vt | -s | --scroll | -t | --timeout | -g | --gamma)
             # argument required but no completions available
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--help --version --store --list --text
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--help --version --store --list --text
             --autozoom --{,no}autoup --{,no}autodown --{,no}fitwidth
             --{,no}verbose --{,no}random --{,no}comments --{,no}edit
             --{,no}backup --{,no}preserve --{,no}readahead --cachemem --blend
             --vt --scroll --timeout --{,no}once --resolution --gamma --font
-            --device --mode' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+            --device --mode' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
     # FIXME: It is hard to determine correct supported extensions.
     # fbi can handle any format that imagemagick can plus some others
     _filedir 'bmp|gif|jp?(e)g|pcd|png|p[pgb]m|tif?(f)|webp|xpm|xwd|?(e)ps|pdf|dvi|txt|svg?(z)|cdr|[ot]tf'
 } &&
-complete -F _fbi fbi
+    complete -F _fbi fbi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/feh b/msys2/usr/share/bash-completion/completions/feh
index 71e597987..f1d4b18ad 100644
--- a/msys2/usr/share/bash-completion/completions/feh
+++ b/msys2/usr/share/bash-completion/completions/feh
@@ -6,22 +6,22 @@ _feh()
     _init_completion -s || return
 
     case "$prev" in
-        --image-bg|-B)
-            COMPREPLY=( $(compgen -W 'checks white black' -- "$cur") )
+        --image-bg | -B)
+            COMPREPLY=($(compgen -W 'checks white black' -- "$cur"))
             return
             ;;
-        --filelist|--output|--output-only|--start-at|-!(-*)[foO\|])
+        --filelist | --output | --output-only | --start-at | -!(-*)[foO\|])
             _filedir
             return
             ;;
-        --caption-path|--fontpath|--output-dir|-!(-*)[KCj])
+        --caption-path | --fontpath | --output-dir | -!(-*)[KCj])
             _filedir -d
             return
             ;;
-        --font|--menu-font|--title-font|-!(-*)[eM@])
+        --font | --menu-font | --title-font | -!(-*)[eM@])
             # expect string like "dejavu.ttf/12"
-            if [[ "$cur" == */* ]]; then # expect integer value
-                COMPREPLY=( $(compgen -P "$cur" -W '{0..9}') )
+            if [[ $cur == */* ]]; then # expect integer value
+                COMPREPLY=($(compgen -P "$cur" -W '{0..9}'))
                 compopt -o nospace
                 return
             fi
@@ -29,69 +29,72 @@ _feh()
             # font_path="$(imlib2-config --prefix 2>/dev/null)/share/imlib2/data/fonts"
             # COMPREPLY=( $(cd "$font_path" 2>/dev/null; compgen -f \
             #     -X "!*.@([tT][tT][fF])" -S / -- "$cur") )
-            for (( i=${#words[@]}-1; i>0; i-- )); do
+            for ((i = ${#words[@]} - 1; i > 0; i--)); do
                 if [[ ${words[i]} == -@(C|-fontpath) ]]; then
-                    font_path="${words[i+1]}"
-                    COMPREPLY+=( $(cd "$font_path" 2>/dev/null; compgen -f \
-                        -X "!*.@([tT][tT][fF])" -S / -- "$cur") )
+                    font_path="${words[i + 1]}"
+                    COMPREPLY+=($(
+                        cd "$font_path" 2>/dev/null
+                        compgen -f \
+                            -X "!*.@([tT][tT][fF])" -S / -- "$cur"
+                    ))
                 fi
             done
             compopt -o nospace
             return
             ;;
-        --theme|-!(-*)T)
+        --theme | -!(-*)T)
             local conf_path=~/.config/feh/themes
             local theme_name theme_opts
             [[ -r $conf_path ]] || return
             while read theme_name theme_opts; do
-                if [[ "$theme_name" == '#'* || "$theme_name" == "" ]]; then
+                if [[ $theme_name == '#'* || $theme_name == "" ]]; then
                     continue
                 fi
-                COMPREPLY+=( $(compgen -W "$theme_name" -- "$cur") )
+                COMPREPLY+=($(compgen -W "$theme_name" -- "$cur"))
             done <"$conf_path"
             return
             ;;
-        --sort|-!(-*)S)
-            COMPREPLY=( $(compgen -W 'name filename mtime width height
-                pixels size format' -- "$cur") )
+        --sort | -!(-*)S)
+            COMPREPLY=($(compgen -W 'name filename mtime width height
+                pixels size format' -- "$cur"))
             return
             ;;
-        --reload|--limit-height|--limit-width|--thumb-height|--thumb-width|\
-        --thumb-redraw|--magick-timeout|-!(-*)[RHWEyJ])
+        --reload | --limit-height | --limit-width | --thumb-height | --thumb-width | \
+            --thumb-redraw | --magick-timeout | -!(-*)[RHWEyJ])
             # expect integer value
-            COMPREPLY+=( $(compgen -W '{0..9}') )
+            COMPREPLY+=($(compgen -W '{0..9}'))
             compopt -o nospace
             return
             ;;
         --zoom)
             # expect integer value or "max", "fill"
-            COMPREPLY=( $(compgen -W 'max fill' -- "$cur") )
-            if [[ ! $cur || ! $COMPREPLY ]]; then
-                COMPREPLY+=( $(compgen -W '{0..9}') )
+            COMPREPLY=($(compgen -W 'max fill' -- "$cur"))
+            if [[ ! $cur || ! ${COMPREPLY-} ]]; then
+                COMPREPLY+=($(compgen -W '{0..9}'))
                 compopt -o nospace
             fi
             return
             ;;
-        --alpha|-!(-*)a)
-            COMPREPLY=( $(compgen -W '{0..255}' -- "$cur") )
+        --alpha | -!(-*)a)
+            COMPREPLY=($(compgen -W '{0..255}' -- "$cur"))
             return
             ;;
-        --bg|-!(-*)b)
+        --bg | -!(-*)b)
             _filedir
-            COMPREPLY+=( $(compgen -W 'trans' -- "$cur") )
+            COMPREPLY+=($(compgen -W 'trans' -- "$cur"))
             return
             ;;
-        --geometry|--max-dimension|--min-dimension|-!(-*)g)
+        --geometry | --max-dimension | --min-dimension | -!(-*)g)
             # expect string like 640x480
-            if [[ $cur && "$cur" != *x* ]]; then
-                COMPREPLY=( x )
+            if [[ $cur && $cur != *x* ]]; then
+                COMPREPLY=(x)
             fi
-            COMPREPLY+=( $(compgen -W "{0..9}") )
+            COMPREPLY+=($(compgen -W "{0..9}"))
             compopt -o nospace
             return
             ;;
-        --customlist|--index-info|--info|--slideshow-delay|--thumb-title|\
-        --title|-!(-*)[LD~^])
+        --customlist | --index-info | --info | --slideshow-delay | --thumb-title | \
+            --title | -!(-*)[LD~^])
             # argument required but no completions available
             return
             ;;
@@ -99,17 +102,19 @@ _feh()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # Some versions of feh just output "See 'man feh'" for --help :(
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-        [[ $COMPREPLY ]] && return
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        if [[ ${COMPREPLY-} ]]; then
+            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            return
+        fi
     fi
 
     # FIXME: It is hard to determine correct supported extensions.
     # feh can handle any format that imagemagick can plus some others
     _filedir 'xpm|tif?(f)|png|p[npgba]m|iff|?(i)lbm|jp?(e)g|jfi?(f)|gif|bmp|arg?(b)|tga|xcf|ani|ico|?(e)ps|pdf|dvi|txt|svg?(z)|cdr|[ot]tf'
 } &&
-complete -F _feh feh
+    complete -F _feh feh
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/file b/msys2/usr/share/bash-completion/completions/file
index 494c7866a..21fbd161f 100644
--- a/msys2/usr/share/bash-completion/completions/file
+++ b/msys2/usr/share/bash-completion/completions/file
@@ -6,27 +6,27 @@ _file()
     _init_completion || return
 
     case $prev in
-        --help|--version|--separator|-!(-*)[vF])
+        --help | --version | --separator | -!(-*)[vF])
             return
             ;;
-        --magic-file|--files-from|-!(-*)[mf])
+        --magic-file | --files-from | -!(-*)[mf])
             _filedir
             return
             ;;
-        --exclude|-!(-*)e)
-            COMPREPLY=( $(compgen -W 'apptype ascii cdf compress elf encoding
-                soft tar text tokens troff' -- "$cur") )
+        --exclude | -!(-*)e)
+            COMPREPLY=($(compgen -W 'apptype ascii cdf compress elf encoding
+                soft tar text tokens troff' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _file file
+    complete -F _file file
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/file-roller b/msys2/usr/share/bash-completion/completions/file-roller
index bebf04eed..1d223fd45 100644
--- a/msys2/usr/share/bash-completion/completions/file-roller
+++ b/msys2/usr/share/bash-completion/completions/file-roller
@@ -8,19 +8,19 @@ _file_roller()
     local exts='@(7z|ace|alz|ar|arj|[bglx]z|bz2|tb?(z)2|cab|cb[rz]|iso?(9660)|Z|t[abglx]z|cpio|deb|rar|?(g)tar|gem|lh[az]|lz[4h]|?(t)lrz|lzma|lzo|wim|swm|rpm|sit|zoo)'
 
     case $prev in
-        --help|--help-all|--help-gtk|--help-sm-client|-!(-*)'?')
+        --help | --help-all | --help-gtk | --help-sm-client | -!(-*)'?')
             return
             ;;
         --sm-client-state-file)
             _filedir
             return
             ;;
-        --add-to|-!(-*)a)
+        --add-to | -!(-*)a)
             _filedir_xspec unzip
             _filedir "$exts"
             return
             ;;
-        --extract-to|--default-dir|-!(-*)e)
+        --extract-to | --default-dir | -!(-*)e)
             _filedir -d
             return
             ;;
@@ -29,14 +29,14 @@ _file_roller()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir_xspec unzip
     _filedir "$exts"
 } &&
-complete -F _file_roller file-roller
+    complete -F _file_roller file-roller
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/filebucket b/msys2/usr/share/bash-completion/completions/filebucket
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/filebucket
+++ b/msys2/usr/share/bash-completion/completions/filebucket
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/filefrag b/msys2/usr/share/bash-completion/completions/filefrag
index b8b51e3c5..d26e8c8a2 100644
--- a/msys2/usr/share/bash-completion/completions/filefrag
+++ b/msys2/usr/share/bash-completion/completions/filefrag
@@ -5,13 +5,13 @@ _filefrag()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _filefrag filefrag
+    complete -F _filefrag filefrag
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/filesnarf b/msys2/usr/share/bash-completion/completions/filesnarf
index 01766555a..f959d80fc 100644
--- a/msys2/usr/share/bash-completion/completions/filesnarf
+++ b/msys2/usr/share/bash-completion/completions/filesnarf
@@ -12,11 +12,11 @@ _snarf()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _snarf filesnarf mailsnarf msgsnarf
+    complete -F _snarf filesnarf mailsnarf msgsnarf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/find b/msys2/usr/share/bash-completion/completions/find
index 80fbe8c02..64121edaa 100644
--- a/msys2/usr/share/bash-completion/completions/find
+++ b/msys2/usr/share/bash-completion/completions/find
@@ -7,20 +7,28 @@ _find()
     local cur prev words cword
     _init_completion || return
 
+    local i
+    for i in ${!words[*]}; do
+        if [[ ${words[i]} == -@(exec|ok)?(dir) ]]; then
+            _command_offset $((i + 1))
+            return
+        fi
+    done
+
     case $prev in
-        -maxdepth|-mindepth)
-            COMPREPLY=( $(compgen -W '{0..9}' -- "$cur") )
+        -maxdepth | -mindepth)
+            COMPREPLY=($(compgen -W '{0..9}' -- "$cur"))
             return
             ;;
-        -newer|-anewer|-cnewer|-fls|-fprint|-fprint0|-fprintf|-name|-iname|\
-        -lname|-ilname|-wholename|-iwholename|-samefile)
+        -newer | -anewer | -cnewer | -fls | -fprint | -fprint0 | -fprintf | -name | -[il]name | \
+            -ilname | -wholename | -[il]wholename | -samefile)
             _filedir
             return
             ;;
         -fstype)
             _fstypes
-            [[ $OSTYPE == *bsd* ]] && \
-                COMPREPLY+=( $(compgen -W 'local rdonly' -- "$cur") )
+            [[ $OSTYPE == *bsd* ]] &&
+                COMPREPLY+=($(compgen -W 'local rdonly' -- "$cur"))
             return
             ;;
         -gid)
@@ -28,11 +36,11 @@ _find()
             return
             ;;
         -group)
-            COMPREPLY=( $(compgen -g -- "$cur" 2>/dev/null) )
+            COMPREPLY=($(compgen -g -- "$cur" 2>/dev/null))
             return
             ;;
-        -xtype|-type)
-            COMPREPLY=( $(compgen -W 'b c d p f l s' -- "$cur") )
+        -xtype | -type)
+            COMPREPLY=($(compgen -W 'b c d p f l s' -- "$cur"))
             return
             ;;
         -uid)
@@ -40,24 +48,17 @@ _find()
             return
             ;;
         -user)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        -exec|-execdir|-ok|-okdir)
-            words=(words[0] "$cur")
-            cword=1
-            _command
-            return
-            ;;
-        -[acm]min|-[acm]time|-iname|-lname|-wholename|-iwholename|-lwholename|\
-        -ilwholename|-inum|-path|-ipath|-regex|-iregex|-links|-perm|-size|\
-        -used|-printf|-context)
+        -[acm]min | -[acm]time | -inum | -path | -ipath | -regex | -iregex | -links | -perm | \
+            -size | -used | -printf | -context)
             # do nothing, just wait for a parameter to be given
             return
             ;;
         -regextype)
-            COMPREPLY=( $(compgen -W 'emacs posix-awk posix-basic posix-egrep
-                posix-extended' -- "$cur") )
+            COMPREPLY=($(compgen -W 'emacs posix-awk posix-basic posix-egrep
+                posix-extended' -- "$cur"))
             return
             ;;
     esac
@@ -65,17 +66,17 @@ _find()
     local i exprfound=false
     # set exprfound to true if there is already an expression present
     for i in "${words[@]}"; do
-        [[ "$i" == [-\(\),\!]* ]] && exprfound=true && break
+        [[ $i == [-\(\),\!]* ]] && exprfound=true && break
     done
 
     # handle case where first parameter is not a dash option
-    if ! $exprfound && [[ "$cur" != [-\(\),\!]* ]]; then
+    if ! $exprfound && [[ $cur != [-\(\),\!]* ]]; then
         _filedir -d
         return
     fi
 
     # complete using basic options
-    COMPREPLY=( $(compgen -W '-daystart -depth -follow -help
+    COMPREPLY=($(compgen -W '-daystart -depth -follow -help
         -ignore_readdir_race -maxdepth -mindepth -mindepth -mount
         -noignore_readdir_race -noleaf -regextype -version -warn -nowarn -xdev
         -amin -anewer -atime -cmin -cnewer -ctime -empty -executable -false
@@ -84,22 +85,22 @@ _find()
         -readable -regex -samefile -size -true -type -uid -used -user
         -wholename -writable -xtype -context -delete -exec -execdir -fls
         -fprint -fprint0 -fprintf -ls -ok -okdir -print -print0 -printf -prune
-        -quit' -- "$cur") )
+        -quit' -- "$cur"))
 
-    if [[ ${#COMPREPLY[@]} -ne 0 ]]; then
+    if ((${#COMPREPLY[@]} != 0)); then
         # this removes any options from the list of completions that have
         # already been specified somewhere on the command line, as long as
         # these options can only be used once (in a word, "options", in
         # opposition to "tests" and "actions", as in the find(1) manpage).
-        local -A onlyonce=( [-daystart]=1 [-depth]=1 [-follow]=1 [-help]=1
+        local -A onlyonce=([-daystart]=1 [-depth]=1 [-follow]=1 [-help]=1
             [-ignore_readdir_race]=1 [-maxdepth]=1 [-mindepth]=1 [-mount]=1
             [-noignore_readdir_race]=1 [-noleaf]=1 [-nowarn]=1 [-regextype]=1
-            [-version]=1 [-warn]=1 [-xdev]=1 )
+            [-version]=1 [-warn]=1 [-xdev]=1)
         local j
         for i in "${words[@]}"; do
-            [[ $i && ${onlyonce[$i]} ]] || continue
+            [[ $i && -v onlyonce["$i"] ]] || continue
             for j in "${!COMPREPLY[@]}"; do
-                [[ ${COMPREPLY[j]} == $i ]] && unset 'COMPREPLY[j]'
+                [[ ${COMPREPLY[j]} == "$i" ]] && unset 'COMPREPLY[j]'
             done
         done
     fi
@@ -107,6 +108,6 @@ _find()
     _filedir
 
 } &&
-complete -F _find find
+    complete -F _find find
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/find_member b/msys2/usr/share/bash-completion/completions/find_member
index 720e3074b..cf30c70df 100644
--- a/msys2/usr/share/bash-completion/completions/find_member
+++ b/msys2/usr/share/bash-completion/completions/find_member
@@ -6,7 +6,7 @@ _find_member()
     _init_completion -s || return
 
     case $prev in
-        -l|-x|--listname|--exclude)
+        -l | -x | --listname | --exclude)
             _xfunc list_lists _mailman_lists
             return
             ;;
@@ -14,12 +14,12 @@ _find_member()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--listname --exclude --owners --help' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--listname --exclude --owners --help' \
+            -- "$cur"))
     fi
 
 } &&
-complete -F _find_member find_member
+    complete -F _find_member find_member
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/fio b/msys2/usr/share/bash-completion/completions/fio
index 7710cf6b3..f81a4da75 100644
--- a/msys2/usr/share/bash-completion/completions/fio
+++ b/msys2/usr/share/bash-completion/completions/fio
@@ -6,28 +6,29 @@ _fio()
     _init_completion -s || return
 
     case $prev in
-        --help|--version)
+        --help | --version)
             return
             ;;
         --debug)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -W "process file io mem blktrace verify
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -W "process file io mem blktrace verify
                 random parse diskutil job mutex profile time net rate compress
-                steadystate helperthread" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+                steadystate helperthread" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
         --output-format)
-            COMPREPLY=( $(compgen -W "terse json json+ normal" -- "$cur") )
+            COMPREPLY=($(compgen -W "terse json json+ normal" -- "$cur"))
             return
             ;;
         --terse-version)
-            COMPREPLY=( $(compgen -W "2 3" -- "$cur") )
+            COMPREPLY=($(compgen -W "2 3" -- "$cur"))
             return
             ;;
         --cmdhelp)
             # TODO more commands?
-            COMPREPLY=( $(compgen -W "all" -- "$cur") )
+            COMPREPLY=($(compgen -W "all" -- "$cur"))
             return
             ;;
         --enghelp)
@@ -36,7 +37,7 @@ _fio()
             return
             ;;
         --eta)
-            COMPREPLY=( $(compgen -W "always never auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "always never auto" -- "$cur"))
             return
             ;;
         --daemonize)
@@ -52,7 +53,7 @@ _fio()
             return
             ;;
         --idle-prof)
-            COMPREPLY=( $(compgen -W "system percpu calibrate" -- "$cur") )
+            COMPREPLY=($(compgen -W "system percpu calibrate" -- "$cur"))
             return
             ;;
         --inflate-log)
@@ -63,9 +64,9 @@ _fio()
             _filedir
             return
             ;;
-        --trigger|--trigger-remote)
+        --trigger | --trigger-remote)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
         --aux-path)
@@ -77,13 +78,13 @@ _fio()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir job
 } &&
-complete -F _fio fio
+    complete -F _fio fio
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/firefox b/msys2/usr/share/bash-completion/completions/firefox
index eeaca9f67..4656f8df4 100644
--- a/msys2/usr/share/bash-completion/completions/firefox
+++ b/msys2/usr/share/bash-completion/completions/firefox
@@ -8,12 +8,12 @@ _firefox()
     [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=}
 
     case $prev in
-        --help|--version|--display|--UILocale|-MOZ_LOG|--new-window|--new-tab|\
-        --private-window|--window-size|--search|--start-debugger-server|\
-        --recording|--debugger-args|-[hvPa])
+        --help | --version | --display | --UILocale | -MOZ_LOG | --new-window | --new-tab | \
+            --private-window | --window-size | --search | --start-debugger-server | \
+            --recording | --debugger-args | -[hvPa])
             return
             ;;
-        --profile|--screenshot)
+        --profile | --screenshot)
             _filedir -d
             return
             ;;
@@ -25,8 +25,8 @@ _firefox()
             _filedir
             return
             ;;
-        --debugger|-d)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        --debugger | -d)
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
@@ -34,13 +34,13 @@ _firefox()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([xs])htm?(l)|pdf)"
+    _filedir "@(?([xs])htm?(l)|pdf|txt)"
 } &&
-complete -F _firefox firefox mozilla-firefox iceweasel
+    complete -F _firefox firefox mozilla-firefox iceweasel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/flake8 b/msys2/usr/share/bash-completion/completions/flake8
index f18351e86..045c40954 100644
--- a/msys2/usr/share/bash-completion/completions/flake8
+++ b/msys2/usr/share/bash-completion/completions/flake8
@@ -6,22 +6,22 @@ _flake8()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)h)
+        --help | --version | -!(-*)h)
             return
             ;;
         --format)
-            COMPREPLY=( $(compgen -W 'default pylint' -- "$cur") )
+            COMPREPLY=($(compgen -W 'default pylint' -- "$cur"))
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "auto {1..$(_ncpus)}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "auto {1..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        --output-file|--append-config|--config)
+        --output-file | --append-config | --config)
             _filedir
             return
             ;;
-        --include-in-doctest|--exclude-from-doctest)
+        --include-in-doctest | --exclude-from-doctest)
             _filedir py
             return
             ;;
@@ -30,13 +30,13 @@ _flake8()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir py
 } &&
-complete -F _flake8 flake8
+    complete -F _flake8 flake8
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freebsd-update b/msys2/usr/share/bash-completion/completions/freebsd-update
index 6ee2438b5..d5be86129 100644
--- a/msys2/usr/share/bash-completion/completions/freebsd-update
+++ b/msys2/usr/share/bash-completion/completions/freebsd-update
@@ -8,7 +8,7 @@ _freebsd_update()
     _init_completion || return
 
     case $prev in
-        -b|-d)
+        -b | -d)
             _filedir -d
             return
             ;;
@@ -16,14 +16,14 @@ _freebsd_update()
             _filedir
             return
             ;;
-        -k|-r|-s|-t)
+        -k | -r | -s | -t)
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W "fetch cron upgrade install rollback IDS" -- \
-        $cur) )
+    COMPREPLY=($(compgen -W "fetch cron upgrade install rollback IDS" -- \
+        $cur))
 } &&
-complete -F _freebsd_update  freebsd-update
+    complete -F _freebsd_update freebsd-update
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv b/msys2/usr/share/bash-completion/completions/freeciv
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv
+++ b/msys2/usr/share/bash-completion/completions/freeciv
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv-gtk2 b/msys2/usr/share/bash-completion/completions/freeciv-gtk2
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv-gtk2
+++ b/msys2/usr/share/bash-completion/completions/freeciv-gtk2
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv-gtk3 b/msys2/usr/share/bash-completion/completions/freeciv-gtk3
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv-gtk3
+++ b/msys2/usr/share/bash-completion/completions/freeciv-gtk3
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv-sdl b/msys2/usr/share/bash-completion/completions/freeciv-sdl
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv-sdl
+++ b/msys2/usr/share/bash-completion/completions/freeciv-sdl
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv-server b/msys2/usr/share/bash-completion/completions/freeciv-server
index 08f63158f..a34b5a29f 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv-server
+++ b/msys2/usr/share/bash-completion/completions/freeciv-server
@@ -6,17 +6,17 @@ _civserver()
     _init_completion || return
 
     case $prev in
-        -f|-g|-l|-r|--file|--log|--gamelog|--read)
+        -f | -g | -l | -r | --file | --log | --gamelog | --read)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _civserver civserver freeciv-server
+    complete -F _civserver civserver freeciv-server
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/freeciv-xaw b/msys2/usr/share/bash-completion/completions/freeciv-xaw
index 0f4754828..01af31182 100644
--- a/msys2/usr/share/bash-completion/completions/freeciv-xaw
+++ b/msys2/usr/share/bash-completion/completions/freeciv-xaw
@@ -6,36 +6,36 @@ _freeciv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--name|--port|-[hvnp])
+        --help | --version | --name | --port | -[hvnp])
             return
             ;;
-        --file|--log|--music|--read|--Sound|--tiles|-[flmrSt])
+        --file | --log | --music | --read | --Sound | --tiles | -[flmrSt])
             _filedir
             return
             ;;
-        --Announce|-A)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+        --Announce | -A)
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --debug|-d)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --debug | -d)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --Meta|--server|-[Ms])
+        --Meta | --server | -[Ms])
             _known_hosts_real -- "$cur"
             return
             ;;
-        --Plugin|-P)
-            COMPREPLY=( $(compgen -W 'none esd sdl' -- "$cur") )
+        --Plugin | -P)
+            COMPREPLY=($(compgen -W 'none esd sdl' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
+    complete -F _freeciv freeciv{,-{gtk{2,3},sdl,xaw}} civclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/function b/msys2/usr/share/bash-completion/completions/function
index a97b5255c..6ae52718f 100644
--- a/msys2/usr/share/bash-completion/completions/function
+++ b/msys2/usr/share/bash-completion/completions/function
@@ -8,30 +8,30 @@ _function()
     if [[ $1 == @(declare|typeset) ]]; then
         if [[ $cur == [-+]* ]]; then
             local opts
-            opts=( $(_parse_usage "$1") )
+            opts=($(_parse_usage "$1"))
             # Most options also have a '+' form.  We'll exclude the ones that don't with compgen.
-            opts+=( ${opts[*]/-/+} )
-            COMPREPLY=( $(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur") )
+            opts+=(${opts[*]/-/+})
+            COMPREPLY=($(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur"))
         else
             local i=1
             while [[ ${words[i]} == [-+]* ]]; do
                 if [[ ${words[i]} == -*[fF]* ]]; then
-                    COMPREPLY=( $(compgen -A function -- "$cur") )
+                    COMPREPLY=($(compgen -A function -- "$cur"))
                     return
                 fi
                 ((i++))
             done
-            if [[ $i -gt 1 ]]; then
+            if ((i > 1)); then
                 # There was at least one option and it was not one that limited operations to functions
-                COMPREPLY=( $(compgen -A variable -- "$cur") )
+                COMPREPLY=($(compgen -A variable -- "$cur"))
             fi
         fi
-    elif [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -A function -- "$cur") )
+    elif ((cword == 1)); then
+        COMPREPLY=($(compgen -A function -- "$cur"))
     else
-        COMPREPLY=( "() $(type -- ${words[1]} | command sed -e 1,2d)" )
+        COMPREPLY=("() $(type -- ${words[1]} | command sed -e 1,2d)")
     fi
 } &&
-complete -F _function function declare typeset
+    complete -F _function function declare typeset
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/fusermount b/msys2/usr/share/bash-completion/completions/fusermount
index c40c18ce2..7e4892259 100644
--- a/msys2/usr/share/bash-completion/completions/fusermount
+++ b/msys2/usr/share/bash-completion/completions/fusermount
@@ -10,19 +10,19 @@ _fusermount()
             return
             ;;
         -*u)
-            COMPREPLY=( $(compgen -W "$(awk \
+            COMPREPLY=($(compgen -W "$(awk \
                 '{ if ($3 ~ /^fuse(\.|$)/) print $2 }' /etc/mtab \
-                2>/dev/null)" -- "$cur") )
+                2>/dev/null)" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
         _filedir -d
     fi
 } &&
-complete -F _fusermount fusermount
+    complete -F _fusermount fusermount
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g++ b/msys2/usr/share/bash-completion/completions/g++
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g++
+++ b/msys2/usr/share/bash-completion/completions/g++
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g++-5 b/msys2/usr/share/bash-completion/completions/g++-5
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g++-5
+++ b/msys2/usr/share/bash-completion/completions/g++-5
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g++-6 b/msys2/usr/share/bash-completion/completions/g++-6
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g++-6
+++ b/msys2/usr/share/bash-completion/completions/g++-6
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g++-7 b/msys2/usr/share/bash-completion/completions/g++-7
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g++-7
+++ b/msys2/usr/share/bash-completion/completions/g++-7
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g++-8 b/msys2/usr/share/bash-completion/completions/g++-8
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g++-8
+++ b/msys2/usr/share/bash-completion/completions/g++-8
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g4 b/msys2/usr/share/bash-completion/completions/g4
index e383c8cf7..ed5f20c25 100644
--- a/msys2/usr/share/bash-completion/completions/g4
+++ b/msys2/usr/share/bash-completion/completions/g4
@@ -14,38 +14,38 @@ _p4()
         uresource uxbinary xbinary xltext xtempobj xtext \
         text binary resource"
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "$p4commands" -- "$cur") )
-    elif [[ $cword -eq 2 ]]; then
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W "$p4commands" -- "$cur"))
+    elif ((cword == 2)); then
         case $prev in
             help)
-                COMPREPLY=( $(compgen -W "simple commands environment
+                COMPREPLY=($(compgen -W "simple commands environment
                     filetypes jobview revisions usage views $p4commands" \
-                        -- "$cur") )
+                    -- "$cur"))
                 ;;
             admin)
-                COMPREPLY=( $(compgen -W "checkpoint stop" -- "$cur") )
-                ;;
-            *)
+                COMPREPLY=($(compgen -W "checkpoint stop" -- "$cur"))
                 ;;
+            *) ;;
+
         esac
-    elif [[ $cword -gt 2 ]]; then
+    elif ((cword > 2)); then
         case $prev in
             -t)
-                case ${words[$cword-2]} in
-                    add|edit|reopen)
-                        COMPREPLY=( $(compgen -W "$p4filetypes" -- "$cur") )
-                        ;;
-                    *)
+                case ${words[cword - 2]} in
+                    add | edit | reopen)
+                        COMPREPLY=($(compgen -W "$p4filetypes" -- "$cur"))
                         ;;
+                    *) ;;
+
                 esac
                 ;;
-            *)
-                ;;
+            *) ;;
+
         esac
     fi
 
 } &&
-complete -F _p4 -o default p4 g4
+    complete -F _p4 -o default p4 g4
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g77 b/msys2/usr/share/bash-completion/completions/g77
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g77
+++ b/msys2/usr/share/bash-completion/completions/g77
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/g95 b/msys2/usr/share/bash-completion/completions/g95
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/g95
+++ b/msys2/usr/share/bash-completion/completions/g95
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcc b/msys2/usr/share/bash-completion/completions/gcc
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcc
+++ b/msys2/usr/share/bash-completion/completions/gcc
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcc-5 b/msys2/usr/share/bash-completion/completions/gcc-5
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcc-5
+++ b/msys2/usr/share/bash-completion/completions/gcc-5
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcc-6 b/msys2/usr/share/bash-completion/completions/gcc-6
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcc-6
+++ b/msys2/usr/share/bash-completion/completions/gcc-6
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcc-7 b/msys2/usr/share/bash-completion/completions/gcc-7
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcc-7
+++ b/msys2/usr/share/bash-completion/completions/gcc-7
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcc-8 b/msys2/usr/share/bash-completion/completions/gcc-8
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcc-8
+++ b/msys2/usr/share/bash-completion/completions/gcc-8
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gccgo b/msys2/usr/share/bash-completion/completions/gccgo
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gccgo
+++ b/msys2/usr/share/bash-completion/completions/gccgo
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gccgo-5 b/msys2/usr/share/bash-completion/completions/gccgo-5
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gccgo-5
+++ b/msys2/usr/share/bash-completion/completions/gccgo-5
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gccgo-6 b/msys2/usr/share/bash-completion/completions/gccgo-6
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gccgo-6
+++ b/msys2/usr/share/bash-completion/completions/gccgo-6
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gccgo-7 b/msys2/usr/share/bash-completion/completions/gccgo-7
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gccgo-7
+++ b/msys2/usr/share/bash-completion/completions/gccgo-7
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gccgo-8 b/msys2/usr/share/bash-completion/completions/gccgo-8
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gccgo-8
+++ b/msys2/usr/share/bash-completion/completions/gccgo-8
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcj b/msys2/usr/share/bash-completion/completions/gcj
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gcj
+++ b/msys2/usr/share/bash-completion/completions/gcj
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gcl b/msys2/usr/share/bash-completion/completions/gcl
index 9acc813d3..73a18b2d7 100644
--- a/msys2/usr/share/bash-completion/completions/gcl
+++ b/msys2/usr/share/bash-completion/completions/gcl
@@ -8,14 +8,14 @@ _gcl()
     _init_completion || return
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-eval -load -f -batch -dir -libdir -compile
-            -o-file -c-file -h-file -data-file -system-p' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-eval -load -f -batch -dir -libdir -compile
+            -o-file -c-file -h-file -data-file -system-p' -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _gcl -o default gcl
+    complete -F _gcl -o default gcl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gdb b/msys2/usr/share/bash-completion/completions/gdb
index b37387e12..f78f8a57d 100644
--- a/msys2/usr/share/bash-completion/completions/gdb
+++ b/msys2/usr/share/bash-completion/completions/gdb
@@ -6,41 +6,42 @@ _gdb()
     _init_completion || return
 
     # gdb [options] --args executable-file [inferior-arguments ...]
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --args ]]; then
-            _command_offset $((i+1))
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --args ]]; then
+            _command_offset $((i + 1))
             return $?
         fi
     done
 
     # gdb [options] [executable-file [core-file or process-id]]
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         local IFS
         compopt -o filenames
-        if [[ "$cur" == */* ]]; then
+        if [[ $cur == */* ]]; then
             # compgen -c works as expected if $cur contains any slashes.
             IFS=$'\n'
-            COMPREPLY=( $(PATH="$PATH:." compgen -d -c -- "$cur") )
+            COMPREPLY=($(PATH="$PATH:." compgen -d -c -- "$cur"))
         else
             # otherwise compgen -c contains Bash's built-in commands,
             # functions and aliases. Thus we need to retrieve the program
             # names manually.
             IFS=":"
-            local path_array=( $(\
-                command sed -e 's/:\{2,\}/:/g' -e 's/^://' -e 's/:$//' <<<"$PATH") )
+            local path_array=($(
+                command sed -e 's/:\{2,\}/:/g' -e 's/^://' -e 's/:$//' <<<"$PATH"
+            ))
             IFS=$'\n'
-            COMPREPLY=( $(compgen -d -W '$(find "${path_array[@]}" . \
+            COMPREPLY=($(compgen -d -W '$(find "${path_array[@]}" . \
                 -mindepth 1 -maxdepth 1 -not -type d -executable \
-                -printf "%f\\n" 2>/dev/null)' -- "$cur") )
+                -printf "%f\\n" 2>/dev/null)' -- "$cur"))
         fi
-    elif [[ $cword -eq 2 ]]; then
-        COMPREPLY=( $(compgen -W "$(command ps axo comm,pid | \
-            awk '{if ($1 ~ /^'"${prev##*/}"'/) print $2}')" -- "$cur") )
+    elif ((cword == 2)); then
+        COMPREPLY=($(compgen -W "$(command ps axo comm,pid |
+            awk '{if ($1 ~ /^'"${prev##*/}"'/) print $2}')" -- "$cur"))
         compopt -o filenames
-        COMPREPLY+=( $(compgen -f -X '!?(*/)core?(.?*)' -o plusdirs \
-            -- "$cur") )
+        COMPREPLY+=($(compgen -f -X '!?(*/)core?(.?*)' -o plusdirs \
+            -- "$cur"))
     fi
 } &&
-complete -F _gdb gdb
+    complete -F _gdb gdb
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/genaliases b/msys2/usr/share/bash-completion/completions/genaliases
index 3bad5c7e2..5953b9efd 100644
--- a/msys2/usr/share/bash-completion/completions/genaliases
+++ b/msys2/usr/share/bash-completion/completions/genaliases
@@ -5,11 +5,11 @@ _genaliases()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--quiet --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--quiet --help' -- "$cur"))
     fi
 
 } &&
-complete -F _genaliases genaliases
+    complete -F _genaliases genaliases
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gendiff b/msys2/usr/share/bash-completion/completions/gendiff
index cb9bab391..d37793f60 100644
--- a/msys2/usr/share/bash-completion/completions/gendiff
+++ b/msys2/usr/share/bash-completion/completions/gendiff
@@ -5,8 +5,8 @@ _gendiff()
     local cur prev words cword
     _init_completion -o '@(diff|patch)' || return
 
-    [[ $cword -eq 1 ]] && _filedir -d
+    ((cword == 1)) && _filedir -d
 } &&
-complete -F _gendiff gendiff
+    complete -F _gendiff gendiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/genisoimage b/msys2/usr/share/bash-completion/completions/genisoimage
index 52b66bbe9..dfa39c0ab 100644
--- a/msys2/usr/share/bash-completion/completions/genisoimage
+++ b/msys2/usr/share/bash-completion/completions/genisoimage
@@ -6,14 +6,14 @@ _mkisofs()
     _init_completion || return
 
     case $prev in
-        -o|-abstract|-biblio|-check-session|-copyright|-log-file| \
-        -root-info|-prep-boot|-*-list)
+        -o | -abstract | -biblio | -check-session | -copyright | -log-file | \
+            -root-info | -prep-boot | -*-list)
             _filedir
             return
             ;;
         -*-charset)
-            COMPREPLY=( $(compgen -W '$(mkisofs -input-charset \
-                    help 2>&1 | tail -n +3)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(mkisofs -input-charset \
+                    help 2>&1 | tail -n +3)' -- "$cur"))
             return
             ;;
         -uid)
@@ -26,13 +26,13 @@ _mkisofs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _mkisofs mkisofs genisoimage
+    complete -F _mkisofs mkisofs genisoimage
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/geoiplookup b/msys2/usr/share/bash-completion/completions/geoiplookup
index 8347728ff..c60be8986 100644
--- a/msys2/usr/share/bash-completion/completions/geoiplookup
+++ b/msys2/usr/share/bash-completion/completions/geoiplookup
@@ -6,7 +6,7 @@ _geoiplookup()
     _init_completion || return
 
     case $prev in
-        -h|-'?'|-v)
+        -h | -'?' | -v)
             return
             ;;
         -d)
@@ -20,7 +20,7 @@ _geoiplookup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
         return
     fi
 
@@ -28,6 +28,6 @@ _geoiplookup()
     [[ $1 == *6 ]] && ipvx=-6 || ipvx=-4
     _known_hosts_real $ipvx -- "$cur"
 } &&
-complete -F _geoiplookup geoiplookup geoiplookup6
+    complete -F _geoiplookup geoiplookup geoiplookup6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/geoiplookup6 b/msys2/usr/share/bash-completion/completions/geoiplookup6
index 8347728ff..c60be8986 100644
--- a/msys2/usr/share/bash-completion/completions/geoiplookup6
+++ b/msys2/usr/share/bash-completion/completions/geoiplookup6
@@ -6,7 +6,7 @@ _geoiplookup()
     _init_completion || return
 
     case $prev in
-        -h|-'?'|-v)
+        -h | -'?' | -v)
             return
             ;;
         -d)
@@ -20,7 +20,7 @@ _geoiplookup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
         return
     fi
 
@@ -28,6 +28,6 @@ _geoiplookup()
     [[ $1 == *6 ]] && ipvx=-6 || ipvx=-4
     _known_hosts_real $ipvx -- "$cur"
 } &&
-complete -F _geoiplookup geoiplookup geoiplookup6
+    complete -F _geoiplookup geoiplookup geoiplookup6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/getconf b/msys2/usr/share/bash-completion/completions/getconf
index 6e86e9de4..de1ad2d66 100644
--- a/msys2/usr/share/bash-completion/completions/getconf
+++ b/msys2/usr/share/bash-completion/completions/getconf
@@ -11,22 +11,22 @@ _getconf()
             return
             ;;
         -v)
-            COMPREPLY=( $(compgen -W \
+            COMPREPLY=($(compgen -W \
                 '$("$1" -a 2>/dev/null | awk "{ print \$1 }")' -- \
-                "${cur:-POSIX_V}") )
+                "${cur:-POSIX_V}"))
             return
             ;;
     esac
 
-    if [[ $prev == PATH_MAX ]]; then  # TODO more path vars, better handling
+    if [[ $prev == PATH_MAX ]]; then # TODO more path vars, better handling
         _filedir
     elif [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-a -v' -- "$cur") )
+        COMPREPLY=($(compgen -W '-a -v' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W \
-            '$("$1" -a 2>/dev/null | awk "{ print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W \
+            '$("$1" -a 2>/dev/null | awk "{ print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _getconf getconf
+    complete -F _getconf getconf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/getent b/msys2/usr/share/bash-completion/completions/getent
index 9a181f60a..4c54a2424 100644
--- a/msys2/usr/share/bash-completion/completions/getent
+++ b/msys2/usr/share/bash-completion/completions/getent
@@ -6,16 +6,16 @@ _getent()
     _init_completion -s || return
 
     local i db
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            --version|--usage|--help|-!(-*)[V?])
+            --version | --usage | --help | -!(-*)[V?])
                 return
                 ;;
-            --service|-!(-*)s)
-                (( i++ ))
-                ;;
-            -*)
+            --service | -!(-*)s)
+                ((i++))
                 ;;
+            -*) ;;
+
             *)
                 # First non-option value is the db
                 db=${words[i]}
@@ -24,39 +24,39 @@ _getent()
         esac
     done
 
-    case $db in
+    case ${db-} in
         passwd)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         group)
-            COMPREPLY=( $(compgen -g -- "$cur") )
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
             ;;
         services)
-            COMPREPLY=( $(compgen -s -- "$cur") )
+            COMPREPLY=($(compgen -s -- "$cur"))
             return
             ;;
         hosts)
-            COMPREPLY=( $(compgen -A hostname -- "$cur") )
+            COMPREPLY=($(compgen -A hostname -- "$cur"))
             return
             ;;
-        protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
-            COMPREPLY=( $(compgen -W "$($1 $db | \
-                awk '{ print $1 }')" -- "$cur") )
+        protocols | networks | ahosts | ahostsv4 | ahostsv6 | rpc)
+            COMPREPLY=($(compgen -W "$($1 $db |
+                awk '{ print $1 }')" -- "$cur"))
             return
             ;;
-        aliases|shadow|gshadow)
-            COMPREPLY=( $(compgen -W "$($1 $db | cut -d: -f1)" -- "$cur") )
+        aliases | shadow | gshadow)
+            COMPREPLY=($(compgen -W "$($1 $db | cut -d: -f1)" -- "$cur"))
             return
             ;;
-        ethers|netgroup)
+        ethers | netgroup)
             return
             ;;
     esac
 
     case $prev in
-        -s|--service)
+        -s | --service)
             return
             ;;
     esac
@@ -64,14 +64,14 @@ _getent()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ -z $db ]]; then
-        COMPREPLY=( $(compgen -W 'passwd group hosts services protocols
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v db ]]; then
+        COMPREPLY=($(compgen -W 'passwd group hosts services protocols
             networks ahosts ahostsv4 ahostsv6 aliases ethers netgroup rpc
-            shadow gshadow' -- "$cur") )
+            shadow gshadow' -- "$cur"))
     fi
 } &&
-complete -F _getent getent
+    complete -F _getent getent
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gfortran b/msys2/usr/share/bash-completion/completions/gfortran
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gfortran
+++ b/msys2/usr/share/bash-completion/completions/gfortran
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gfortran-5 b/msys2/usr/share/bash-completion/completions/gfortran-5
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gfortran-5
+++ b/msys2/usr/share/bash-completion/completions/gfortran-5
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gfortran-6 b/msys2/usr/share/bash-completion/completions/gfortran-6
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gfortran-6
+++ b/msys2/usr/share/bash-completion/completions/gfortran-6
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gfortran-7 b/msys2/usr/share/bash-completion/completions/gfortran-7
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gfortran-7
+++ b/msys2/usr/share/bash-completion/completions/gfortran-7
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gfortran-8 b/msys2/usr/share/bash-completion/completions/gfortran-8
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gfortran-8
+++ b/msys2/usr/share/bash-completion/completions/gfortran-8
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gio b/msys2/usr/share/bash-completion/completions/gio
new file mode 100644
index 000000000..75473d255
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/gio
@@ -0,0 +1,119 @@
+#
+# Copyright (C) 2018 Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# licence, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+
+# Check for bash
+[ -z "$BASH_VERSION" ] && return
+
+####################################################################################################
+
+# Check whether the suggestions have common prefix (i.e. suggestions won't be
+# shown and prefix will be completed first)
+__has_common_prefix() {
+    for (( i = 1; i < ${#COMPREPLY[@]}; i++ )); do
+        if [[ "${COMPREPLY[i-1]:${#cur}:1}" != "${COMPREPLY[i]:${#cur}:1}" ]]; then
+            return 1 # False
+        fi
+    done
+
+    return 0 # True
+}
+
+# Complete file location
+__gio_location() {
+    # Prevent breaking on colons, we have to work with uris
+    local cur
+    _get_comp_words_by_ref -n : cur
+
+    # Resolve dirname for dir listing
+    local dir=""
+    if [[ $cur =~ "/"$ ]]; then
+        dir="$cur"
+    elif [[ $cur =~ "/" ]]; then
+        # Subtract basename because dirname cmd doesn't work well with schemes
+        dir=${cur%$(basename "$cur")}
+    fi
+
+    # List volumes and mounts
+    local mounts=( )
+    while IFS=$'\n' read mount; do
+        # Do not care about local mounts
+        [[ "$mount" =~ ^"file:" ]] && continue
+
+        # Use only matching mounts
+        [[ "$mount" =~ ^"$cur" && "$mount" != "$cur" ]] && mounts+=("$mount")
+    done < <(gio mount -li | sed -n -r 's/^ *(default_location|activation_root)=(.*)$/\2/p' | sort -u)
+
+    # Workaround to unescape dir name (e.g. "\ " -> " ")
+    declare -a tmp="( ${dir} )"
+    unescaped_dir="${tmp[0]}"
+
+    # List files
+    local files=()
+    local names=()
+    while IFS=$'\t' read name size type; do
+        # Escape name properly
+        local escaped_name="$(printf "%q" "$name")"
+
+        # Append slash for directories and space for files
+        if [[ "$type" == "(directory)" ]]; then
+            escaped_name="$escaped_name/"
+        else
+            escaped_name="$escaped_name "
+        fi
+
+        path="$dir$escaped_name"
+
+        # Use only matching paths
+        if [[ "$path" =~ ^"$cur" ]]; then
+            files+=("$path")
+            names+=("$escaped_name")
+        fi
+    done < <(gio list -hl "$unescaped_dir" 2> /dev/null)
+
+    COMPREPLY=("${files[@]}" "${mounts[@]}")
+
+    # Workaround to show suggestions as basenames only
+    if ! __has_common_prefix; then
+        COMPREPLY=("${mounts[@]} ${names[@]}")
+
+        # Workaround to prevent overwriting suggestions, it adds empty
+        # suggestion, otherwise names with colons will be corrupted
+        COMPREPLY+=(" ")
+
+        return 0
+    fi
+
+    # Workaround to complete names with colons, it removes colon prefix from
+    # COMPREPLY
+    __ltrim_colon_completions "$cur"
+}
+
+__gio() {
+    # Complete subcommands
+    if (( ${COMP_CWORD} == 1 )); then
+        COMPREPLY=($(compgen -W "help version cat copy info list mime mkdir monitor mount move open rename remove save set trash tree" -- "${COMP_WORDS[1]}"))
+        compopt +o nospace
+        return 0
+    fi
+
+    # Complete file locations
+    __gio_location
+}
+
+####################################################################################################
+
+complete -o nospace -F __gio gio
diff --git a/msys2/usr/share/bash-completion/completions/gkrellm b/msys2/usr/share/bash-completion/completions/gkrellm
index 9eb76bcb2..c38c5ae14 100644
--- a/msys2/usr/share/bash-completion/completions/gkrellm
+++ b/msys2/usr/share/bash-completion/completions/gkrellm
@@ -6,34 +6,34 @@ _gkrellm()
     _init_completion || return
 
     case $prev in
-        -t|--theme)
+        -t | --theme)
             _filedir -d
             return
             ;;
-        -p|--plugin)
+        -p | --plugin)
             _filedir so
             return
             ;;
-        -s|--server)
+        -s | --server)
             _known_hosts_real -- "$cur"
             return
             ;;
-        -l|--logfile)
+        -l | --logfile)
             _filedir
             return
             ;;
-        -g|--geometry|-c|--config|-P|--port|-d|--debug-level)
+        -g | --geometry | -c | --config | -P | --port | -d | --debug-level)
             # Argument required but no completions available
             return
             ;;
-        -h|--help|-v|--version)
+        -h | --help | -v | --version)
             # All other options are noop with these
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _gkrellm gkrellm gkrellm2
+    complete -F _gkrellm gkrellm gkrellm2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gkrellm2 b/msys2/usr/share/bash-completion/completions/gkrellm2
index 9eb76bcb2..c38c5ae14 100644
--- a/msys2/usr/share/bash-completion/completions/gkrellm2
+++ b/msys2/usr/share/bash-completion/completions/gkrellm2
@@ -6,34 +6,34 @@ _gkrellm()
     _init_completion || return
 
     case $prev in
-        -t|--theme)
+        -t | --theme)
             _filedir -d
             return
             ;;
-        -p|--plugin)
+        -p | --plugin)
             _filedir so
             return
             ;;
-        -s|--server)
+        -s | --server)
             _known_hosts_real -- "$cur"
             return
             ;;
-        -l|--logfile)
+        -l | --logfile)
             _filedir
             return
             ;;
-        -g|--geometry|-c|--config|-P|--port|-d|--debug-level)
+        -g | --geometry | -c | --config | -P | --port | -d | --debug-level)
             # Argument required but no completions available
             return
             ;;
-        -h|--help|-v|--version)
+        -h | --help | -v | --version)
             # All other options are noop with these
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _gkrellm gkrellm gkrellm2
+    complete -F _gkrellm gkrellm gkrellm2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gm b/msys2/usr/share/bash-completion/completions/gm
index 4ea4f3e9f..b86c9cc35 100644
--- a/msys2/usr/share/bash-completion/completions/gm
+++ b/msys2/usr/share/bash-completion/completions/gm
@@ -2,8 +2,8 @@
 
 _gm_commands()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" help |
-        awk "/^ +[^ ]+ +- / { print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" help |
+        awk "/^ +[^ ]+ +- / { print \$1 }")' -- "$cur"))
 }
 
 _gm()
@@ -11,7 +11,7 @@ _gm()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         _gm_commands "$1"
         return
     elif [[ $cword -eq 2 && ${words[1]} == time ]]; then
@@ -35,6 +35,6 @@ _gm()
     # TODO... defer some commnds to the imagemagick "gm"less completions etc?
     compopt -o default
 } &&
-complete -F _gm gm
+    complete -F _gm gm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gmake b/msys2/usr/share/bash-completion/completions/gmake
index f119dcc3d..96517c217 100644
--- a/msys2/usr/share/bash-completion/completions/gmake
+++ b/msys2/usr/share/bash-completion/completions/gmake
@@ -8,7 +8,7 @@ _make_target_extract_script()
     local prefix="$1"
     local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
     local basename=${prefix##*/}
-    local dirname_len=$(( ${#prefix} - ${#basename} ))
+    local dirname_len=$((${#prefix} - ${#basename}))
 
     if [[ $mode == -d ]]; then
         # display mode, only output current path component to the next slash
@@ -67,8 +67,8 @@ _make_target_extract_script()
 EOF
 
     # don't complete with hidden targets unless we are doing a partial completion
-    if [[ -z "${prefix_pat}" || "${prefix_pat}" = */ ]]; then
-      cat <<EOF
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
       /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
 EOF
     fi
@@ -86,37 +86,37 @@ _make()
     local cur prev words cword split
     _init_completion -s || return
 
-    local file makef makef_dir=( "-C" "." ) makef_inc i
+    local makef makef_dir=("-C" ".") i
 
     case $prev in
-        --file|--makefile|--old-file|--assume-old|--what-if| --new-file|\
-        --assume-new|-!(-*)[foW])
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
             _filedir
             return
             ;;
-        --include-dir|--directory|-!(-*)[ICm])
+        --include-dir | --directory | -!(-*)[ICm])
             _filedir -d
             return
             ;;
         -!(-*)E)
-            COMPREPLY=( $(compgen -v -- "$cur") )
+            COMPREPLY=($(compgen -v -- "$cur"))
             return
             ;;
-        --eval|-!(-*)[DVx])
+        --eval | -!(-*)[DVx])
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(( $(_ncpus)*2 ))}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
@@ -126,20 +126,20 @@ _make()
     else
         # before we check for makefiles, see if a path was specified
         # with -C/--directory
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
-                eval "makef_dir=( -C \"${words[i+1]}\" )"
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
                 break
             fi
         done
 
         # before we scan for targets, see if a Makefile name was
         # specified with -f/--file/--makefile
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
-                eval "makef=( -f \"${words[i+1]}\" )"
+                eval "makef=( -f \"${words[i + 1]}\" )"
                 break
             fi
         done
@@ -147,24 +147,24 @@ _make()
         # recognise that possible completions are only going to be displayed
         # so only the base name is shown
         local mode=--
-        if (( COMP_TYPE != 9 )); then
+        if ((COMP_TYPE != 9)); then
             mode=-d # display-only mode
         fi
 
         local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
-        COMPREPLY=( $(LC_ALL=C \
+        COMPREPLY=($(LC_ALL=C \
             $1 -npq __BASH_MAKE_COMPLETION__=1 \
-                "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-            command sed -ne "$script") )
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
             # so set options for completion based on the first one
-            [[ $COMPREPLY == */ ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
         fi
 
     fi
 } &&
-complete -F _make make gmake gnumake pmake colormake
+    complete -F _make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gmplayer b/msys2/usr/share/bash-completion/completions/gmplayer
index 525c63e22..d71ebb8e9 100644
--- a/msys2/usr/share/bash-completion/completions/gmplayer
+++ b/msys2/usr/share/bash-completion/completions/gmplayer
@@ -3,9 +3,9 @@
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $(compgen -W "$($1 -noconfig all $2 help 2>/dev/null | \
-        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 -noconfig all $2 help 2>/dev/null |
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' |
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur"))
 }
 
 _mplayer()
@@ -16,8 +16,8 @@ _mplayer()
     local cmd=${words[0]} i j k=0
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
-        -audio-demuxer|-sub-demuxer)
+        -[av][cfo] | -[av]fm | -vop | -fstype | -demuxer | -o[av]c | -of | -profile | \
+            -audio-demuxer | -sub-demuxer)
             _mplayer_options_list $cmd $prev
             return
             ;;
@@ -25,43 +25,43 @@ _mplayer()
             _mplayer_options_list $cmd -profile
             return
             ;;
-        -audiofile|-audio-file)
+        -audiofile | -audio-file)
             _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ac3|ape)'
             return
             ;;
-        -font|-subfont)
+        -font | -subfont)
             if [[ $prev == -font ]]; then
                 _filedir '@(desc|ttf)'
             else
                 _filedir ttf
             fi
             local IFS=$'\n'
-            COMPREPLY+=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -sub|-sub-file)
+        -sub | -sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
             local IFS=$'\n'
-            COMPREPLY=( $(for i in "${COMPREPLY[@]}"; do
-                        if [[ -f $i && -r $i ]]; then
-                            printf '%s\n' ${i%.*}
-                        else
-                            printf '%s\n' $i
-                        fi
-                        done) )
+            COMPREPLY=($(for i in "${COMPREPLY[@]}"; do
+                if [[ -f $i && -r $i ]]; then
+                    printf '%s\n' ${i%.*}
+                else
+                    printf '%s\n' $i
+                fi
+            done))
             return
             ;;
-        -subcp|-msgcharset)
+        -subcp | -msgcharset)
             local cp
-            cp=( $(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null) )
-            if [[ "$cur" == "${cur,,}" ]]; then
-                COMPREPLY=( $(compgen -W '${cp[@],,}' -- "$cur") )
+            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
+            if [[ $cur == "${cur,,}" ]]; then
+                COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
             else
-                COMPREPLY=( $(compgen -W '${cp[@]^^}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
             fi
             return
             ;;
@@ -107,53 +107,52 @@ _mplayer()
             _filedir -d
             return
             ;;
-        -mixer|-dvdauth|-fb|-zrdev)
+        -mixer | -dvdauth | -fb | -zrdev)
             cur=${cur:=/dev/}
             _filedir
             return
             ;;
-        -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
+            -subfile | -aofile | -fbmodeconfig | -include | -o | -dvdkey | -passlogfile)
             _filedir
             return
             ;;
-        -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
-        -dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
-        -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
-        -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \
-        -fbmode|-geometry|-guiwid|-hue|-icelayer|-screen[wh]|-wid| \
-        -monitor-dotclock|-monitor-[hv]freq|-panscan| \
-        -saturation|-xineramascreen|-zrcrop|-zrnorm|-zrquality| \
-        -zr[xy]doff|-zr[vh]dec|-pp|-x|-y|-xy|-z|-stereo| \
-        -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
-        -ffourcc|-sws|-skiplimit|-format|-ofps|-aadriver| \
-        -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-subdelay|-subfps|-subpos| \
-        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
-        -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-text-scale)
+        -autoq | -autosync | -loop | -menu-root | -speed | -sstep | -aid | -alang | \
+            -bandwidth | -bluray-angle | -bluray-chapter | -cache | -chapter | -dvd-speed | \
+            -dvdangle | -fps | -frames | -mc | -passwd | -user | -sb | -srate | -ss | -vcd | \
+            -vi | -vid | -vivo | -ffactor | -sid | -slang | -spualign | -spuaa | -spugauss | \
+            -vobsubid | -delay | -bpp | -brightness | -contrast | -dfbopts | -display | \
+            -fbmode | -geometry | -guiwid | -hue | -icelayer | -screen[wh] | -wid | \
+            -monitor-dotclock | -monitor-[hv]freq | -panscan | \
+            -saturation | -xineramascreen | -zrcrop | -zrnorm | -zrquality | \
+            -zr[xy]doff | -zr[vh]dec | -pp | -x | -y | -xy | -z | -stereo | \
+            -audio-density | -audio-delay | -audio-preload | -endpos | -osdlevel | \
+            -ffourcc | -sws | -skiplimit | -format | -ofps | -aadriver | \
+            -aaosdcolor | -aasubcolor | -vobsubout | -vobsuboutid | -vobsuboutindex | \
+            -sub-bg-alpha | -sub-bg-color | -subdelay | -subfps | -subpos | \
+            -subalign | -subwidth | -subfont-blur | -subfont-outline | \
+            -subfont-autoscale | -subfont-encoding | -subfont-osd-scale | \
+            -subfont-text-scale)
             return
             ;;
         -channels)
-            COMPREPLY=( $(compgen -W '2 4 6 8' -- "$cur") )
+            COMPREPLY=($(compgen -W '2 4 6 8' -- "$cur"))
             return
             ;;
-        -aspect|-monitoraspect)
-            COMPREPLY=( $(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
-                2.35:1' -- "$cur") )
+        -aspect | -monitoraspect)
+            COMPREPLY=($(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
+                2.35:1' -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         -lavdopts)
-            COMPREPLY=( $(compgen -W 'bitexact bug= debug= ec= er= fast gray
+            COMPREPLY=($(compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
-                threads= vismv= vstats' -- "$cur") )
+                threads= vismv= vstats' -- "$cur"))
             return
             ;;
         -lavcopts)
-            COMPREPLY=( $(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
+            COMPREPLY=($(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
                 mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint=
                 vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate=
                 vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset=
@@ -162,120 +161,120 @@ _mplayer()
                 vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask=
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
-                umv' -- "$cur") )
+                umv' -- "$cur"))
             return
             ;;
         -ssf)
-            COMPREPLY=( $(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur"))
             return
             ;;
         -jpeg)
-            COMPREPLY=( $(compgen -W 'noprogressive progressive nobaseline
-                baseline optimize= smooth= quality= outdir=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noprogressive progressive nobaseline
+                baseline optimize= smooth= quality= outdir=' -- "$cur"))
             return
             ;;
         -xvidopts)
-            COMPREPLY=( $(compgen -W 'dr2 nodr2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dr2 nodr2' -- "$cur"))
             return
             ;;
         -xvidencopts)
-            COMPREPLY=( $(compgen -W 'pass= bitrate= fixed_quant= me_quality=
+            COMPREPLY=($(compgen -W 'pass= bitrate= fixed_quant= me_quality=
                 4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer=
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
-                kfthreshold= kfreduction=' -- "$cur") )
+                kfthreshold= kfreduction=' -- "$cur"))
             return
             ;;
         -divx4opts)
-            COMPREPLY=( $(compgen -W 'br= key= deinterlace q= min_quant=
+            COMPREPLY=($(compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
-                rc_reaction_ratio= pass= vbrpass= help' -- "$cur") )
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur"))
             return
             ;;
         -info)
-            COMPREPLY=( $(compgen -W 'name= artist= genre= subject=
-                copyright= srcform= comment= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'name= artist= genre= subject=
+                copyright= srcform= comment= help' -- "$cur"))
             return
             ;;
         -lameopts)
-            COMPREPLY=( $(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
-                mode= padding= fast preset= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
+                mode= padding= fast preset= help' -- "$cur"))
             return
             ;;
         -rawaudio)
-            COMPREPLY=( $(compgen -W 'on channels= rate= samplesize= format=' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'on channels= rate= samplesize= format=' \
+                -- "$cur"))
             return
             ;;
         -rawvideo)
-            COMPREPLY=( $(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
-                h= y420 yv12 yuy2 y8 format= size=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur"))
             return
             ;;
         -aop)
-            COMPREPLY=( $(compgen -W 'list= delay= format= fout= volume= mul=
-                softclip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list= delay= format= fout= volume= mul=
+                softclip' -- "$cur"))
             return
             ;;
         -dxr2)
-            COMPREPLY=( $(compgen -W 'ar-mode= iec958-encoded iec958-decoded
+            COMPREPLY=($(compgen -W 'ar-mode= iec958-encoded iec958-decoded
                 mute ucode= 75ire bw color interlaced macrovision= norm=
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur") )
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur"))
             return
             ;;
         -tv)
-            COMPREPLY=( $(compgen -W 'on noaudio driver= device= input= freq=
+            COMPREPLY=($(compgen -W 'on noaudio driver= device= input= freq=
                 outfmt= width= height= buffersize= norm= channel= chanlist=
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -mf)
-            COMPREPLY=( $(compgen -W 'on w= h= fps= type=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on w= h= fps= type=' -- "$cur"))
             return
             ;;
         -cdda)
-            COMPREPLY=( $(compgen -W 'speed= paranoia= generic-dev=
+            COMPREPLY=($(compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -input)
-            COMPREPLY=( $(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
-                js-dev file' -- "$cur") )
+            COMPREPLY=($(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
+                js-dev file' -- "$cur"))
             return
             ;;
         -af-adv)
-            COMPREPLY=( $(compgen -W 'force= list=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'force= list=' -- "$cur"))
             return
             ;;
         -noconfig)
-            COMPREPLY=( $(compgen -W 'all gui system user' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all gui system user' -- "$cur"))
             return
             ;;
         -*)
             # Assume arg is required for everything else except options
             # for which -list-options says Type is Flag or Print.
-            $cmd -noconfig all -list-options 2>/dev/null \
-            | while read -r i j k; do
-                if [[ $i == ${prev#-} ]]; then
-                    [[ ${j,,} != @(flag|print) ]] && return 1
-                    break
-                fi
-            done || return
+            $cmd -noconfig all -list-options 2>/dev/null |
+                while read -r i j k; do
+                    if [[ $i == "${prev#-}" ]]; then
+                        [[ ${j,,} != @(flag|print) ]] && return 1
+                        break
+                    fi
+                done || return
             ;;
     esac
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
-                command sed -ne '1,/^[[:space:]]*Name/d' \
+            COMPREPLY=($(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
+                command sed -ne "1,/^[[:space:]]*Name/d" \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
-                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur") )
+                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur"))
             ;;
         *)
             _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS|m[eo]d|M[EO]D|xm|XM|it|IT|s[t3]m|S[T3]M|mtm|MTM|w64|W64)?(.@(crdownload|part))'
@@ -283,6 +282,6 @@ _mplayer()
     esac
 
 } &&
-complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
+    complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gnatmake b/msys2/usr/share/bash-completion/completions/gnatmake
index 383bb9b46..5f4b96397 100644
--- a/msys2/usr/share/bash-completion/completions/gnatmake
+++ b/msys2/usr/share/bash-completion/completions/gnatmake
@@ -6,21 +6,21 @@ _gnatmake()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # relevant (and less relevant ;-) )options completion
-        COMPREPLY=( $(compgen -W '-a -c -f -i -j -k -m -M -n -o -q -s -v -z
+        COMPREPLY=($(compgen -W '-a -c -f -i -j -k -m -M -n -o -q -s -v -z
             -aL -A -aO -aI -I -I- -L -nostdinc -nostdlib -cargs -bargs -largs
             -fstack-check -fno-inline -g -O1 -O0 -O2 -O3 -gnata -gnatA -gnatb
             -gnatc -gnatd -gnatD -gnate -gnatE -gnatf -gnatF -gnatg -gnatG
             -gnath -gnati -gnatk -gnatl -gnatL -gnatm -gnatn -gnato -gnatO
             -gnatp -gnatP -gnatq -gnatR -gnats -gnatt -gnatT -gnatu -gnatU
             -gnatv -gnatws -gnatwe -gnatwl -gnatwu -gnatW -gnatx -gnatX -gnaty
-            -gnatz -gnatZ -gnat83' -- "$cur") )
+            -gnatz -gnatZ -gnat83' -- "$cur"))
     else
         # source file completion
         _filedir '@(adb|ads)'
     fi
 } &&
-complete -F _gnatmake gnatmake
+    complete -F _gnatmake gnatmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gnokii b/msys2/usr/share/bash-completion/completions/gnokii
index ff43c3d1b..039141aec 100644
--- a/msys2/usr/share/bash-completion/completions/gnokii
+++ b/msys2/usr/share/bash-completion/completions/gnokii
@@ -3,7 +3,7 @@
 _gnokii_memory_type()
 {
     # TODO: reduce the number of choices
-    COMPREPLY=( $(compgen -W "IN OU SM ME MT" -- "$cur") )
+    COMPREPLY=($(compgen -W "IN OU SM ME MT" -- "$cur"))
 }
 
 _gnokii()
@@ -20,123 +20,123 @@ _gnokii()
             local config_file
             for config_file in "$XDG_CONFIG_HOME/gnokii/config" \
                 "$HOME/.config/gnokii/config" "$HOME/.gnokiirc" \
-                "$XDG_CONFIG_DIRS/gnokii/config" /etc/gnokiirc ; do
+                "$XDG_CONFIG_DIRS/gnokii/config" /etc/gnokiirc; do
                 [[ -f $config_file ]] && break
             done
             [[ ! -f $config_file ]] && return
-            COMPREPLY=( $(compgen -W \
+            COMPREPLY=($(compgen -W \
                 "$(command sed -n 's/^\[phone_\(.*\)\]/\1/p' $config_file)" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --help)
-            COMPREPLY=( $(compgen -W 'all monitor sms mms phonebook calendar
+            COMPREPLY=($(compgen -W 'all monitor sms mms phonebook calendar
                 todo dial profile settings wap logo ringtone security file
-                other' -- "$cur") )
+                other' -- "$cur"))
             return
             ;;
-        --version|--shell|ping)
+        --version | --shell | ping)
             return
             ;;
 
         # MONITOR
         --monitor)
-            COMPREPLY=( $(compgen -W 'delay once' -- "$cur") )
+            COMPREPLY=($(compgen -W 'delay once' -- "$cur"))
             return
             ;;
-        --getdisplaystatus|--displayoutput)
+        --getdisplaystatus | --displayoutput)
             return
             ;;
         --netmonitor)
-            COMPREPLY=( $(compgen -W 'reset off field devel next nr' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'reset off field devel next nr' \
+                -- "$cur"))
             return
             ;;
 
         # SMS
         --sendsms)
-	    # (how)TODO ?
+            # (how)TODO ?
             return
             ;;
         --savesms)
-            COMPREPLY=( $(compgen -W '--sender --smsc --smscno --folder
-                --location --sent --read --deliver --datetime' -- "$cur") )
+            COMPREPLY=($(compgen -W '--sender --smsc --smscno --folder
+                --location --sent --read --deliver --datetime' -- "$cur"))
             return
             ;;
-        --memory-type|--memory|--getsms|--deletesms|--getmms|--deletemms|\
-        --getphonebook|--deletephonebook)
+        --memory-type | --memory | --getsms | --deletesms | --getmms | --deletemms | \
+            --getphonebook | --deletephonebook)
             _gnokii_memory_type
             return
             ;;
-        --getsmsc|--getcalendarnote|--deletecalendarnote|--gettodo|\
-        --getspeeddial)
+        --getsmsc | --getcalendarnote | --deletecalendarnote | --gettodo | \
+            --getspeeddial)
             # TODO: grab a specific entry ID
             return
             ;;
-        --setsmsc|--smsreader|--createsmsfolder|--deletealltodos|\
-        --showsmsfolderstatus)
+        --setsmsc | --smsreader | --createsmsfolder | --deletealltodos | \
+            --showsmsfolderstatus)
             return
             ;;
-        --deletesmsfolder|--folder)
+        --deletesmsfolder | --folder)
             # TODO: folderid
             return
             ;;
         --writephonebook)
-            COMPREPLY=( $(compgen -W '--overwrite --find-free --memory-type
-                --location --vcard --ldif' -- "$cur") )
+            COMPREPLY=($(compgen -W '--overwrite --find-free --memory-type
+                --location --vcard --ldif' -- "$cur"))
             return
             ;;
-        --writecalendarnote|--writetodo)
+        --writecalendarnote | --writetodo)
             _filedir vcf
             return
             ;;
 
         # DIAL
-        --setspeeddial|--dialvoice|--senddtmf|--answercall|--hangup)
+        --setspeeddial | --dialvoice | --senddtmf | --answercall | --hangup)
             # TODO
             return
             ;;
         --divert)
-            COMPREPLY=( $(compgen -W '--op' -- "$cur") )
+            COMPREPLY=($(compgen -W '--op' -- "$cur"))
             return
             ;;
 
         # PROFILE
-        --getprofile|--setactiveprofile)
+        --getprofile | --setactiveprofile)
             # TODO
             return
             ;;
-        --setprofile|--getactiveprofile)
+        --setprofile | --getactiveprofile)
             return
             ;;
 
         # SETTINGS
         --reset)
-            COMPREPLY=( $(compgen -W 'soft hard' -- "$cur") )
+            COMPREPLY=($(compgen -W 'soft hard' -- "$cur"))
             return
             ;;
-        --setdatetime|--setalarm)
+        --setdatetime | --setalarm)
             # TODO
             return
             ;;
-        --getdatetime|--getalarm)
+        --getdatetime | --getalarm)
             return
             ;;
 
         # WAP
-        --getwapbookmark|--writewapbookmark|--deletewapbookmark|\
-        --getwapsetting|--writewapsetting|--activatewapsetting)
+        --getwapbookmark | --writewapbookmark | --deletewapbookmark | \
+            --getwapsetting | --writewapsetting | --activatewapsetting)
             return
             ;;
 
         # LOGOS
         --sendlogo)
-            COMPREPLY=( $(compgen -W 'caller op picture' -- "$cur") )
+            COMPREPLY=($(compgen -W 'caller op picture' -- "$cur"))
             return
             ;;
-        --setlogo|--getlogo)
-            COMPREPLY=( $(compgen -W 'op startup caller dealer text' \
-                -- "$cur") )
+        --setlogo | --getlogo)
+            COMPREPLY=($(compgen -W 'op startup caller dealer text' \
+                -- "$cur"))
             return
             ;;
         --viewlogo)
@@ -145,77 +145,79 @@ _gnokii()
             ;;
 
         --entersecuritycode)
-            COMPREPLY=( $(compgen -W 'PIN PIN2 PUK PUK2 SEC' -- "$cur") )
+            COMPREPLY=($(compgen -W 'PIN PIN2 PUK PUK2 SEC' -- "$cur"))
             return
             ;;
 
-        # TODO: RINGTONES
+            # TODO: RINGTONES
     esac
 
     # second level completion
-    if [[ $((cword-2)) -ge 1 && ${words[cword-2]} =~ --* ]]; then
-        pprev=${words[cword-2]}
+    if [[ $((cword - 2)) -ge 1 && ${words[cword - 2]} =~ --* ]]; then
+        pprev=${words[cword - 2]}
         case $pprev in
             --setspeeddial)
                 _gnokii_memory_type
                 return
                 ;;
-            --getsms|--deletesms|--getmms|--deletemms|--getphonebook|\
-            --writetodo|--writecalendarnote)
+            --getsms | --deletesms | --getmms | --deletemms | --getphonebook | \
+                --writetodo | --writecalendarnote)
                 # TODO: start number
                 return
                 ;;
-            --gettodo|--getcalendarnote)
-                COMPREPLY=( $(compgen -W '{1..9} end --vCal' -- "$cur") )
+            --gettodo | --getcalendarnote)
+                COMPREPLY=($(compgen -W '{1..9} end --vCal' -- "$cur"))
                 return
                 ;;
             --deletecalendarnote)
-                COMPREPLY=( $(compgen -W '{1..9} end' -- "$cur") )
+                COMPREPLY=($(compgen -W '{1..9} end' -- "$cur"))
                 return
                 ;;
             --divert)
-                COMPREPLY=( $(compgen -W 'register enable query disable
-                    erasure' -- "$cur") )
+                COMPREPLY=($(compgen -W 'register enable query disable
+                    erasure' -- "$cur"))
                 return
                 ;;
         esac
     fi
 
     # third level completion
-    if [[ $((cword-3)) -ge 1 && ${words[cword-3]} =~ --* ]]; then
-        tprev=${words[cword-3]}
+    if [[ $((cword - 3)) -ge 1 && ${words[cword - 3]} =~ --* ]]; then
+        tprev=${words[cword - 3]}
         case $tprev in
-            --deletesms|--deletemms)
-                COMPREPLY=( $(compgen -W 'end' -- "$cur") )
+            --deletesms | --deletemms)
+                COMPREPLY=($(compgen -W 'end' -- "$cur"))
                 return
                 ;;
-            --getphonebook|--writetodo|--writecalendarnote)
-                COMPREPLY=( $(compgen -W '{1..9} end' -- "$cur") )
+            --getphonebook | --writetodo | --writecalendarnote)
+                COMPREPLY=($(compgen -W '{1..9} end' -- "$cur"))
                 return
                 ;;
-            --gettodo|--getcalendarnote)
-                [[ ${words[cword-1]} == end ]] && \
-                    COMPREPLY=( $(compgen -W '--vCal' -- "$cur") )
+            --gettodo | --getcalendarnote)
+                [[ ${words[cword - 1]} == end ]] &&
+                    COMPREPLY=($(compgen -W '--vCal' -- "$cur"))
                 return
                 ;;
             --divert)
-                COMPREPLY=( $(compgen -W '--type' -- "$cur") )
+                COMPREPLY=($(compgen -W '--type' -- "$cur"))
                 return
+                ;;
         esac
     fi
 
     # fourth level completion
-    if [[ $((cword-4)) -ge 1 && ${words[cword-4]} =~ --* ]]; then
-        fprev=${words[cword-4]}
+    if [[ $((cword - 4)) -ge 1 && ${words[cword - 4]} =~ --* ]]; then
+        fprev=${words[cword - 4]}
         case $fprev in
             --getphonebook)
-                COMPREPLY=( $(compgen -W '--raw --vcard --ldif' -- "$cur") )
+                COMPREPLY=($(compgen -W '--raw --vcard --ldif' -- "$cur"))
                 return
                 ;;
             --divert)
-                COMPREPLY=( $(compgen -W 'all busy noans outofreach notavail' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'all busy noans outofreach notavail' \
+                    -- "$cur"))
                 return
+                ;;
         esac
     fi
 
@@ -226,10 +228,10 @@ _gnokii()
 
     # don't provide main command completions if one is
     # already on the command line
-    [[ $COMP_LINE =~ $(tr ' ' '\b|'<<<$main_cmd) ]] && return
+    [[ $COMP_LINE =~ $(tr ' ' '\b|' <<<$main_cmd) ]] && return
 
-    COMPREPLY=( $(compgen -W "$all_cmd" -- "$cur") )
+    COMPREPLY=($(compgen -W "$all_cmd" -- "$cur"))
 } &&
-complete -F _gnokii gnokii
+    complete -F _gnokii gnokii
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gnome-mplayer b/msys2/usr/share/bash-completion/completions/gnome-mplayer
index fa4361df1..32d93fc3b 100644
--- a/msys2/usr/share/bash-completion/completions/gnome-mplayer
+++ b/msys2/usr/share/bash-completion/completions/gnome-mplayer
@@ -6,11 +6,11 @@ _gnome_mplayer()
     _init_completion -s || return
 
     case $prev in
-        -'?'|--help|--help-all|--help-gtk)
+        -'?' | --help | --help-all | --help-gtk)
             return
             ;;
-        --showcontrols|--showsubtitles|--autostart)
-            COMPREPLY=( $(compgen -w '0 1' -- "$cur") )
+        --showcontrols | --showsubtitles | --autostart)
+            COMPREPLY=($(compgen -w '0 1' -- "$cur"))
             return
             ;;
         --subtitle)
@@ -18,7 +18,7 @@ _gnome_mplayer()
             return
             ;;
         --tvdriver)
-            COMPREPLY=( $(compgen -W 'v4l v4l2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'v4l v4l2' -- "$cur"))
             return
             ;;
     esac
@@ -26,13 +26,13 @@ _gnome_mplayer()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _gnome_mplayer gnome-mplayer
+    complete -F _gnome_mplayer gnome-mplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gnome-screenshot b/msys2/usr/share/bash-completion/completions/gnome-screenshot
index d0270c38b..b3594d203 100644
--- a/msys2/usr/share/bash-completion/completions/gnome-screenshot
+++ b/msys2/usr/share/bash-completion/completions/gnome-screenshot
@@ -6,14 +6,14 @@ _gnome_screenshot()
     _init_completion -s || return
 
     case $prev in
-        --help|--help-*|--version|--delay|--display|-!(-*)[hd])
+        --help | --help-* | --version | --delay | --display | -!(-*)[hd])
             return
             ;;
-        --border-effect|-!(-*)e)
-            COMPREPLY=( $(compgen -W 'shadow border vintage none' -- "$cur") )
+        --border-effect | -!(-*)e)
+            COMPREPLY=($(compgen -W 'shadow border vintage none' -- "$cur"))
             return
             ;;
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir '@(jp?(e)|pn)g'
             return
             ;;
@@ -22,10 +22,10 @@ _gnome_screenshot()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _gnome_screenshot gnome-screenshot
+    complete -F _gnome_screenshot gnome-screenshot
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gnumake b/msys2/usr/share/bash-completion/completions/gnumake
index f119dcc3d..96517c217 100644
--- a/msys2/usr/share/bash-completion/completions/gnumake
+++ b/msys2/usr/share/bash-completion/completions/gnumake
@@ -8,7 +8,7 @@ _make_target_extract_script()
     local prefix="$1"
     local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
     local basename=${prefix##*/}
-    local dirname_len=$(( ${#prefix} - ${#basename} ))
+    local dirname_len=$((${#prefix} - ${#basename}))
 
     if [[ $mode == -d ]]; then
         # display mode, only output current path component to the next slash
@@ -67,8 +67,8 @@ _make_target_extract_script()
 EOF
 
     # don't complete with hidden targets unless we are doing a partial completion
-    if [[ -z "${prefix_pat}" || "${prefix_pat}" = */ ]]; then
-      cat <<EOF
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
       /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
 EOF
     fi
@@ -86,37 +86,37 @@ _make()
     local cur prev words cword split
     _init_completion -s || return
 
-    local file makef makef_dir=( "-C" "." ) makef_inc i
+    local makef makef_dir=("-C" ".") i
 
     case $prev in
-        --file|--makefile|--old-file|--assume-old|--what-if| --new-file|\
-        --assume-new|-!(-*)[foW])
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
             _filedir
             return
             ;;
-        --include-dir|--directory|-!(-*)[ICm])
+        --include-dir | --directory | -!(-*)[ICm])
             _filedir -d
             return
             ;;
         -!(-*)E)
-            COMPREPLY=( $(compgen -v -- "$cur") )
+            COMPREPLY=($(compgen -v -- "$cur"))
             return
             ;;
-        --eval|-!(-*)[DVx])
+        --eval | -!(-*)[DVx])
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(( $(_ncpus)*2 ))}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
@@ -126,20 +126,20 @@ _make()
     else
         # before we check for makefiles, see if a path was specified
         # with -C/--directory
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
-                eval "makef_dir=( -C \"${words[i+1]}\" )"
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
                 break
             fi
         done
 
         # before we scan for targets, see if a Makefile name was
         # specified with -f/--file/--makefile
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
-                eval "makef=( -f \"${words[i+1]}\" )"
+                eval "makef=( -f \"${words[i + 1]}\" )"
                 break
             fi
         done
@@ -147,24 +147,24 @@ _make()
         # recognise that possible completions are only going to be displayed
         # so only the base name is shown
         local mode=--
-        if (( COMP_TYPE != 9 )); then
+        if ((COMP_TYPE != 9)); then
             mode=-d # display-only mode
         fi
 
         local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
-        COMPREPLY=( $(LC_ALL=C \
+        COMPREPLY=($(LC_ALL=C \
             $1 -npq __BASH_MAKE_COMPLETION__=1 \
-                "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-            command sed -ne "$script") )
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
             # so set options for completion based on the first one
-            [[ $COMPREPLY == */ ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
         fi
 
     fi
 } &&
-complete -F _make make gmake gnumake pmake colormake
+    complete -F _make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/google-chrome b/msys2/usr/share/bash-completion/completions/google-chrome
index a26b04f22..9ee989629 100644
--- a/msys2/usr/share/bash-completion/completions/google-chrome
+++ b/msys2/usr/share/bash-completion/completions/google-chrome
@@ -6,7 +6,7 @@ _chromium_browser()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--app|--proxy-pac-url|-h)
+        --help | --app | --proxy-pac-url | -h)
             return
             ;;
         --user-data-dir)
@@ -18,18 +18,18 @@ _chromium_browser()
                 *://*)
                     local prefix="${cur%%://*}://"
                     _known_hosts_real -- "${cur#*://}"
-                    COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+                    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
                     __ltrim_colon_completions "$cur"
                     ;;
                 *)
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S :// -W 'http socks socks4 socks5' -- "$cur") )
+                    COMPREPLY=($(compgen -S :// -W 'http socks socks4 socks5' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --password-store)
-            COMPREPLY=( $(compgen -W 'basic gnome kwallet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'basic gnome kwallet' -- "$cur"))
             return
             ;;
     esac
@@ -37,14 +37,14 @@ _chromium_browser()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([mxs])htm?(l)|pdf)"
+    _filedir "@(?([mxs])htm?(l)|pdf|txt)"
 } &&
-complete -F _chromium_browser chromium-browser google-chrome \
-    google-chrome-stable chromium chrome
+    complete -F _chromium_browser chromium-browser google-chrome \
+        google-chrome-stable chromium chrome
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/google-chrome-stable b/msys2/usr/share/bash-completion/completions/google-chrome-stable
index a26b04f22..9ee989629 100644
--- a/msys2/usr/share/bash-completion/completions/google-chrome-stable
+++ b/msys2/usr/share/bash-completion/completions/google-chrome-stable
@@ -6,7 +6,7 @@ _chromium_browser()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--app|--proxy-pac-url|-h)
+        --help | --app | --proxy-pac-url | -h)
             return
             ;;
         --user-data-dir)
@@ -18,18 +18,18 @@ _chromium_browser()
                 *://*)
                     local prefix="${cur%%://*}://"
                     _known_hosts_real -- "${cur#*://}"
-                    COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+                    COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
                     __ltrim_colon_completions "$cur"
                     ;;
                 *)
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S :// -W 'http socks socks4 socks5' -- "$cur") )
+                    COMPREPLY=($(compgen -S :// -W 'http socks socks4 socks5' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --password-store)
-            COMPREPLY=( $(compgen -W 'basic gnome kwallet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'basic gnome kwallet' -- "$cur"))
             return
             ;;
     esac
@@ -37,14 +37,14 @@ _chromium_browser()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([mxs])htm?(l)|pdf)"
+    _filedir "@(?([mxs])htm?(l)|pdf|txt)"
 } &&
-complete -F _chromium_browser chromium-browser google-chrome \
-    google-chrome-stable chromium chrome
+    complete -F _chromium_browser chromium-browser google-chrome \
+        google-chrome-stable chromium chrome
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpasswd b/msys2/usr/share/bash-completion/completions/gpasswd
index 8f27cfec2..f1f220030 100644
--- a/msys2/usr/share/bash-completion/completions/gpasswd
+++ b/msys2/usr/share/bash-completion/completions/gpasswd
@@ -6,20 +6,20 @@ _gpasswd()
     _init_completion || return
 
     case $prev in
-        --add|--delete|--administrators|--members|-!(-*)[adAM])
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --add | --delete | --administrators | --members | -!(-*)[adAM])
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # TODO: only -A and -M can be combined
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -g -- "$cur") )
+    COMPREPLY=($(compgen -g -- "$cur"))
 } &&
-complete -F _gpasswd gpasswd
+    complete -F _gpasswd gpasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpc b/msys2/usr/share/bash-completion/completions/gpc
index 86d0d0952..fa9527417 100644
--- a/msys2/usr/share/bash-completion/completions/gpc
+++ b/msys2/usr/share/bash-completion/completions/gpc
@@ -8,13 +8,13 @@ _gcc()
     # Test that GCC is recent enough and if not fallback to
     # parsing of --completion option.
     if ! $1 --completion=" " 2>/dev/null; then
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             local cc=$($1 -print-prog-name=cc1 2>/dev/null)
             [[ $cc ]] || return
-            COMPREPLY=($( compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |\
+            COMPREPLY=($(compgen -W "$($cc --help 2>/dev/null | tr '\t' ' ' |
                 command sed -e '/^  *-/!d' -e 's/ *-\([^][ <>]*\).*/-\1/')" \
-                -- "$cur" ))
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir
         fi
@@ -22,54 +22,54 @@ _gcc()
     fi
 
     # extract also for situations like: -fsanitize=add
-    if [[ $cword -gt 2 ]]; then
-        prev2="${COMP_WORDS[$cword - 2]}"
+    if ((cword > 2)); then
+        prev2="${COMP_WORDS[cword - 2]}"
     fi
 
     # sample: -fsan
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         argument=$cur
         prefix=""
     # sample: -fsanitize=
-    elif [[ "$cur" == "=" && $prev == -* ]]; then
+    elif [[ $cur == "=" && $prev == -* ]]; then
         argument=$prev$cur
         prefix=$prev$cur
     # sample: -fsanitize=add
-    elif [[ "$prev" == "=" && $prev2 == -* ]]; then
+    elif [[ $prev == "=" && $prev2 == -* ]]; then
         argument=$prev2$prev$cur
         prefix=$prev2$prev
     # sample: --param lto-
-    elif [[ "$prev" == --param ]]; then
+    elif [[ $prev == --param ]]; then
         argument="$prev $cur"
         prefix="$prev "
     fi
 
-    if [[ -z $argument ]]; then
+    if [[ ! -v argument ]]; then
         _filedir
     else
         # In situation like '-fsanitize=add' $cur is equal to last token.
         # Thus we need to strip the beginning of suggested option.
-        prefix_length=$((${#prefix}+1))
+        prefix_length=$((${#prefix} + 1))
         local flags=$($1 --completion="$argument" | cut -c $prefix_length-)
-        [[ "${flags}" == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=( $(compgen -W "$flags" -- "") )
+        [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
+        COMPREPLY=($(compgen -W "$flags" -- ""))
     fi
 } &&
-complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
-    gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
-{
-    cc  --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand cc) == *gcc* ]] && \
-        complete -F _gcc cc  || complete -F _minimal cc
-    c++ --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand c++) == *g++* ]] && \
-        complete -F _gcc c++ || complete -F _minimal c++
-    f77 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f77) == *gfortran* ]] && \
-        complete -F _gcc f77 || complete -F _minimal f77
-    f95 --version 2>/dev/null | command grep -q GCC || \
-        [[ $(_realcommand f95) == *gfortran* ]] && \
-        complete -F _gcc f95 || complete -F _minimal f95
-}
+    complete -F _gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \
+        gccgo{,-5,-6,-7,-8} gcj gfortran{,-5,-6,-7,-8} gpc &&
+    {
+        cc --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand cc) == *gcc* ]] &&
+            complete -F _gcc cc || complete -F _minimal cc
+        c++ --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand c++) == *g++* ]] &&
+            complete -F _gcc c++ || complete -F _minimal c++
+        f77 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f77) == *gfortran* ]] &&
+            complete -F _gcc f77 || complete -F _minimal f77
+        f95 --version 2>/dev/null | command grep -q GCC ||
+            [[ $(_realcommand f95) == *gfortran* ]] &&
+            complete -F _gcc f95 || complete -F _minimal f95
+    }
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpg b/msys2/usr/share/bash-completion/completions/gpg
index cb00fa661..f0ca88453 100644
--- a/msys2/usr/share/bash-completion/completions/gpg
+++ b/msys2/usr/share/bash-completion/completions/gpg
@@ -6,33 +6,33 @@ _gpg()
     _init_completion || return
 
     case $prev in
-        --sign|--clearsign|--decrypt-files|--load-extension|-!(-*)s)
+        --sign | --clearsign | --decrypt-files | --load-extension | -!(-*)s)
             _filedir
             return
             ;;
-        --export|--sign-key|--lsign-key|--nrsign-key|--nrlsign-key|--edit-key)
+        --export | --sign-key | --lsign-key | --nrsign-key | --nrlsign-key | --edit-key)
             # return list of public keys
-            COMPREPLY=( $(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
                 's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
-                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur") )
+                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
             return
             ;;
-        --recipient|-!(-*)r)
-            COMPREPLY=( $(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
-                's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur") )
+        --recipient | -!(-*)r)
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
+                's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur"))
             if [[ -e ~/.gnupg/gpg.conf ]]; then
-                COMPREPLY+=( $(compgen -W "$(command sed -ne \
+                COMPREPLY+=($(compgen -W "$(command sed -ne \
                     's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
-                    ~/.gnupg/gpg.conf)" -- "$cur") )
+                    ~/.gnupg/gpg.conf)" -- "$cur"))
             fi
             return
-        ;;
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$($1 --dump-options)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$($1 --dump-options)' -- "$cur"))
     fi
 } &&
-complete -F _gpg -o default gpg
+    complete -F _gpg -o default gpg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpg2 b/msys2/usr/share/bash-completion/completions/gpg2
index 450149226..cfa402318 100644
--- a/msys2/usr/share/bash-completion/completions/gpg2
+++ b/msys2/usr/share/bash-completion/completions/gpg2
@@ -10,33 +10,33 @@ _gpg2()
             _filedir -d
             return
             ;;
-        --sign|--clearsign|--options|--decrypt|-!(-*)s)
+        --sign | --clearsign | --options | --decrypt | -!(-*)s)
             _filedir
             return
             ;;
-        --export|--sign-key|--lsign-key|--nrsign-key|--nrlsign-key|--edit-key)
+        --export | --sign-key | --lsign-key | --nrsign-key | --nrlsign-key | --edit-key)
             # return list of public keys
-            COMPREPLY=( $(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
                 's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
-                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur") )
+                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
             return
             ;;
-        --recipient|-!(-*)r)
-            COMPREPLY=( $(compgen -W "$($1 --list-keys 2>/dev/null | \
-                command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur") )
+        --recipient | -!(-*)r)
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null |
+                command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur"))
             if [[ -e ~/.gnupg/gpg.conf ]]; then
-                COMPREPLY+=( $(compgen -W "$(command sed -ne \
+                COMPREPLY+=($(compgen -W "$(command sed -ne \
                     's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
-                    ~/.gnupg/gpg.conf)" -- "$cur") )
+                    ~/.gnupg/gpg.conf)" -- "$cur"))
             fi
-        return
-        ;;
+            return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$($1 --dump-options)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$($1 --dump-options)' -- "$cur"))
     fi
 } &&
-complete -F _gpg2 -o default gpg2
+    complete -F _gpg2 -o default gpg2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpgv b/msys2/usr/share/bash-completion/completions/gpgv
index a3221afc0..29315c9c2 100644
--- a/msys2/usr/share/bash-completion/completions/gpgv
+++ b/msys2/usr/share/bash-completion/completions/gpgv
@@ -6,7 +6,7 @@ _gpgv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--weak-digest|--*-fd|-!(-*)[?h]*)
+        --help | --version | --weak-digest | --*-fd | -!(-*)[?h]*)
             return
             ;;
         --keyring)
@@ -23,15 +23,15 @@ _gpgv()
     _count_args "" "--@(weak-digest|*-fd|keyring|homedir)"
 
     if [[ $cur == -* && $args -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    if [[ $args -gt 1 ]]; then
+    if ((args > 1)); then
         if [[ ${COMP_LINE,,} == *.@(asc|sig|sign)\ * ]]; then
             # Detached signature, only complete one arbitrary file arg and -
-            if [[ $args -eq 2 ]]; then
-                COMPREPLY=( $(compgen -W '-' -- "$cur") )
+            if ((args == 2)); then
+                COMPREPLY=($(compgen -W '-' -- "$cur"))
                 _filedir
             fi
         else
@@ -41,6 +41,6 @@ _gpgv()
         _filedir "@(asc|gpg|sig|sign)"
     fi
 } &&
-complete -F _gpgv gpgv gpgv2
+    complete -F _gpgv gpgv gpgv2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gpgv2 b/msys2/usr/share/bash-completion/completions/gpgv2
index a3221afc0..29315c9c2 100644
--- a/msys2/usr/share/bash-completion/completions/gpgv2
+++ b/msys2/usr/share/bash-completion/completions/gpgv2
@@ -6,7 +6,7 @@ _gpgv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--weak-digest|--*-fd|-!(-*)[?h]*)
+        --help | --version | --weak-digest | --*-fd | -!(-*)[?h]*)
             return
             ;;
         --keyring)
@@ -23,15 +23,15 @@ _gpgv()
     _count_args "" "--@(weak-digest|*-fd|keyring|homedir)"
 
     if [[ $cur == -* && $args -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    if [[ $args -gt 1 ]]; then
+    if ((args > 1)); then
         if [[ ${COMP_LINE,,} == *.@(asc|sig|sign)\ * ]]; then
             # Detached signature, only complete one arbitrary file arg and -
-            if [[ $args -eq 2 ]]; then
-                COMPREPLY=( $(compgen -W '-' -- "$cur") )
+            if ((args == 2)); then
+                COMPREPLY=($(compgen -W '-' -- "$cur"))
                 _filedir
             fi
         else
@@ -41,6 +41,6 @@ _gpgv()
         _filedir "@(asc|gpg|sig|sign)"
     fi
 } &&
-complete -F _gpgv gpgv gpgv2
+    complete -F _gpgv gpgv gpgv2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gphoto2 b/msys2/usr/share/bash-completion/completions/gphoto2
index 89277a957..cbf84c0a3 100644
--- a/msys2/usr/share/bash-completion/completions/gphoto2
+++ b/msys2/usr/share/bash-completion/completions/gphoto2
@@ -18,37 +18,38 @@ _gphoto2()
             _filedir
             return
             ;;
-        -u|--upload-file)
+        -u | --upload-file)
             _filedir
             return
             ;;
         --port)
-            COMPREPLY=( $(compgen -W "$($1 --list-ports 2>/dev/null | \
-                awk 'NR>3 { print $1 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 --list-ports 2>/dev/null |
+                awk 'NR>3 { print $1 }')" -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         --camera)
             local IFS=$'\n'
-            COMPREPLY=( $(compgen -W "$($1 --list-cameras 2>/dev/null | \
-                awk -F'"' 'NR>2 { print $2 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 --list-cameras 2>/dev/null |
+                awk -F'"' 'NR>2 { print $2 }')" -- "$cur"))
             return
             ;;
-        --get-config|--set-config|--set-config-index|--set-config-value)
-            COMPREPLY=( $(compgen -W "$($1 --list-config 2>/dev/null \
-               )" -- "$cur") )
+        --get-config | --set-config | --set-config-index | --set-config-value)
+            COMPREPLY=($(compgen -W "$(
+                $1 --list-config 2>/dev/null
+            )" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
 } &&
-complete -F _gphoto2 gphoto2
+    complete -F _gphoto2 gphoto2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gprof b/msys2/usr/share/bash-completion/completions/gprof
index 40a748200..5a4ab2d4d 100644
--- a/msys2/usr/share/bash-completion/completions/gprof
+++ b/msys2/usr/share/bash-completion/completions/gprof
@@ -6,37 +6,37 @@ _gprof()
     _init_completion -s || return
 
     case $cur in
-        -A*|-C*|-J*|-p*|-P*|-q*|-Q*|-n*|-N*|-d*)
+        -A* | -C* | -J* | -p* | -P* | -q* | -Q* | -n* | -N* | -d*)
             return
             ;;
         -S*)
             cur=${cur:2}
             _filedir
-            COMPREPLY=( "${COMPREPLY[@]/#/-S}" )
+            COMPREPLY=("${COMPREPLY[@]/#/-S}")
             return
             ;;
         -O*)
             cur=${cur:2}
-            COMPREPLY=( $(compgen -P -O -W 'auto bsd 4.4bsd magic prof' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -P -O -W 'auto bsd 4.4bsd magic prof' \
+                -- "$cur"))
             return
             ;;
     esac
 
     case $prev in
-        -I|--directory-path)
+        -I | --directory-path)
             _filedir -d
             return
             ;;
-        -R|--file-ordering|--external-symbol-table)
+        -R | --file-ordering | --external-symbol-table)
             _filedir
             return
             ;;
-        -w|--width|-k|-m|--min-count|-h|--help|-e|-E|-f|-F)
+        -w | --width | -k | -m | --min-count | -h | --help | -e | -E | -f | -F)
             return
             ;;
         --file-format)
-            COMPREPLY=( $(compgen -W 'auto bsd 4.4bsd magic prof' -- "$cur") )
+            COMPREPLY=($(compgen -W 'auto bsd 4.4bsd magic prof' -- "$cur"))
             return
             ;;
     esac
@@ -44,13 +44,13 @@ _gprof()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _gprof gprof
+    complete -F _gprof gprof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/groupadd b/msys2/usr/share/bash-completion/completions/groupadd
index 013feaa46..5f67f2996 100644
--- a/msys2/usr/share/bash-completion/completions/groupadd
+++ b/msys2/usr/share/bash-completion/completions/groupadd
@@ -9,18 +9,18 @@ _groupadd()
     #       with -g/--gid
 
     case $prev in
-        --gid|--key|--password|-!(-*)[gKp])
+        --gid | --key | --password | -!(-*)[gKp])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _groupadd groupadd
+    complete -F _groupadd groupadd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/groupdel b/msys2/usr/share/bash-completion/completions/groupdel
index fcdd14c10..4d8ca7f72 100644
--- a/msys2/usr/share/bash-completion/completions/groupdel
+++ b/msys2/usr/share/bash-completion/completions/groupdel
@@ -6,22 +6,22 @@ _groupdel()
     _init_completion || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
-        -R|--root)
+        -R | --root)
             _filedir -d
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -g -- "$cur") )
+    COMPREPLY=($(compgen -g -- "$cur"))
 } &&
-complete -F _groupdel groupdel
+    complete -F _groupdel groupdel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/groupmems b/msys2/usr/share/bash-completion/completions/groupmems
index 6e599a24a..2e89a5ab4 100644
--- a/msys2/usr/share/bash-completion/completions/groupmems
+++ b/msys2/usr/share/bash-completion/completions/groupmems
@@ -6,22 +6,22 @@ _groupmems()
     _init_completion || return
 
     case $prev in
-        -a|--add|-d|--delete)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        -a | --add | -d | --delete)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        -g|--group)
-            COMPREPLY=( $(compgen -g -- "$cur") )
+        -g | --group)
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
             ;;
-        -R|--root)
+        -R | --root)
             _filedir -d
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _groupmems groupmems
+    complete -F _groupmems groupmems
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/groupmod b/msys2/usr/share/bash-completion/completions/groupmod
index 2ac62ea3c..5516d31c9 100644
--- a/msys2/usr/share/bash-completion/completions/groupmod
+++ b/msys2/usr/share/bash-completion/completions/groupmod
@@ -9,21 +9,21 @@ _groupmod()
     #       with -g/--gid
 
     case $prev in
-        --gid|--help|--new-name|--password|-!(-*)[ghnp])
+        --gid | --help | --new-name | --password | -!(-*)[ghnp])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    COMPREPLY=( $(compgen -g -- "$cur") )
+    COMPREPLY=($(compgen -g -- "$cur"))
 } &&
-complete -F _groupmod groupmod
+    complete -F _groupmod groupmod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/growisofs b/msys2/usr/share/bash-completion/completions/growisofs
index a0c6de3f7..ee09fe6c7 100644
--- a/msys2/usr/share/bash-completion/completions/growisofs
+++ b/msys2/usr/share/bash-completion/completions/growisofs
@@ -6,10 +6,10 @@ _growisofs()
     _init_completion || return
 
     case $prev in
-        -version|-speed)
+        -version | -speed)
             return
             ;;
-        -Z|-M)
+        -Z | -M)
             compopt -o nospace
             _dvd_devices
             return
@@ -24,16 +24,16 @@ _growisofs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # TODO: mkisofs options
-        COMPREPLY=( $(compgen -W '-dvd-compat -overburn -speed= -Z -M' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '-dvd-compat -overburn -speed= -Z -M' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _growisofs growisofs
+    complete -F _growisofs growisofs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/grpck b/msys2/usr/share/bash-completion/completions/grpck
index 9f5eac7b8..0fadbedc6 100644
--- a/msys2/usr/share/bash-completion/completions/grpck
+++ b/msys2/usr/share/bash-completion/completions/grpck
@@ -6,20 +6,20 @@ _grpck()
     _init_completion || return
 
     case $prev in
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _grpck grpck
+    complete -F _grpck grpck
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gsettings b/msys2/usr/share/bash-completion/completions/gsettings
index 0316e299f..d509758e9 100644
--- a/msys2/usr/share/bash-completion/completions/gsettings
+++ b/msys2/usr/share/bash-completion/completions/gsettings
@@ -35,11 +35,15 @@ __gsettings() {
           choices=$'list-schemas\nlist-relocatable-schemas\nlist-keys\nlist-children\nlist-recursively\nget\nrange\nset\nreset\nreset-recursively\nwritable\nmonitor'
           ;;
         list-keys|list-children|list-recursively|reset-recursively)
-          choices="$(gsettings $schemadir list-schemas)"$'\n'"$(gsettings $schemadir list-relocatable-schemas | sed -e 's.$.:/.')"
+          choices="$(gsettings $schemadir list-schemas 2> /dev/null)"$'\n'"$(gsettings $schemadir list-relocatable-schemas 2> /dev/null | sed -e 's.$.:/.')"
+          ;;
+        list-schemas)
+          COMPREPLY=($(compgen -W "--print-paths" -- ${COMP_WORDS[${COMP_CWORD}]}))
+          return 0
           ;;
 
         get|range|set|reset|writable|monitor|describe)
-          choices="$(gsettings $schemadir list-schemas | sed -e 's.$. .')"$'\n'"$(gsettings $schemadir list-relocatable-schemas | sed -e 's.$.:/.')"
+          choices="$(gsettings $schemadir list-schemas 2> /dev/null | sed -e 's.$. .')"$'\n'"$(gsettings $schemadir list-relocatable-schemas 2> /dev/null | sed -e 's.$.:/.')"
           ;;
       esac
       ;;
diff --git a/msys2/usr/share/bash-completion/completions/gssdp-discover b/msys2/usr/share/bash-completion/completions/gssdp-discover
index f0fa69553..8454f52a1 100644
--- a/msys2/usr/share/bash-completion/completions/gssdp-discover
+++ b/msys2/usr/share/bash-completion/completions/gssdp-discover
@@ -6,26 +6,29 @@ _gssdp_discover()
     _init_completion -s || return
 
     case $prev in
-        --help|--target|--timeout|--rescan-interval|-[htnr])
+        --help | --target | --timeout | --rescan-interval | -[htnr])
             return
             ;;
-        --interface|-i)
+        --interface | -i)
             _available_interfaces -a
             return
             ;;
-        --message-type|-m)
-            local types=$($1 --help 2>&1 | \
+        --message-type | -m)
+            local types=$($1 --help 2>&1 |
                 command sed -ne 's/^.*--message-type=.*(\([^)]*\))$/\1/p')
-            COMPREPLY=( $(IFS+=,; compgen -W "$types" -- "$cur") )
+            COMPREPLY=($(
+                IFS+=,
+                compgen -W "$types" -- "$cur"
+            ))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _gssdp_discover gssdp-discover
+    complete -F _gssdp_discover gssdp-discover
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gtar b/msys2/usr/share/bash-completion/completions/gtar
index fda739c40..04b7fc078 100644
--- a/msys2/usr/share/bash-completion/completions/gtar
+++ b/msys2/usr/share/bash-completion/completions/gtar
@@ -47,10 +47,11 @@ __gtar_parse_help_opt()
     separator=" "
 
     case "$opt" in
-        --*)
-            ;;
+        --*) ;;
+
         -\?)
-            return ;;
+            return
+            ;;
         -*)
             opttype=short
             opt=${opt##-}
@@ -76,7 +77,6 @@ __gtar_parse_help_opt()
     eval "$optvar=\"\$$optvar$separator\"\"$opt\""
 }
 
-
 __gtar_parse_help_line()
 {
     local i
@@ -84,18 +84,18 @@ __gtar_parse_help_line()
     for i in $1; do
         case "$i" in
             # regular options
-            --*|-*)
+            --* | -*)
                 __gtar_parse_help_opt "$i" "$2"
                 ;;
 
             # end once there is single non-option word
             *)
                 break
+                ;;
         esac
     done
 }
 
-
 __gnu_tar_parse_help()
 {
     local str line arg
@@ -104,7 +104,7 @@ __gnu_tar_parse_help()
         # options on lines beginning with spaces.  After that, there is one
         # or more options separated by ', ' separator string.  We are matching
         # like this then:  ^<spaces>(<separator>?<option>)+<whatever>$
-        if [[ "$line" =~ \
+        if [[ $line =~ \
             ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
 
             line=${BASH_REMATCH[1]}
@@ -115,8 +115,8 @@ __gnu_tar_parse_help()
             # description in GNU help output mentions arguments.  So the $line
             # variable may contain e.g. '-X, --XXX[=NAME], -XXX2[=NAME]'.
             arg=none
-            if [[ "$line" =~ --[A-Za-z0-9-]+(\[?)= ]]; then
-                [[ -n "${BASH_REMATCH[1]}" ]] && arg=opt || arg=req
+            if [[ $line =~ --[A-Za-z0-9-]+(\[?)= ]]; then
+                [[ -n ${BASH_REMATCH[1]} ]] && arg=opt || arg=req
             fi
 
             __gtar_parse_help_line "$str" "$arg"
@@ -124,14 +124,11 @@ __gnu_tar_parse_help()
     done <<<"$(tar --help)"
 
     long_opts="\
-        $long_arg_none\
-        $long_arg_opt\
-        $long_arg_req"
+        $long_arg_none        $long_arg_opt        $long_arg_req"
 
     short_opts="$short_arg_none$short_arg_opt$short_arg_req"
 }
 
-
 # Hack: parse --warning keywords from tar's error output
 __gtar_parse_warnings()
 {
@@ -143,32 +140,30 @@ __gtar_parse_warnings()
     done
 }
 
-
 # Helper to obtain last character of string.
 __tar_last_char()
 {
-    echo "${1: $(( ${#1} - 1))}"
+    echo "${1:$((${#1} - 1))}"
 }
 
-
 __tar_parse_old_opt()
 {
     local first_word char
 
     # current word is the first word
-    [[ "$cword" -eq 1 && -n "$cur" && "${cur:0:1}" != '-' ]] \
-        && old_opt_progress=1
+    [[ $cword -eq 1 && -n $cur && ${cur:0:1} != '-' ]] &&
+        old_opt_progress=1
 
     # check that first argument does not begin with "-"
     first_word=${words[1]}
-    [[ -n "$first_word" && "${first_word:0:1}" != "-" ]] \
-        && old_opt_used=1
+    [[ -n $first_word && ${first_word:0:1} != "-" ]] &&
+        old_opt_used=1
 
     # parse the old option (if present) contents to allow later code expect
     # corresponding arguments
-    if [[ $old_opt_used -eq 1 ]]; then
+    if ((old_opt_used == 1)); then
         char=${first_word:0:1}
-        while [[ -n "$char" ]]; do
+        while [[ -n $char ]]; do
             if __tar_is_argreq "$char"; then
                 old_opt_parsed+=("$char")
             fi
@@ -178,11 +173,10 @@ __tar_parse_old_opt()
     fi
 }
 
-
 # Make the analysis of whole command line.
 __tar_preparse_cmdline()
 {
-    local first_arg my_args tmparg i modes="ctxurdA"
+    local first_arg i modes="ctxurdA"
 
     shift # progname
 
@@ -191,7 +185,7 @@ __tar_preparse_cmdline()
     first_arg=1
     for i in "$@"; do
         case "$i" in
-            --delete|--test-label)
+            --delete | --test-label)
                 tar_mode=${i:2:100}
                 tar_mode_arg=$i
                 break
@@ -207,7 +201,7 @@ __tar_preparse_cmdline()
                 ;;
             *[$modes]*)
                 # Only the first arg may be "MODE" without leading dash
-                if [[ $first_arg -eq 1 ]]; then
+                if ((first_arg == 1)); then
                     tar_mode=${i//[^$modes]/}
                     tar_mode=${tar_mode:0:1}
                     tar_mode_arg=$i
@@ -218,7 +212,6 @@ __tar_preparse_cmdline()
     done
 }
 
-
 # Generate completions for -f/--file.
 __tar_file_option()
 {
@@ -235,7 +228,6 @@ __tar_file_option()
     esac
 }
 
-
 # Returns truth if option requires argument.  No equal sign must be pasted.
 # Accepts option in format: 'c', '-c', '--create'
 __tar_is_argreq()
@@ -244,29 +236,28 @@ __tar_is_argreq()
     opt=$1
     case "$opt" in
         -[A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt##-} ]] && return 0
+            [[ $short_arg_req =~ ${opt##-} ]] && return 0
             ;;
         [A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt} ]] && return 0
+            [[ $short_arg_req =~ ${opt} ]] && return 0
             ;;
         --*)
-            [[ "$long_arg_req" =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
+            [[ $long_arg_req =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
             ;;
     esac
 
     return 1
 }
 
-
 # Called only for short parameter
 __tar_complete_mode()
 {
-    local short_modes has_mode rawopt generated \
-          allshort_raw_unused allshort_raw \
-          filler i
+    local short_modes rawopt generated \
+        allshort_raw_unused allshort_raw \
+        filler i
 
     short_modes="ctx"
-    [[ -z "$basic_tar" ]] && short_modes="ctxurdA"
+    [[ ! -v basic_tar ]] && short_modes="ctxurdA"
 
     # Remove prefix when needed
     rawopt=${cur#-}
@@ -275,95 +266,92 @@ __tar_complete_mode()
     allshort_raw=${short_opts//[- ]/}
 
     # init the 'mode' option if no option is in ${cur}
-    if [[ "$tar_mode" == none ]]; then
+    if [[ $tar_mode == none ]]; then
 
         # when user passed something like 'tar cf' do not put the '-' before
         filler=
-        if [[ -z "$cur" && -z "$basic_tar" ]]; then
+        if [[ -z $cur && ! -v basic_tar ]]; then
             filler=-
         fi
 
         generated=""
-        for (( i=0 ; 1; i++ )); do
-            local c="${short_modes:$i:1}"
-            [[ -z "$c" ]] && break
+        for ((i = 0; 1; i++)); do
+            local c="${short_modes:i:1}"
+            [[ -z $c ]] && break
             generated+=" $filler$cur$c"
         done
 
-        COMPREPLY=( $(compgen -W "$generated" ) )
+        COMPREPLY=($(compgen -W "$generated"))
         return 0
     fi
 
     # The last short option requires argument, like '-cf<TAB>'.  Cut the
     # completion here to enforce argument processing.
-    if [[ "$old_opt_progress" -eq 0 ]] \
-        && __tar_is_argreq "$(__tar_last_char "$cur")"; then
-        COMPREPLY=( "$cur" ) && return 0
+    if ((old_opt_progress == 0)) &&
+        __tar_is_argreq "$(__tar_last_char "$cur")"; then
+        COMPREPLY=("$cur") && return 0
     fi
 
     allshort_raw_unused=${allshort_raw//[$rawopt]/}
-    if [[ "$tar_mode" != none ]]; then
-        allshort_raw_unused=${allshort_raw_unused//[$short_modes]}
+    if [[ $tar_mode != none ]]; then
+        allshort_raw_unused=${allshort_raw_unused//[$short_modes]/}
     fi
 
     generated=
-    for (( i=0 ; 1; i++ )); do
-        local c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        local c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated") )
+    COMPREPLY=($(compgen -W "$generated"))
 
     return 0
 }
 
-
 __gtar_complete_lopts()
 {
     local rv
-    COMPREPLY=( $(compgen -W "$long_opts" -- "$cur") )
+    COMPREPLY=($(compgen -W "$long_opts" -- "$cur"))
     rv=$?
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     return $rv
 }
 
-
 __gtar_complete_sopts()
 {
     local generated short_mode_opts i c
     short_mode_opts="ctxurdA"
     generated=${short_opts//[$short_mode_opts]/}
 
-    for (( i=0 ; 1; i++ )); do
-        c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated" -- "$cur") )
+    COMPREPLY=($(compgen -W "$generated" -- "$cur"))
 }
 
-
 __tar_try_mode()
 {
     case "$cur" in
         --*)
             # posix tar does not support long opts
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
             __gtar_complete_lopts
             return $?
             ;;
 
         -*)
             # posix tar does not support short optios
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
 
             __tar_complete_mode && return 0
             ;;
 
         *)
-            if [[ "$cword" -eq 1 || "$tar_mode" == none ]]; then
+            if [[ $cword -eq 1 || $tar_mode == none ]]; then
                 __tar_complete_mode && return 0
             fi
             ;;
@@ -371,31 +359,27 @@ __tar_try_mode()
     return 1
 }
 
-
 __tar_adjust_PREV_from_old_option()
 {
     # deal with old style arguments here
     # $ tar cfTC # expects this sequence of arguments:
     # $ tar cfTC ARCHIVE_FILE PATTERNS_FILE CHANGE_DIR
-    if [[ "$old_opt_used" -eq 1 && "$cword" -gt 1 \
-        && "$cword" -lt $(( ${#old_opt_parsed[@]} + 2 )) ]];
-    then
+    if ((old_opt_used == 1 && cword > 1 && \
+        cword < ${#old_opt_parsed[@]} + 2)); then
         # make e.g. 'C' option from 'cffCT'
-        prev="-${old_opt_parsed[ $cword - 2 ]}"
+        prev="-${old_opt_parsed[cword - 2]}"
     fi
 }
 
-
 __tar_extract_like_mode()
 {
     local i
     for i in x d t delete; do
-        [[ "$tar_mode" == "$i" ]] && return 0
+        [[ $tar_mode == "$i" ]] && return 0
     done
     return 1
 }
 
-
 __tar_try_list_archive()
 {
     local tarball tarbin untar i
@@ -416,13 +400,13 @@ __tar_try_list_archive()
             break
         fi
     done
-    if [[ -n "$tarball" ]]; then
+    if [[ -n $tarball ]]; then
         local IFS=$'\n'
         COMPREPLY=($(compgen -o filenames -W "$(
             $tarbin $untar "$tarball" 2>/dev/null |
-            while read line; do
-                printf "%q\n" "$(printf %q"\n" "$line")"
-            done
+                while read line; do
+                    printf "%q\n" "$(printf %q"\n" "$line")"
+                done
         )" -- "$(printf "%q\n" "$cur")"))
         return 0
     fi
@@ -430,7 +414,7 @@ __tar_try_list_archive()
 
 __tar_cleanup_prev()
 {
-    if [[ "$prev" =~ ^-[a-zA-Z0-9?]*$ ]]; then
+    if [[ $prev =~ ^-[a-zA-Z0-9?]*$ ]]; then
         # transform '-caf' ~> '-f'
         prev="-$(__tar_last_char "$prev")"
     fi
@@ -448,11 +432,11 @@ __tar_detect_ext()
         ?(-)*[cr]*f)
             ext='@(tar|gem|spkg)'
             case ${words[1]} in
-                *a*)    ext="$tars"               ;;
-                *z*)    ext='t?(ar.)gz'           ;;
-                *Z*)    ext='ta@(r.Z|z)'          ;;
+                *a*) ext="$tars" ;;
+                *z*) ext='t?(ar.)gz' ;;
+                *Z*) ext='ta@(r.Z|z)' ;;
                 *[jy]*) ext='t@(?(ar.)bz?(2)|b2)' ;;
-                *J*)    ext='t?(ar.)xz'           ;;
+                *J*) ext='t?(ar.)xz' ;;
             esac
             ;;
         +([^ZzJjy])f)
@@ -470,14 +454,13 @@ __tar_detect_ext()
     esac
 }
 
-
 _gtar()
 {
-    local long_opts short_opts                          \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=0 old_opt_parsed=()
+    local long_opts short_opts \
+        long_arg_none="" long_arg_opt="" long_arg_req="" \
+        short_arg_none="" short_arg_opt="" short_arg_req="" \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=0 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -486,9 +469,9 @@ _gtar()
     # FIXME: handle long options
     local tar_mode_arg=
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set -x
-        PS4="\$BASH_SOURCE:\$LINENO: "
+        PS4='$BASH_SOURCE:$LINENO: '
     fi
 
     local cur prev words cword split
@@ -500,7 +483,7 @@ _gtar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -513,53 +496,53 @@ _gtar()
         # user (TODO: is there any sane way to deal with this?).  This case
         # statement successes only if there already is PREV.
         case $prev in
-            --directory|-!(-*)C)
+            --directory | -!(-*)C)
                 _filedir -d
                 break
                 ;;
             --atime-preserve)
-                COMPREPLY=( $(compgen -W 'replace system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'replace system' -- "$cur"))
                 break
                 ;;
             --group)
-                COMPREPLY=( $(compgen -g -- "$cur") )
+                COMPREPLY=($(compgen -g -- "$cur"))
                 break
                 ;;
             --owner)
-                COMPREPLY=( $(compgen -u -- "$cur") )
+                COMPREPLY=($(compgen -u -- "$cur"))
                 break
                 ;;
-            --info-script|--new-volume-script|--rmt-command|--rsh-command|\
-            --use-compress-program|-!(-*)[FI])
+            --info-script | --new-volume-script | --rmt-command | --rsh-command | \
+                --use-compress-program | -!(-*)[FI])
                 compopt -o filenames
-                COMPREPLY=( $(compgen -c -- "$cur") )
+                COMPREPLY=($(compgen -c -- "$cur"))
                 break
                 ;;
-            --volno-file|--add-file|--files-from|--exclude-from|\
-            --index-file|--listed-incremental|-!(-*)[TXg])
+            --volno-file | --add-file | --files-from | --exclude-from | \
+                --index-file | --listed-incremental | -!(-*)[TXg])
                 _filedir
                 break
                 ;;
-            --format|-!(-*)H)
-                COMPREPLY=( $(compgen -W 'gnu oldgnu pax posix ustar v7' \
-                    -- "$cur") )
+            --format | -!(-*)H)
+                COMPREPLY=($(compgen -W 'gnu oldgnu pax posix ustar v7' \
+                    -- "$cur"))
                 break
                 ;;
             --quoting-style)
-                COMPREPLY=( $(compgen -W 'literal shell shell-always c c-maybe
-                    escape locale clocale' -- "$cur") )
+                COMPREPLY=($(compgen -W 'literal shell shell-always c c-maybe
+                    escape locale clocale' -- "$cur"))
                 break
                 ;;
             --totals)
-                COMPREPLY=( $(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
+                    -- "$cur"))
                 break
                 ;;
             --warning)
-                COMPREPLY=( $(compgen -W "$(__gtar_parse_warnings)" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(__gtar_parse_warnings)" -- "$cur"))
                 break
                 ;;
-            --file|-!(-*)f)
+            --file | -!(-*)f)
                 __tar_file_option "$ext"
                 break
                 ;;
@@ -581,7 +564,7 @@ _gtar()
                 ;;
             -!(-*)[a-zA-Z0-9?])
                 # argument required but no completion yet
-                [[ "$short_arg_req" =~ ${prev##-} ]] && break
+                [[ $short_arg_req =~ ${prev##-} ]] && break
                 ;;
         esac
 
@@ -612,7 +595,7 @@ _gtar()
 
         # the first argument must be "mode" argument or --param, if any of those
         # was truth - the 'break' statement would have been already called
-        [[ "$cword" -eq 1 ]] && break
+        ((cword == 1)) && break
 
         __tar_try_list_archive && break
 
@@ -624,13 +607,12 @@ _gtar()
         break
     done # just-for-easy-break while
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set +x
         unset PS4
     fi
 }
 
-
 __tar_posix_prev_handle()
 {
     case "$prev" in
@@ -640,19 +622,19 @@ __tar_posix_prev_handle()
             ;;
         -b)
             return 0
+            ;;
     esac
 
     return 1
 }
 
-
 _posix_tar()
 {
-    local long_opts short_opts basic_tar                \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=1 old_opt_parsed=()
+    local long_opts short_opts basic_tar \
+        long_arg_none="" long_arg_opt long_arg_req="" \
+        short_arg_none short_arg_opt short_arg_req \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=1 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -675,7 +657,7 @@ _posix_tar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -691,23 +673,22 @@ _posix_tar()
     _filedir
 }
 
-
 _tar()
 {
     local cmd=${COMP_WORDS[0]} func line
     line="$($cmd --version 2>/dev/null)"
     case "$line" in
-    *GNU*)
-        func=_gtar
-        ;;
-    *)
-        func=_posix_tar
-        ;;
+        *GNU*)
+            func=_gtar
+            ;;
+        *)
+            func=_posix_tar
+            ;;
     esac
     $func "$@"
 
     # Install real completion for subsequent completions
-    if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
+    if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
         complete -F $func -o dirnames tar
     else
         complete -F $func tar
@@ -715,17 +696,16 @@ _tar()
     unset -f _tar
 }
 
-
-if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
-    complete -F _tar        -o dirnames tar
-    complete -F _gtar       -o dirnames gtar
-    complete -F _posix_tar  -o dirnames bsdtar
-    complete -F _posix_tar  -o dirnames star
+if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
+    complete -F _tar -o dirnames tar
+    complete -F _gtar -o dirnames gtar
+    complete -F _posix_tar -o dirnames bsdtar
+    complete -F _posix_tar -o dirnames star
 else
-    complete -F _tar        tar
-    complete -F _gtar       gtar
-    complete -F _posix_tar  bsdtar
-    complete -F _posix_tar  star
+    complete -F _tar tar
+    complete -F _gtar gtar
+    complete -F _posix_tar bsdtar
+    complete -F _posix_tar star
 fi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/gzip b/msys2/usr/share/bash-completion/completions/gzip
index d3bce2821..0144c3a33 100644
--- a/msys2/usr/share/bash-completion/completions/gzip
+++ b/msys2/usr/share/bash-completion/completions/gzip
@@ -6,38 +6,38 @@ _gzip()
     _init_completion || return
 
     case $prev in
-        --blocksize|--suffix|--help|--version|-!(-*)[bShV])
+        --blocksize | --suffix | --help | --version | -!(-*)[bShV])
             return
             ;;
-        --processes|-!(-*)p)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --processes | -!(-*)p)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
     [[ ${1##*/} == pigz ]] && xspec="*.@([gz]z|t[ag]z)"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --force ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dlt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*f* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --force ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dlt]* ]] && xspec="!"$xspec
+        [[ $prev == -*f* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") \
-        $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur")
+    $(compgen -d -- "$cur"))
 } &&
-complete -F _gzip gzip pigz
+    complete -F _gzip gzip pigz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hciattach b/msys2/usr/share/bash-completion/completions/hciattach
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/hciattach
+++ b/msys2/usr/share/bash-completion/completions/hciattach
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hciconfig b/msys2/usr/share/bash-completion/completions/hciconfig
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/hciconfig
+++ b/msys2/usr/share/bash-completion/completions/hciconfig
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hcitool b/msys2/usr/share/bash-completion/completions/hcitool
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/hcitool
+++ b/msys2/usr/share/bash-completion/completions/hcitool
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hd b/msys2/usr/share/bash-completion/completions/hd
index a3c2a839c..785f5976c 100644
--- a/msys2/usr/share/bash-completion/completions/hd
+++ b/msys2/usr/share/bash-completion/completions/hd
@@ -9,7 +9,7 @@ _hexdump()
     _init_completion || return
 
     case $prev in
-        -V|-e|-n|-s)
+        -V | -e | -n | -s)
             return
             ;;
         -f)
@@ -20,12 +20,12 @@ _hexdump()
 
     if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _hexdump hexdump hd
+    complete -F _hexdump hexdump hd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hddtemp b/msys2/usr/share/bash-completion/completions/hddtemp
index b7487cc92..7b95f0eec 100644
--- a/msys2/usr/share/bash-completion/completions/hddtemp
+++ b/msys2/usr/share/bash-completion/completions/hddtemp
@@ -6,19 +6,19 @@ _hddtemp()
     _init_completion -s || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir db
             return
             ;;
-        --listen|-!(-*)l)
+        --listen | -!(-*)l)
             _ip_addresses
             return
             ;;
-        --unit|-!(-*)u)
-            COMPREPLY=( $(compgen -W 'C F' -- "$cur") )
+        --unit | -!(-*)u)
+            COMPREPLY=($(compgen -W 'C F' -- "$cur"))
             return
             ;;
-        --port|--separator|--syslog|--version|--help|-!(-*)[psSvh?])
+        --port | --separator | --syslog | --version | --help | -!(-*)[psSvh?])
             return
             ;;
     esac
@@ -26,13 +26,13 @@ _hddtemp()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") --help' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") --help' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         cur=${cur:=/dev/}
         _filedir
     fi
 } &&
-complete -F _hddtemp hddtemp
+    complete -F _hddtemp hddtemp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hid2hci b/msys2/usr/share/bash-completion/completions/hid2hci
index 9e3305d06..f33a49575 100644
--- a/msys2/usr/share/bash-completion/completions/hid2hci
+++ b/msys2/usr/share/bash-completion/completions/hid2hci
@@ -5,11 +5,11 @@ _hid2hci()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--help --quiet -0 --tohci -1 --tohid' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--help --quiet -0 --tohci -1 --tohid' \
+            -- "$cur"))
     fi
 } &&
-complete -F _hid2hci hid2hci
+    complete -F _hid2hci hid2hci
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/host b/msys2/usr/share/bash-completion/completions/host
index 267d0c308..3341b1f64 100644
--- a/msys2/usr/share/bash-completion/completions/host
+++ b/msys2/usr/share/bash-completion/completions/host
@@ -2,15 +2,15 @@
 
 _bind_queryclass()
 {
-    COMPREPLY+=( $(compgen -W 'IN CH HS ANY' -- "$cur") )
+    COMPREPLY+=($(compgen -W 'IN CH HS ANY' -- "$cur"))
 }
 
 _bind_querytype()
 {
-    # http://en.wikipedia.org/wiki/List_of_DNS_record_types
-    COMPREPLY+=( $(compgen -W 'A AAAA AFSDB APL CERT CNAME DHCID DLV DNAME
+    # https://en.wikipedia.org/wiki/List_of_DNS_record_types
+    COMPREPLY+=($(compgen -W 'A AAAA AFSDB APL CERT CNAME DHCID DLV DNAME
         DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR
-        RRSIG RP SIG SOA SPF SRV SSHFP TXT' -- "$cur") )
+        RRSIG RP SIG SOA SPF SRV SSHFP TXT' -- "$cur"))
 }
 
 _nslookup()
@@ -19,12 +19,12 @@ _nslookup()
     _init_completion -n = || return
 
     case $cur in
-        -class=*|-cl=*)
+        -class=* | -cl=*)
             cur=${cur#*=}
             _bind_queryclass
             return
             ;;
-        -querytype=*|-type=*|-q=*|-ty=*)
+        -querytype=* | -type=* | -q=* | -ty=*)
             cur=${cur#*=}
             _bind_querytype
             return
@@ -35,21 +35,21 @@ _nslookup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-all -class= -debug -nodebug -d2 -nod2
+        COMPREPLY=($(compgen -W '-all -class= -debug -nodebug -d2 -nod2
             -domain= -search -nosearch -port= -querytype= -recurse -norecurse
-            -retry= -timeout= -vc -novc -fail -nofail' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+            -retry= -timeout= -vc -novc -fail -nofail' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local args
     _count_args =
-    if [[ $args -le 2 ]]; then
+    if ((args <= 2)); then
         _known_hosts_real -- "$cur"
-        [[ $args -eq 1 && $cur == @(|-) ]] && COMPREPLY+=( - )
+        [[ $args -eq 1 && $cur == @(|-) ]] && COMPREPLY+=(-)
     fi
 } &&
-complete -F _nslookup nslookup
+    complete -F _nslookup nslookup
 
 _host()
 {
@@ -66,21 +66,21 @@ _host()
             return
             ;;
         -m)
-            COMPREPLY=( $(compgen -W 'trace record usage' -- "$cur") )
+            COMPREPLY=($(compgen -W 'trace record usage' -- "$cur"))
             return
             ;;
-        -N|-R|-W)
+        -N | -R | -W)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _known_hosts_real -- "$cur"
 } &&
-complete -F _host host
+    complete -F _host host
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hostname b/msys2/usr/share/bash-completion/completions/hostname
index 68f9b4ed1..ce1b32e2c 100644
--- a/msys2/usr/share/bash-completion/completions/hostname
+++ b/msys2/usr/share/bash-completion/completions/hostname
@@ -6,18 +6,18 @@ _hostname()
     _init_completion || return
 
     case $prev in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --file|-!(-*)F)
+        --file | -!(-*)F)
             _filedir
             return
             ;;
     esac
 
-    [[ $cur == -* ]] && \
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    [[ $cur == -* ]] &&
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _hostname hostname
+    complete -F _hostname hostname
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hping b/msys2/usr/share/bash-completion/completions/hping
index 78d35b05d..666838b1a 100644
--- a/msys2/usr/share/bash-completion/completions/hping
+++ b/msys2/usr/share/bash-completion/completions/hping
@@ -6,30 +6,30 @@ _hping2()
     _init_completion || return
 
     case $prev in
-        --interface|-!(-*)I)
+        --interface | -!(-*)I)
             _available_interfaces
             return
             ;;
-        --spoof|-!(-*)a)
+        --spoof | -!(-*)a)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --tos|-!(-*)o)
-            COMPREPLY=( $(compgen -W '02 04 08 10') )
+        --tos | -!(-*)o)
+            COMPREPLY=($(compgen -W '02 04 08 10'))
             return
             ;;
-        --file|-!(-*)E)
+        --file | -!(-*)E)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _hping2 hping hping2 hping3
+    complete -F _hping2 hping hping2 hping3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hping2 b/msys2/usr/share/bash-completion/completions/hping2
index 78d35b05d..666838b1a 100644
--- a/msys2/usr/share/bash-completion/completions/hping2
+++ b/msys2/usr/share/bash-completion/completions/hping2
@@ -6,30 +6,30 @@ _hping2()
     _init_completion || return
 
     case $prev in
-        --interface|-!(-*)I)
+        --interface | -!(-*)I)
             _available_interfaces
             return
             ;;
-        --spoof|-!(-*)a)
+        --spoof | -!(-*)a)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --tos|-!(-*)o)
-            COMPREPLY=( $(compgen -W '02 04 08 10') )
+        --tos | -!(-*)o)
+            COMPREPLY=($(compgen -W '02 04 08 10'))
             return
             ;;
-        --file|-!(-*)E)
+        --file | -!(-*)E)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _hping2 hping hping2 hping3
+    complete -F _hping2 hping hping2 hping3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hping3 b/msys2/usr/share/bash-completion/completions/hping3
index 78d35b05d..666838b1a 100644
--- a/msys2/usr/share/bash-completion/completions/hping3
+++ b/msys2/usr/share/bash-completion/completions/hping3
@@ -6,30 +6,30 @@ _hping2()
     _init_completion || return
 
     case $prev in
-        --interface|-!(-*)I)
+        --interface | -!(-*)I)
             _available_interfaces
             return
             ;;
-        --spoof|-!(-*)a)
+        --spoof | -!(-*)a)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --tos|-!(-*)o)
-            COMPREPLY=( $(compgen -W '02 04 08 10') )
+        --tos | -!(-*)o)
+            COMPREPLY=($(compgen -W '02 04 08 10'))
             return
             ;;
-        --file|-!(-*)E)
+        --file | -!(-*)E)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _hping2 hping hping2 hping3
+    complete -F _hping2 hping hping2 hping3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/htop b/msys2/usr/share/bash-completion/completions/htop
index 3f1680b5a..b4916d5bf 100644
--- a/msys2/usr/share/bash-completion/completions/htop
+++ b/msys2/usr/share/bash-completion/completions/htop
@@ -6,15 +6,15 @@ _htop()
     _init_completion -s || return
 
     case "$prev" in
-        --sort-key|-!(-*)s)
-            COMPREPLY=( $(compgen -W '$("$1" -s help)' -- "$cur") )
+        --sort-key | -!(-*)s)
+            COMPREPLY=($(compgen -W '$("$1" -s help)' -- "$cur"))
             return
             ;;
-        --user|-!(-*)u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -!(-*)u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        --delay|-!(-*)d)
+        --delay | -!(-*)d)
             # argument required but no completions available
             return
             ;;
@@ -22,12 +22,12 @@ _htop()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _htop htop
+    complete -F _htop htop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/htpasswd b/msys2/usr/share/bash-completion/completions/htpasswd
index 827e6dcc6..527684bf3 100644
--- a/msys2/usr/share/bash-completion/completions/htpasswd
+++ b/msys2/usr/share/bash-completion/completions/htpasswd
@@ -6,28 +6,31 @@ _htpasswd()
     _init_completion || return
 
     local i o=0 # $o is index of first non-option argument
-    for (( i=1; i <= cword; i++ )); do
+    for ((i = 1; i <= cword; i++)); do
         case ${words[i]} in
-            -*n*) return       ;;
-            -*)                ;;
-            *)    o=$i ; break ;;
+            -*n*) return ;;
+            -*) ;;
+            *)
+                o=$i
+                break
+                ;;
         esac
     done
 
-    if [[ $o -eq 0 || $o -eq $cword ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if ((o == 0 || o == cword)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
             return
         fi
         # Password file (first non-option argument)
         _filedir
 
-    elif [[ $o -eq $cword-1 ]]; then
+    elif ((o == cword - 1)); then
         # Username (second non-option argument)
-        COMPREPLY=( $(compgen -W \
-            '$(cut -d: -f1 "${words[o]}" 2>/dev/null)' -- "$cur") )
+        COMPREPLY=($(compgen -W \
+            '$(cut -d: -f1 "${words[o]}" 2>/dev/null)' -- "$cur"))
     fi
 } &&
-complete -F _htpasswd htpasswd
+    complete -F _htpasswd htpasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/hunspell b/msys2/usr/share/bash-completion/completions/hunspell
index 627f3e4b1..92b4fe848 100644
--- a/msys2/usr/share/bash-completion/completions/hunspell
+++ b/msys2/usr/share/bash-completion/completions/hunspell
@@ -6,18 +6,19 @@ _hunspell()
     _init_completion || return
 
     case $prev in
-        --help|--version|-vv|-[hPv])
+        --help | --version | -vv | -[hPv])
             return
             ;;
         -d)
-            local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
-            local -a dicts=( /usr/share/hunspell/*.dic
-                             /usr/local/share/hunspell/*.dic )
-            dicts=( "${dicts[@]##*/}" )
-            dicts=( "${dicts[@]%.dic}" )
+            local IFS=$' \t\n' reset=$(shopt -p nullglob)
+            shopt -s nullglob
+            local -a dicts=(/usr/share/hunspell/*.dic
+                /usr/local/share/hunspell/*.dic)
+            dicts=("${dicts[@]##*/}")
+            dicts=("${dicts[@]%.dic}")
             $reset
             IFS=$'\n'
-            COMPREPLY=( $(compgen -W '${dicts[@]}' -- "$cur") )
+            COMPREPLY=($(compgen -W '${dicts[@]}' -- "$cur"))
             return
             ;;
         -i)
@@ -31,12 +32,12 @@ _hunspell()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _hunspell hunspell
+    complete -F _hunspell hunspell
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iceweasel b/msys2/usr/share/bash-completion/completions/iceweasel
index eeaca9f67..4656f8df4 100644
--- a/msys2/usr/share/bash-completion/completions/iceweasel
+++ b/msys2/usr/share/bash-completion/completions/iceweasel
@@ -8,12 +8,12 @@ _firefox()
     [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=}
 
     case $prev in
-        --help|--version|--display|--UILocale|-MOZ_LOG|--new-window|--new-tab|\
-        --private-window|--window-size|--search|--start-debugger-server|\
-        --recording|--debugger-args|-[hvPa])
+        --help | --version | --display | --UILocale | -MOZ_LOG | --new-window | --new-tab | \
+            --private-window | --window-size | --search | --start-debugger-server | \
+            --recording | --debugger-args | -[hvPa])
             return
             ;;
-        --profile|--screenshot)
+        --profile | --screenshot)
             _filedir -d
             return
             ;;
@@ -25,8 +25,8 @@ _firefox()
             _filedir
             return
             ;;
-        --debugger|-d)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        --debugger | -d)
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
@@ -34,13 +34,13 @@ _firefox()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([xs])htm?(l)|pdf)"
+    _filedir "@(?([xs])htm?(l)|pdf|txt)"
 } &&
-complete -F _firefox firefox mozilla-firefox iceweasel
+    complete -F _firefox firefox mozilla-firefox iceweasel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iconv b/msys2/usr/share/bash-completion/completions/iconv
index 372c525bb..81ae01ba6 100644
--- a/msys2/usr/share/bash-completion/completions/iconv
+++ b/msys2/usr/share/bash-completion/completions/iconv
@@ -2,8 +2,8 @@
 
 _iconv_charsets()
 {
-    COMPREPLY+=( $(compgen -X ... -W '$(${1:-iconv} -l | \
-        command sed -e "s@/*\$@@" -e "s/[,()]//g")' -- "$cur") )
+    COMPREPLY+=($(compgen -X ... -W '$(${1:-iconv} -l | \
+        command sed -e "s@/*\$@@" -e "s/[,()]//g")' -- "$cur"))
 }
 
 _iconv()
@@ -12,15 +12,15 @@ _iconv()
     _init_completion -s || return
 
     case $prev in
-        --help|--usage|--version|--unicode-subst|--byte-subst|\
-        --widechar-subst|-!(-*)[?V])
+        --help | --usage | --version | --unicode-subst | --byte-subst | \
+            --widechar-subst | -!(-*)[?V])
             return
             ;;
-        --from-code|--to-code|-!(-*)[ft])
+        --from-code | --to-code | -!(-*)[ft])
             _iconv_charsets $1
             return
             ;;
-        --output|-!(-*)o)
+        --output | -!(-*)o)
             _filedir
             return
             ;;
@@ -28,11 +28,11 @@ _iconv()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _iconv -o default iconv
+    complete -F _iconv -o default iconv
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/id b/msys2/usr/share/bash-completion/completions/id
index 3f3087cb4..a07e51dc5 100644
--- a/msys2/usr/share/bash-completion/completions/id
+++ b/msys2/usr/share/bash-completion/completions/id
@@ -5,14 +5,14 @@ _id()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
         [[ $opts ]] || opts="-G -g -u" # POSIX fallback
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     else
-        COMPREPLY=( $(compgen -u "$cur") )
+        COMPREPLY=($(compgen -u "$cur"))
     fi
 } &&
-complete -F _id id
+    complete -F _id id
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/identify b/msys2/usr/share/bash-completion/completions/identify
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/identify
+++ b/msys2/usr/share/bash-completion/completions/identify
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/idn b/msys2/usr/share/bash-completion/completions/idn
index 39d13021f..8023f8fdc 100644
--- a/msys2/usr/share/bash-completion/completions/idn
+++ b/msys2/usr/share/bash-completion/completions/idn
@@ -6,21 +6,21 @@ _idn()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --profile|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'Nameprep iSCSI Nodeprep Resourceprep
-                trace SASLprep' -- "$cur") )
+        --profile | -!(-*)p)
+            COMPREPLY=($(compgen -W 'Nameprep iSCSI Nodeprep Resourceprep
+                trace SASLprep' -- "$cur"))
             return
             ;;
     esac
 
     if ! $split && [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _idn idn
+    complete -F _idn idn
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ifdown b/msys2/usr/share/bash-completion/completions/ifdown
index db8de8e06..5b35bfb24 100644
--- a/msys2/usr/share/bash-completion/completions/ifdown
+++ b/msys2/usr/share/bash-completion/completions/ifdown
@@ -8,10 +8,10 @@ _ifupdown()
     _init_completion || return
 
     case $prev in
-        --help|--version|--allow|--exclude|--option|-!(-*)[hVXo])
+        --help | --version | --allow | --exclude | --option | -!(-*)[hVXo])
             return
             ;;
-        --interfaces|-!(-*)i)
+        --interfaces | -!(-*)i)
             _filedir
             return
             ;;
@@ -22,18 +22,18 @@ _ifupdown()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     local args
     _count_args "" "@(--allow|-i|--interfaces|--state-dir|-X|--exclude|-o)"
 
-    if [[ $args -eq 1 ]]; then
+    if ((args == 1)); then
         _configured_interfaces
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     fi
 } &&
-complete -F _ifupdown ifup ifdown ifquery ifstatus
+    complete -F _ifupdown ifup ifdown ifquery ifstatus
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ifquery b/msys2/usr/share/bash-completion/completions/ifquery
index db8de8e06..5b35bfb24 100644
--- a/msys2/usr/share/bash-completion/completions/ifquery
+++ b/msys2/usr/share/bash-completion/completions/ifquery
@@ -8,10 +8,10 @@ _ifupdown()
     _init_completion || return
 
     case $prev in
-        --help|--version|--allow|--exclude|--option|-!(-*)[hVXo])
+        --help | --version | --allow | --exclude | --option | -!(-*)[hVXo])
             return
             ;;
-        --interfaces|-!(-*)i)
+        --interfaces | -!(-*)i)
             _filedir
             return
             ;;
@@ -22,18 +22,18 @@ _ifupdown()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     local args
     _count_args "" "@(--allow|-i|--interfaces|--state-dir|-X|--exclude|-o)"
 
-    if [[ $args -eq 1 ]]; then
+    if ((args == 1)); then
         _configured_interfaces
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     fi
 } &&
-complete -F _ifupdown ifup ifdown ifquery ifstatus
+    complete -F _ifupdown ifup ifdown ifquery ifstatus
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ifstat b/msys2/usr/share/bash-completion/completions/ifstat
index 9fac3d304..629786e4b 100644
--- a/msys2/usr/share/bash-completion/completions/ifstat
+++ b/msys2/usr/share/bash-completion/completions/ifstat
@@ -6,7 +6,7 @@ _ifstat()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--scan|--interval|-!(-*)[hvV])
+        --help | --version | --scan | --interval | -!(-*)[hvV])
             return
             ;;
         -!(-*)i)
@@ -17,18 +17,22 @@ _ifstat()
         -!(-*)d)
             # iproute2: no completion (scan delay)
             # traditional: parse driver
-            if ! { "$1" --help 2>&1 || :; } | \
-                    command grep -q -- '-d.*--scan'; then
-                COMPREPLY=( $(compgen -W '$("$1" -v | command \
-                    sed -e "s/[,.]//g" -ne "s/^.*drivers://p")' -- "$cur") )
+            if ! {
+                "$1" --help 2>&1 || :
+            } |
+                command grep -q -- '-d.*--scan'; then
+                COMPREPLY=($(compgen -W '$("$1" -v | command \
+                    sed -e "s/[,.]//g" -ne "s/^.*drivers://p")' -- "$cur"))
             fi
             return
             ;;
-        --noupdate|-!(-*)s)
+        --noupdate | -!(-*)s)
             # iproute2: pass through (skip history update)
             # traditional: hostnames (snmp)
-            if ! { "$1" --help 2>&1 || :; } | \
-                    command grep -q -- '-s.*--noupdate'; then
+            if ! {
+                "$1" --help 2>&1 || :
+            } |
+                command grep -q -- '-s.*--noupdate'; then
                 _known_hosts_real -- "$cur"
                 return
             fi
@@ -36,27 +40,29 @@ _ifstat()
         -!(-*)t)
             # iproute2: no completion (interval)
             # traditional: pass through (add timestamp)
-            ! { "$1" --help 2>&1 || :; } | \
+            ! {
+                "$1" --help 2>&1 || :
+            } |
                 command grep -q -- '-t.*--interval' || return
             ;;
-        --extended|-!(-*)x)
+        --extended | -!(-*)x)
             # iproute2: parse xstat types
-            COMPREPLY=( $(compgen -W '$("$1" -x nonexistent-xstat 2>&1 |
+            COMPREPLY=($(compgen -W '$("$1" -x nonexistent-xstat 2>&1 |
                 awk "found { print \$1 } /supported xstats:/ { found=1 }")' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _ifstat ifstat
+    complete -F _ifstat ifstat
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ifstatus b/msys2/usr/share/bash-completion/completions/ifstatus
index db8de8e06..5b35bfb24 100644
--- a/msys2/usr/share/bash-completion/completions/ifstatus
+++ b/msys2/usr/share/bash-completion/completions/ifstatus
@@ -8,10 +8,10 @@ _ifupdown()
     _init_completion || return
 
     case $prev in
-        --help|--version|--allow|--exclude|--option|-!(-*)[hVXo])
+        --help | --version | --allow | --exclude | --option | -!(-*)[hVXo])
             return
             ;;
-        --interfaces|-!(-*)i)
+        --interfaces | -!(-*)i)
             _filedir
             return
             ;;
@@ -22,18 +22,18 @@ _ifupdown()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     local args
     _count_args "" "@(--allow|-i|--interfaces|--state-dir|-X|--exclude|-o)"
 
-    if [[ $args -eq 1 ]]; then
+    if ((args == 1)); then
         _configured_interfaces
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     fi
 } &&
-complete -F _ifupdown ifup ifdown ifquery ifstatus
+    complete -F _ifupdown ifup ifdown ifquery ifstatus
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iftop b/msys2/usr/share/bash-completion/completions/iftop
index 6320316d1..b73f4b6b8 100644
--- a/msys2/usr/share/bash-completion/completions/iftop
+++ b/msys2/usr/share/bash-completion/completions/iftop
@@ -6,7 +6,7 @@ _iftop()
     _init_completion || return
 
     case $prev in
-        -h|-f|-F|-m)
+        -h | -f | -F | -m)
             return
             ;;
         -i)
@@ -19,8 +19,8 @@ _iftop()
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
 } &&
-complete -F _iftop iftop
+    complete -F _iftop iftop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ifup b/msys2/usr/share/bash-completion/completions/ifup
index db8de8e06..5b35bfb24 100644
--- a/msys2/usr/share/bash-completion/completions/ifup
+++ b/msys2/usr/share/bash-completion/completions/ifup
@@ -8,10 +8,10 @@ _ifupdown()
     _init_completion || return
 
     case $prev in
-        --help|--version|--allow|--exclude|--option|-!(-*)[hVXo])
+        --help | --version | --allow | --exclude | --option | -!(-*)[hVXo])
             return
             ;;
-        --interfaces|-!(-*)i)
+        --interfaces | -!(-*)i)
             _filedir
             return
             ;;
@@ -22,18 +22,18 @@ _ifupdown()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     local args
     _count_args "" "@(--allow|-i|--interfaces|--state-dir|-X|--exclude|-o)"
 
-    if [[ $args -eq 1 ]]; then
+    if ((args == 1)); then
         _configured_interfaces
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
     fi
 } &&
-complete -F _ifupdown ifup ifdown ifquery ifstatus
+    complete -F _ifupdown ifup ifdown ifquery ifstatus
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/import b/msys2/usr/share/bash-completion/completions/import
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/import
+++ b/msys2/usr/share/bash-completion/completions/import
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/influx b/msys2/usr/share/bash-completion/completions/influx
index bbedf10f7..e9362e7ef 100644
--- a/msys2/usr/share/bash-completion/completions/influx
+++ b/msys2/usr/share/bash-completion/completions/influx
@@ -6,27 +6,30 @@ _influx()
     _init_completion || return
 
     case $prev in
-        -version|-port|-database|-password|-username|-execute|-pps)
+        -version | -port | -database | -password | -username | -execute | -pps)
             return
             ;;
         -host)
             _known_hosts_real -- "$cur"
             return
             ;;
-        -format|-precision|-consistency)
+        -format | -precision | -consistency)
             local args=$($1 --help 2>&1 | awk "\$1 == \"$prev\" { print \$2 }")
-            COMPREPLY=( $(IFS+="\"'|"; compgen -W "$args" -- "$cur") )
+            COMPREPLY=($(
+                IFS+="\"'|"
+                compgen -W "$args" -- "$cur"
+            ))
             return
             ;;
-        -import|-path)
+        -import | -path)
             _filedir
             return
             ;;
     esac
 
-    [[ "$cur" == -* ]] &&
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    [[ $cur == -* ]] &&
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _influx influx
+    complete -F _influx influx
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/info b/msys2/usr/share/bash-completion/completions/info
index 87179ac88..f50f8424a 100644
--- a/msys2/usr/share/bash-completion/completions/info
+++ b/msys2/usr/share/bash-completion/completions/info
@@ -6,13 +6,13 @@ _info()
     _init_completion -s || return
 
     # default completion if parameter looks like a path
-    if [[ "$cur" == @(*/|[.~])* ]]; then
+    if [[ $cur == @(*/|[.~])* ]]; then
         _filedir
         return
     fi
 
     case $prev in
-        --apropos|--index-search|--node|--help|--version|-!(-*)[knhv])
+        --apropos | --index-search | --node | --help | --version | -!(-*)[knhv])
             return
             ;;
         -!(-*)d)
@@ -25,7 +25,7 @@ _info()
             _filedir -d
             return
             ;;
-        --dribble|--file|--output|--restore|--raw-filename|--rcfile|-!(-*)[for])
+        --dribble | --file | --output | --restore | --raw-filename | --rcfile | -!(-*)[for])
             _filedir
             return
             ;;
@@ -34,14 +34,14 @@ _info()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local i infopath=/usr/share/info
 
-    if [[ $INFOPATH == *: ]]; then
+    if [[ ${INFOPATH-} == *: ]]; then
         infopath=${INFOPATH}${infopath}
     elif [[ ${INFOPATH:+set} ]]; then
         infopath=$INFOPATH
@@ -57,18 +57,18 @@ _info()
     fi
 
     # redirect stderr for when path doesn't exist
-    COMPREPLY=( $(eval command ls "$infopath" 2>/dev/null) )
+    COMPREPLY=($(eval command ls "$infopath" 2>/dev/null))
     # weed out directory path names and paths to info pages
-    COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
+    COMPREPLY=(${COMPREPLY[@]##*/?(:)})
     # weed out info dir file
-    for (( i=0 ; i < ${#COMPREPLY[@]} ; ++i )); do
-        [[ ${COMPREPLY[$i]} == dir ]] && unset "COMPREPLY[$i]"
+    for i in ${!COMPREPLY[*]}; do
+        [[ ${COMPREPLY[i]} == dir ]] && unset "COMPREPLY[i]"
     done
     # strip suffix from info pages
-    COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|xz|lzma)} )
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}") )
+    COMPREPLY=(${COMPREPLY[@]%.@(gz|bz2|xz|lzma)})
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}"))
 
 } &&
-complete -F _info info pinfo
+    complete -F _info info pinfo
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/inject b/msys2/usr/share/bash-completion/completions/inject
index 8becf274a..fad73a19f 100644
--- a/msys2/usr/share/bash-completion/completions/inject
+++ b/msys2/usr/share/bash-completion/completions/inject
@@ -6,7 +6,7 @@ _inject()
     _init_completion -s || return
 
     case $prev in
-        -l|--listname)
+        -l | --listname)
             _xfunc list_lists _mailman_lists
             return
             ;;
@@ -14,13 +14,13 @@ _inject()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--listname --queue --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--listname --queue --help' -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _inject inject
+    complete -F _inject inject
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/inotifywait b/msys2/usr/share/bash-completion/completions/inotifywait
index 637d47427..e5608fc64 100644
--- a/msys2/usr/share/bash-completion/completions/inotifywait
+++ b/msys2/usr/share/bash-completion/completions/inotifywait
@@ -5,10 +5,10 @@ _inotifywait_events()
     # Expecting line with "Events:", followed by ones starting with one
     # tab. Word following the tab is event name, others are line
     # wrapped explanations.
-    COMPREPLY+=( $(compgen -W "$($1 --help 2>/dev/null | \
+    COMPREPLY+=($(compgen -W "$($1 --help 2>/dev/null |
         command sed -e '/^Events:/,/^[^'$'\t'']/!d' \
-           -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p')" \
-        -- "$cur") )
+            -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p')" \
+        -- "$cur"))
 }
 
 _inotifywait()
@@ -17,31 +17,31 @@ _inotifywait()
     _init_completion || return
 
     case $prev in
-        --help|--exclude|--excludei|--format|--timefmt|--timeout|-!(-*)[ht])
+        --help | --exclude | --excludei | --format | --timefmt | --timeout | -!(-*)[ht])
             return
             ;;
-        --fromfile|--outfile|-!(-*)o)
+        --fromfile | --outfile | -!(-*)o)
             _filedir
             return
             ;;
-        --event|-!(-*)e)
+        --event | -!(-*)e)
             _inotifywait_events "$1"
             return
             ;;
-        --ascending|--descending)
-            COMPREPLY=( $(compgen -W 'total' -- "$cur") )
+        --ascending | --descending)
+            COMPREPLY=($(compgen -W 'total' -- "$cur"))
             _inotifywait_events "$1"
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _inotifywait inotifywait inotifywatch
+    complete -F _inotifywait inotifywait inotifywatch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/inotifywatch b/msys2/usr/share/bash-completion/completions/inotifywatch
index 637d47427..e5608fc64 100644
--- a/msys2/usr/share/bash-completion/completions/inotifywatch
+++ b/msys2/usr/share/bash-completion/completions/inotifywatch
@@ -5,10 +5,10 @@ _inotifywait_events()
     # Expecting line with "Events:", followed by ones starting with one
     # tab. Word following the tab is event name, others are line
     # wrapped explanations.
-    COMPREPLY+=( $(compgen -W "$($1 --help 2>/dev/null | \
+    COMPREPLY+=($(compgen -W "$($1 --help 2>/dev/null |
         command sed -e '/^Events:/,/^[^'$'\t'']/!d' \
-           -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p')" \
-        -- "$cur") )
+            -ne 's/^'$'\t''\([^ '$'\t'']\{1,\}\)[ '$'\t''].*/\1/p')" \
+        -- "$cur"))
 }
 
 _inotifywait()
@@ -17,31 +17,31 @@ _inotifywait()
     _init_completion || return
 
     case $prev in
-        --help|--exclude|--excludei|--format|--timefmt|--timeout|-!(-*)[ht])
+        --help | --exclude | --excludei | --format | --timefmt | --timeout | -!(-*)[ht])
             return
             ;;
-        --fromfile|--outfile|-!(-*)o)
+        --fromfile | --outfile | -!(-*)o)
             _filedir
             return
             ;;
-        --event|-!(-*)e)
+        --event | -!(-*)e)
             _inotifywait_events "$1"
             return
             ;;
-        --ascending|--descending)
-            COMPREPLY=( $(compgen -W 'total' -- "$cur") )
+        --ascending | --descending)
+            COMPREPLY=($(compgen -W 'total' -- "$cur"))
             _inotifywait_events "$1"
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _inotifywait inotifywait inotifywatch
+    complete -F _inotifywait inotifywait inotifywatch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/insmod b/msys2/usr/share/bash-completion/completions/insmod
index 36c29dc46..a59e75355 100644
--- a/msys2/usr/share/bash-completion/completions/insmod
+++ b/msys2/usr/share/bash-completion/completions/insmod
@@ -6,13 +6,13 @@ _insmod()
     _init_completion || return
 
     # do filename completion for first argument
-    if [[ $cword -eq 1 ]]; then
-        _filedir '@(?(k)o?(.gz))'
+    if ((cword == 1)); then
+        _filedir '@(?(k)o?(.[gx]z))'
     else # do module parameter completion
-        COMPREPLY=( $(compgen -W "$(PATH="$PATH:/sbin" modinfo \
-            -p ${words[1]} 2>/dev/null | cut -d: -f1)" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(PATH="$PATH:/sbin" modinfo \
+            -p ${words[1]} 2>/dev/null | cut -d: -f1)" -- "$cur"))
     fi
 } &&
-complete -F _insmod insmod insmod.static
+    complete -F _insmod insmod insmod.static
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/insmod.static b/msys2/usr/share/bash-completion/completions/insmod.static
index 36c29dc46..a59e75355 100644
--- a/msys2/usr/share/bash-completion/completions/insmod.static
+++ b/msys2/usr/share/bash-completion/completions/insmod.static
@@ -6,13 +6,13 @@ _insmod()
     _init_completion || return
 
     # do filename completion for first argument
-    if [[ $cword -eq 1 ]]; then
-        _filedir '@(?(k)o?(.gz))'
+    if ((cword == 1)); then
+        _filedir '@(?(k)o?(.[gx]z))'
     else # do module parameter completion
-        COMPREPLY=( $(compgen -W "$(PATH="$PATH:/sbin" modinfo \
-            -p ${words[1]} 2>/dev/null | cut -d: -f1)" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(PATH="$PATH:/sbin" modinfo \
+            -p ${words[1]} 2>/dev/null | cut -d: -f1)" -- "$cur"))
     fi
 } &&
-complete -F _insmod insmod insmod.static
+    complete -F _insmod insmod insmod.static
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/installpkg b/msys2/usr/share/bash-completion/completions/installpkg
index 3ebf1dfcc..7455eb10d 100644
--- a/msys2/usr/share/bash-completion/completions/installpkg
+++ b/msys2/usr/share/bash-completion/completions/installpkg
@@ -11,7 +11,7 @@ _installpkg()
             return
             ;;
         --priority)
-            COMPREPLY=( $(compgen -W 'ADD REC OPT SKP' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ADD REC OPT SKP' -- "$cur"))
             return
             ;;
         --tagfile)
@@ -20,14 +20,14 @@ _installpkg()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--warn --md5sum --root --infobox --terse
-            --menu --ask --priority --tagfile' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--warn --md5sum --root --infobox --terse
+            --menu --ask --priority --tagfile' -- "$cur"))
         return
     fi
 
     _filedir 't[bglx]z'
 } &&
-complete -F _installpkg installpkg
+    complete -F _installpkg installpkg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/interdiff b/msys2/usr/share/bash-completion/completions/interdiff
index e79237518..9933d15db 100644
--- a/msys2/usr/share/bash-completion/completions/interdiff
+++ b/msys2/usr/share/bash-completion/completions/interdiff
@@ -6,7 +6,7 @@ _interdiff()
     _init_completion -s || return
 
     case $prev in
-        --unified|--strip-match|--drop-context|-!(-*)[Upd])
+        --unified | --strip-match | --drop-context | -!(-*)[Upd])
             return
             ;;
     esac
@@ -14,8 +14,8 @@ _interdiff()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -28,6 +28,6 @@ _interdiff()
     done
     _filedir "$exts"
 } &&
-complete -F _interdiff interdiff
+    complete -F _interdiff interdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/invoke-rc.d b/msys2/usr/share/bash-completion/completions/invoke-rc.d
index e4b2afc98..4a5045a8d 100644
--- a/msys2/usr/share/bash-completion/completions/invoke-rc.d
+++ b/msys2/usr/share/bash-completion/completions/invoke-rc.d
@@ -9,30 +9,30 @@ _invoke_rc_d()
 
     local sysvdir services options valid_options
 
-    [[ -d /etc/rc.d/init.d ]] && sysvdir=/etc/rc.d/init.d \
-        || sysvdir=/etc/init.d
+    [[ -d /etc/rc.d/init.d ]] && sysvdir=/etc/rc.d/init.d ||
+        sysvdir=/etc/init.d
 
-    services=( $(printf '%s ' $sysvdir/!(README*|*.sh|$_backup_glob)) )
-    services=( ${services[@]#$sysvdir/} )
-    options=( --help --quiet --force --try-anyway --disclose-deny --query \
-        --no-fallback )
+    services=($(printf '%s ' $sysvdir/!(README*|*.sh|$_backup_glob)))
+    services=(${services[@]#$sysvdir/})
+    options=(--help --quiet --force --try-anyway --disclose-deny --query
+        --no-fallback)
 
-    if [[ ($cword -eq 1) || ("$prev" == --* ) ]]; then
-    valid_options=( $(\
-        tr " " "\n" <<<"${words[*]} ${options[*]}" \
-        | command sed -ne "/$(command sed "s/ /\\\\|/g" <<<"${options[*]}")/p" \
-        | sort | uniq -u \
-        ) )
-    COMPREPLY=( $(compgen -W '${valid_options[@]} ${services[@]}' -- "$cur") )
+    if [[ $cword -eq 1 || $prev == --* ]]; then
+        valid_options=($(
+            tr " " "\n" <<<"${words[*]} ${options[*]}" |
+                command sed -ne "/$(command sed 's/ /\\|/g' <<<"${options[*]}")/p" |
+                sort | uniq -u
+        ))
+        COMPREPLY=($(compgen -W '${valid_options[@]} ${services[@]}' -- "$cur"))
     elif [[ -x $sysvdir/$prev ]]; then
-        COMPREPLY=( $(compgen -W '`command sed -e "y/|/ /" \
+        COMPREPLY=($(compgen -W '`command sed -e "y/|/ /" \
             -ne "s/^.*Usage:[ ]*[^ ]*[ ]*{*\([^}\"]*\).*$/\1/p" \
-            $sysvdir/$prev`' -- "$cur") )
+            $sysvdir/$prev`' -- "$cur"))
     else
         COMPREPLY=()
     fi
 
 } &&
-complete -F _invoke_rc_d invoke-rc.d
+    complete -F _invoke_rc_d invoke-rc.d
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ip b/msys2/usr/share/bash-completion/completions/ip
index f7e6e7c2b..12ad9aa36 100644
--- a/msys2/usr/share/bash-completion/completions/ip
+++ b/msys2/usr/share/bash-completion/completions/ip
@@ -2,9 +2,9 @@
 
 _iproute2_etc()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(awk '!/#/ { print $2 }' /etc/iproute2/$1 2>/dev/null)" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 _ip()
@@ -13,100 +13,99 @@ _ip()
     _init_completion || return
 
     case $prev in
-        -V|-Version|-rc|-rcvbuf)
+        -V | -Version | -rc | -rcvbuf)
             return
             ;;
-        -f|-family)
-            COMPREPLY=( $(compgen -W 'inet inet6 ipx dnet link' -- "$cur") )
+        -f | -family)
+            COMPREPLY=($(compgen -W 'inet inet6 ipx dnet link' -- "$cur"))
             return
             ;;
-        -b|-batch)
+        -b | -batch)
             _filedir
             return
             ;;
         -force)
-            COMPREPLY=( $(compgen -W '-batch' -- "$cur") )
+            COMPREPLY=($(compgen -W '-batch' -- "$cur"))
             return
             ;;
     esac
 
-    local subcword cmd subcmd
-    for (( subcword=1; subcword < ${#words[@]}-1; subcword++ )); do
+    local subcword cmd subcmd=""
+    for ((subcword = 1; subcword < ${#words[@]} - 1; subcword++)); do
         [[ ${words[subcword]} == -b?(atch) ]] && return
-        [[ -n $cmd ]] && subcmd=${words[subcword]} && break
+        [[ -v cmd ]] && subcmd=${words[subcword]} && break
         [[ ${words[subcword]} != -* && \
-                ${words[subcword-1]} != -@(f?(amily)|rc?(vbuf)) ]] && \
+        ${words[subcword - 1]} != -@(f?(amily)|rc?(vbuf)) ]] &&
             cmd=${words[subcword]}
     done
 
-    if [[ -z $cmd ]]; then
+    if [[ ! -v cmd ]]; then
         case $cur in
             -*)
                 local c="-Version -statistics -details -resolve -family
                     -oneline -timestamp -batch -rcvbuf"
-                [[ $cword -eq 1 ]] && c+=" -force"
-                COMPREPLY=( $(compgen -W "$c" -- "$cur") )
-                return
+                ((cword == 1)) && c+=" -force"
+                COMPREPLY=($(compgen -W "$c" -- "$cur"))
                 ;;
             *)
-                COMPREPLY=( $(compgen -W "help $($1 help 2>&1 | command sed -e \
+                COMPREPLY=($(compgen -W "help $($1 help 2>&1 | command sed -e \
                     '/OBJECT := /,/}/!d' -e \
                     's/.*{//' -e \
                     's/}.*//' -e \
-                    's/|//g')" -- "$cur") )
-                return
+                    's/|//g')" -- "$cur"))
                 ;;
         esac
+        return
     fi
 
     [[ $subcmd == help ]] && return
 
     case $cmd in
-        l|link)
+        l | link)
             case $subcmd in
                 add)
                     # TODO
                     ;;
                 delete)
-                    case $(($cword-$subcword)) in
+                    case $((cword - subcword)) in
                         1)
                             _available_interfaces
                             ;;
                         2)
-                            COMPREPLY=( $(compgen -W 'type' -- "$cur") )
+                            COMPREPLY=($(compgen -W 'type' -- "$cur"))
                             ;;
                         3)
-                            [[ $prev == type ]] && \
-                                COMPREPLY=( $(compgen -W 'vlan veth vcan dummy
-                                    ifb macvlan can' -- "$cur") )
+                            [[ $prev == type ]] &&
+                                COMPREPLY=($(compgen -W 'vlan veth vcan dummy
+                                    ifb macvlan can' -- "$cur"))
                             ;;
                     esac
                     ;;
                 set)
-                    if [[ $cword-$subcword -eq 1 ]]; then
+                    if ((cword - subcword == 1)); then
                         _available_interfaces
                     else
                         case $prev in
-                            arp|dynamic|multicast|allmulticast|promisc|\
-                            trailers)
-                                COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
-                                ;;
-                            txqueuelen|name|address|broadcast|mtu|netns|alias)
+                            arp | dynamic | multicast | allmulticast | promisc | \
+                                trailers)
+                                COMPREPLY=($(compgen -W 'on off' -- "$cur"))
                                 ;;
+                            txqueuelen | name | address | broadcast | mtu | netns | alias) ;;
+
                             *)
                                 local c="arp dynamic multicast allmulticast
                                     promisc trailers txqueuelen name address
                                     broadcast mtu netns alias"
                                 [[ $prev != @(up|down) ]] && c+=" up down"
-                                COMPREPLY=( $(compgen -W "$c" -- "$cur") )
+                                COMPREPLY=($(compgen -W "$c" -- "$cur"))
                                 ;;
                         esac
                     fi
                     ;;
                 show)
-                    if [[ $cword -eq $subcword+1 ]]; then
+                    if ((cword == subcword + 1)); then
                         _available_interfaces
-                        COMPREPLY+=( $(compgen -W 'dev group up' -- "$cur") )
+                        COMPREPLY+=($(compgen -W 'dev group up' -- "$cur"))
                     elif [[ $prev == dev ]]; then
                         _available_interfaces
                     elif [[ $prev == group ]]; then
@@ -114,16 +113,16 @@ _ip()
                     fi
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help add delete set show' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add delete set show' \
+                            -- "$cur"))
                     ;;
             esac
             ;;
 
-        a|addr|address)
+        a | addr | address)
             case $subcmd in
-                add|change|replace)
+                add | change | replace)
                     if [[ $prev == dev ]]; then
                         _available_interfaces
                     elif [[ $prev == scope ]]; then
@@ -141,12 +140,12 @@ _ip()
                         : # TODO
                     fi
                     ;;
-                show|flush)
-                    if [[ $cword -eq $subcword+1 ]]; then
+                show | flush)
+                    if ((cword == subcword + 1)); then
                         _available_interfaces
-                        COMPREPLY+=( $(compgen -W 'dev scope to label dynamic
+                        COMPREPLY+=($(compgen -W 'dev scope to label dynamic
                             permanent tentative deprecated dadfailed temporary
-                            primary secondary up' -- "$cur") )
+                            primary secondary up' -- "$cur"))
                     elif [[ $prev == dev ]]; then
                         _available_interfaces
                     elif [[ $prev == scope ]]; then
@@ -154,16 +153,16 @@ _ip()
                     fi
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help add change replace del
-                            show flush' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add change replace del
+                            show flush' -- "$cur"))
                     ;;
             esac
             ;;
 
         addrlabel)
             case $subcmd in
-                list|add|del|flush)
+                list | add | del | flush)
                     if [[ $prev == dev ]]; then
                         _available_interfaces
                     else
@@ -171,16 +170,16 @@ _ip()
                     fi
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help list add del flush' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help list add del flush' \
+                            -- "$cur"))
                     ;;
             esac
             ;;
 
-        route)
+        r | route)
             case $subcmd in
-                list|flush)
+                list | flush)
                     if [[ $prev == proto ]]; then
                         _iproute2_etc rt_protos
                     else
@@ -190,44 +189,79 @@ _ip()
                 get)
                     # TODO
                     ;;
-                add|del|change|append|replace|monitor)
-                    # TODO
+                a | add | d | del | change | append | r | replace | monitor)
+                    if [[ $prev == via ]]; then
+                        COMPREPLY=($(compgen -W "$($1 r | command sed -ne \
+                            's/.*via \([0-9.]*\).*/\1/p')" -- "$cur"))
+                    elif [[ $prev == "$subcmd" ]]; then
+                        COMPREPLY=($(compgen -W "table default \
+                            $($1 r | cut -d ' ' -f 1)" -- "$cur"))
+                    elif [[ $prev == dev ]]; then
+                        _available_interfaces -a
+                    elif [[ $prev == table ]]; then
+                        COMPREPLY=($(compgen -W 'local main default' -- "$cur"))
+                    else
+                        COMPREPLY=($(compgen -W 'via dev weight' -- "$cur"))
+                    fi
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help list flush get add del
-                            change append replace monitor' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help list flush get add del
+                            change append replace monitor' -- "$cur"))
                     ;;
             esac
             ;;
 
         rule)
             case $subcmd in
-                add|del)
-                    # TODO
+                add | del | list | lst)
+                    case $prev in
+                        from | to | tos | dsfield | fwmark | uidrange | ipproto | sport | \
+                            dport | priority | protocol | suppress_prefixlength | \
+                            suppress_ifgroup | realms | nat | goto) ;;
+
+                        iif | oif)
+                            _available_interfaces -a
+                            ;;
+                        table | lookup)
+                            COMPREPLY=($(compgen -W 'local main default' -- "$cur"))
+                            ;;
+                        *)
+                            COMPREPLY=($(compgen -W 'from to tos dsfield fwmark
+                                uidrange ipproto sport dport priority table lookup
+                                protocol suppress_prefixlength suppress_ifgroup realms
+                                nat goto iif oif not' -- "$cur"))
+                            ;;
+                    esac
                     ;;
-                flush|show|list|lst)
+                flush | save)
+                    if [[ $prev == protocol ]]; then
+                        :
+                    else
+                        COMPREPLY=($(compgen -W 'protocol' -- "$cur"))
+                    fi
                     ;;
+                restore | show) ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help list add del flush' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add del list flush save
+                            restore show' -- "$cur"))
                     ;;
             esac
             ;;
 
         neigh)
             case $subcmd in
-                add|del|change|replace)
+                add | del | change | replace)
                     # TODO
                     ;;
-                show|flush)
+                show | flush)
                     # TODO
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help add del change replace
-                            show flush' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add del change replace
+                            show flush' -- "$cur"))
                     ;;
             esac
             ;;
@@ -241,45 +275,45 @@ _ip()
                     # TODO
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help change show' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help change show' \
+                            -- "$cur"))
                     ;;
             esac
             ;;
 
         tunnel)
             case $subcmd in
-                show)
-                    ;;
-                add|change|del|prl|6rd)
+                show) ;;
+
+                add | change | del | prl | 6rd)
                     # TODO
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help add change del show prl
-                            6rd' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add change del show prl
+                            6rd' -- "$cur"))
                     ;;
             esac
             ;;
 
         maddr)
             case $subcmd in
-                add|del)
+                add | del)
                     # TODO
                     ;;
                 show)
                     if [[ $cword -eq $subcword+1 || $prev == dev ]]; then
                         _available_interfaces
-                        [[ $prev != dev ]] && \
-                            COMPREPLY=( $(compgen -W '${COMPREPLY[@]} dev' \
-                            -- "$cur") )
+                        [[ $prev != dev ]] &&
+                            COMPREPLY=($(compgen -W '${COMPREPLY[@]} dev' \
+                                -- "$cur"))
                     fi
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help add del show' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add del show' \
+                            -- "$cur"))
                     ;;
             esac
             ;;
@@ -290,8 +324,8 @@ _ip()
                     # TODO
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help show' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help show' -- "$cur"))
                     ;;
             esac
             ;;
@@ -300,26 +334,45 @@ _ip()
             case $subcmd in
                 all) ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'help all' -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help all' -- "$cur"))
+                    ;;
+            esac
+            ;;
+
+        netns)
+            case $subcmd in
+                list | monitor) ;;
+
+                add | identify | list-id)
+                    # TODO
+                    ;;
+                delete | exec | pids | set)
+                    [[ $prev == "$subcmd" ]] &&
+                        COMPREPLY=($(compgen -W "$($1 netns list)" -- "$cur"))
+                    ;;
+                *)
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'help add delete exec
+                            identify list list-id monitor pids set' -- "$cur"))
                     ;;
             esac
             ;;
 
         xfrm)
             case $subcmd in
-                state|policy|monitor)
+                state | policy | monitor)
                     # TODO
                     ;;
                 *)
-                    [[ $cword -eq $subcword ]] && \
-                        COMPREPLY=( $(compgen -W 'state policy monitor' \
-                        -- "$cur") )
+                    ((cword == subcword)) &&
+                        COMPREPLY=($(compgen -W 'state policy monitor' \
+                            -- "$cur"))
                     ;;
             esac
             ;;
     esac
 } &&
-complete -F _ip ip
+    complete -F _ip ip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ipcalc b/msys2/usr/share/bash-completion/completions/ipcalc
new file mode 100644
index 000000000..5603c26ce
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/ipcalc
@@ -0,0 +1,25 @@
+# ipcalc(1) completion                                     -*- shell-script -*-
+
+_ipcalc()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        --help | --version | --split | -[hs])
+            return
+            ;;
+    esac
+
+    # --split takes 3 args
+    local i
+    for i in {1..3}; do
+        [[ ${words[cword - i]} == -@(-split|s) ]] && return
+    done
+
+    [[ $cur != -* ]] ||
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+} &&
+    complete -F _ipcalc ipcalc
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iperf b/msys2/usr/share/bash-completion/completions/iperf
index 43f9bcaf7..6347fe00f 100644
--- a/msys2/usr/share/bash-completion/completions/iperf
+++ b/msys2/usr/share/bash-completion/completions/iperf
@@ -6,36 +6,36 @@ _iperf()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--version|--interval|--len|--port|--window|--mss|--bandwidth|\
-        --num|--time|--listenport|--parallel|--ttl|--linux-congestion|--omit|\
-        --congestion|--bytes|--blockcount|--cport|--set-mss|--flowlabel|\
-        --title|--tos|--affinity|-!(-*)[hvilpwMbntLPTZCkOSA])
+        --help | --version | --interval | --len | --port | --window | --mss | --bandwidth | \
+            --num | --time | --listenport | --parallel | --ttl | --linux-congestion | --omit | \
+            --congestion | --bytes | --blockcount | --cport | --set-mss | --flowlabel | \
+            --title | --tos | --affinity | -!(-*)[hvilpwMbntLPTZCkOSA])
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'k m g K M G' -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'k m g K M G' -- "$cur"))
             return
             ;;
-        --output|--fileinput|-!(-*)[oF])
+        --output | --fileinput | -!(-*)[oF])
             _filedir
             return
             ;;
-        --bind|-!(-*)B)
+        --bind | -!(-*)B)
             _available_interfaces -a
             _ip_addresses -a
             __ltrim_colon_completions "$cur"
             return
             ;;
-        --client|-!(-*)c)
+        --client | -!(-*)c)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --reportexclude|-!(-*)x)
-            COMPREPLY=( $(compgen -W 'C D M S V' -- "$cur") )
+        --reportexclude | -!(-*)x)
+            COMPREPLY=($(compgen -W 'C D M S V' -- "$cur"))
             return
             ;;
-        --reportstyle|-!(-*)y)
-            COMPREPLY=( $(compgen -W 'C' -- "$cur") )
+        --reportstyle | -!(-*)y)
+            COMPREPLY=($(compgen -W 'C' -- "$cur"))
             return
             ;;
         --logfile)
@@ -50,20 +50,20 @@ _iperf()
     local i filter=cat
     for i in "${words[@]}"; do
         case $i in
-            -s|--server)
+            -s | --server)
                 filter='command sed -e /^Client.specific/,/^\(Server.specific.*\)\?$/d'
                 ;;
-            -c|--client)
+            -c | --client)
                 filter='command sed -e /^Server.specific/,/^\(Client.specific.*\)\?$/d'
                 ;;
         esac
     done
     [[ $filter != cat ]] && filter+=' -e /--client/d -e /--server/d'
 
-    COMPREPLY=( $(compgen -W \
-        '$("$1" --help 2>&1 | $filter | _parse_help -)' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W \
+        '$("$1" --help 2>&1 | $filter | _parse_help -)' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _iperf iperf iperf3
+    complete -F _iperf iperf iperf3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iperf3 b/msys2/usr/share/bash-completion/completions/iperf3
index 43f9bcaf7..6347fe00f 100644
--- a/msys2/usr/share/bash-completion/completions/iperf3
+++ b/msys2/usr/share/bash-completion/completions/iperf3
@@ -6,36 +6,36 @@ _iperf()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--version|--interval|--len|--port|--window|--mss|--bandwidth|\
-        --num|--time|--listenport|--parallel|--ttl|--linux-congestion|--omit|\
-        --congestion|--bytes|--blockcount|--cport|--set-mss|--flowlabel|\
-        --title|--tos|--affinity|-!(-*)[hvilpwMbntLPTZCkOSA])
+        --help | --version | --interval | --len | --port | --window | --mss | --bandwidth | \
+            --num | --time | --listenport | --parallel | --ttl | --linux-congestion | --omit | \
+            --congestion | --bytes | --blockcount | --cport | --set-mss | --flowlabel | \
+            --title | --tos | --affinity | -!(-*)[hvilpwMbntLPTZCkOSA])
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'k m g K M G' -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'k m g K M G' -- "$cur"))
             return
             ;;
-        --output|--fileinput|-!(-*)[oF])
+        --output | --fileinput | -!(-*)[oF])
             _filedir
             return
             ;;
-        --bind|-!(-*)B)
+        --bind | -!(-*)B)
             _available_interfaces -a
             _ip_addresses -a
             __ltrim_colon_completions "$cur"
             return
             ;;
-        --client|-!(-*)c)
+        --client | -!(-*)c)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --reportexclude|-!(-*)x)
-            COMPREPLY=( $(compgen -W 'C D M S V' -- "$cur") )
+        --reportexclude | -!(-*)x)
+            COMPREPLY=($(compgen -W 'C D M S V' -- "$cur"))
             return
             ;;
-        --reportstyle|-!(-*)y)
-            COMPREPLY=( $(compgen -W 'C' -- "$cur") )
+        --reportstyle | -!(-*)y)
+            COMPREPLY=($(compgen -W 'C' -- "$cur"))
             return
             ;;
         --logfile)
@@ -50,20 +50,20 @@ _iperf()
     local i filter=cat
     for i in "${words[@]}"; do
         case $i in
-            -s|--server)
+            -s | --server)
                 filter='command sed -e /^Client.specific/,/^\(Server.specific.*\)\?$/d'
                 ;;
-            -c|--client)
+            -c | --client)
                 filter='command sed -e /^Server.specific/,/^\(Client.specific.*\)\?$/d'
                 ;;
         esac
     done
     [[ $filter != cat ]] && filter+=' -e /--client/d -e /--server/d'
 
-    COMPREPLY=( $(compgen -W \
-        '$("$1" --help 2>&1 | $filter | _parse_help -)' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W \
+        '$("$1" --help 2>&1 | $filter | _parse_help -)' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _iperf iperf iperf3
+    complete -F _iperf iperf iperf3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ipmitool b/msys2/usr/share/bash-completion/completions/ipmitool
index f6307cfa8..920287dd5 100644
--- a/msys2/usr/share/bash-completion/completions/ipmitool
+++ b/msys2/usr/share/bash-completion/completions/ipmitool
@@ -2,8 +2,8 @@
 
 _ipmitool_singleline_help()
 {
-    COMPREPLY=( $(compgen -W "$($1 $2 2>&1 | \
-        command sed -ne 's/[,\r]//g' -e 's/^.*[Cc]ommands://p')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 $2 2>&1 |
+        command sed -ne 's/[,\r]//g' -e 's/^.*[Cc]ommands://p')" -- "$cur"))
 }
 
 _ipmitool()
@@ -16,17 +16,18 @@ _ipmitool()
             return
             ;;
         -*d)
-            COMPREPLY=( $(compgen -W "$(\
+            COMPREPLY=($(compgen -W "$(
                 command ls -d /dev/ipmi* /dev/ipmi/* /dev/ipmidev/* \
-                2>/dev/null | command sed -ne 's/^[^0-9]*\([0-9]\{1,\}\)/\1/p')" \
-                -- "$cur") )
+                    2>/dev/null | command sed -ne 's/^[^0-9]*\([0-9]\{1,\}\)/\1/p'
+            )" \
+                -- "$cur"))
             return
             ;;
         -*I)
-            COMPREPLY=( $(compgen -W "$($1 -h 2>&1 | \
+            COMPREPLY=($(compgen -W "$($1 -h 2>&1 |
                 command sed -e '/^Interfaces:/,/^[[:space:]]*$/!d' \
-                -ne 's/^[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*/\1/p')" \
-                -- "$cur") )
+                    -ne 's/^[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*/\1/p')" \
+                -- "$cur"))
             return
             ;;
         -*H)
@@ -38,45 +39,45 @@ _ipmitool()
             return
             ;;
         -*C)
-            COMPREPLY=( $(compgen -W '{0..14}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..14}' -- "$cur"))
             return
             ;;
         -*L)
-            COMPREPLY=( $(compgen -W 'CALLBACK USER OPERATOR ADMINISTRATOR' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'CALLBACK USER OPERATOR ADMINISTRATOR' \
+                -- "$cur"))
             return
             ;;
         -*A)
-            COMPREPLY=( $(compgen -W 'NONE PASSWORD MD2 MD5 OEM' -- "$cur") )
+            COMPREPLY=($(compgen -W 'NONE PASSWORD MD2 MD5 OEM' -- "$cur"))
             return
             ;;
         -*o)
-            COMPREPLY=( $(compgen -W "$($1 -o list 2>&1 | \
-                awk '/^[ \t]+/ { print $1 }') list" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -o list 2>&1 |
+                awk '/^[ \t]+/ { print $1 }') list" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 
     # Find out command and subcommand
 
-    local cmds=( raw i2c spd lan chassis power event mc sdr sensor fru gendev
+    local cmds=(raw i2c spd lan chassis power event mc sdr sensor fru gendev
         sel pef sol tsol isol user channel session sunoem kontronoem picmg fwum
         firewall shell exec set hpm ekanalyzer)
     local i c cmd subcmd
-    for (( i=1; i < ${#words[@]}-1; i++ )); do
-        [[ -n $cmd ]] && subcmd=${words[i]} && break
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
+        [[ -v cmd ]] && subcmd=${words[i]} && break
         for c in "${cmds[@]}"; do
-            [[ ${words[i]} == $c ]] && cmd=$c && break
+            [[ ${words[i]} == "$c" ]] && cmd=$c && break
         done
     done
 
-    if [[ -z $cmd ]]; then
-        COMPREPLY=( $(compgen -W '${cmds[@]}' -- "$cur") )
+    if [[ ! -v cmd ]]; then
+        COMPREPLY=($(compgen -W '${cmds[@]}' -- "$cur"))
         return
     fi
 
@@ -84,43 +85,43 @@ _ipmitool()
 
     case $cmd in
 
-        shell)
-            ;;
+        shell) ;;
 
-        exec)
+        \
+            exec)
             _filedir
             ;;
 
-        chassis|power|kontronoem|fwum)
+        chassis | power | kontronoem | fwum)
             _ipmitool_singleline_help $1 $cmd
             ;;
 
         lan)
             case $subcmd in
-                print|set)
-                    ;;
+                print | set) ;;
+
                 alert)
-                    [[ $prev == alert ]] && \
-                        COMPREPLY=( $(compgen -W 'print set' -- "$cur") )
+                    [[ $prev == alert ]] &&
+                        COMPREPLY=($(compgen -W 'print set' -- "$cur"))
                     ;;
                 stats)
-                    [[ $prev == stats ]] && \
-                        COMPREPLY=( $(compgen -W 'print set' -- "$cur") )
+                    [[ $prev == stats ]] &&
+                        COMPREPLY=($(compgen -W 'print set' -- "$cur"))
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'print set alert stats' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W 'print set alert stats' \
+                        -- "$cur"))
                     ;;
             esac
             ;;
 
         sdr)
             case $subcmd in
-                get|info|type|list|entity)
-                    ;;
+                get | info | type | list | entity) ;;
+
                 elist)
-                    COMPREPLY=( $(compgen -W 'all full compact event mclog fru
-                        generic' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'all full compact event mclog fru
+                        generic' -- "$cur"))
                     ;;
                 dump)
                     _filedir
@@ -128,7 +129,7 @@ _ipmitool()
                 fill)
                     case $prev in
                         fill)
-                            COMPREPLY=( $(compgen -W 'sensors file' -- "$cur") )
+                            COMPREPLY=($(compgen -W 'sensors file' -- "$cur"))
                             ;;
                         file)
                             _filedir
@@ -136,63 +137,63 @@ _ipmitool()
                     esac
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'get info type list elist entity
-                        dump fill' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'get info type list elist entity
+                        dump fill' -- "$cur"))
                     ;;
             esac
             ;;
 
         sensor)
             case $subcmd in
-                list|get|thresh)
-                    ;;
+                list | get | thresh) ;;
+
                 *)
-                    COMPREPLY=( $(compgen -W 'list get thresh' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'list get thresh' -- "$cur"))
                     ;;
             esac
             ;;
 
         sel)
             case $subcmd in
-                info|clear|list|elist|delete)
-                    ;;
-                add|save|writeraw|readraw)
+                info | clear | list | elist | delete) ;;
+
+                add | save | writeraw | readraw)
                     _filedir
                     ;;
                 time)
-                    [[ $prev == time ]] && \
-                        COMPREPLY=( $(compgen -W 'get set' -- "$cur") )
+                    [[ $prev == time ]] &&
+                        COMPREPLY=($(compgen -W 'get set' -- "$cur"))
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'info clear list elist delete add
-                        get save writeraw readraw time' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'info clear list elist delete add
+                        get save writeraw readraw time' -- "$cur"))
                     ;;
             esac
             ;;
 
         user)
             case $subcmd in
-                summary|list|disable|enable|priv|test)
-                    ;;
+                summary | list | disable | enable | priv | test) ;;
+
                 set)
-                    [[ $prev == set ]] && \
-                        COMPREPLY=( $(compgen -W 'name password' -- "$cur") )
+                    [[ $prev == set ]] &&
+                        COMPREPLY=($(compgen -W 'name password' -- "$cur"))
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'summary list set disable enable
-                        priv test' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'summary list set disable enable
+                        priv test' -- "$cur"))
                     ;;
             esac
             ;;
 
         set)
-            [[ $prev == set ]] && \
-                COMPREPLY=( $(compgen -W 'hostname username password privlvl
-                    authtype localaddr targetaddr port csv verbose' -- "$cur") )
+            [[ $prev == set ]] &&
+                COMPREPLY=($(compgen -W 'hostname username password privlvl
+                    authtype localaddr targetaddr port csv verbose' -- "$cur"))
             ;;
 
     esac
 } &&
-complete -F _ipmitool ipmitool
+    complete -F _ipmitool ipmitool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ipsec b/msys2/usr/share/bash-completion/completions/ipsec
index 00e6b7ea6..4bc8cdf38 100644
--- a/msys2/usr/share/bash-completion/completions/ipsec
+++ b/msys2/usr/share/bash-completion/completions/ipsec
@@ -8,9 +8,9 @@ _ipsec_connections()
     local keyword name
     while read -r keyword name; do
         if [[ $keyword == [#]* ]]; then continue; fi
-        [[ $keyword == conn && $name != '%default' ]] && COMPREPLY+=( "$name" )
+        [[ $keyword == conn && $name != '%default' ]] && COMPREPLY+=("$name")
     done
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
 }
 
 _ipsec_freeswan()
@@ -18,31 +18,31 @@ _ipsec_freeswan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'auto barf eroute klipsdebug look manual
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'auto barf eroute klipsdebug look manual
             pluto ranbits rsasigkey setup showdefaults showhostkey spi spigrp
-            tncfg whack' -- "$cur") )
+            tncfg whack' -- "$cur"))
         return
     fi
 
     case ${words[1]} in
         auto)
-            COMPREPLY=( $(compgen -W '--asynchronous --up --add --delete
+            COMPREPLY=($(compgen -W '--asynchronous --up --add --delete
                 --replace --down --route --unroute --ready --status
-                --rereadsecrets' -- "$cur") )
+                --rereadsecrets' -- "$cur"))
             ;;
         manual)
-            COMPREPLY=( $(compgen -W '--up --down --route --unroute --union' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W '--up --down --route --unroute --union' \
+                -- "$cur"))
             ;;
         ranbits)
-            COMPREPLY=( $(compgen -W '--quick --continuous --bytes' -- "$cur") )
+            COMPREPLY=($(compgen -W '--quick --continuous --bytes' -- "$cur"))
             ;;
         setup)
-            COMPREPLY=( $(compgen -W '--start --stop --restart' -- "$cur") )
-            ;;
-        *)
+            COMPREPLY=($(compgen -W '--start --stop --restart' -- "$cur"))
             ;;
+        *) ;;
+
     esac
 }
 
@@ -51,8 +51,8 @@ _ipsec_strongswan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'down irdumm leases listaacerts listacerts
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'down irdumm leases listaacerts listacerts
             listalgs listall listcacerts listcainfos listcards listcerts
             listcrls listgroups listocsp listocspcerts listpubkeys openac pki
             pluto pool purgecerts purgecrls purgeike purgeocsp ready reload
@@ -60,33 +60,33 @@ _ipsec_strongswan()
             rereadgroups rereadocspcerts rereadsecrets restart route scdecrypt
             scencrypt scepclient secrets start starter status statusall stop
             stroke unroute uci up update version whack --confdir --copyright
-            --directory --help --version --versioncode' -- "$cur") )
+            --directory --help --version --versioncode' -- "$cur"))
         return
     fi
 
     case ${words[1]} in
-        down|route|status|statusall|unroute|up)
+        down | route | status | statusall | unroute | up)
             local confdir=$(ipsec --confdir)
             _ipsec_connections <"$confdir/ipsec.conf"
             ;;
         list*)
-            COMPREPLY=( $(compgen -W '--utc' -- "$cur") )
+            COMPREPLY=($(compgen -W '--utc' -- "$cur"))
             ;;
-        restart|start)
-            COMPREPLY=( $(compgen -W '--attach-gdb --auto-update --debug
-                --debug-all --debug-more --nofork' -- "$cur") )
+        restart | start)
+            COMPREPLY=($(compgen -W '--attach-gdb --auto-update --debug
+                --debug-all --debug-more --nofork' -- "$cur"))
             ;;
         pki)
-            COMPREPLY=( $(compgen -W '--gen --issue --keyid --print --pub
-                --req --self --signcrl --verify' -- "$cur") )
-            ;;
-        pool)
+            COMPREPLY=($(compgen -W '--gen --issue --keyid --print --pub
+                --req --self --signcrl --verify' -- "$cur"))
             ;;
+        pool) ;;
+
         irdumm)
             _filedir 'rb'
             ;;
-        *)
-            ;;
+        *) ;;
+
     esac
 }
 
diff --git a/msys2/usr/share/bash-completion/completions/iptables b/msys2/usr/share/bash-completion/completions/iptables
index 690726131..ffb905b8d 100644
--- a/msys2/usr/share/bash-completion/completions/iptables
+++ b/msys2/usr/share/bash-completion/completions/iptables
@@ -7,45 +7,45 @@ _iptables()
 
     local table chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
 
-    [[ "${words[*]}" =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] \
-        && table="-t ${BASH_REMATCH[2]}"
+    [[ ${words[*]} =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] &&
+        table="-t ${BASH_REMATCH[2]}"
 
     case $prev in
-    -*[AIDRPFXLZ])
-        COMPREPLY=( $(compgen -W '`"$1" $table -nL 2>/dev/null | \
-                command sed -ne "s/^Chain \([^ ]\{1,\}\).*$/\1/p"`' -- "$cur") )
-        ;;
-    -*t)
-        COMPREPLY=( $(compgen -W 'nat filter mangle' -- "$cur") )
-        ;;
-    -j)
-        if [[ "$table" == "-t filter" || -z "$table" ]]; then
-            COMPREPLY=( $(compgen -W 'ACCEPT DROP LOG ULOG REJECT
+        -*[AIDRPFXLZ])
+            COMPREPLY=($(compgen -W '`"$1" $table -nL 2>/dev/null | \
+                command sed -ne "s/^Chain \([^ ]\{1,\}\).*$/\1/p"`' -- "$cur"))
+            ;;
+        -*t)
+            COMPREPLY=($(compgen -W 'nat filter mangle' -- "$cur"))
+            ;;
+        -j)
+            if [[ $table == "-t filter" || -z $table ]]; then
+                COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT
                 `"$1" $table -nL 2>/dev/null | command sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
-                "$cur") )
-        elif [[ $table == "-t nat" ]]; then
-            COMPREPLY=( $(compgen -W 'ACCEPT DROP LOG ULOG REJECT MIRROR SNAT
+                    "$cur"))
+            elif [[ $table == "-t nat" ]]; then
+                COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT MIRROR SNAT
                 DNAT MASQUERADE `"$1" $table -nL 2>/dev/null | \
                 command sed -ne "$chain" -e "s/OUTPUT|PREROUTING|POSTROUTING//"`' \
-                -- "$cur") )
-        elif [[ $table == "-t mangle" ]]; then
-            COMPREPLY=( $(compgen -W 'ACCEPT DROP LOG ULOG REJECT MARK TOS
+                    -- "$cur"))
+            elif [[ $table == "-t mangle" ]]; then
+                COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT MARK TOS
                 `"$1" $table -nL 2>/dev/null | command sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
-                "$cur") )
-        fi
-        ;;
-    *)
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$("$1" --help 2>&1 |
-                command sed -e "s/^\[\!\]//" | _parse_help -)' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
-        fi
-        ;;
+                    "$cur"))
+            fi
+            ;;
+        *)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '$("$1" --help 2>&1 |
+                command sed -e "s/^\[\!\]//" | _parse_help -)' -- "$cur"))
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+            fi
+            ;;
     esac
 
 } &&
-complete -F _iptables iptables
+    complete -F _iptables iptables
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ipv6calc b/msys2/usr/share/bash-completion/completions/ipv6calc
index 6a5771efe..c452c155e 100644
--- a/msys2/usr/share/bash-completion/completions/ipv6calc
+++ b/msys2/usr/share/bash-completion/completions/ipv6calc
@@ -6,33 +6,33 @@ _ipv6calc()
     _init_completion -s || return
 
     case "$prev" in
-        --debug|-!(-*)d)
+        --debug | -!(-*)d)
             return
             ;;
-        --in|--out|--action|-!(-*)[IOA])
+        --in | --out | --action | -!(-*)[IOA])
             # With ipv6calc < 0.73.0, -m does nothing here, so use sed instead.
-            COMPREPLY=( $(compgen -W "$($1 "$prev" -h 2>&1 | \
+            COMPREPLY=($(compgen -W "$($1 "$prev" -h 2>&1 |
                 command sed -ne 's/^[[:space:]]\{1,\}\([^[:space:]:]\{1,\}\)[[:space:]]*:.*/\1/p')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
-        --db-geoip|--db-ip2location-ipv4|--db-ip2location-ipv6)
+        --db-geoip | --db-ip2location-ipv4 | --db-ip2location-ipv6)
             _filedir
             return
             ;;
-        --printstart|--printend)
+        --printstart | --printend)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" -h 2>&1 |
-            command sed -e "s/[][]//g" | _parse_help -)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$("$1" -h 2>&1 |
+            command sed -e "s/[][]//g" | _parse_help -)' -- "$cur"))
     fi
 
 } &&
-complete -F _ipv6calc ipv6calc
+    complete -F _ipv6calc ipv6calc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iscsiadm b/msys2/usr/share/bash-completion/completions/iscsiadm
index 1fa30db62..7786ddcd9 100644
--- a/msys2/usr/share/bash-completion/completions/iscsiadm
+++ b/msys2/usr/share/bash-completion/completions/iscsiadm
@@ -6,21 +6,21 @@ _iscsiadm()
     _init_completion -s || return
 
     case $prev in
-        --mode|-!(-*)m)
-            COMPREPLY=( $(compgen -W 'discovery node session iface fw host' \
-                -- "$cur") )
+        --mode | -!(-*)m)
+            COMPREPLY=($(compgen -W 'discovery node session iface fw host' \
+                -- "$cur"))
             return
             ;;
-        --op|-!(-*)o)
-            COMPREPLY=( $(compgen -W 'new delete update show' -- "$cur") )
+        --op | -!(-*)o)
+            COMPREPLY=($(compgen -W 'new delete update show' -- "$cur"))
             return
             ;;
-        --type|-!(-*)t)
-            COMPREPLY=( $(compgen -W 'sendtargets st slp isns fw' -- "$cur") )
+        --type | -!(-*)t)
+            COMPREPLY=($(compgen -W 'sendtargets st slp isns fw' -- "$cur"))
             return
             ;;
-        --loginall|--logoutall|-!(-*)[LU])
-            COMPREPLY=( $(compgen -W 'all manual automatic' -- "$cur") )
+        --loginall | --logoutall | -!(-*)[LU])
+            COMPREPLY=($(compgen -W 'all manual automatic' -- "$cur"))
             return
             ;;
     esac
@@ -28,7 +28,7 @@ _iscsiadm()
     $split && return
 
     local options
-    if [[ $cword -gt 1 ]]; then
+    if ((cword > 1)); then
 
         case ${words[2]} in
             discovery)
@@ -59,8 +59,8 @@ _iscsiadm()
         options='--mode'
     fi
 
-    COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+    COMPREPLY=($(compgen -W "$options" -- "$cur"))
 } &&
-complete -F _iscsiadm iscsiadm
+    complete -F _iscsiadm iscsiadm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/isort b/msys2/usr/share/bash-completion/completions/isort
index e4a028bef..2a84e2575 100644
--- a/msys2/usr/share/bash-completion/completions/isort
+++ b/msys2/usr/share/bash-completion/completions/isort
@@ -6,36 +6,36 @@ _isort()
     _init_completion || return
 
     case $prev in
-        --help|--add-import|--builtin|--future|--from-first|-ff|\
-        --force-grid-wrap|-fgw|--indent|--lines|--lines-after-imports|-lai|\
-        --lines-between-types|-lbt|--line-ending|-le|--no-lines-before|-nlb|\
-        --dont-skip|-ns|--thirdparty|--project|--remove-import|--skip|\
-        --skip-glob|-sg|--settings-path|-sp|--top|--virtual-env|--line-width|\
-        --wrap-length|-wl|-[habfiloprstw])
+        --help | --add-import | --builtin | --future | --from-first | -ff | \
+            --force-grid-wrap | -fgw | --indent | --lines | --lines-after-imports | -lai | \
+            --lines-between-types | -lbt | --line-ending | -le | --no-lines-before | -nlb | \
+            --dont-skip | -ns | --thirdparty | --project | --remove-import | --skip | \
+            --skip-glob | -sg | --settings-path | -sp | --top | --virtual-env | --line-width | \
+            --wrap-length | -wl | -[habfiloprstw])
             return
             ;;
-        --jobs|-j)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --jobs | -j)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        --multi-line|-m)
-            COMPREPLY=( $(compgen -W '{0..5}' -- "$cur") )
+        --multi-line | -m)
+            COMPREPLY=($(compgen -W '{0..5}' -- "$cur"))
             return
             ;;
-        --section-default|-sd)
-            COMPREPLY=( $(compgen -W 'FUTURE STDLIB THIRDPARTY FIRSTPARTY
-                                      LOCALFOLDER' -- "$cur") )
+        --section-default | -sd)
+            COMPREPLY=($(compgen -W 'FUTURE STDLIB THIRDPARTY FIRSTPARTY
+                                      LOCALFOLDER' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir '@(py|pyi)'
 } &&
-complete -F _isort isort
+    complete -F _isort isort
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/isql b/msys2/usr/share/bash-completion/completions/isql
index 4bd24c41e..4258c519d 100644
--- a/msys2/usr/share/bash-completion/completions/isql
+++ b/msys2/usr/share/bash-completion/completions/isql
@@ -6,9 +6,9 @@ _isql()
     local cur prev words cword
     _init_completion || return
 
-    [[ -f $ODBCINI ]] \
-        && COMPREPLY=( $(command grep "\[$cur" "$ODBCINI" | tr -d \[\]) )
+    [[ -f $ODBCINI ]] &&
+        COMPREPLY=($(command grep "\[$cur" "$ODBCINI" | tr -d \[\]))
 } &&
-complete -F _isql isql
+    complete -F _isql isql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iwconfig b/msys2/usr/share/bash-completion/completions/iwconfig
index 762ec2eaf..aa8fbf395 100644
--- a/msys2/usr/share/bash-completion/completions/iwconfig
+++ b/msys2/usr/share/bash-completion/completions/iwconfig
@@ -7,84 +7,84 @@ _iwconfig()
 
     case $prev in
         mode)
-            COMPREPLY=( $(compgen -W 'managed ad-hoc master repeater secondary
-                monitor' -- "$cur") )
+            COMPREPLY=($(compgen -W 'managed ad-hoc master repeater secondary
+                monitor' -- "$cur"))
             return
             ;;
         essid)
-            COMPREPLY=( $(compgen -W 'on off any' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on off any' -- "$cur"))
             if [[ -n ${COMP_IWLIST_SCAN:-} ]]; then
-                COMPREPLY+=( $(compgen -W \
-                    "$(iwlist ${words[1]} scan | \
-                    awk -F'\"' '/ESSID/ {print $2}')" -- "$cur") )
+                COMPREPLY+=($(compgen -W \
+                    "$(iwlist ${words[1]} scan |
+                        awk -F'\"' '/ESSID/ {print $2}')" -- "$cur"))
             fi
             return
             ;;
         nwid)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         channel)
-            COMPREPLY=( $(compgen -W "$(iwlist ${words[1]} channel | \
-                awk '/^[ \t]*Channel/ {print $2}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$(iwlist ${words[1]} channel |
+                awk '/^[ \t]*Channel/ {print $2}')" -- "$cur"))
             return
             ;;
 
         freq)
-            COMPREPLY=( $(compgen -W "$(iwlist ${words[1]} channel | \
-                awk '/^[ \t]*Channel/ {print $4"G"}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$(iwlist ${words[1]} channel |
+                awk '/^[ \t]*Channel/ {print $4"G"}')" -- "$cur"))
             return
             ;;
         ap)
-            COMPREPLY=( $(compgen -W 'on off any' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on off any' -- "$cur"))
             if [[ -n ${COMP_IWLIST_SCAN:-} ]]; then
-                COMPREPLY+=( $(compgen -W \
-                    "$(iwlist ${words[1]} scan | \
-                    awk -F ': ' '/Address/ {print $2}')" -- "$cur") )
+                COMPREPLY+=($(compgen -W \
+                    "$(iwlist ${words[1]} scan |
+                        awk -F ': ' '/Address/ {print $2}')" -- "$cur"))
             fi
             return
             ;;
         rate)
-            COMPREPLY=( $(compgen -W 'auto fixed' -- "$cur") )
-            COMPREPLY+=( $(compgen -W \
-                "$(iwlist ${words[1]} rate | \
-                awk '/^[ \t]*[0-9]/ {print $1"M"}')" -- "$cur") )
+            COMPREPLY=($(compgen -W 'auto fixed' -- "$cur"))
+            COMPREPLY+=($(compgen -W \
+                "$(iwlist ${words[1]} rate |
+                    awk '/^[ \t]*[0-9]/ {print $1"M"}')" -- "$cur"))
             return
             ;;
-        rts|frag)
-            COMPREPLY=( $(compgen -W 'auto fixed off' -- "$cur") )
+        rts | frag)
+            COMPREPLY=($(compgen -W 'auto fixed off' -- "$cur"))
             return
             ;;
-        key|enc)
-            COMPREPLY=( $(compgen -W 'off on open restricted' -- "$cur") )
+        key | enc)
+            COMPREPLY=($(compgen -W 'off on open restricted' -- "$cur"))
             return
             ;;
         power)
-            COMPREPLY=( $(compgen -W 'period timeout off on' -- "$cur") )
+            COMPREPLY=($(compgen -W 'period timeout off on' -- "$cur"))
             return
             ;;
         txpower)
-            COMPREPLY=( $(compgen -W 'off on auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'off on auto' -- "$cur"))
             return
             ;;
         retry)
-            COMPREPLY=( $(compgen -W 'limit lifetime' -- "$cur") )
+            COMPREPLY=($(compgen -W 'limit lifetime' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
         else
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $(compgen -W 'essid nwid mode freq channel sens mode ap
-            nick rate rts frag enc key power txpower commit' -- "$cur") )
+        COMPREPLY=($(compgen -W 'essid nwid mode freq channel sens mode ap
+            nick rate rts frag enc key power txpower commit' -- "$cur"))
     fi
 
 } &&
-complete -F _iwconfig iwconfig
+    complete -F _iwconfig iwconfig
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iwlist b/msys2/usr/share/bash-completion/completions/iwlist
index 65e0b2fbf..16aa39c90 100644
--- a/msys2/usr/share/bash-completion/completions/iwlist
+++ b/msys2/usr/share/bash-completion/completions/iwlist
@@ -5,18 +5,18 @@ _iwlist()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
         else
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $(compgen -W 'scan scanning freq frequency channel rate
+        COMPREPLY=($(compgen -W 'scan scanning freq frequency channel rate
             bit bitrate key enc encryption power txpower retry ap accesspoint
-            peers event' -- "$cur") )
+            peers event' -- "$cur"))
     fi
 } &&
-complete -F _iwlist iwlist
+    complete -F _iwlist iwlist
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iwpriv b/msys2/usr/share/bash-completion/completions/iwpriv
index 83673b4e1..4e382463d 100644
--- a/msys2/usr/share/bash-completion/completions/iwpriv
+++ b/msys2/usr/share/bash-completion/completions/iwpriv
@@ -7,25 +7,25 @@ _iwpriv()
 
     case $prev in
         roam)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         port)
-            COMPREPLY=( $(compgen -W 'ad-hoc managed' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ad-hoc managed' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
         else
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $(compgen -W '--all roam port' -- "$cur") )
+        COMPREPLY=($(compgen -W '--all roam port' -- "$cur"))
     fi
 } &&
-complete -F _iwpriv iwpriv
+    complete -F _iwpriv iwpriv
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/iwspy b/msys2/usr/share/bash-completion/completions/iwspy
index e48051166..38b7868ed 100644
--- a/msys2/usr/share/bash-completion/completions/iwspy
+++ b/msys2/usr/share/bash-completion/completions/iwspy
@@ -5,16 +5,16 @@ _iwspy()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
         else
             _available_interfaces -w
         fi
     else
-        COMPREPLY=( $(compgen -W 'setthr getthr off' -- "$cur") )
+        COMPREPLY=($(compgen -W 'setthr getthr off' -- "$cur"))
     fi
 } &&
-complete -F _iwspy iwspy
+    complete -F _iwspy iwspy
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jar b/msys2/usr/share/bash-completion/completions/jar
index c839aa856..228949179 100644
--- a/msys2/usr/share/bash-completion/completions/jar
+++ b/msys2/usr/share/bash-completion/completions/jar
@@ -5,8 +5,8 @@ _jar()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'c t x u' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'c t x u' -- "$cur"))
         return
     fi
 
@@ -22,6 +22,6 @@ _jar()
             ;;
     esac
 } &&
-complete -F _jar jar
+    complete -F _jar jar
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jarsigner b/msys2/usr/share/bash-completion/completions/jarsigner
index 171865b23..1f26c9c23 100644
--- a/msys2/usr/share/bash-completion/completions/jarsigner
+++ b/msys2/usr/share/bash-completion/completions/jarsigner
@@ -7,51 +7,51 @@ _jarsigner()
 
     case $prev in
         -keystore)
-            COMPREPLY=( $(compgen -W 'NONE' -- "$cur") )
+            COMPREPLY=($(compgen -W 'NONE' -- "$cur"))
             _filedir '@(jks|ks|p12|pfx)'
             return
             ;;
-        -storepass|-keypass|-sigfile|-digestalg|-sigalg|-tsacert|-tsapolicyid|\
-        -tsadigestalg|-altsigner|-altsignerpath|-providerName|-providerClass|\
-        -providerArg)
+        -storepass | -keypass | -sigfile | -digestalg | -sigalg | -tsacert | -tsapolicyid | \
+            -tsadigestalg | -altsigner | -altsignerpath | -providerName | -providerClass | \
+            -providerArg)
             return
             ;;
-        -certchain|-sigfile|-tsa)
+        -certchain | -tsa)
             _filedir
             return
             ;;
         -storetype)
-            COMPREPLY=( $(compgen -W 'JKS PKCS11 PKCS12' -- "$cur") )
+            COMPREPLY=($(compgen -W 'JKS PKCS11 PKCS12' -- "$cur"))
             return
             ;;
         -signedjar)
-            _filedir jar
+            _filedir '@(jar|apk)'
             return
             ;;
     esac
 
     # Check if a jar was already given.
     local i jar=false
-    for (( i=0; i < ${#words[@]}-1; i++ )) ; do
-        if [[ "${words[i]}" == *.jar && \
-            "${words[i-1]}" != -signedjar ]]; then
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
+        if [[ ${words[i]} == *.@(jar|apk) && \
+            ${words[i - 1]} != -signedjar ]]; then
             jar=true
             break
         fi
     done
 
-    if ! $jar ; then
-        if [[ "$cur" == -* ]]; then
+    if ! $jar; then
+        if [[ $cur == -* ]]; then
             # Documented as "should not be used": -internalsf, -sectionsonly
-            COMPREPLY=( $(compgen -W '-keystore -storepass -storetype
+            COMPREPLY=($(compgen -W '-keystore -storepass -storetype
                 -keypass -sigfile -signedjar -digestalg -sigalg -verify
                 -verbose -certs -tsa -tsacert -altsigner -altsignerpath
                 -protected -providerName -providerClass -providerArg' \
-                -- "$cur") )
+                -- "$cur"))
         fi
-        _filedir jar
+        _filedir '@(jar|apk)'
     fi
 } &&
-complete -F _jarsigner jarsigner
+    complete -F _jarsigner jarsigner
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/java b/msys2/usr/share/bash-completion/completions/java
index 89d207d23..d0f70ae6a 100644
--- a/msys2/usr/share/bash-completion/completions/java
+++ b/msys2/usr/share/bash-completion/completions/java
@@ -13,15 +13,15 @@ _java_find_classpath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(cp|classpath) ]]; then
-            classpath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(cp|classpath) ]]; then
+            classpath=${words[i + 1]}
             break
         fi
     done
 
     # default to environment
-    [[ -z $classpath ]] && classpath=$CLASSPATH
+    [[ ! -v classpath ]] && classpath=${CLASSPATH-}
 
     # default to current directory
     [[ -z $classpath ]] && classpath=.
@@ -33,15 +33,15 @@ _java_find_sourcepath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -sourcepath ]]; then
-            sourcepath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -sourcepath ]]; then
+            sourcepath=${words[i + 1]}
             break
         fi
     done
 
     # default to classpath
-    if [[ -z $sourcepath ]]; then
+    if [[ ! -v sourcepath ]]; then
         local classpath
         _java_find_classpath
         sourcepath=$classpath
@@ -60,27 +60,27 @@ _java_classes()
     cur=${cur//.//}
     # parse each classpath element for classes
     for i in ${classpath//:/ }; do
-        if [[ "$i" == *.@(jar|zip) && -r $i ]]; then
+        if [[ $i == *.@(jar|zip) && -r $i ]]; then
             if type zipinfo &>/dev/null; then
-                COMPREPLY+=( $(zipinfo -1 "$i" "$cur*" 2>/dev/null | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(zipinfo -1 "$i" "$cur*" 2>/dev/null |
+                    command grep '^[^$]*\.class$'))
             elif type unzip &>/dev/null; then
                 # Last column, between entries consisting entirely of dashes
-                COMPREPLY+=( $(unzip -lq "$i" "$cur*" 2>/dev/null | \
+                COMPREPLY+=($(unzip -lq "$i" "$cur*" 2>/dev/null |
                     awk '$NF ~ /^-+$/ { flag=!flag; next };
-                         flag && $NF ~ /^[^$]*\.class/ { print $NF }') )
+                         flag && $NF ~ /^[^$]*\.class/ { print $NF }'))
             elif type jar &>/dev/null; then
-                COMPREPLY+=( $(jar tf "$i" "$cur" | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(jar tf "$i" "$cur" |
+                    command grep '^[^$]*\.class$'))
             fi
 
         elif [[ -d $i ]]; then
             COMPREPLY+=(
                 $(compgen -d -- "$i/$cur" | command sed -e "s|^$i/\(.*\)|\1.|")
-                $(compgen -f -X '!*.class' -- "$i/$cur" | \
-                  command sed -e '/\$/d' -e "s|^$i/||")
+                $(compgen -f -X '!*.class' -- "$i/$cur" |
+                    command sed -e '/\$/d' -e "s|^$i/||")
             )
-            [[ $COMPREPLY == *.class ]] || compopt -o nospace
+            [[ ${COMPREPLY-} == *.class ]] || compopt -o nospace
 
             # FIXME: if we have foo.class and foo/, the completion
             # returns "foo/"... how to give precedence to files
@@ -88,10 +88,12 @@ _java_classes()
         fi
     done
 
-    # remove class extension
-    COMPREPLY=( ${COMPREPLY[@]%.class} )
-    # convert path syntax to package syntax
-    COMPREPLY=( ${COMPREPLY[@]//\//.} )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # remove class extension
+        COMPREPLY=(${COMPREPLY[@]%.class})
+        # convert path syntax to package syntax
+        COMPREPLY=(${COMPREPLY[@]//\//.})
+    fi
 }
 
 # available packages completion
@@ -107,16 +109,18 @@ _java_packages()
     # parse each sourcepath element for packages
     for i in ${sourcepath//:/ }; do
         if [[ -d $i ]]; then
-            COMPREPLY+=( $(command ls -F -d $i/$cur* 2>/dev/null | \
-                command sed -e 's|^'$i'/||') )
+            COMPREPLY+=($(command ls -F -d $i/$cur* 2>/dev/null |
+                command sed -e 's|^'$i'/||'))
         fi
     done
-    # keep only packages
-    COMPREPLY=( $(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$") )
-    # remove packages extension
-    COMPREPLY=( ${COMPREPLY[@]%/} )
-    # convert path syntax to package syntax
-    cur=${COMPREPLY[@]//\//.}
+    if ((${#COMPREPLY[@]} != 0)); then
+        # keep only packages
+        COMPREPLY=($(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$"))
+        # remove packages extension
+        COMPREPLY=(${COMPREPLY[@]%/})
+        # convert path syntax to package syntax
+        cur="${COMPREPLY[*]//\//.}"
+    fi
 }
 
 # java completion
@@ -128,9 +132,9 @@ _java()
 
     local i
 
-    for ((i=1; i < $cword; i++)); do
-        case ${words[$i]} in
-            -cp|-classpath)
+    for ((i = 1; i < cword; i++)); do
+        case ${words[i]} in
+            -cp | -classpath)
                 ((i++)) # skip the classpath string.
                 ;;
             -*)
@@ -147,7 +151,7 @@ _java()
     case $cur in
         # standard option completions
         -verbose:*)
-            COMPREPLY=( $(compgen -W 'class gc jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'class gc jni' -- "${cur#*:}"))
             return
             ;;
         -javaagent:*)
@@ -171,56 +175,56 @@ _java()
             return
             ;;
         -Xcheck:*)
-            COMPREPLY=( $(compgen -W 'jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'jni' -- "${cur#*:}"))
             return
             ;;
         -Xgc:*)
-            COMPREPLY=( $(compgen -W 'singlecon gencon singlepar genpar' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'singlecon gencon singlepar genpar' \
+                -- "${cur#*:}"))
             return
             ;;
         -Xgcprio:*)
-            COMPREPLY=( $(compgen -W 'throughput pausetime deterministic' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'throughput pausetime deterministic' \
+                -- "${cur#*:}"))
             return
             ;;
-        -Xloggc:*|-Xverboselog:*)
+        -Xloggc:* | -Xverboselog:*)
             cur=${cur#*:}
             _filedir
             return
             ;;
         -Xshare:*)
-            COMPREPLY=( $(compgen -W 'auto off on' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'auto off on' -- "${cur#*:}"))
             return
             ;;
         -Xverbose:*)
-            COMPREPLY=( $(compgen -W 'memory load jni cpuinfo codegen opt
-                gcpause gcreport' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'memory load jni cpuinfo codegen opt
+                gcpause gcreport' -- "${cur#*:}"))
             return
             ;;
         -Xverify:*)
-            COMPREPLY=( $(compgen -W 'all none remote' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'all none remote' -- "${cur#*:}"))
             return
             ;;
         # the rest that we have no completions for
-        -D*|-*:*)
+        -D* | -*:*)
             return
             ;;
     esac
 
     case $prev in
-        -cp|-classpath)
+        -cp | -classpath)
             _java_path
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
-        if [[ "$prev" == -jar ]]; then
+        if [[ $prev == -jar ]]; then
             # jar file completion
             _filedir '[jw]ar'
         else
@@ -229,11 +233,11 @@ _java()
         fi
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _java java
+    complete -F _java java
 
 _javadoc()
 {
@@ -241,42 +245,38 @@ _javadoc()
     _init_completion || return
 
     case $prev in
-        -overview|-helpfile)
+        -overview | -helpfile)
             _filedir '?(x)htm?(l)'
             return
             ;;
-        -doclet|-exclude|-subpackages|-source|-locale|-encoding|-windowtitle|\
-        -doctitle|-header|-footer|-top|-bottom|-group|-noqualifier|-tag|\
-        -charset|-sourcetab|-docencoding)
+        -doclet | -exclude | -subpackages | -source | -locale | -encoding | -windowtitle | \
+            -doctitle | -header | -footer | -top | -bottom | -group | -noqualifier | -tag | \
+            -charset | -sourcetab | -docencoding)
             return
             ;;
         -stylesheetfile)
             _filedir css
             return
             ;;
-        -d|-link|-linkoffline)
+        -d | -link | -linkoffline)
             _filedir -d
             return
             ;;
-        -classpath|-cp|-bootclasspath|-docletpath|-sourcepath|-extdirs|\
-        -excludedocfilessubdir)
+        -classpath | -cp | -bootclasspath | -docletpath | -sourcepath | -extdirs | \
+            -excludedocfilessubdir)
             _java_path
             return
             ;;
-        -helpfile)
-            _filedir
-            return
-            ;;
     esac
 
     # -linkoffline takes two arguments
-    if [[ $cword -gt 2 && ${words[$cword-2]} == -linkoffline ]]; then
+    if [[ $cword -gt 2 && ${words[cword - 2]} == -linkoffline ]]; then
         _filedir -d
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
     else
         # source files completion
         _filedir java
@@ -284,7 +284,7 @@ _javadoc()
         _java_packages
     fi
 } &&
-complete -F _javadoc javadoc
+    complete -F _javadoc javadoc
 
 _javac()
 {
@@ -296,13 +296,13 @@ _javac()
             _filedir -d
             return
             ;;
-        -cp|-classpath|-bootclasspath|-sourcepath|-extdirs)
+        -cp | -classpath | -bootclasspath | -sourcepath | -extdirs)
             _java_path
             return
             ;;
     esac
 
-    if [[ $cur == -+([a-zA-z0-9-_]):* ]]; then
+    if [[ $cur == -+([a-zA-Z0-9-_]):* ]]; then
         # Parse required options from -foo:{bar,quux,baz}
         local helpopt=-help
         [[ $cur == -X* ]] && helpopt=-X
@@ -311,23 +311,23 @@ _javac()
         # the others.
         local opts=$("$1" $helpopt 2>&1 | command sed -e 's/-g:none/-g:{none}/' -ne \
             "s/^[[:space:]]*${cur%%:*}:{\([^}]\{1,\}\)}.*/\1/p")
-        COMPREPLY=( $(compgen -W "${opts//,/ }" -- "${cur#*:}") )
+        COMPREPLY=($(compgen -W "${opts//,/ }" -- "${cur#*:}"))
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
         # source files completion
         _filedir java
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _javac javac
+    complete -F _javac javac
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/javac b/msys2/usr/share/bash-completion/completions/javac
index 89d207d23..d0f70ae6a 100644
--- a/msys2/usr/share/bash-completion/completions/javac
+++ b/msys2/usr/share/bash-completion/completions/javac
@@ -13,15 +13,15 @@ _java_find_classpath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(cp|classpath) ]]; then
-            classpath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(cp|classpath) ]]; then
+            classpath=${words[i + 1]}
             break
         fi
     done
 
     # default to environment
-    [[ -z $classpath ]] && classpath=$CLASSPATH
+    [[ ! -v classpath ]] && classpath=${CLASSPATH-}
 
     # default to current directory
     [[ -z $classpath ]] && classpath=.
@@ -33,15 +33,15 @@ _java_find_sourcepath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -sourcepath ]]; then
-            sourcepath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -sourcepath ]]; then
+            sourcepath=${words[i + 1]}
             break
         fi
     done
 
     # default to classpath
-    if [[ -z $sourcepath ]]; then
+    if [[ ! -v sourcepath ]]; then
         local classpath
         _java_find_classpath
         sourcepath=$classpath
@@ -60,27 +60,27 @@ _java_classes()
     cur=${cur//.//}
     # parse each classpath element for classes
     for i in ${classpath//:/ }; do
-        if [[ "$i" == *.@(jar|zip) && -r $i ]]; then
+        if [[ $i == *.@(jar|zip) && -r $i ]]; then
             if type zipinfo &>/dev/null; then
-                COMPREPLY+=( $(zipinfo -1 "$i" "$cur*" 2>/dev/null | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(zipinfo -1 "$i" "$cur*" 2>/dev/null |
+                    command grep '^[^$]*\.class$'))
             elif type unzip &>/dev/null; then
                 # Last column, between entries consisting entirely of dashes
-                COMPREPLY+=( $(unzip -lq "$i" "$cur*" 2>/dev/null | \
+                COMPREPLY+=($(unzip -lq "$i" "$cur*" 2>/dev/null |
                     awk '$NF ~ /^-+$/ { flag=!flag; next };
-                         flag && $NF ~ /^[^$]*\.class/ { print $NF }') )
+                         flag && $NF ~ /^[^$]*\.class/ { print $NF }'))
             elif type jar &>/dev/null; then
-                COMPREPLY+=( $(jar tf "$i" "$cur" | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(jar tf "$i" "$cur" |
+                    command grep '^[^$]*\.class$'))
             fi
 
         elif [[ -d $i ]]; then
             COMPREPLY+=(
                 $(compgen -d -- "$i/$cur" | command sed -e "s|^$i/\(.*\)|\1.|")
-                $(compgen -f -X '!*.class' -- "$i/$cur" | \
-                  command sed -e '/\$/d' -e "s|^$i/||")
+                $(compgen -f -X '!*.class' -- "$i/$cur" |
+                    command sed -e '/\$/d' -e "s|^$i/||")
             )
-            [[ $COMPREPLY == *.class ]] || compopt -o nospace
+            [[ ${COMPREPLY-} == *.class ]] || compopt -o nospace
 
             # FIXME: if we have foo.class and foo/, the completion
             # returns "foo/"... how to give precedence to files
@@ -88,10 +88,12 @@ _java_classes()
         fi
     done
 
-    # remove class extension
-    COMPREPLY=( ${COMPREPLY[@]%.class} )
-    # convert path syntax to package syntax
-    COMPREPLY=( ${COMPREPLY[@]//\//.} )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # remove class extension
+        COMPREPLY=(${COMPREPLY[@]%.class})
+        # convert path syntax to package syntax
+        COMPREPLY=(${COMPREPLY[@]//\//.})
+    fi
 }
 
 # available packages completion
@@ -107,16 +109,18 @@ _java_packages()
     # parse each sourcepath element for packages
     for i in ${sourcepath//:/ }; do
         if [[ -d $i ]]; then
-            COMPREPLY+=( $(command ls -F -d $i/$cur* 2>/dev/null | \
-                command sed -e 's|^'$i'/||') )
+            COMPREPLY+=($(command ls -F -d $i/$cur* 2>/dev/null |
+                command sed -e 's|^'$i'/||'))
         fi
     done
-    # keep only packages
-    COMPREPLY=( $(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$") )
-    # remove packages extension
-    COMPREPLY=( ${COMPREPLY[@]%/} )
-    # convert path syntax to package syntax
-    cur=${COMPREPLY[@]//\//.}
+    if ((${#COMPREPLY[@]} != 0)); then
+        # keep only packages
+        COMPREPLY=($(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$"))
+        # remove packages extension
+        COMPREPLY=(${COMPREPLY[@]%/})
+        # convert path syntax to package syntax
+        cur="${COMPREPLY[*]//\//.}"
+    fi
 }
 
 # java completion
@@ -128,9 +132,9 @@ _java()
 
     local i
 
-    for ((i=1; i < $cword; i++)); do
-        case ${words[$i]} in
-            -cp|-classpath)
+    for ((i = 1; i < cword; i++)); do
+        case ${words[i]} in
+            -cp | -classpath)
                 ((i++)) # skip the classpath string.
                 ;;
             -*)
@@ -147,7 +151,7 @@ _java()
     case $cur in
         # standard option completions
         -verbose:*)
-            COMPREPLY=( $(compgen -W 'class gc jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'class gc jni' -- "${cur#*:}"))
             return
             ;;
         -javaagent:*)
@@ -171,56 +175,56 @@ _java()
             return
             ;;
         -Xcheck:*)
-            COMPREPLY=( $(compgen -W 'jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'jni' -- "${cur#*:}"))
             return
             ;;
         -Xgc:*)
-            COMPREPLY=( $(compgen -W 'singlecon gencon singlepar genpar' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'singlecon gencon singlepar genpar' \
+                -- "${cur#*:}"))
             return
             ;;
         -Xgcprio:*)
-            COMPREPLY=( $(compgen -W 'throughput pausetime deterministic' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'throughput pausetime deterministic' \
+                -- "${cur#*:}"))
             return
             ;;
-        -Xloggc:*|-Xverboselog:*)
+        -Xloggc:* | -Xverboselog:*)
             cur=${cur#*:}
             _filedir
             return
             ;;
         -Xshare:*)
-            COMPREPLY=( $(compgen -W 'auto off on' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'auto off on' -- "${cur#*:}"))
             return
             ;;
         -Xverbose:*)
-            COMPREPLY=( $(compgen -W 'memory load jni cpuinfo codegen opt
-                gcpause gcreport' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'memory load jni cpuinfo codegen opt
+                gcpause gcreport' -- "${cur#*:}"))
             return
             ;;
         -Xverify:*)
-            COMPREPLY=( $(compgen -W 'all none remote' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'all none remote' -- "${cur#*:}"))
             return
             ;;
         # the rest that we have no completions for
-        -D*|-*:*)
+        -D* | -*:*)
             return
             ;;
     esac
 
     case $prev in
-        -cp|-classpath)
+        -cp | -classpath)
             _java_path
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
-        if [[ "$prev" == -jar ]]; then
+        if [[ $prev == -jar ]]; then
             # jar file completion
             _filedir '[jw]ar'
         else
@@ -229,11 +233,11 @@ _java()
         fi
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _java java
+    complete -F _java java
 
 _javadoc()
 {
@@ -241,42 +245,38 @@ _javadoc()
     _init_completion || return
 
     case $prev in
-        -overview|-helpfile)
+        -overview | -helpfile)
             _filedir '?(x)htm?(l)'
             return
             ;;
-        -doclet|-exclude|-subpackages|-source|-locale|-encoding|-windowtitle|\
-        -doctitle|-header|-footer|-top|-bottom|-group|-noqualifier|-tag|\
-        -charset|-sourcetab|-docencoding)
+        -doclet | -exclude | -subpackages | -source | -locale | -encoding | -windowtitle | \
+            -doctitle | -header | -footer | -top | -bottom | -group | -noqualifier | -tag | \
+            -charset | -sourcetab | -docencoding)
             return
             ;;
         -stylesheetfile)
             _filedir css
             return
             ;;
-        -d|-link|-linkoffline)
+        -d | -link | -linkoffline)
             _filedir -d
             return
             ;;
-        -classpath|-cp|-bootclasspath|-docletpath|-sourcepath|-extdirs|\
-        -excludedocfilessubdir)
+        -classpath | -cp | -bootclasspath | -docletpath | -sourcepath | -extdirs | \
+            -excludedocfilessubdir)
             _java_path
             return
             ;;
-        -helpfile)
-            _filedir
-            return
-            ;;
     esac
 
     # -linkoffline takes two arguments
-    if [[ $cword -gt 2 && ${words[$cword-2]} == -linkoffline ]]; then
+    if [[ $cword -gt 2 && ${words[cword - 2]} == -linkoffline ]]; then
         _filedir -d
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
     else
         # source files completion
         _filedir java
@@ -284,7 +284,7 @@ _javadoc()
         _java_packages
     fi
 } &&
-complete -F _javadoc javadoc
+    complete -F _javadoc javadoc
 
 _javac()
 {
@@ -296,13 +296,13 @@ _javac()
             _filedir -d
             return
             ;;
-        -cp|-classpath|-bootclasspath|-sourcepath|-extdirs)
+        -cp | -classpath | -bootclasspath | -sourcepath | -extdirs)
             _java_path
             return
             ;;
     esac
 
-    if [[ $cur == -+([a-zA-z0-9-_]):* ]]; then
+    if [[ $cur == -+([a-zA-Z0-9-_]):* ]]; then
         # Parse required options from -foo:{bar,quux,baz}
         local helpopt=-help
         [[ $cur == -X* ]] && helpopt=-X
@@ -311,23 +311,23 @@ _javac()
         # the others.
         local opts=$("$1" $helpopt 2>&1 | command sed -e 's/-g:none/-g:{none}/' -ne \
             "s/^[[:space:]]*${cur%%:*}:{\([^}]\{1,\}\)}.*/\1/p")
-        COMPREPLY=( $(compgen -W "${opts//,/ }" -- "${cur#*:}") )
+        COMPREPLY=($(compgen -W "${opts//,/ }" -- "${cur#*:}"))
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
         # source files completion
         _filedir java
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _javac javac
+    complete -F _javac javac
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/javadoc b/msys2/usr/share/bash-completion/completions/javadoc
index 89d207d23..d0f70ae6a 100644
--- a/msys2/usr/share/bash-completion/completions/javadoc
+++ b/msys2/usr/share/bash-completion/completions/javadoc
@@ -13,15 +13,15 @@ _java_find_classpath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(cp|classpath) ]]; then
-            classpath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(cp|classpath) ]]; then
+            classpath=${words[i + 1]}
             break
         fi
     done
 
     # default to environment
-    [[ -z $classpath ]] && classpath=$CLASSPATH
+    [[ ! -v classpath ]] && classpath=${CLASSPATH-}
 
     # default to current directory
     [[ -z $classpath ]] && classpath=.
@@ -33,15 +33,15 @@ _java_find_sourcepath()
     local i
 
     # search first in current options
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -sourcepath ]]; then
-            sourcepath=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -sourcepath ]]; then
+            sourcepath=${words[i + 1]}
             break
         fi
     done
 
     # default to classpath
-    if [[ -z $sourcepath ]]; then
+    if [[ ! -v sourcepath ]]; then
         local classpath
         _java_find_classpath
         sourcepath=$classpath
@@ -60,27 +60,27 @@ _java_classes()
     cur=${cur//.//}
     # parse each classpath element for classes
     for i in ${classpath//:/ }; do
-        if [[ "$i" == *.@(jar|zip) && -r $i ]]; then
+        if [[ $i == *.@(jar|zip) && -r $i ]]; then
             if type zipinfo &>/dev/null; then
-                COMPREPLY+=( $(zipinfo -1 "$i" "$cur*" 2>/dev/null | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(zipinfo -1 "$i" "$cur*" 2>/dev/null |
+                    command grep '^[^$]*\.class$'))
             elif type unzip &>/dev/null; then
                 # Last column, between entries consisting entirely of dashes
-                COMPREPLY+=( $(unzip -lq "$i" "$cur*" 2>/dev/null | \
+                COMPREPLY+=($(unzip -lq "$i" "$cur*" 2>/dev/null |
                     awk '$NF ~ /^-+$/ { flag=!flag; next };
-                         flag && $NF ~ /^[^$]*\.class/ { print $NF }') )
+                         flag && $NF ~ /^[^$]*\.class/ { print $NF }'))
             elif type jar &>/dev/null; then
-                COMPREPLY+=( $(jar tf "$i" "$cur" | \
-                    command grep '^[^$]*\.class$') )
+                COMPREPLY+=($(jar tf "$i" "$cur" |
+                    command grep '^[^$]*\.class$'))
             fi
 
         elif [[ -d $i ]]; then
             COMPREPLY+=(
                 $(compgen -d -- "$i/$cur" | command sed -e "s|^$i/\(.*\)|\1.|")
-                $(compgen -f -X '!*.class' -- "$i/$cur" | \
-                  command sed -e '/\$/d' -e "s|^$i/||")
+                $(compgen -f -X '!*.class' -- "$i/$cur" |
+                    command sed -e '/\$/d' -e "s|^$i/||")
             )
-            [[ $COMPREPLY == *.class ]] || compopt -o nospace
+            [[ ${COMPREPLY-} == *.class ]] || compopt -o nospace
 
             # FIXME: if we have foo.class and foo/, the completion
             # returns "foo/"... how to give precedence to files
@@ -88,10 +88,12 @@ _java_classes()
         fi
     done
 
-    # remove class extension
-    COMPREPLY=( ${COMPREPLY[@]%.class} )
-    # convert path syntax to package syntax
-    COMPREPLY=( ${COMPREPLY[@]//\//.} )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # remove class extension
+        COMPREPLY=(${COMPREPLY[@]%.class})
+        # convert path syntax to package syntax
+        COMPREPLY=(${COMPREPLY[@]//\//.})
+    fi
 }
 
 # available packages completion
@@ -107,16 +109,18 @@ _java_packages()
     # parse each sourcepath element for packages
     for i in ${sourcepath//:/ }; do
         if [[ -d $i ]]; then
-            COMPREPLY+=( $(command ls -F -d $i/$cur* 2>/dev/null | \
-                command sed -e 's|^'$i'/||') )
+            COMPREPLY+=($(command ls -F -d $i/$cur* 2>/dev/null |
+                command sed -e 's|^'$i'/||'))
         fi
     done
-    # keep only packages
-    COMPREPLY=( $(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$") )
-    # remove packages extension
-    COMPREPLY=( ${COMPREPLY[@]%/} )
-    # convert path syntax to package syntax
-    cur=${COMPREPLY[@]//\//.}
+    if ((${#COMPREPLY[@]} != 0)); then
+        # keep only packages
+        COMPREPLY=($(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$"))
+        # remove packages extension
+        COMPREPLY=(${COMPREPLY[@]%/})
+        # convert path syntax to package syntax
+        cur="${COMPREPLY[*]//\//.}"
+    fi
 }
 
 # java completion
@@ -128,9 +132,9 @@ _java()
 
     local i
 
-    for ((i=1; i < $cword; i++)); do
-        case ${words[$i]} in
-            -cp|-classpath)
+    for ((i = 1; i < cword; i++)); do
+        case ${words[i]} in
+            -cp | -classpath)
                 ((i++)) # skip the classpath string.
                 ;;
             -*)
@@ -147,7 +151,7 @@ _java()
     case $cur in
         # standard option completions
         -verbose:*)
-            COMPREPLY=( $(compgen -W 'class gc jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'class gc jni' -- "${cur#*:}"))
             return
             ;;
         -javaagent:*)
@@ -171,56 +175,56 @@ _java()
             return
             ;;
         -Xcheck:*)
-            COMPREPLY=( $(compgen -W 'jni' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'jni' -- "${cur#*:}"))
             return
             ;;
         -Xgc:*)
-            COMPREPLY=( $(compgen -W 'singlecon gencon singlepar genpar' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'singlecon gencon singlepar genpar' \
+                -- "${cur#*:}"))
             return
             ;;
         -Xgcprio:*)
-            COMPREPLY=( $(compgen -W 'throughput pausetime deterministic' \
-                -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'throughput pausetime deterministic' \
+                -- "${cur#*:}"))
             return
             ;;
-        -Xloggc:*|-Xverboselog:*)
+        -Xloggc:* | -Xverboselog:*)
             cur=${cur#*:}
             _filedir
             return
             ;;
         -Xshare:*)
-            COMPREPLY=( $(compgen -W 'auto off on' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'auto off on' -- "${cur#*:}"))
             return
             ;;
         -Xverbose:*)
-            COMPREPLY=( $(compgen -W 'memory load jni cpuinfo codegen opt
-                gcpause gcreport' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'memory load jni cpuinfo codegen opt
+                gcpause gcreport' -- "${cur#*:}"))
             return
             ;;
         -Xverify:*)
-            COMPREPLY=( $(compgen -W 'all none remote' -- "${cur#*:}") )
+            COMPREPLY=($(compgen -W 'all none remote' -- "${cur#*:}"))
             return
             ;;
         # the rest that we have no completions for
-        -D*|-*:*)
+        -D* | -*:*)
             return
             ;;
     esac
 
     case $prev in
-        -cp|-classpath)
+        -cp | -classpath)
             _java_path
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
-        if [[ "$prev" == -jar ]]; then
+        if [[ $prev == -jar ]]; then
             # jar file completion
             _filedir '[jw]ar'
         else
@@ -229,11 +233,11 @@ _java()
         fi
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _java java
+    complete -F _java java
 
 _javadoc()
 {
@@ -241,42 +245,38 @@ _javadoc()
     _init_completion || return
 
     case $prev in
-        -overview|-helpfile)
+        -overview | -helpfile)
             _filedir '?(x)htm?(l)'
             return
             ;;
-        -doclet|-exclude|-subpackages|-source|-locale|-encoding|-windowtitle|\
-        -doctitle|-header|-footer|-top|-bottom|-group|-noqualifier|-tag|\
-        -charset|-sourcetab|-docencoding)
+        -doclet | -exclude | -subpackages | -source | -locale | -encoding | -windowtitle | \
+            -doctitle | -header | -footer | -top | -bottom | -group | -noqualifier | -tag | \
+            -charset | -sourcetab | -docencoding)
             return
             ;;
         -stylesheetfile)
             _filedir css
             return
             ;;
-        -d|-link|-linkoffline)
+        -d | -link | -linkoffline)
             _filedir -d
             return
             ;;
-        -classpath|-cp|-bootclasspath|-docletpath|-sourcepath|-extdirs|\
-        -excludedocfilessubdir)
+        -classpath | -cp | -bootclasspath | -docletpath | -sourcepath | -extdirs | \
+            -excludedocfilessubdir)
             _java_path
             return
             ;;
-        -helpfile)
-            _filedir
-            return
-            ;;
     esac
 
     # -linkoffline takes two arguments
-    if [[ $cword -gt 2 && ${words[$cword-2]} == -linkoffline ]]; then
+    if [[ $cword -gt 2 && ${words[cword - 2]} == -linkoffline ]]; then
         _filedir -d
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
     else
         # source files completion
         _filedir java
@@ -284,7 +284,7 @@ _javadoc()
         _java_packages
     fi
 } &&
-complete -F _javadoc javadoc
+    complete -F _javadoc javadoc
 
 _javac()
 {
@@ -296,13 +296,13 @@ _javac()
             _filedir -d
             return
             ;;
-        -cp|-classpath|-bootclasspath|-sourcepath|-extdirs)
+        -cp | -classpath | -bootclasspath | -sourcepath | -extdirs)
             _java_path
             return
             ;;
     esac
 
-    if [[ $cur == -+([a-zA-z0-9-_]):* ]]; then
+    if [[ $cur == -+([a-zA-Z0-9-_]):* ]]; then
         # Parse required options from -foo:{bar,quux,baz}
         local helpopt=-help
         [[ $cur == -X* ]] && helpopt=-X
@@ -311,23 +311,23 @@ _javac()
         # the others.
         local opts=$("$1" $helpopt 2>&1 | command sed -e 's/-g:none/-g:{none}/' -ne \
             "s/^[[:space:]]*${cur%%:*}:{\([^}]\{1,\}\)}.*/\1/p")
-        COMPREPLY=( $(compgen -W "${opts//,/ }" -- "${cur#*:}") )
+        COMPREPLY=($(compgen -W "${opts//,/ }" -- "${cur#*:}"))
         return
     fi
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $cur == -X* ]] && \
-            COMPREPLY+=( $(compgen -W '$(_parse_help "$1" -X)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ $cur == -X* ]] &&
+            COMPREPLY+=($(compgen -W '$(_parse_help "$1" -X)' -- "$cur"))
     else
         # source files completion
         _filedir java
     fi
 
-    [[ $COMPREPLY == -*[:=] ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == -*[:=] ]] && compopt -o nospace
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _javac javac
+    complete -F _javac javac
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/javaws b/msys2/usr/share/bash-completion/completions/javaws
index c21d3ac4e..f42a1e55e 100644
--- a/msys2/usr/share/bash-completion/completions/javaws
+++ b/msys2/usr/share/bash-completion/completions/javaws
@@ -6,14 +6,14 @@ _javaws()
     _init_completion -n = || return
 
     case $prev in
-        -help|-license|-about|-viewer|-arg|-param|-property|-update|-umask)
+        -help | -license | -about | -viewer | -arg | -param | -property | -update | -umask)
             return
             ;;
-        -basedir|-codebase)
+        -basedir | -codebase)
             _filedir -d
             return
             ;;
-        -uninstall|-import)
+        -uninstall | -import)
             _filedir jnlp
             return
             ;;
@@ -22,13 +22,13 @@ _javaws()
     if [[ $cur == *= ]]; then
         return
     elif [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1" -help) " -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "$(_parse_help "$1" -help) " -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir jnlp
 } &&
-complete -F _javaws javaws
+    complete -F _javaws javaws
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jpegoptim b/msys2/usr/share/bash-completion/completions/jpegoptim
index 044cc753a..c36697217 100644
--- a/msys2/usr/share/bash-completion/completions/jpegoptim
+++ b/msys2/usr/share/bash-completion/completions/jpegoptim
@@ -6,19 +6,19 @@ _jpegoptim()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hV]*)
+        --help | --version | -!(-*)[hV]*)
             return
             ;;
-        --dest|-!(-*)d)
+        --dest | -!(-*)d)
             _filedir -d
             return
             ;;
-        --max|--threshold|-!(-*)[mT])
-            COMPREPLY=( $(compgen -W '{0..100}' -- "$cur") )
+        --max | --threshold | -!(-*)[mT])
+            COMPREPLY=($(compgen -W '{0..100}' -- "$cur"))
             return
             ;;
-        --size|-!(-*)S)
-            COMPREPLY=( $(compgen -W '{1..99}%' -- "$cur") )
+        --size | -!(-*)S)
+            COMPREPLY=($(compgen -W '{1..99}%' -- "$cur"))
             return
             ;;
     esac
@@ -26,13 +26,13 @@ _jpegoptim()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir 'jp?(e)g'
 } &&
-complete -F _jpegoptim jpegoptim
+    complete -F _jpegoptim jpegoptim
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jps b/msys2/usr/share/bash-completion/completions/jps
index a6a602994..a451eec1b 100644
--- a/msys2/usr/share/bash-completion/completions/jps
+++ b/msys2/usr/share/bash-completion/completions/jps
@@ -6,7 +6,7 @@ _jps()
     _init_completion || return
 
     case $prev in
-        -J*|-help)
+        -J* | -help)
             return
             ;;
     esac
@@ -14,12 +14,12 @@ _jps()
     if [[ $cur == -* ]]; then
         # Not using _parse_usage because output has [-help] which does not
         # mean -h, -e, -l, -p...
-        COMPREPLY=( $(compgen -W "-q -m -l -v -V -J -help" -- "$cur") )
-        [[ $COMPREPLY == -J* ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "-q -m -l -v -V -J -help" -- "$cur"))
+        [[ ${COMPREPLY-} == -J* ]] && compopt -o nospace
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _jps jps
+    complete -F _jps jps
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jq b/msys2/usr/share/bash-completion/completions/jq
index 3fdbfb0cc..2d99c3912 100644
--- a/msys2/usr/share/bash-completion/completions/jq
+++ b/msys2/usr/share/bash-completion/completions/jq
@@ -6,14 +6,14 @@ _jq()
     _init_completion || return
 
     case $prev in
-        --help|--version|--arg|--argjson|--slurpfile|--argfile)
+        --help | --version | --arg | --argjson | --slurpfile | --argfile)
             return
             ;;
         --indent)
-            COMPREPLY=( $(compgen -W '{1..8}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..8}' -- "$cur"))
             return
             ;;
-        --from-file|--run-tests|-!(-*)f)
+        --from-file | --run-tests | -!(-*)f)
             _filedir
             return
             ;;
@@ -23,19 +23,19 @@ _jq()
             ;;
     esac
 
-    (( cword > 2 )) && \
-    case ${words[cword-2]} in
-        --arg|--argjson)
-            return
-            ;;
-        --slurpfile|--argfile)
-            _filedir json
-            return
-            ;;
-    esac
+    ((cword > 2)) &&
+        case ${words[cword - 2]} in
+            --arg | --argjson)
+                return
+                ;;
+            --slurpfile | --argfile)
+                _filedir json
+                return
+                ;;
+        esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
@@ -44,11 +44,11 @@ _jq()
     _count_args "" "@(--arg|--arg?(json|file)|--?(slurp|from-)file|--indent|--run-tests|-!(-*)[fL])"
 
     # 1st arg is filter
-    [[ $args -eq 1 ]] && return
+    ((args == 1)) && return
     # 2... are input files
     _filedir json
 
 } &&
-complete -F _jq jq
+    complete -F _jq jq
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jshint b/msys2/usr/share/bash-completion/completions/jshint
index ee89070a6..3622cecfd 100644
--- a/msys2/usr/share/bash-completion/completions/jshint
+++ b/msys2/usr/share/bash-completion/completions/jshint
@@ -6,19 +6,19 @@ _jshint()
     _init_completion -s || return
 
     case $prev in
-        -v|--version|-h|--help|--exclude|--filename|-e|--extra-ext)
+        -v | --version | -h | --help | --exclude | --filename | -e | --extra-ext)
             return
             ;;
-        -c|--config)
+        -c | --config)
             _filedir
             return
             ;;
         --reporter)
-            COMPREPLY=( $(compgen -W "jslint checkstyle unix" -- "$cur") )
+            COMPREPLY=($(compgen -W "jslint checkstyle unix" -- "$cur"))
             return
             ;;
         --extract)
-            COMPREPLY=( $(compgen -W "auto always never" -- "$cur") )
+            COMPREPLY=($(compgen -W "auto always never" -- "$cur"))
             return
             ;;
     esac
@@ -26,13 +26,13 @@ _jshint()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir js
 } &&
-complete -F _jshint jshint
+    complete -F _jshint jshint
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/json_xs b/msys2/usr/share/bash-completion/completions/json_xs
index 98d0ba63e..c93ba8648 100644
--- a/msys2/usr/share/bash-completion/completions/json_xs
+++ b/msys2/usr/share/bash-completion/completions/json_xs
@@ -7,15 +7,15 @@ _json_xs()
 
     case $prev in
         -*f)
-            COMPREPLY=( $(compgen -W 'json cbor storable storable-file bencode
-                clzf eval yaml string none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'json cbor storable storable-file bencode
+                clzf eval yaml string none' -- "$cur"))
             return
             ;;
         -*t)
-            COMPREPLY=( $(compgen -W 'json json-utf-8 json-pretty
+            COMPREPLY=($(compgen -W 'json json-utf-8 json-pretty
                 json-utf-16le json-utf-16be json-utf-32le json-utf-32be
                 cbor storable storable-file bencode clzf yaml dump dumper
-                string none' -- "$cur") )
+                string none' -- "$cur"))
             return
             ;;
         -*e)
@@ -24,8 +24,8 @@ _json_xs()
     esac
 
     [[ $cur == -* ]] &&
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1") -f' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -f' -- "$cur"))
 } &&
-complete -F _json_xs json_xs
+    complete -F _json_xs json_xs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/jsonschema b/msys2/usr/share/bash-completion/completions/jsonschema
index 441977e4f..8a36ed364 100644
--- a/msys2/usr/share/bash-completion/completions/jsonschema
+++ b/msys2/usr/share/bash-completion/completions/jsonschema
@@ -6,24 +6,25 @@ _jsonschema()
     _init_completion || return
 
     case $prev in
-        --help|--error-format|--validator|-[hFV])
+        --help | --error-format | --validator | -[hFV])
             return
             ;;
-        --instance|-i)
+        --instance | -i)
             _filedir json
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    local args; _count_args "" "-*"
-    [[ $args -eq 1 ]] || return
+    local args
+    _count_args "" "-*"
+    ((args == 1)) || return
     _filedir '@(json|schema)'
 } &&
-complete -F _jsonschema jsonschema
+    complete -F _jsonschema jsonschema
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/k3b b/msys2/usr/share/bash-completion/completions/k3b
index b52e6de05..87d26cdc9 100644
--- a/msys2/usr/share/bash-completion/completions/k3b
+++ b/msys2/usr/share/bash-completion/completions/k3b
@@ -6,23 +6,23 @@ _k3b()
     _init_completion || return
 
     case $prev in
-        --help*|--author|-v|--version|--license|--lang)
+        --help* | --author | -v | --version | --license | --lang)
             return
             ;;
-        --datacd|--audiocd|--videocd|--mixedcd|--emovixcd|--videodvd)
+        --datacd | --audiocd | --videocd | --mixedcd | --emovixcd | --videodvd)
             _filedir
             return
             ;;
-        --copydvd|--formatdvd|--videodvdrip)
+        --copydvd | --formatdvd | --videodvdrip)
             _dvd_devices
             return
             ;;
-        --copycd|--erasecd|--cddarip|--videocdrip)
+        --copycd | --erasecd | --cddarip | --videocdrip)
             _cd_devices
             _dvd_devices
             return
             ;;
-        --cdimage|--image)
+        --cdimage | --image)
             _filedir '@(cue|iso|toc)'
             return
             ;;
@@ -31,18 +31,18 @@ _k3b()
             return
             ;;
         --ao)
-            COMPREPLY=( $(compgen -W 'alsa arts' -- "$cur") )
+            COMPREPLY=($(compgen -W 'alsa arts' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir
     fi
 } &&
-complete -F _k3b k3b
+    complete -F _k3b k3b
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/kcov b/msys2/usr/share/bash-completion/completions/kcov
index 8490a969e..672967afa 100644
--- a/msys2/usr/share/bash-completion/completions/kcov
+++ b/msys2/usr/share/bash-completion/completions/kcov
@@ -6,21 +6,21 @@ _kcov()
     _init_completion -s -n : || return
 
     case "$prev" in
-        --pid|-p)
+        --pid | -p)
             _pids
             return
             ;;
-        --sort-type|-s)
-            COMPREPLY=( $(compgen -W 'filename percent reverse lines
-                uncovered' -- "$cur") )
+        --sort-type | -s)
+            COMPREPLY=($(compgen -W 'filename percent reverse lines
+                uncovered' -- "$cur"))
             return
             ;;
-        --include-path|--exclude-path)
+        --include-path | --exclude-path)
             _filedir
             return
             ;;
         --replace-src-path)
-            if [[ "$cur" == ?*:* ]]; then
+            if [[ $cur == ?*:* ]]; then
                 cur="${cur##*:}"
                 _filedir
             else
@@ -29,21 +29,21 @@ _kcov()
             fi
             return
             ;;
-        --limits|-l)
-            if [[ "$cur" == ?*,* ]]; then
+        --limits | -l)
+            if [[ $cur == ?*,* ]]; then
                 prev="${cur%,*}"
                 cur="${cur##*,}"
-                COMPREPLY=( $(compgen -W "{0..100}" -- "$cur") )
-                [[ ${#COMPREPLY[@]} -eq 1 ]] && \
-                    COMPREPLY=( ${COMPREPLY/#/$prev,} )
+                COMPREPLY=($(compgen -W "{0..100}" -- "$cur"))
+                ((${#COMPREPLY[@]} == 1)) &&
+                    COMPREPLY=(${COMPREPLY/#/$prev,})
             else
-                COMPREPLY=( $(compgen -W "{0..100}" -- "$cur") )
-                [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/%/,} )
+                COMPREPLY=($(compgen -W "{0..100}" -- "$cur"))
+                ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/%/,})
                 compopt -o nospace
             fi
             return
             ;;
-        --title|-t|--include-pattern|--exclude-pattern|--path-strip-level)
+        --title | -t | --include-pattern | --exclude-pattern | --path-strip-level)
             # argument required but no completions available
             return
             ;;
@@ -51,14 +51,14 @@ _kcov()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _kcov kcov
+    complete -F _kcov kcov
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/kill b/msys2/usr/share/bash-completion/completions/kill
index 4cd5f9112..25cddbadc 100644
--- a/msys2/usr/share/bash-completion/completions/kill
+++ b/msys2/usr/share/bash-completion/completions/kill
@@ -15,15 +15,15 @@ _kill()
             ;;
     esac
 
-    if [[ $cword -eq 1 && "$cur" == -* ]]; then
+    if [[ $cword -eq 1 && $cur == -* ]]; then
         # return list of available signals
         _signals -
-        COMPREPLY+=( $(compgen -W "-s -l" -- "$cur") )
+        COMPREPLY+=($(compgen -W "-s -l" -- "$cur"))
     else
         # return list of available PIDs
         _pids
     fi
 } &&
-complete -F _kill kill
+    complete -F _kill kill
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/killall b/msys2/usr/share/bash-completion/completions/killall
index e1b56ce13..c7c0b0fc3 100644
--- a/msys2/usr/share/bash-completion/completions/killall
+++ b/msys2/usr/share/bash-completion/completions/killall
@@ -8,14 +8,14 @@ _killall()
     _init_completion -s || return
 
     case $prev in
-        --context|--older-than|--younger-than|--version|-!(-*)@([Zoy]|V*))
+        --context | --older-than | --younger-than | --version | -!(-*)@([Zoy]|V*))
             return
             ;;
-        --signal|-!(-*)s)
+        --signal | -!(-*)s)
             _signals
             return
             ;;
-        --user|-!(-*)u)
+        --user | -!(-*)u)
             _allowed_users
             return
             ;;
@@ -24,13 +24,13 @@ _killall()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $cword -eq 1 ]] && _signals -
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        ((cword == 1)) && _signals -
         return
     fi
 
     _pnames
 } &&
-complete -F _killall killall
+    complete -F _killall killall
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/kldload b/msys2/usr/share/bash-completion/completions/kldload
index 4817679e1..f5111584c 100644
--- a/msys2/usr/share/bash-completion/completions/kldload
+++ b/msys2/usr/share/bash-completion/completions/kldload
@@ -11,11 +11,11 @@ _kldload()
     [[ -d $moddir ]] || moddir=/boot/kernel/
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f "$moddir$cur") )
-    COMPREPLY=( ${COMPREPLY[@]#$moddir} )
-    COMPREPLY=( ${COMPREPLY[@]%.ko} )
+    COMPREPLY=($(compgen -f "$moddir$cur"))
+    COMPREPLY=(${COMPREPLY[@]#$moddir})
+    COMPREPLY=(${COMPREPLY[@]%.ko})
 
 } &&
-complete -F _kldload kldload
+    complete -F _kldload kldload
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/kldunload b/msys2/usr/share/bash-completion/completions/kldunload
index e14626770..2e12282c8 100644
--- a/msys2/usr/share/bash-completion/completions/kldunload
+++ b/msys2/usr/share/bash-completion/completions/kldunload
@@ -7,9 +7,9 @@ _kldunload()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W '$(kldstat)' -X 'kernel' -X '!*.ko' -- "$cur") )
-    COMPREPLY=( ${COMPREPLY[@]%.ko} )
+    COMPREPLY=($(compgen -W '$(kldstat)' -X 'kernel' -X '!*.ko' -- "$cur"))
+    COMPREPLY=(${COMPREPLY[@]%.ko})
 } &&
-complete -F _kldunload kldunload
+    complete -F _kldunload kldunload
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/koji b/msys2/usr/share/bash-completion/completions/koji
index be43f0a24..8efef9a7f 100644
--- a/msys2/usr/share/bash-completion/completions/koji
+++ b/msys2/usr/share/bash-completion/completions/koji
@@ -2,8 +2,8 @@
 
 _koji_search()
 {
-    COMPREPLY+=( $(compgen -W \
-        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur"))
 }
 
 _koji_build()
@@ -23,13 +23,13 @@ _koji_user()
 
 _koji_tag()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur"))
 }
 
 _koji_target()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-targets 2>/dev/null |
-        awk "{ print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-targets 2>/dev/null |
+        awk "{ print \$1 }")' -- "$cur"))
 }
 
 _koji()
@@ -38,7 +38,7 @@ _koji()
     _init_completion -s || return
 
     local commandix command
-    for (( commandix=1; commandix < cword; commandix++ )); do
+    for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
             break
@@ -46,19 +46,19 @@ _koji()
     done
 
     case $prev in
-        --help|--help-commands|-!(-*)h*)
+        --help | --help-commands | -!(-*)h*)
             return
             ;;
-        --config|--keytab|-!(-*)[co])
+        --config | --keytab | -!(-*)[co])
             _filedir
             return
             ;;
-        --runas|--user|--editor|--by)
+        --runas | --user | --editor | --by)
             _koji_user "$1"
             return
             ;;
         --authtype)
-            COMPREPLY=( $(compgen -W 'noauth ssl password kerberos' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noauth ssl password kerberos' -- "$cur"))
             return
             ;;
         --topdir)
@@ -66,15 +66,15 @@ _koji()
             return
             ;;
         --type)
-            case $command in
-                latest-pkg|list-tagged)
-                    COMPREPLY=( $(compgen -W 'maven' -- "$cur") )
+            case ${command-} in
+                latest-pkg | list-tagged)
+                    COMPREPLY=($(compgen -W 'maven' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --name)
-            case $command in
+            case ${command-} in
                 list-targets)
                     _koji_target "$1"
                     ;;
@@ -85,7 +85,7 @@ _koji()
             _koji_user "$1"
             return
             ;;
-        --tag|--latestfrom)
+        --tag | --latestfrom)
             _koji_tag "$1"
             return
             ;;
@@ -105,22 +105,22 @@ _koji()
 
     $split && return
 
-    if [[ $command ]]; then
+    if [[ -v command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
 
         # How many'th non-option arg (1-based) for $command are we completing?
         local i nth=1
-        for (( i=commandix+1; i < cword; i++ )); do
-            [[ ${words[i]} == -* ]] || (( nth++ ))
+        for ((i = commandix + 1; i < cword; i++)); do
+            [[ ${words[i]} == -* ]] || ((nth++))
         done
 
         case $command in
-            build|maven-build|win-build)
+            build | maven-build | win-build)
                 case $nth in
                     1)
                         _koji_target "$1"
@@ -160,7 +160,7 @@ _koji()
             latest-by-tag)
                 _koji_package "$1"
                 ;;
-            latest-pkg|list-groups|list-tag-inheritance|show-groups)
+            latest-pkg | list-groups | list-tag-inheritance | show-groups)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -186,7 +186,7 @@ _koji()
                 ;;
             move-pkg)
                 case $nth in
-                    1|2)
+                    1 | 2)
                         _koji_tag "$1"
                         ;;
                     *)
@@ -197,12 +197,12 @@ _koji()
             search)
                 case $nth in
                     1)
-                        COMPREPLY=( $(compgen -W 'package build tag target
-                            user host rpm' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'package build tag target
+                            user host rpm' -- "$cur"))
                         ;;
                 esac
                 ;;
-            tag-pkg|untag-pkg)
+            tag-pkg | untag-pkg)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -218,7 +218,7 @@ _koji()
             wait-repo)
                 case $nth in
                     1)
-                        for (( i=commandix+1; i < cword; i++ )); do
+                        for ((i = commandix + 1; i < cword; i++)); do
                             if [[ ${words[i]} == --target ]]; then
                                 _koji_target "$1"
                                 return
@@ -233,13 +233,13 @@ _koji()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ ! $command ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help-commands 2>/dev/null | \
-            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v command ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
+            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
+    complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/kplayer b/msys2/usr/share/bash-completion/completions/kplayer
index 525c63e22..d71ebb8e9 100644
--- a/msys2/usr/share/bash-completion/completions/kplayer
+++ b/msys2/usr/share/bash-completion/completions/kplayer
@@ -3,9 +3,9 @@
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $(compgen -W "$($1 -noconfig all $2 help 2>/dev/null | \
-        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 -noconfig all $2 help 2>/dev/null |
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' |
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur"))
 }
 
 _mplayer()
@@ -16,8 +16,8 @@ _mplayer()
     local cmd=${words[0]} i j k=0
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
-        -audio-demuxer|-sub-demuxer)
+        -[av][cfo] | -[av]fm | -vop | -fstype | -demuxer | -o[av]c | -of | -profile | \
+            -audio-demuxer | -sub-demuxer)
             _mplayer_options_list $cmd $prev
             return
             ;;
@@ -25,43 +25,43 @@ _mplayer()
             _mplayer_options_list $cmd -profile
             return
             ;;
-        -audiofile|-audio-file)
+        -audiofile | -audio-file)
             _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ac3|ape)'
             return
             ;;
-        -font|-subfont)
+        -font | -subfont)
             if [[ $prev == -font ]]; then
                 _filedir '@(desc|ttf)'
             else
                 _filedir ttf
             fi
             local IFS=$'\n'
-            COMPREPLY+=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -sub|-sub-file)
+        -sub | -sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
             local IFS=$'\n'
-            COMPREPLY=( $(for i in "${COMPREPLY[@]}"; do
-                        if [[ -f $i && -r $i ]]; then
-                            printf '%s\n' ${i%.*}
-                        else
-                            printf '%s\n' $i
-                        fi
-                        done) )
+            COMPREPLY=($(for i in "${COMPREPLY[@]}"; do
+                if [[ -f $i && -r $i ]]; then
+                    printf '%s\n' ${i%.*}
+                else
+                    printf '%s\n' $i
+                fi
+            done))
             return
             ;;
-        -subcp|-msgcharset)
+        -subcp | -msgcharset)
             local cp
-            cp=( $(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null) )
-            if [[ "$cur" == "${cur,,}" ]]; then
-                COMPREPLY=( $(compgen -W '${cp[@],,}' -- "$cur") )
+            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
+            if [[ $cur == "${cur,,}" ]]; then
+                COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
             else
-                COMPREPLY=( $(compgen -W '${cp[@]^^}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
             fi
             return
             ;;
@@ -107,53 +107,52 @@ _mplayer()
             _filedir -d
             return
             ;;
-        -mixer|-dvdauth|-fb|-zrdev)
+        -mixer | -dvdauth | -fb | -zrdev)
             cur=${cur:=/dev/}
             _filedir
             return
             ;;
-        -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
+            -subfile | -aofile | -fbmodeconfig | -include | -o | -dvdkey | -passlogfile)
             _filedir
             return
             ;;
-        -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
-        -dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
-        -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
-        -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \
-        -fbmode|-geometry|-guiwid|-hue|-icelayer|-screen[wh]|-wid| \
-        -monitor-dotclock|-monitor-[hv]freq|-panscan| \
-        -saturation|-xineramascreen|-zrcrop|-zrnorm|-zrquality| \
-        -zr[xy]doff|-zr[vh]dec|-pp|-x|-y|-xy|-z|-stereo| \
-        -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
-        -ffourcc|-sws|-skiplimit|-format|-ofps|-aadriver| \
-        -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-subdelay|-subfps|-subpos| \
-        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
-        -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-text-scale)
+        -autoq | -autosync | -loop | -menu-root | -speed | -sstep | -aid | -alang | \
+            -bandwidth | -bluray-angle | -bluray-chapter | -cache | -chapter | -dvd-speed | \
+            -dvdangle | -fps | -frames | -mc | -passwd | -user | -sb | -srate | -ss | -vcd | \
+            -vi | -vid | -vivo | -ffactor | -sid | -slang | -spualign | -spuaa | -spugauss | \
+            -vobsubid | -delay | -bpp | -brightness | -contrast | -dfbopts | -display | \
+            -fbmode | -geometry | -guiwid | -hue | -icelayer | -screen[wh] | -wid | \
+            -monitor-dotclock | -monitor-[hv]freq | -panscan | \
+            -saturation | -xineramascreen | -zrcrop | -zrnorm | -zrquality | \
+            -zr[xy]doff | -zr[vh]dec | -pp | -x | -y | -xy | -z | -stereo | \
+            -audio-density | -audio-delay | -audio-preload | -endpos | -osdlevel | \
+            -ffourcc | -sws | -skiplimit | -format | -ofps | -aadriver | \
+            -aaosdcolor | -aasubcolor | -vobsubout | -vobsuboutid | -vobsuboutindex | \
+            -sub-bg-alpha | -sub-bg-color | -subdelay | -subfps | -subpos | \
+            -subalign | -subwidth | -subfont-blur | -subfont-outline | \
+            -subfont-autoscale | -subfont-encoding | -subfont-osd-scale | \
+            -subfont-text-scale)
             return
             ;;
         -channels)
-            COMPREPLY=( $(compgen -W '2 4 6 8' -- "$cur") )
+            COMPREPLY=($(compgen -W '2 4 6 8' -- "$cur"))
             return
             ;;
-        -aspect|-monitoraspect)
-            COMPREPLY=( $(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
-                2.35:1' -- "$cur") )
+        -aspect | -monitoraspect)
+            COMPREPLY=($(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
+                2.35:1' -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         -lavdopts)
-            COMPREPLY=( $(compgen -W 'bitexact bug= debug= ec= er= fast gray
+            COMPREPLY=($(compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
-                threads= vismv= vstats' -- "$cur") )
+                threads= vismv= vstats' -- "$cur"))
             return
             ;;
         -lavcopts)
-            COMPREPLY=( $(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
+            COMPREPLY=($(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
                 mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint=
                 vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate=
                 vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset=
@@ -162,120 +161,120 @@ _mplayer()
                 vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask=
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
-                umv' -- "$cur") )
+                umv' -- "$cur"))
             return
             ;;
         -ssf)
-            COMPREPLY=( $(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur"))
             return
             ;;
         -jpeg)
-            COMPREPLY=( $(compgen -W 'noprogressive progressive nobaseline
-                baseline optimize= smooth= quality= outdir=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noprogressive progressive nobaseline
+                baseline optimize= smooth= quality= outdir=' -- "$cur"))
             return
             ;;
         -xvidopts)
-            COMPREPLY=( $(compgen -W 'dr2 nodr2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dr2 nodr2' -- "$cur"))
             return
             ;;
         -xvidencopts)
-            COMPREPLY=( $(compgen -W 'pass= bitrate= fixed_quant= me_quality=
+            COMPREPLY=($(compgen -W 'pass= bitrate= fixed_quant= me_quality=
                 4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer=
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
-                kfthreshold= kfreduction=' -- "$cur") )
+                kfthreshold= kfreduction=' -- "$cur"))
             return
             ;;
         -divx4opts)
-            COMPREPLY=( $(compgen -W 'br= key= deinterlace q= min_quant=
+            COMPREPLY=($(compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
-                rc_reaction_ratio= pass= vbrpass= help' -- "$cur") )
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur"))
             return
             ;;
         -info)
-            COMPREPLY=( $(compgen -W 'name= artist= genre= subject=
-                copyright= srcform= comment= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'name= artist= genre= subject=
+                copyright= srcform= comment= help' -- "$cur"))
             return
             ;;
         -lameopts)
-            COMPREPLY=( $(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
-                mode= padding= fast preset= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
+                mode= padding= fast preset= help' -- "$cur"))
             return
             ;;
         -rawaudio)
-            COMPREPLY=( $(compgen -W 'on channels= rate= samplesize= format=' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'on channels= rate= samplesize= format=' \
+                -- "$cur"))
             return
             ;;
         -rawvideo)
-            COMPREPLY=( $(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
-                h= y420 yv12 yuy2 y8 format= size=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur"))
             return
             ;;
         -aop)
-            COMPREPLY=( $(compgen -W 'list= delay= format= fout= volume= mul=
-                softclip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list= delay= format= fout= volume= mul=
+                softclip' -- "$cur"))
             return
             ;;
         -dxr2)
-            COMPREPLY=( $(compgen -W 'ar-mode= iec958-encoded iec958-decoded
+            COMPREPLY=($(compgen -W 'ar-mode= iec958-encoded iec958-decoded
                 mute ucode= 75ire bw color interlaced macrovision= norm=
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur") )
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur"))
             return
             ;;
         -tv)
-            COMPREPLY=( $(compgen -W 'on noaudio driver= device= input= freq=
+            COMPREPLY=($(compgen -W 'on noaudio driver= device= input= freq=
                 outfmt= width= height= buffersize= norm= channel= chanlist=
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -mf)
-            COMPREPLY=( $(compgen -W 'on w= h= fps= type=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on w= h= fps= type=' -- "$cur"))
             return
             ;;
         -cdda)
-            COMPREPLY=( $(compgen -W 'speed= paranoia= generic-dev=
+            COMPREPLY=($(compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -input)
-            COMPREPLY=( $(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
-                js-dev file' -- "$cur") )
+            COMPREPLY=($(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
+                js-dev file' -- "$cur"))
             return
             ;;
         -af-adv)
-            COMPREPLY=( $(compgen -W 'force= list=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'force= list=' -- "$cur"))
             return
             ;;
         -noconfig)
-            COMPREPLY=( $(compgen -W 'all gui system user' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all gui system user' -- "$cur"))
             return
             ;;
         -*)
             # Assume arg is required for everything else except options
             # for which -list-options says Type is Flag or Print.
-            $cmd -noconfig all -list-options 2>/dev/null \
-            | while read -r i j k; do
-                if [[ $i == ${prev#-} ]]; then
-                    [[ ${j,,} != @(flag|print) ]] && return 1
-                    break
-                fi
-            done || return
+            $cmd -noconfig all -list-options 2>/dev/null |
+                while read -r i j k; do
+                    if [[ $i == "${prev#-}" ]]; then
+                        [[ ${j,,} != @(flag|print) ]] && return 1
+                        break
+                    fi
+                done || return
             ;;
     esac
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
-                command sed -ne '1,/^[[:space:]]*Name/d' \
+            COMPREPLY=($(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
+                command sed -ne "1,/^[[:space:]]*Name/d" \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
-                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur") )
+                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur"))
             ;;
         *)
             _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS|m[eo]d|M[EO]D|xm|XM|it|IT|s[t3]m|S[T3]M|mtm|MTM|w64|W64)?(.@(crdownload|part))'
@@ -283,6 +282,6 @@ _mplayer()
     esac
 
 } &&
-complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
+    complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ktutil b/msys2/usr/share/bash-completion/completions/ktutil
index 572a2ec4d..6030a474f 100644
--- a/msys2/usr/share/bash-completion/completions/ktutil
+++ b/msys2/usr/share/bash-completion/completions/ktutil
@@ -2,21 +2,21 @@
 
 _heimdal_principals()
 {
-    COMPREPLY=( $(compgen -W "$(kadmin -l dump 2>/dev/null | \
-        awk '{print $1}')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(kadmin -l dump 2>/dev/null |
+        awk '{print $1}')" -- "$cur"))
 }
 
 _heimdal_realms()
 {
-    COMPREPLY=( $(compgen -W "$(kadmin -l dump 2>/dev/null | \
-        awk '{print $1}' | awk -F@ '{print $2}')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(kadmin -l dump 2>/dev/null |
+        awk '{print $1}' | awk -F@ '{print $2}')" -- "$cur"))
 }
 
 _heimdal_encodings()
 {
-    COMPREPLY=( $(compgen -W 'des-cbc-mcrc des-cbc-md4 des-cbc-md5
+    COMPREPLY=($(compgen -W 'des-cbc-mcrc des-cbc-md4 des-cbc-md5
         des3-cbc-sha1 arcfour-hmac-md5 aes128-cts-hmac-sha1-96
-        aes256-cts-hmac-sha1-96' -- "$cur") )
+        aes256-cts-hmac-sha1-96' -- "$cur"))
 }
 
 _ktutil()
@@ -27,23 +27,23 @@ _ktutil()
     local command commands i options
 
     case $prev in
-        -p|--principal)
+        -p | --principal)
             _heimdal_principals
             return
             ;;
-        -e|--enctype)
+        -e | --enctype)
             _heimdal_encodings
             return
             ;;
-        -a|--admin-server)
+        -a | --admin-server)
             _known_hosts_real -- "$cur"
             return
             ;;
-        -r|--realm)
+        -r | --realm)
             _heimdal_realms
             return
             ;;
-        -s|-k|--srvtab|--keytab)
+        -s | -k | --srvtab | --keytab)
             _filedir
             return
             ;;
@@ -54,13 +54,13 @@ _ktutil()
     commands='add change copy get list remove rename purge srvconvert
         srv2keytab srvcreate key2srvtab'
 
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            -k|--keytab)
-                (( i++ ))
-                ;;
-            -*)
+            -k | --keytab)
+                ((i++))
                 ;;
+            -*) ;;
+
             *)
                 command=${words[i]}
                 break
@@ -68,15 +68,15 @@ _ktutil()
         esac
     done
 
-    if [[ "$cur" == -* ]]; then
-        case $command in
+    if [[ $cur == -* ]]; then
+        case ${command-} in
             add)
                 options='-p --principal -V -e --enctype -w --password -r
                     --random -s --no-salt -h --hex'
-            ;;
+                ;;
             change)
                 options='-r --realm -a --admin-server -s --server-port'
-            ;;
+                ;;
             get)
                 options='-p --principal -e --enctype -r --realm -a
                     --admin-server -s server --server-port'
@@ -90,16 +90,16 @@ _ktutil()
             purge)
                 options='--age'
                 ;;
-            srv2keytab|key2srvtab)
+            srv2keytab | key2srvtab)
                 options='-s --srvtab'
                 ;;
             *)
                 options='-k --keytab -v --verbose --version -v --help'
                 ;;
         esac
-        COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+        COMPREPLY=($(compgen -W "$options" -- "$cur"))
     else
-        case $command in
+        case ${command-} in
             copy)
                 _filedir
                 ;;
@@ -110,11 +110,11 @@ _ktutil()
                 _heimdal_principals
                 ;;
             *)
-                COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+                COMPREPLY=($(compgen -W "$commands" -- "$cur"))
                 ;;
         esac
     fi
 } &&
-complete -F _ktutil ktutil
+    complete -F _ktutil ktutil
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/l2ping b/msys2/usr/share/bash-completion/completions/l2ping
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/l2ping
+++ b/msys2/usr/share/bash-completion/completions/l2ping
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/larch b/msys2/usr/share/bash-completion/completions/larch
index 0773c2dac..7ed9ca207 100644
--- a/msys2/usr/share/bash-completion/completions/larch
+++ b/msys2/usr/share/bash-completion/completions/larch
@@ -6,8 +6,8 @@ _larch()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 || "$prev" == -* ]]; then
-        COMPREPLY=( $(compgen -W ' \
+    if [[ $cword -eq 1 || $prev == -* ]]; then
+        COMPREPLY=($(compgen -W ' \
             my-id my-default-archive register-archive whereis-archive archives \
             init-tree tree-root tree-version set-tree-version inventory \
             tagging-method tree-lint missing-tags add delete \
@@ -30,10 +30,10 @@ _larch()
             distribution-name notify my-notifier mail-new-categories \
             mail-new-branches mail-new-versions mail-new-revisions \
             notify-library notify-browser push-new-revisions sendmail-mailx' \
-            "$cur") )
+            "$cur"))
     fi
 
 } &&
-complete -F _larch -o default larch
+    complete -F _larch -o default larch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lastlog b/msys2/usr/share/bash-completion/completions/lastlog
index 19e928c20..214a174d5 100644
--- a/msys2/usr/share/bash-completion/completions/lastlog
+++ b/msys2/usr/share/bash-completion/completions/lastlog
@@ -6,20 +6,20 @@ _lastlog()
     _init_completion -s || return
 
     case $prev in
-        --before|--help|--time|-!(-*)@([bt]|h*))
+        --before | --help | --time | -!(-*)@([bt]|h*))
             return
             ;;
-        --user|-!(-*)u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -!(-*)u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _lastlog lastlog
+    complete -F _lastlog lastlog
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lbzip2 b/msys2/usr/share/bash-completion/completions/lbzip2
index 8bd72cc98..40e50fe32 100644
--- a/msys2/usr/share/bash-completion/completions/lbzip2
+++ b/msys2/usr/share/bash-completion/completions/lbzip2
@@ -6,37 +6,37 @@ _bzip2()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)[bhp])
+        --help | -!(-*)[bhp])
             return
             ;;
         -!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local helpopts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
-            -- "$cur") )
+        COMPREPLY=($(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
+            -- "$cur"))
         return
     fi
 
     local IFS=$'\n' xspec="*.?(t)bz2"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --compress ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*z* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --compress ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dt]* ]] && xspec="!"$xspec
+        [[ $prev == -*z* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _bzip2 bzip2 pbzip2 lbzip2
+    complete -F _bzip2 bzip2 pbzip2 lbzip2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapadd b/msys2/usr/share/bash-completion/completions/ldapadd
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapadd
+++ b/msys2/usr/share/bash-completion/completions/ldapadd
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapcompare b/msys2/usr/share/bash-completion/completions/ldapcompare
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapcompare
+++ b/msys2/usr/share/bash-completion/completions/ldapcompare
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapdelete b/msys2/usr/share/bash-completion/completions/ldapdelete
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapdelete
+++ b/msys2/usr/share/bash-completion/completions/ldapdelete
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapmodify b/msys2/usr/share/bash-completion/completions/ldapmodify
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapmodify
+++ b/msys2/usr/share/bash-completion/completions/ldapmodify
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapmodrdn b/msys2/usr/share/bash-completion/completions/ldapmodrdn
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapmodrdn
+++ b/msys2/usr/share/bash-completion/completions/ldapmodrdn
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldappasswd b/msys2/usr/share/bash-completion/completions/ldappasswd
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldappasswd
+++ b/msys2/usr/share/bash-completion/completions/ldappasswd
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapsearch b/msys2/usr/share/bash-completion/completions/ldapsearch
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapsearch
+++ b/msys2/usr/share/bash-completion/completions/ldapsearch
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapvi b/msys2/usr/share/bash-completion/completions/ldapvi
index a7b55fcc2..cb01ac8dd 100644
--- a/msys2/usr/share/bash-completion/completions/ldapvi
+++ b/msys2/usr/share/bash-completion/completions/ldapvi
@@ -6,46 +6,46 @@ _ldapvi()
     _init_completion || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --sasl-mech|-!(-*)Y)
-            COMPREPLY=( $(compgen -W 'EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5
-                PLAIN ANONYMOUS' -- "$cur") )
+        --sasl-mech | -!(-*)Y)
+            COMPREPLY=($(compgen -W 'EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5
+                PLAIN ANONYMOUS' -- "$cur"))
             return
             ;;
         --bind)
-            COMPREPLY=( $(compgen -W 'simple sasl' -- "$cur") )
+            COMPREPLY=($(compgen -W 'simple sasl' -- "$cur"))
             return
             ;;
         --bind-dialog)
-            COMPREPLY=( $(compgen -W 'never auto always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never auto always' -- "$cur"))
             return
             ;;
         --scope)
-            COMPREPLY=( $(compgen -W 'base one sub' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub' -- "$cur"))
             return
             ;;
         --deref)
-            COMPREPLY=( $(compgen -W 'never searching finding always' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'never searching finding always' \
+                -- "$cur"))
             return
             ;;
         --encoding)
-            COMPREPLY=( $(compgen -W 'ASCII UTF-8 binary' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ASCII UTF-8 binary' -- "$cur"))
             return
             ;;
         --tls)
-            COMPREPLY=( $(compgen -W 'never allow try strict' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never allow try strict' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _ldapvi ldapvi
+    complete -F _ldapvi ldapvi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ldapwhoami b/msys2/usr/share/bash-completion/completions/ldapwhoami
index a0bdcb9d7..6dc415e66 100644
--- a/msys2/usr/share/bash-completion/completions/ldapwhoami
+++ b/msys2/usr/share/bash-completion/completions/ldapwhoami
@@ -2,12 +2,12 @@
 
 _ldap_uris()
 {
-    COMPREPLY=( $(compgen -W 'ldap:// ldaps://' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ldap:// ldaps://' -- "$cur"))
 }
 
 _ldap_protocols()
 {
-    COMPREPLY=( $(compgen -W '2 3' -- "$cur") )
+    COMPREPLY=($(compgen -W '2 3' -- "$cur"))
 }
 
 _ldapsearch()
@@ -33,11 +33,11 @@ _ldapsearch()
             return
             ;;
         -*s)
-            COMPREPLY=( $(compgen -W 'base one sub children' -- "$cur") )
+            COMPREPLY=($(compgen -W 'base one sub children' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W 'never always search find' -- "$cur") )
+            COMPREPLY=($(compgen -W 'never always search find' -- "$cur"))
             return
             ;;
         -*P)
@@ -46,11 +46,11 @@ _ldapsearch()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapsearch ldapsearch
+    complete -F _ldapsearch ldapsearch
 
 _ldapaddmodify()
 {
@@ -76,11 +76,11 @@ _ldapaddmodify()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapaddmodify ldapadd ldapmodify
+    complete -F _ldapaddmodify ldapadd ldapmodify
 
 _ldapdelete()
 {
@@ -106,11 +106,11 @@ _ldapdelete()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapdelete ldapdelete
+    complete -F _ldapdelete ldapdelete
 
 _ldapcompare()
 {
@@ -136,11 +136,11 @@ _ldapcompare()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapcompare ldapcompare
+    complete -F _ldapcompare ldapcompare
 
 _ldapmodrdn()
 {
@@ -166,11 +166,11 @@ _ldapmodrdn()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -ZZ -MM' -- "$cur"))
     fi
 } &&
-complete -F _ldapmodrdn ldapmodrdn
+    complete -F _ldapmodrdn ldapmodrdn
 
 _ldapwhoami()
 {
@@ -196,11 +196,11 @@ _ldapwhoami()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldapwhoami ldapwhoami
+    complete -F _ldapwhoami ldapwhoami
 
 _ldappasswd()
 {
@@ -222,10 +222,10 @@ _ldappasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -MM -ZZ' -- "$cur"))
     fi
 } &&
-complete -F _ldappasswd ldappasswd
+    complete -F _ldappasswd ldappasswd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lftp b/msys2/usr/share/bash-completion/completions/lftp
index 41fb1356c..72dedb428 100644
--- a/msys2/usr/share/bash-completion/completions/lftp
+++ b/msys2/usr/share/bash-completion/completions/lftp
@@ -10,20 +10,19 @@ _lftp()
             _filedir
             return
             ;;
-        --help|--version|-!(-*)[chveups])
+        --help | --version | -!(-*)[chveups])
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -W \
-        '$(cut -f 1 -s ~/.lftp/bookmarks ${XDG_DATA_HOME:-$HOME/.local/share}/lftp/bookmarks 2>/dev/null)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$("$1" -c "bookmark list" 2>/dev/null)' -- "$cur"))
     _known_hosts_real -- "$cur"
 } &&
-complete -F _lftp lftp
+    complete -F _lftp lftp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lftpget b/msys2/usr/share/bash-completion/completions/lftpget
index 1583500ce..d21622eb5 100644
--- a/msys2/usr/share/bash-completion/completions/lftpget
+++ b/msys2/usr/share/bash-completion/completions/lftpget
@@ -5,10 +5,10 @@ _lftpget()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-c -d -v' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-c -d -v' -- "$cur"))
     fi
 } &&
-complete -F _lftpget lftpget
+    complete -F _lftpget lftpget
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lilo b/msys2/usr/share/bash-completion/completions/lilo
index 03e3ee29a..af8539aa9 100644
--- a/msys2/usr/share/bash-completion/completions/lilo
+++ b/msys2/usr/share/bash-completion/completions/lilo
@@ -2,8 +2,9 @@
 
 _lilo_labels()
 {
-    COMPREPLY=( $(compgen -W "$(awk -F'=' '/label/ {print $2}' \
-        /etc/lilo.conf | command sed -e 's/\"//g')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk -F= '$1 ~ /^[ \t]*label$/ {print $2}' \
+        ${1:-/etc/lilo.conf} 2>/dev/null | command sed -e 's/\"//g')" \
+        -- "$cur"))
 }
 
 _lilo()
@@ -12,7 +13,7 @@ _lilo()
     _init_completion || return
 
     case $prev in
-        -C|-i|-m|-s|-S)
+        -C | -i | -m | -s | -S)
             _filedir
             return
             ;;
@@ -20,12 +21,19 @@ _lilo()
             _filedir -d
             return
             ;;
-        -I|-D|-R)
+        -I | -D | -R)
             # label completion
-            _lilo_labels
+            local i conf
+            for i in "${!words[@]}"; do
+                if [[ ${words[i]} == -C ]]; then
+                    conf=${words[i + 1]}
+                    break
+                fi
+            done
+            _lilo_labels $conf
             return
             ;;
-        -A|-b|-M|-u|-U)
+        -A | -b | -M | -u | -U)
             # device completion
             cur=${cur:=/dev/}
             _filedir
@@ -33,18 +41,26 @@ _lilo()
             ;;
         -T)
             # topic completion
-            COMPREPLY=( $(compgen -W 'help ChRul EBDA geom geom= table=
-                video' -- "$cur") )
+            COMPREPLY=($(compgen -W 'help ChRul EBDA geom geom= table=
+                video' -- "$cur"))
+            return
+            ;;
+        -B)
+            _filedir bmp
+            return
+            ;;
+        -E)
+            _filedir '@(bmp|dat)'
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # relevant options completion
-        COMPREPLY=( $(compgen -W '-A -b -c -C -d -f -g -i -I -l -L -m -M -p -P
-            -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur") )
+        COMPREPLY=($(compgen -W '-A -B -b -c -C -d -E -f -g -i -I -l -L -m -M
+            -p -P -q -r -R -s -S -t -T -u -U -v -V -w -x -z' -- "$cur"))
     fi
 } &&
-complete -F _lilo lilo
+    complete -F _lilo lilo
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/links b/msys2/usr/share/bash-completion/completions/links
index 6bfee6540..e0c28e213 100644
--- a/msys2/usr/share/bash-completion/completions/links
+++ b/msys2/usr/share/bash-completion/completions/links
@@ -6,20 +6,20 @@ _links()
     _init_completion -n : || return
 
     case $prev in
-        -html-t-text-color|-html-t-link-color)
-            COMPREPLY=( $(compgen -W '{0..15}' -- "$cur") )
+        -html-t-text-color | -html-t-link-color)
+            COMPREPLY=($(compgen -W '{0..15}' -- "$cur"))
             return
             ;;
-        -http.fake-firefox|-html-[gt]-ignore-document-color)
-            COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+        -http.fake-firefox | -html-[gt]-ignore-document-color)
+            COMPREPLY=($(compgen -W '0 1' -- "$cur"))
             return
             ;;
-        --help|-help|-mode|-display|-source|-dump|-width|-max-connections|\
-        -max-connections-to-host|-retries|-receive-timeout|\
-        -unrestartable-receive-timeout|-*-size|-*-proxy|\
-        -append-text-to-dns-lookups|-ssl.client-cert-passwd|-http.fake-*|\
-        -http.extra-header|-ftp.anonymous-passwd|-*-color|-*-gamma|\
-        -bfu-aspect|-html-image-scale|-html-margin)
+        --help | -help | -mode | -display | -source | -dump | -width | -max-connections | \
+            -max-connections-to-host | -retries | -receive-timeout | \
+            -unrestartable-receive-timeout | -*-size | -*-proxy | \
+            -append-text-to-dns-lookups | -ssl.client-cert-passwd | -http.fake-* | \
+            -http.extra-header | -ftp.anonymous-passwd | -*-color | -*-gamma | \
+            -bfu-aspect | -html-image-scale | -html-margin)
             return
             ;;
         -lookup)
@@ -30,10 +30,10 @@ _links()
             local drivers=$("$1" -driver foo 2>&1 |
                 command sed -ne '$!d' -e '/^[a-z0-9, ]\{1,\}$/s/,/ /gp')
             [[ $drivers ]] || drivers='x svgalib fb directfb pmshell atheos'
-            COMPREPLY=( $(compgen -W "$drivers" -- "$cur") )
+            COMPREPLY=($(compgen -W "$drivers" -- "$cur"))
             return
             ;;
-        -codepage|-bookmarks-codepage|-http-assume-codepage)
+        -codepage | -bookmarks-codepage | -http-assume-codepage)
             _xfunc iconv _iconv_charsets
             return
             ;;
@@ -50,19 +50,19 @@ _links()
             __ltrim_colon_completions "$cur"
             return
             ;;
-        -async-dns|-download-utime|-aggressive-cache|-only-proxies|\
-        -http-bugs.*|-http.do-not-track|-ftp.use-*|-ftp.fast|-ftp.set-iptos|\
-        -smb.allow-hyperlinks-to-smb|-save-url-history|-dither-letters|\
-        -dither-images|-overwrite-instead-of-scroll|-html-*)
-            COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+        -async-dns | -download-utime | -aggressive-cache | -only-proxies | \
+            -http-bugs.* | -http.do-not-track | -ftp.use-* | -ftp.fast | -ftp.set-iptos | \
+            -smb.allow-hyperlinks-to-smb | -save-url-history | -dither-letters | \
+            -dither-images | -overwrite-instead-of-scroll | -html-*)
+            COMPREPLY=($(compgen -W '0 1' -- "$cur"))
             return
             ;;
-        -address-preference|-http.referer)
-            COMPREPLY=( $(compgen -W '{0..4}' -- "$cur") )
+        -address-preference | -http.referer)
+            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
             return
             ;;
-        -ssl-certificates|-display-optimize|-gamma-correction)
-            COMPREPLY=( $(compgen -W '{0..2}' -- "$cur") )
+        -ssl-certificates | -display-optimize | -gamma-correction)
+            COMPREPLY=($(compgen -W '{0..2}' -- "$cur"))
             return
             ;;
         -ssl.client-cert-key)
@@ -80,21 +80,21 @@ _links()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" |
-            command grep -vF -- "->")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" |
+            command grep -vF -- "->")' -- "$cur"))
         return
     fi
 
     local dir
     for dir in .links .links2; do
         if [[ -r ~/$dir/links.his ]]; then
-            COMPREPLY+=( $(compgen -W '$(cat ~/$dir/links.his)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(cat ~/$dir/links.his)' -- "$cur"))
             __ltrim_colon_completions "$cur"
         fi
     done
     _filedir '@(htm|html)'
 
 } &&
-complete -F _links links links2
+    complete -F _links links links2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/links2 b/msys2/usr/share/bash-completion/completions/links2
index 6bfee6540..e0c28e213 100644
--- a/msys2/usr/share/bash-completion/completions/links2
+++ b/msys2/usr/share/bash-completion/completions/links2
@@ -6,20 +6,20 @@ _links()
     _init_completion -n : || return
 
     case $prev in
-        -html-t-text-color|-html-t-link-color)
-            COMPREPLY=( $(compgen -W '{0..15}' -- "$cur") )
+        -html-t-text-color | -html-t-link-color)
+            COMPREPLY=($(compgen -W '{0..15}' -- "$cur"))
             return
             ;;
-        -http.fake-firefox|-html-[gt]-ignore-document-color)
-            COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+        -http.fake-firefox | -html-[gt]-ignore-document-color)
+            COMPREPLY=($(compgen -W '0 1' -- "$cur"))
             return
             ;;
-        --help|-help|-mode|-display|-source|-dump|-width|-max-connections|\
-        -max-connections-to-host|-retries|-receive-timeout|\
-        -unrestartable-receive-timeout|-*-size|-*-proxy|\
-        -append-text-to-dns-lookups|-ssl.client-cert-passwd|-http.fake-*|\
-        -http.extra-header|-ftp.anonymous-passwd|-*-color|-*-gamma|\
-        -bfu-aspect|-html-image-scale|-html-margin)
+        --help | -help | -mode | -display | -source | -dump | -width | -max-connections | \
+            -max-connections-to-host | -retries | -receive-timeout | \
+            -unrestartable-receive-timeout | -*-size | -*-proxy | \
+            -append-text-to-dns-lookups | -ssl.client-cert-passwd | -http.fake-* | \
+            -http.extra-header | -ftp.anonymous-passwd | -*-color | -*-gamma | \
+            -bfu-aspect | -html-image-scale | -html-margin)
             return
             ;;
         -lookup)
@@ -30,10 +30,10 @@ _links()
             local drivers=$("$1" -driver foo 2>&1 |
                 command sed -ne '$!d' -e '/^[a-z0-9, ]\{1,\}$/s/,/ /gp')
             [[ $drivers ]] || drivers='x svgalib fb directfb pmshell atheos'
-            COMPREPLY=( $(compgen -W "$drivers" -- "$cur") )
+            COMPREPLY=($(compgen -W "$drivers" -- "$cur"))
             return
             ;;
-        -codepage|-bookmarks-codepage|-http-assume-codepage)
+        -codepage | -bookmarks-codepage | -http-assume-codepage)
             _xfunc iconv _iconv_charsets
             return
             ;;
@@ -50,19 +50,19 @@ _links()
             __ltrim_colon_completions "$cur"
             return
             ;;
-        -async-dns|-download-utime|-aggressive-cache|-only-proxies|\
-        -http-bugs.*|-http.do-not-track|-ftp.use-*|-ftp.fast|-ftp.set-iptos|\
-        -smb.allow-hyperlinks-to-smb|-save-url-history|-dither-letters|\
-        -dither-images|-overwrite-instead-of-scroll|-html-*)
-            COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+        -async-dns | -download-utime | -aggressive-cache | -only-proxies | \
+            -http-bugs.* | -http.do-not-track | -ftp.use-* | -ftp.fast | -ftp.set-iptos | \
+            -smb.allow-hyperlinks-to-smb | -save-url-history | -dither-letters | \
+            -dither-images | -overwrite-instead-of-scroll | -html-*)
+            COMPREPLY=($(compgen -W '0 1' -- "$cur"))
             return
             ;;
-        -address-preference|-http.referer)
-            COMPREPLY=( $(compgen -W '{0..4}' -- "$cur") )
+        -address-preference | -http.referer)
+            COMPREPLY=($(compgen -W '{0..4}' -- "$cur"))
             return
             ;;
-        -ssl-certificates|-display-optimize|-gamma-correction)
-            COMPREPLY=( $(compgen -W '{0..2}' -- "$cur") )
+        -ssl-certificates | -display-optimize | -gamma-correction)
+            COMPREPLY=($(compgen -W '{0..2}' -- "$cur"))
             return
             ;;
         -ssl.client-cert-key)
@@ -80,21 +80,21 @@ _links()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" |
-            command grep -vF -- "->")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" |
+            command grep -vF -- "->")' -- "$cur"))
         return
     fi
 
     local dir
     for dir in .links .links2; do
         if [[ -r ~/$dir/links.his ]]; then
-            COMPREPLY+=( $(compgen -W '$(cat ~/$dir/links.his)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(cat ~/$dir/links.his)' -- "$cur"))
             __ltrim_colon_completions "$cur"
         fi
     done
     _filedir '@(htm|html)'
 
 } &&
-complete -F _links links links2
+    complete -F _links links links2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lintian b/msys2/usr/share/bash-completion/completions/lintian
index d62d83734..934383252 100644
--- a/msys2/usr/share/bash-completion/completions/lintian
+++ b/msys2/usr/share/bash-completion/completions/lintian
@@ -5,18 +5,18 @@ _lintian_tags()
     local match search tags
 
     tags=$(awk '/^Tag/ { print $2 }' /usr/share/lintian/checks/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^Tag: $item$" \
                 /usr/share/lintian/checks/*.desc | cut -d: -f1)
             tags=$(command sed -e "s/\<$item\>//g" <<<$tags)
         done
-        COMPREPLY+=( $(compgen -W "$tags") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$tags" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$tags"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$tags" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$tags" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$tags" -- "$cur"))
     fi
 }
 
@@ -26,7 +26,7 @@ _lintian_checks()
 
     checks=$(awk '/^(Check-Script|Abbrev)/ { print $2 }' \
         /usr/share/lintian/checks/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^(Check-Script|Abbrev): $item$" \
@@ -36,11 +36,11 @@ _lintian_checks()
                 checks=$(command sed -e "s/\<$name\>//g" <<<$checks)
             done
         done
-        COMPREPLY+=( $(compgen -W "$checks") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$checks" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$checks"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$checks" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$checks" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$checks" -- "$cur"))
     fi
 }
 
@@ -50,18 +50,18 @@ _lintian_infos()
 
     infos=$(awk '/^Collector/ { print $2 }' \
         /usr/share/lintian/collection/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^Collector: $item$" \
                 /usr/share/lintian/collection/*.desc | cut -d: -f1)
             infos=$(command sed -e "s/\<$item\>//g" <<<$infos)
         done
-        COMPREPLY+=( $(compgen -W "$infos") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$infos" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$infos"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$infos" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$infos" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$infos" -- "$cur"))
     fi
 }
 
@@ -70,8 +70,7 @@ _lintian()
     local cur prev words cword
     _init_completion || return
 
-    local action lint_actions general_opts behaviour_opts \
-          configuration_opts selection_opts
+    local lint_actions general_opts behaviour_opts configuration_opts
 
     lint_actions="--setup-lab --remove-lab --check --check-part --tags
         --tags-from-file --ftp-master-rejects --dont-check-part --unpack
@@ -83,34 +82,33 @@ _lintian()
         --allow-root --fail-on-warnings --keep-lab"
     configuration_opts="--cfg --lab --archivedir --dist --area --section --arch
         --root"
-    selection_opts="--all --binary --source --udeb --packages-file"
 
-    if [[ "$prev" == -* ]]; then
+    if [[ $prev == -* ]]; then
         case $prev in
-            -C|--check-part|-X|--dont-check-part)
+            -C | --check-part | -X | --dont-check-part)
                 _lintian_checks
                 ;;
-            -T|--tags|--suppress-tags)
+            -T | --tags | --suppress-tags)
                 _lintian_tags
                 ;;
-            --tags-from-file|--suppress-tags-from-file|--cfg|-p|\
-            --packages-file)
+            --tags-from-file | --suppress-tags-from-file | --cfg | -p | \
+                --packages-file)
                 _filedir
                 ;;
-            --lab|--archivedir|--dist|--root)
+            --lab | --archivedir | --dist | --root)
                 _filedir -d
                 ;;
             --color)
                 COMPREPLY=($(compgen -W "never always auto html" -- "$cur"))
                 ;;
-            -U|--unpack-info)
+            -U | --unpack-info)
                 _lintian_infos
                 ;;
-            --area|--section)
+            --area | --section)
                 COMPREPLY=($(compgen -W "main contrib non-free" -- "$cur"))
                 ;;
-            --arch)
-                ;;
+            --arch) ;;
+
         esac
     fi
 
@@ -124,24 +122,25 @@ _lintian()
             # --action tag,tag,<TAB>
             # Only few actions permit that, re-complete them now.
             case "$prev" in
-                -C|--check-part|-X|--dont-check-part)
+                -C | --check-part | -X | --dont-check-part)
                     _lintian_checks
                     ;;
-                -T|--tags|--suppress-tags)
+                -T | --tags | --suppress-tags)
                     _lintian_tags
                     ;;
-                -U|--unpack-info)
+                -U | --unpack-info)
                     _lintian_infos
                     ;;
             esac
             ;;
         *)
-            _filedir '@(?(u)deb|changes|dsc)'
+            # in Ubuntu, dbgsym packages end in .ddeb, lintian >= 2.57.0 groks
+            _filedir '@(?(u|d)deb|changes|dsc|buildinfo)'
             ;;
     esac
     return 0
 } &&
-complete -F _lintian lintian
+    complete -F _lintian lintian
 
 _lintian_info()
 {
@@ -149,10 +148,10 @@ _lintian_info()
     _init_completion || return
 
     case "$prev" in
-        --help|--profile)
+        --help | --profile)
             return
             ;;
-        -t|--tags)
+        -t | --tags)
             _lintian_tags
             return
             ;;
@@ -164,7 +163,7 @@ _lintian_info()
 
     case "$cur" in
         --*)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
             ;;
         *)
             _filedir
@@ -172,6 +171,6 @@ _lintian_info()
     esac
     return 0
 } &&
-complete -F _lintian_info lintian-info
+    complete -F _lintian_info lintian-info
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lintian-info b/msys2/usr/share/bash-completion/completions/lintian-info
index d62d83734..934383252 100644
--- a/msys2/usr/share/bash-completion/completions/lintian-info
+++ b/msys2/usr/share/bash-completion/completions/lintian-info
@@ -5,18 +5,18 @@ _lintian_tags()
     local match search tags
 
     tags=$(awk '/^Tag/ { print $2 }' /usr/share/lintian/checks/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^Tag: $item$" \
                 /usr/share/lintian/checks/*.desc | cut -d: -f1)
             tags=$(command sed -e "s/\<$item\>//g" <<<$tags)
         done
-        COMPREPLY+=( $(compgen -W "$tags") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$tags" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$tags"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$tags" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$tags" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$tags" -- "$cur"))
     fi
 }
 
@@ -26,7 +26,7 @@ _lintian_checks()
 
     checks=$(awk '/^(Check-Script|Abbrev)/ { print $2 }' \
         /usr/share/lintian/checks/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^(Check-Script|Abbrev): $item$" \
@@ -36,11 +36,11 @@ _lintian_checks()
                 checks=$(command sed -e "s/\<$name\>//g" <<<$checks)
             done
         done
-        COMPREPLY+=( $(compgen -W "$checks") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$checks" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$checks"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$checks" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$checks" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$checks" -- "$cur"))
     fi
 }
 
@@ -50,18 +50,18 @@ _lintian_infos()
 
     infos=$(awk '/^Collector/ { print $2 }' \
         /usr/share/lintian/collection/*.desc)
-    if [[ "$cur" == *, ]]; then
+    if [[ $cur == *, ]]; then
         search=${cur//,/ }
         for item in $search; do
             match=$(command grep -nE "^Collector: $item$" \
                 /usr/share/lintian/collection/*.desc | cut -d: -f1)
             infos=$(command sed -e "s/\<$item\>//g" <<<$infos)
         done
-        COMPREPLY+=( $(compgen -W "$infos") )
-    elif [[ "$cur" == *,* ]]; then
-        COMPREPLY+=( $(compgen -P "${cur%,*}," -W "$infos" -- "${cur##*,}") )
+        COMPREPLY+=($(compgen -W "$infos"))
+    elif [[ $cur == *,* ]]; then
+        COMPREPLY+=($(compgen -P "${cur%,*}," -W "$infos" -- "${cur##*,}"))
     else
-        COMPREPLY+=( $(compgen -W "$infos" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$infos" -- "$cur"))
     fi
 }
 
@@ -70,8 +70,7 @@ _lintian()
     local cur prev words cword
     _init_completion || return
 
-    local action lint_actions general_opts behaviour_opts \
-          configuration_opts selection_opts
+    local lint_actions general_opts behaviour_opts configuration_opts
 
     lint_actions="--setup-lab --remove-lab --check --check-part --tags
         --tags-from-file --ftp-master-rejects --dont-check-part --unpack
@@ -83,34 +82,33 @@ _lintian()
         --allow-root --fail-on-warnings --keep-lab"
     configuration_opts="--cfg --lab --archivedir --dist --area --section --arch
         --root"
-    selection_opts="--all --binary --source --udeb --packages-file"
 
-    if [[ "$prev" == -* ]]; then
+    if [[ $prev == -* ]]; then
         case $prev in
-            -C|--check-part|-X|--dont-check-part)
+            -C | --check-part | -X | --dont-check-part)
                 _lintian_checks
                 ;;
-            -T|--tags|--suppress-tags)
+            -T | --tags | --suppress-tags)
                 _lintian_tags
                 ;;
-            --tags-from-file|--suppress-tags-from-file|--cfg|-p|\
-            --packages-file)
+            --tags-from-file | --suppress-tags-from-file | --cfg | -p | \
+                --packages-file)
                 _filedir
                 ;;
-            --lab|--archivedir|--dist|--root)
+            --lab | --archivedir | --dist | --root)
                 _filedir -d
                 ;;
             --color)
                 COMPREPLY=($(compgen -W "never always auto html" -- "$cur"))
                 ;;
-            -U|--unpack-info)
+            -U | --unpack-info)
                 _lintian_infos
                 ;;
-            --area|--section)
+            --area | --section)
                 COMPREPLY=($(compgen -W "main contrib non-free" -- "$cur"))
                 ;;
-            --arch)
-                ;;
+            --arch) ;;
+
         esac
     fi
 
@@ -124,24 +122,25 @@ _lintian()
             # --action tag,tag,<TAB>
             # Only few actions permit that, re-complete them now.
             case "$prev" in
-                -C|--check-part|-X|--dont-check-part)
+                -C | --check-part | -X | --dont-check-part)
                     _lintian_checks
                     ;;
-                -T|--tags|--suppress-tags)
+                -T | --tags | --suppress-tags)
                     _lintian_tags
                     ;;
-                -U|--unpack-info)
+                -U | --unpack-info)
                     _lintian_infos
                     ;;
             esac
             ;;
         *)
-            _filedir '@(?(u)deb|changes|dsc)'
+            # in Ubuntu, dbgsym packages end in .ddeb, lintian >= 2.57.0 groks
+            _filedir '@(?(u|d)deb|changes|dsc|buildinfo)'
             ;;
     esac
     return 0
 } &&
-complete -F _lintian lintian
+    complete -F _lintian lintian
 
 _lintian_info()
 {
@@ -149,10 +148,10 @@ _lintian_info()
     _init_completion || return
 
     case "$prev" in
-        --help|--profile)
+        --help | --profile)
             return
             ;;
-        -t|--tags)
+        -t | --tags)
             _lintian_tags
             return
             ;;
@@ -164,7 +163,7 @@ _lintian_info()
 
     case "$cur" in
         --*)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
             ;;
         *)
             _filedir
@@ -172,6 +171,6 @@ _lintian_info()
     esac
     return 0
 } &&
-complete -F _lintian_info lintian-info
+    complete -F _lintian_info lintian-info
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lisp b/msys2/usr/share/bash-completion/completions/lisp
index f9f68275d..098567bca 100644
--- a/msys2/usr/share/bash-completion/completions/lisp
+++ b/msys2/usr/share/bash-completion/completions/lisp
@@ -8,15 +8,15 @@ _lisp()
     _init_completion || return
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -* ]]; then
-    COMPREPLY=( $(compgen -W '-core -lib -batch -quit -edit -eval -init
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-core -lib -batch -quit -edit -eval -init
         -dynamic-space-size -hinit -noinit -nositeinit -load -slave' \
-        -- "$cur") )
+            -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _lisp -o default lisp
+    complete -F _lisp -o default lisp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/list_admins b/msys2/usr/share/bash-completion/completions/list_admins
index 11f7414d4..57081797d 100644
--- a/msys2/usr/share/bash-completion/completions/list_admins
+++ b/msys2/usr/share/bash-completion/completions/list_admins
@@ -5,13 +5,13 @@ _list_admins()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--all-vhost --all --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--all-vhost --all --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _list_admins list_admins
+    complete -F _list_admins list_admins
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/list_lists b/msys2/usr/share/bash-completion/completions/list_lists
index c08071784..c5b9ba71f 100644
--- a/msys2/usr/share/bash-completion/completions/list_lists
+++ b/msys2/usr/share/bash-completion/completions/list_lists
@@ -2,7 +2,7 @@
 
 _mailman_lists()
 {
-    COMPREPLY=( $(compgen -W '$(list_lists -b 2>/dev/null)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(list_lists -b 2>/dev/null)' -- "$cur"))
 }
 
 _list_lists()
@@ -10,12 +10,12 @@ _list_lists()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--advertised --virtual-host-overview --bare
-            --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--advertised --virtual-host-overview --bare
+            --help' -- "$cur"))
     fi
 
 } &&
-complete -F _list_lists list_lists
+    complete -F _list_lists list_lists
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/list_members b/msys2/usr/share/bash-completion/completions/list_members
index 90db5cba0..639344c77 100644
--- a/msys2/usr/share/bash-completion/completions/list_members
+++ b/msys2/usr/share/bash-completion/completions/list_members
@@ -6,31 +6,31 @@ _list_members()
     _init_completion -s || return
 
     case $prev in
-        -o|--output)
+        -o | --output)
             _filedir
             return
             ;;
-        -d|--digest)
-            COMPREPLY=( $(compgen -W 'mime plain' -- "$cur") )
+        -d | --digest)
+            COMPREPLY=($(compgen -W 'mime plain' -- "$cur"))
             return
             ;;
-        -n|--nomail)
-            COMPREPLY=( $(compgen -W 'byadmin byuser bybounce unknown' \
-                -- "$cur") )
+        -n | --nomail)
+            COMPREPLY=($(compgen -W 'byadmin byuser bybounce unknown' \
+                -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--output --regular --digest --nomail
-            --fullnames --preserve --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--output --regular --digest --nomail
+            --fullnames --preserve --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _list_members list_members
+    complete -F _list_members list_members
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/list_owners b/msys2/usr/share/bash-completion/completions/list_owners
index 18b524761..445be0bd5 100644
--- a/msys2/usr/share/bash-completion/completions/list_owners
+++ b/msys2/usr/share/bash-completion/completions/list_owners
@@ -5,14 +5,14 @@ _list_owners()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--with-listnames --moderators --help' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--with-listnames --moderators --help' \
+            -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _list_owners list_owners
+    complete -F _list_owners list_owners
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/locale-gen b/msys2/usr/share/bash-completion/completions/locale-gen
index 3dae76ff7..406820131 100644
--- a/msys2/usr/share/bash-completion/completions/locale-gen
+++ b/msys2/usr/share/bash-completion/completions/locale-gen
@@ -6,7 +6,7 @@ _locale_gen()
     _init_completion -s || return
 
     case $prev in
-        --help|-h)
+        --help | -h)
             return
             ;;
         --aliases)
@@ -18,15 +18,15 @@ _locale_gen()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    COMPREPLY=( $(compgen -W \
+    COMPREPLY=($(compgen -W \
         '$(awk "{ print \$1 }" /usr/share/i18n/SUPPORTED 2>/dev/null)' \
-        -- "$cur") )
+        -- "$cur"))
 } &&
-complete -F _locale_gen locale-gen
+    complete -F _locale_gen locale-gen
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lpq b/msys2/usr/share/bash-completion/completions/lpq
index a1223268d..36729d22f 100644
--- a/msys2/usr/share/bash-completion/completions/lpq
+++ b/msys2/usr/share/bash-completion/completions/lpq
@@ -7,22 +7,22 @@ _lpq()
 
     case $prev in
         -P)
-            COMPREPLY=( $(compgen -W "$(lpstat -a 2>/dev/null | cut -d' ' -f1)" -- "$cur") )
+            COMPREPLY=($(compgen -W "$(lpstat -a 2>/dev/null | cut -d' ' -f1)" -- "$cur"))
             return
             ;;
         -U)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == - ]]; then
-        COMPREPLY=( $(compgen -W '-E -P -U -a -h -l' -- "$cur") )
+    if [[ $cur == - ]]; then
+        COMPREPLY=($(compgen -W '-E -P -U -a -h -l' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _lpq lpq
+    complete -F _lpq lpq
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lpr b/msys2/usr/share/bash-completion/completions/lpr
index 9a9e86391..554f05340 100644
--- a/msys2/usr/share/bash-completion/completions/lpr
+++ b/msys2/usr/share/bash-completion/completions/lpr
@@ -7,27 +7,27 @@ _lpr()
 
     case $prev in
         -P)
-            COMPREPLY=( $(compgen -W "$(lpstat -a 2>/dev/null | cut -d' ' -f1)" -- "$cur") )
+            COMPREPLY=($(compgen -W "$(lpstat -a 2>/dev/null | cut -d' ' -f1)" -- "$cur"))
             return
             ;;
         -U)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -o)
-            COMPREPLY=( $(compgen -W "media= landscape orientation-requested= sides= fitplot number-up= scaling= cpi= lpi= page-bottom= page-top= page-left= page-right=" -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W "media= landscape orientation-requested= sides= fitplot number-up= scaling= cpi= lpi= page-bottom= page-top= page-left= page-right=" -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
     esac
 
-    if [[ "$cur" == - ]]; then
-        COMPREPLY=( $(compgen -W '-E -H -C -J -T -P -U -h -l -m -o -p -q -r' -- "$cur") )
+    if [[ $cur == - ]]; then
+        COMPREPLY=($(compgen -W '-E -H -C -J -T -P -U -h -l -m -o -p -q -r' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _lpr lpr
+    complete -F _lpr lpr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lrzip b/msys2/usr/share/bash-completion/completions/lrzip
index 5eb2445bc..eb2904c62 100644
--- a/msys2/usr/share/bash-completion/completions/lrzip
+++ b/msys2/usr/share/bash-completion/completions/lrzip
@@ -23,21 +23,21 @@ _lrzip()
             return
             ;;
         -*L)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             return
             ;;
         -*N)
-            COMPREPLY=( $(compgen -W '{-20..19}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{-20..19}' -- "$cur"))
             return
             ;;
         -*p)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
@@ -45,8 +45,8 @@ _lrzip()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lrzip lrzip
+    complete -F _lrzip lrzip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lsof b/msys2/usr/share/bash-completion/completions/lsof
index e904f406d..eb1e967da 100644
--- a/msys2/usr/share/bash-completion/completions/lsof
+++ b/msys2/usr/share/bash-completion/completions/lsof
@@ -6,23 +6,23 @@ _lsof()
     _init_completion || return
 
     case $prev in
-        -'?'|-h|+c|-c|-d|-F|-i|+r|-r|-s|-S|-T)
+        -'?' | -h | +c | -c | -d | -F | -i | +r | -r | -s | -S | -T)
             return
             ;;
-        -A|-k|-m|+m|-o)
+        -A | -k | -m | +m | -o)
             _filedir
             return
             ;;
-        +d|+D)
+        +d | +D)
             _filedir -d
             return
             ;;
         -D)
-            COMPREPLY=( $(compgen -W '? b i r u' -- "$cur") )
+            COMPREPLY=($(compgen -W '? b i r u' -- "$cur"))
             return
             ;;
         -f)
-            COMPREPLY=( $(compgen -W 'c f g G n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c f g G n' -- "$cur"))
             return
             ;;
         -g)
@@ -37,20 +37,20 @@ _lsof()
             ;;
         -u)
             # TODO: handle ^foo exclusions, comma separated lists
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == [-+]* ]]; then
-        COMPREPLY=( $(compgen -W '-h -a -A -b -c +c -C +d -d +D -D +f -f -F -g
+    if [[ $cur == [-+]* ]]; then
+        COMPREPLY=($(compgen -W '-h -a -A -b -c +c -C +d -d +D -D +f -f -F -g
             -i -k -l +L -L +m -m +M -M -n -N -o -O -p -P +r -r -R -s -S -T -t
-            -u -U -v -V +w -w -x -X -z -Z' -- "$cur") )
+            -u -U -v -V +w -w -x -X -z -Z' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _lsof lsof
+    complete -F _lsof lsof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lsscsi b/msys2/usr/share/bash-completion/completions/lsscsi
index b401c8ab6..bcbc430a9 100644
--- a/msys2/usr/share/bash-completion/completions/lsscsi
+++ b/msys2/usr/share/bash-completion/completions/lsscsi
@@ -6,10 +6,10 @@ _lsscsi()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hV]*)
+        --help | --version | -!(-*)[hV]*)
             return
             ;;
-        --sysfsroot|-!(-*)y)
+        --sysfsroot | -!(-*)y)
             _filedir -d
             return
             ;;
@@ -18,10 +18,10 @@ _lsscsi()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _lsscsi lsscsi
+    complete -F _lsscsi lsscsi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lsusb b/msys2/usr/share/bash-completion/completions/lsusb
index c315abd17..63cff54cd 100644
--- a/msys2/usr/share/bash-completion/completions/lsusb
+++ b/msys2/usr/share/bash-completion/completions/lsusb
@@ -6,15 +6,15 @@ _lsusb()
     _init_completion || return
 
     case $prev in
-        --help|--version|-!(-*)@([sD]|[hV]*))
+        --help | --version | -!(-*)@([sD]|[hV]*))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _lsusb lsusb
+    complete -F _lsusb lsusb
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lua b/msys2/usr/share/bash-completion/completions/lua
index 775eae20a..3c4df901a 100644
--- a/msys2/usr/share/bash-completion/completions/lua
+++ b/msys2/usr/share/bash-completion/completions/lua
@@ -6,18 +6,18 @@ _lua()
     _init_completion || return
 
     case $prev in
-        -e|-l|-v|-)
+        -e | -l | -v | -)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
         return
     fi
 
     _filedir 'l@(ua|?(ua)c)'
 } &&
-complete -F _lua lua
+    complete -F _lua lua
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/luac b/msys2/usr/share/bash-completion/completions/luac
index 15b562ae1..c763deb21 100644
--- a/msys2/usr/share/bash-completion/completions/luac
+++ b/msys2/usr/share/bash-completion/completions/luac
@@ -6,7 +6,7 @@ _luac()
     _init_completion || return
 
     case $prev in
-        -v|-)
+        -v | -)
             return
             ;;
         -o)
@@ -16,12 +16,12 @@ _luac()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
         return
     fi
 
     _filedir lua
 } &&
-complete -F _luac luac
+    complete -F _luac luac
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/luseradd b/msys2/usr/share/bash-completion/completions/luseradd
index 2fa336db9..4d66385bf 100644
--- a/msys2/usr/share/bash-completion/completions/luseradd
+++ b/msys2/usr/share/bash-completion/completions/luseradd
@@ -6,20 +6,20 @@ _luseradd()
     _init_completion -s || return
 
     case $prev in
-        --help|--usage|--gecos|--uid|--login|--plainpassword|--password|\
-        --commonname|--givenname|--surname|--roomnumber|--telephonenumber|\
-        --homephone|-!(-*)@([culPp]|[?]*))
+        --help | --usage | --gecos | --uid | --login | --plainpassword | --password | \
+            --commonname | --givenname | --surname | --roomnumber | --telephonenumber | \
+            --homephone | -!(-*)@([culPp]|[?]*))
             return
             ;;
-        --directory|--skeleton|-!(-*)[dk])
+        --directory | --skeleton | -!(-*)[dk])
             _filedir -d
             return
             ;;
-        --shell|-!(-*)s)
+        --shell | -!(-*)s)
             _shells
             return
             ;;
-        --gid|-!(-*)g)
+        --gid | -!(-*)g)
             _gids
             return
             ;;
@@ -27,14 +27,14 @@ _luseradd()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    [[ ${1##*/} == luseradd ]] || COMPREPLY=( $(compgen -u -- "$cur") )
+    [[ ${1##*/} == luseradd ]] || COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _luseradd luseradd lusermod
+    complete -F _luseradd luseradd lusermod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/luserdel b/msys2/usr/share/bash-completion/completions/luserdel
index ee2b4fdbe..e36bda9fa 100644
--- a/msys2/usr/share/bash-completion/completions/luserdel
+++ b/msys2/usr/share/bash-completion/completions/luserdel
@@ -6,18 +6,18 @@ _luserdel()
     _init_completion || return
 
     case $prev in
-        --help|--usage|-!(-*)[?]*)
+        --help | --usage | -!(-*)[?]*)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _luserdel luserdel
+    complete -F _luserdel luserdel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lusermod b/msys2/usr/share/bash-completion/completions/lusermod
index 2fa336db9..4d66385bf 100644
--- a/msys2/usr/share/bash-completion/completions/lusermod
+++ b/msys2/usr/share/bash-completion/completions/lusermod
@@ -6,20 +6,20 @@ _luseradd()
     _init_completion -s || return
 
     case $prev in
-        --help|--usage|--gecos|--uid|--login|--plainpassword|--password|\
-        --commonname|--givenname|--surname|--roomnumber|--telephonenumber|\
-        --homephone|-!(-*)@([culPp]|[?]*))
+        --help | --usage | --gecos | --uid | --login | --plainpassword | --password | \
+            --commonname | --givenname | --surname | --roomnumber | --telephonenumber | \
+            --homephone | -!(-*)@([culPp]|[?]*))
             return
             ;;
-        --directory|--skeleton|-!(-*)[dk])
+        --directory | --skeleton | -!(-*)[dk])
             _filedir -d
             return
             ;;
-        --shell|-!(-*)s)
+        --shell | -!(-*)s)
             _shells
             return
             ;;
-        --gid|-!(-*)g)
+        --gid | -!(-*)g)
             _gids
             return
             ;;
@@ -27,14 +27,14 @@ _luseradd()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    [[ ${1##*/} == luseradd ]] || COMPREPLY=( $(compgen -u -- "$cur") )
+    [[ ${1##*/} == luseradd ]] || COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _luseradd luseradd lusermod
+    complete -F _luseradd luseradd lusermod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvchange b/msys2/usr/share/bash-completion/completions/lvchange
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvchange
+++ b/msys2/usr/share/bash-completion/completions/lvchange
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvcreate b/msys2/usr/share/bash-completion/completions/lvcreate
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvcreate
+++ b/msys2/usr/share/bash-completion/completions/lvcreate
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvdisplay b/msys2/usr/share/bash-completion/completions/lvdisplay
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvdisplay
+++ b/msys2/usr/share/bash-completion/completions/lvdisplay
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvextend b/msys2/usr/share/bash-completion/completions/lvextend
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvextend
+++ b/msys2/usr/share/bash-completion/completions/lvextend
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvm b/msys2/usr/share/bash-completion/completions/lvm
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvm
+++ b/msys2/usr/share/bash-completion/completions/lvm
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvmdiskscan b/msys2/usr/share/bash-completion/completions/lvmdiskscan
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvmdiskscan
+++ b/msys2/usr/share/bash-completion/completions/lvmdiskscan
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvreduce b/msys2/usr/share/bash-completion/completions/lvreduce
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvreduce
+++ b/msys2/usr/share/bash-completion/completions/lvreduce
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvremove b/msys2/usr/share/bash-completion/completions/lvremove
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvremove
+++ b/msys2/usr/share/bash-completion/completions/lvremove
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvrename b/msys2/usr/share/bash-completion/completions/lvrename
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvrename
+++ b/msys2/usr/share/bash-completion/completions/lvrename
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvresize b/msys2/usr/share/bash-completion/completions/lvresize
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvresize
+++ b/msys2/usr/share/bash-completion/completions/lvresize
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvs b/msys2/usr/share/bash-completion/completions/lvs
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvs
+++ b/msys2/usr/share/bash-completion/completions/lvs
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lvscan b/msys2/usr/share/bash-completion/completions/lvscan
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/lvscan
+++ b/msys2/usr/share/bash-completion/completions/lvscan
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lz4 b/msys2/usr/share/bash-completion/completions/lz4
index 76c24bfae..f297b5d8d 100644
--- a/msys2/usr/share/bash-completion/completions/lz4
+++ b/msys2/usr/share/bash-completion/completions/lz4
@@ -12,22 +12,22 @@ _lz4()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -X '-*#*' -W \
-            '$(_parse_help "$1" -h) -B{4..7} -i{1..9}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -X '-*#*' -W \
+            '$(_parse_help "$1" -h) -B{4..7} -i{1..9}' -- "$cur"))
         return
     fi
 
     local args word xspec="*.?(t)lz4"
     _count_args
-    [[ $args -gt 2 ]] && return
+    ((args > 2)) && return
 
     for word in "${words[@]}"; do
         case $word in
             -*[dt]*)
                 case $args in
                     1) xspec="!"$xspec ;;
-                    2) [[ $word == *t* ]] && return
+                    2) [[ $word == *t* ]] && return ;;
                 esac
                 break
                 ;;
@@ -45,8 +45,8 @@ _lz4()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lz4 lz4 lz4c
+    complete -F _lz4 lz4 lz4c
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lz4c b/msys2/usr/share/bash-completion/completions/lz4c
index 76c24bfae..f297b5d8d 100644
--- a/msys2/usr/share/bash-completion/completions/lz4c
+++ b/msys2/usr/share/bash-completion/completions/lz4c
@@ -12,22 +12,22 @@ _lz4()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -X '-*#*' -W \
-            '$(_parse_help "$1" -h) -B{4..7} -i{1..9}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -X '-*#*' -W \
+            '$(_parse_help "$1" -h) -B{4..7} -i{1..9}' -- "$cur"))
         return
     fi
 
     local args word xspec="*.?(t)lz4"
     _count_args
-    [[ $args -gt 2 ]] && return
+    ((args > 2)) && return
 
     for word in "${words[@]}"; do
         case $word in
             -*[dt]*)
                 case $args in
                     1) xspec="!"$xspec ;;
-                    2) [[ $word == *t* ]] && return
+                    2) [[ $word == *t* ]] && return ;;
                 esac
                 break
                 ;;
@@ -45,8 +45,8 @@ _lz4()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lz4 lz4 lz4c
+    complete -F _lz4 lz4 lz4c
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lzip b/msys2/usr/share/bash-completion/completions/lzip
index 0f95722cf..05f169c96 100644
--- a/msys2/usr/share/bash-completion/completions/lzip
+++ b/msys2/usr/share/bash-completion/completions/lzip
@@ -8,15 +8,15 @@ _lzip()
     local decompress=false
 
     case $prev in
-        --help|--version|--member-size|--match-length|--dictionary-size|\
-        --volume-size|--data-size|-!(-*)@([bmsSB]|[hV]*))
+        --help | --version | --member-size | --match-length | --dictionary-size | \
+            --volume-size | --data-size | -!(-*)@([bmsSB]|[hV]*))
             return
             ;;
         --decompress-!(-*)d)
             decompress=true
             ;;
         --threads-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --output-!(-*)o)
@@ -27,9 +27,9 @@ _lzip()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -40,8 +40,8 @@ _lzip()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzip clzip lzip pdlzip plzip
+    complete -F _lzip clzip lzip pdlzip plzip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lzma b/msys2/usr/share/bash-completion/completions/lzma
index 81a626f5d..34fba89f8 100644
--- a/msys2/usr/share/bash-completion/completions/lzma
+++ b/msys2/usr/share/bash-completion/completions/lzma
@@ -8,27 +8,27 @@ _lzma()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") -{1..9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") -{1..9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local IFS=$'\n' xspec="*.@(lzma|tlz)"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --compress ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*z* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --compress ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dt]* ]] && xspec="!"$xspec
+        [[ $prev == -*z* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzma lzma
+    complete -F _lzma lzma
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/lzop b/msys2/usr/share/bash-completion/completions/lzop
index bedc122ee..2642742a5 100644
--- a/msys2/usr/share/bash-completion/completions/lzop
+++ b/msys2/usr/share/bash-completion/completions/lzop
@@ -6,7 +6,7 @@ _lzop()
     _init_completion || return
 
     case $prev in
-        --output|-!(-*)o)
+        --output | -!(-*)o)
             _filedir
             return
             ;;
@@ -14,32 +14,32 @@ _lzop()
             _filedir -d
             return
             ;;
-        --suffix|-!(-*)S)
+        --suffix | -!(-*)S)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9 -P
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-1 -2 -3 -4 -5 -6 -7 -8 -9 -P
             --fast --best --decompress --extract --test --list --ls --info
             --sysinfo --license --help --version --stdout --output --path
             --force --no-checksum --no-name --name --no-mode --no-time --suffix
             --keep --delete --crc32 --no-warn --ignore-warn --quiet --verbose
             --no-stdin --filter --checksum --no-color --mono --color' \
-                -- "$cur") )
+            -- "$cur"))
         return
     fi
 
     local xspec="*.?(t)lzo"
     case $prev in
-        --decompress|--uncompress|--extract|--list|--ls|--info|--test)
+        --decompress | --uncompress | --extract | --list | --ls | --info | --test)
             xspec="!"$xspec
             ;;
         --force)
             xspec=
             ;;
-        --*)
-            ;;
+        --*) ;;
+
         -*f*)
             xspec=
             ;;
@@ -52,8 +52,8 @@ _lzop()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzop lzop
+    complete -F _lzop lzop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/macof b/msys2/usr/share/bash-completion/completions/macof
index c92a3864f..ad29f58fb 100644
--- a/msys2/usr/share/bash-completion/completions/macof
+++ b/msys2/usr/share/bash-completion/completions/macof
@@ -12,12 +12,11 @@ _macof()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _macof macof
+    complete -F _macof macof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mailmanctl b/msys2/usr/share/bash-completion/completions/mailmanctl
index dac1c5bf6..3bbc2f241 100644
--- a/msys2/usr/share/bash-completion/completions/mailmanctl
+++ b/msys2/usr/share/bash-completion/completions/mailmanctl
@@ -5,14 +5,14 @@ _mailmanctl()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--no-restart --run-as-user
-            --stale-lock-cleanup --quiet --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--no-restart --run-as-user
+            --stale-lock-cleanup --quiet --help' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'start stop restart reopen' -- "$cur") )
+        COMPREPLY=($(compgen -W 'start stop restart reopen' -- "$cur"))
     fi
 
 } &&
-complete -F _mailmanctl mailmanctl
+    complete -F _mailmanctl mailmanctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mailsnarf b/msys2/usr/share/bash-completion/completions/mailsnarf
index 01766555a..f959d80fc 100644
--- a/msys2/usr/share/bash-completion/completions/mailsnarf
+++ b/msys2/usr/share/bash-completion/completions/mailsnarf
@@ -12,11 +12,11 @@ _snarf()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _snarf filesnarf mailsnarf msgsnarf
+    complete -F _snarf filesnarf mailsnarf msgsnarf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/make b/msys2/usr/share/bash-completion/completions/make
index f119dcc3d..96517c217 100644
--- a/msys2/usr/share/bash-completion/completions/make
+++ b/msys2/usr/share/bash-completion/completions/make
@@ -8,7 +8,7 @@ _make_target_extract_script()
     local prefix="$1"
     local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
     local basename=${prefix##*/}
-    local dirname_len=$(( ${#prefix} - ${#basename} ))
+    local dirname_len=$((${#prefix} - ${#basename}))
 
     if [[ $mode == -d ]]; then
         # display mode, only output current path component to the next slash
@@ -67,8 +67,8 @@ _make_target_extract_script()
 EOF
 
     # don't complete with hidden targets unless we are doing a partial completion
-    if [[ -z "${prefix_pat}" || "${prefix_pat}" = */ ]]; then
-      cat <<EOF
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
       /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
 EOF
     fi
@@ -86,37 +86,37 @@ _make()
     local cur prev words cword split
     _init_completion -s || return
 
-    local file makef makef_dir=( "-C" "." ) makef_inc i
+    local makef makef_dir=("-C" ".") i
 
     case $prev in
-        --file|--makefile|--old-file|--assume-old|--what-if| --new-file|\
-        --assume-new|-!(-*)[foW])
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
             _filedir
             return
             ;;
-        --include-dir|--directory|-!(-*)[ICm])
+        --include-dir | --directory | -!(-*)[ICm])
             _filedir -d
             return
             ;;
         -!(-*)E)
-            COMPREPLY=( $(compgen -v -- "$cur") )
+            COMPREPLY=($(compgen -v -- "$cur"))
             return
             ;;
-        --eval|-!(-*)[DVx])
+        --eval | -!(-*)[DVx])
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(( $(_ncpus)*2 ))}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
@@ -126,20 +126,20 @@ _make()
     else
         # before we check for makefiles, see if a path was specified
         # with -C/--directory
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
-                eval "makef_dir=( -C \"${words[i+1]}\" )"
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
                 break
             fi
         done
 
         # before we scan for targets, see if a Makefile name was
         # specified with -f/--file/--makefile
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
-                eval "makef=( -f \"${words[i+1]}\" )"
+                eval "makef=( -f \"${words[i + 1]}\" )"
                 break
             fi
         done
@@ -147,24 +147,24 @@ _make()
         # recognise that possible completions are only going to be displayed
         # so only the base name is shown
         local mode=--
-        if (( COMP_TYPE != 9 )); then
+        if ((COMP_TYPE != 9)); then
             mode=-d # display-only mode
         fi
 
         local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
-        COMPREPLY=( $(LC_ALL=C \
+        COMPREPLY=($(LC_ALL=C \
             $1 -npq __BASH_MAKE_COMPLETION__=1 \
-                "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-            command sed -ne "$script") )
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
             # so set options for completion based on the first one
-            [[ $COMPREPLY == */ ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
         fi
 
     fi
 } &&
-complete -F _make make gmake gnumake pmake colormake
+    complete -F _make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/man b/msys2/usr/share/bash-completion/completions/man
index e5a473617..81d06f513 100644
--- a/msys2/usr/share/bash-completion/completions/man
+++ b/msys2/usr/share/bash-completion/completions/man
@@ -10,29 +10,29 @@ _man()
     local mansect="@([0-9lnp]|[0-9][px]|3?(gl|pm))"
 
     case $prev in
-        --config-file|-!(-*)C)
+        --config-file | -!(-*)C)
             _filedir conf
             return
             ;;
-        --local-file|-!(-*)l)
+        --local-file | -!(-*)l)
             _filedir "$manext"
             return
             ;;
-        --manpath|-!(-*)M)
+        --manpath | -!(-*)M)
             _filedir -d
             return
             ;;
-        --pager|-!(-*)P)
+        --pager | -!(-*)P)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
-        --preprocessor|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'e p t g r v' -- "$cur") )
+        --preprocessor | -!(-*)p)
+            COMPREPLY=($(compgen -W 'e p t g r v' -- "$cur"))
             return
             ;;
-        --locale|--systems|--extension|--prompt|--recode|--encoding|\
-        -!(-*)[LmerRE])
+        --locale | --systems | --extension | --prompt | --recode | --encoding | \
+            -!(-*)[LmerRE])
             return
             ;;
     esac
@@ -41,13 +41,13 @@ _man()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1" -h)
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     # file based completion if parameter looks like a path
-    if [[ "$cur" == @(*/|[.~])* ]]; then
+    if [[ $cur == @(*/|[.~])* ]]; then
         _filedir "$manext"
         return
     fi
@@ -57,7 +57,8 @@ _man()
 
     # determine manual section to search
     local sect
-    [[ "$prev" == $mansect ]] && sect=$prev || sect='*'
+    # shellcheck disable=SC2053
+    [[ $prev == $mansect ]] && sect=$prev || sect='*'
 
     _expand || return
 
@@ -68,29 +69,33 @@ _man()
         manpath="${manpath//://*man$sect/ } ${manpath//://*cat$sect/ }"
     fi
 
-    local IFS=$' \t\n' reset=$(shopt -p failglob); shopt -u failglob
+    local IFS=$' \t\n' reset=$(shopt -p failglob)
+    shopt -u failglob
     # redirect stderr for when path doesn't exist
-    COMPREPLY=( $(eval command ls "$manpath" 2>/dev/null) )
+    COMPREPLY=($(eval command ls "$manpath" 2>/dev/null))
     $reset
 
-    # weed out directory path names and paths to man pages
-    COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
-    # strip suffix from man pages
-    COMPREPLY=( ${COMPREPLY[@]%$comprsuffix} )
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}") )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # weed out directory path names and paths to man pages
+        COMPREPLY=(${COMPREPLY[@]##*/?(:)})
+        # strip suffix from man pages
+        COMPREPLY=(${COMPREPLY[@]%$comprsuffix})
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}"))
+    fi
 
-    if [[ "$prev" != $mansect ]]; then
+    # shellcheck disable=SC2053
+    if [[ $prev != $mansect ]]; then
         # File based completion for the rest, prepending ./ if needed
         # (man 1.6f needs that for man pages in current dir)
         local i start=${#COMPREPLY[@]}
         _filedir "$manext"
-        for (( i=$start; i < ${#COMPREPLY[@]}; i++ )); do
+        for ((i = start; i < ${#COMPREPLY[@]}; i++)); do
             [[ ${COMPREPLY[i]} == */* ]] || COMPREPLY[i]=./${COMPREPLY[i]}
         done
     fi
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _man man apropos whatis
+    complete -F _man man apropos whatis
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mc b/msys2/usr/share/bash-completion/completions/mc
index 8e96dd971..cf38821c1 100644
--- a/msys2/usr/share/bash-completion/completions/mc
+++ b/msys2/usr/share/bash-completion/completions/mc
@@ -6,24 +6,24 @@ _mc()
     _init_completion -s || return
 
     case $prev in
-        --edit|--view|--ftplog|--printwd|-!(-*)[evlP])
+        --edit | --view | --ftplog | --printwd | -!(-*)[evlP])
             _filedir
             return
             ;;
-        --help|--help-*|--version|--colors|--debuglevel|-!(-*)[hVCD])
+        --help | --help-* | --version | --colors | --debuglevel | -!(-*)[hVCD])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help-all)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir -d
     fi
 } &&
-complete -F _mc mc
+    complete -F _mc mc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mcrypt b/msys2/usr/share/bash-completion/completions/mcrypt
index f6094a22f..0c3ab5e68 100644
--- a/msys2/usr/share/bash-completion/completions/mcrypt
+++ b/msys2/usr/share/bash-completion/completions/mcrypt
@@ -7,61 +7,61 @@ _mcrypt()
     _init_completion || return
 
     case $prev in
-        -g|--openpgp-z)
-            COMPREPLY=( $(compgen -W '{0..9}' -- "$cur") )
+        -g | --openpgp-z)
+            COMPREPLY=($(compgen -W '{0..9}' -- "$cur"))
             return
             ;;
-        -o|--keymode)
-            COMPREPLY=( $(compgen -W '$($1 --list-keymodes 2>/dev/null )' \
-                                  -- "$cur") )
+        -o | --keymode)
+            COMPREPLY=($(compgen -W '$($1 --list-keymodes 2>/dev/null )' \
+                -- "$cur"))
             return
             ;;
-        -m|--mode)
-            COMPREPLY=( $(compgen -W "$($1 --list 2>/dev/null | cut -d: -f2-)" \
-                                  -- "$cur") )
+        -m | --mode)
+            COMPREPLY=($(compgen -W "$($1 --list 2>/dev/null | cut -d: -f2-)" \
+                -- "$cur"))
             return
             ;;
-        -a|--algorithm)
-            COMPREPLY=( $(compgen -W "$($1 --list 2>/dev/null | \
-                awk '{print $1}')" -- "$cur") )
+        -a | --algorithm)
+            COMPREPLY=($(compgen -W "$($1 --list 2>/dev/null |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
-        -h|--hash)
-            COMPREPLY=( $(compgen -W '$($1 --list-hash 2>/dev/null | \
-                command sed -e 1d)' -- "$cur") )
+        -h | --hash)
+            COMPREPLY=($(compgen -W '$($1 --list-hash 2>/dev/null | \
+                command sed -e 1d)' -- "$cur"))
             return
             ;;
-        -k|-s|--key|--keysize)
+        -k | -s | --key | --keysize)
             return
             ;;
-        -f|-c|--keyfile|--config)
+        -f | -c | --keyfile | --config)
             _filedir
             return
             ;;
-        --algorithms-directory|--modes-directory)
+        --algorithms-directory | --modes-directory)
             _filedir -d
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     elif [[ ${words[0]} == mdecrypt ]]; then
         _filedir nc
     else
         local i decrypt=0
-        for (( i=1; i < ${#words[@]}-1; i++ )); do
+        for ((i = 1; i < ${#words[@]} - 1; i++)); do
             if [[ ${words[i]} == -@(d|-decrypt) ]]; then
                 _filedir nc
                 decrypt=1
                 break
             fi
         done
-        if [[ $decrypt -eq 0 ]]; then
+        if ((decrypt == 0)); then
             _filedir
         fi
     fi
 } &&
-complete -F _mcrypt mcrypt mdecrypt
+    complete -F _mcrypt mcrypt mdecrypt
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mdadm b/msys2/usr/share/bash-completion/completions/mdadm
index 5fbd9bf3c..37effd96f 100644
--- a/msys2/usr/share/bash-completion/completions/mdadm
+++ b/msys2/usr/share/bash-completion/completions/mdadm
@@ -4,13 +4,13 @@ _mdadm_raid_level()
 {
     local mode
 
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            -!(-*)C*|--create)
+            -!(-*)C* | --create)
                 mode=create
                 break
                 ;;
-            -!(-*)B*|--build)
+            -!(-*)B* | --build)
                 mode=build
                 break
                 ;;
@@ -19,13 +19,13 @@ _mdadm_raid_level()
 
     case $mode in
         create)
-            COMPREPLY=( $(compgen -W 'linear raid0 0 stripe raid1 1 mirror
+            COMPREPLY=($(compgen -W 'linear raid0 0 stripe raid1 1 mirror
                 raid4 4 raid5 5 raid6 6 raid10 10 multipath mp faulty' \
-                -- "$cur") )
+                -- "$cur"))
             ;;
         build)
-            COMPREPLY=( $(compgen -W 'linear stripe raid0 0 raid1 multipath mp
-                faulty' -- "$cur") )
+            COMPREPLY=($(compgen -W 'linear stripe raid0 0 raid1 multipath mp
+                faulty' -- "$cur"))
             ;;
     esac
 }
@@ -33,64 +33,63 @@ _mdadm_raid_level()
 _mdadm_raid_layout()
 {
     local level
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(l|-level) ]]; then
-            level=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(l|-level) ]]; then
+            level=${words[i + 1]}
             break
         fi
     done
 
     case $level in
         raid5)
-            COMPREPLY=( $(compgen -W 'left-asymmetric left-symmetric
-                right-asymmetric right-symmetric la ra ls rs' -- "$cur") )
+            COMPREPLY=($(compgen -W 'left-asymmetric left-symmetric
+                right-asymmetric right-symmetric la ra ls rs' -- "$cur"))
             ;;
         raid10)
-            COMPREPLY=( $(compgen -W 'n o p' -- "$cur") )
+            COMPREPLY=($(compgen -W 'n o p' -- "$cur"))
             ;;
         faulty)
-            COMPREPLY=( $(compgen -W 'write-transient wt read-transient rt
+            COMPREPLY=($(compgen -W 'write-transient wt read-transient rt
                 write-persistent wp read-persistent rp write-all read-fixable
-                rf clear flush none' -- "$cur") )
+                rf clear flush none' -- "$cur"))
             ;;
     esac
 }
 
 _mdadm_auto_flag()
 {
-    COMPREPLY=( $(compgen -W 'no yes md mdp part p' -- "$cur") )
+    COMPREPLY=($(compgen -W 'no yes md mdp part p' -- "$cur"))
 }
 
 _mdadm_update_flag()
 {
-    COMPREPLY=( $(compgen -W 'sparc2.2 summaries uuid name homehost resync
-        byteorder super-minor' -- "$cur") )
+    COMPREPLY=($(compgen -W 'sparc2.2 summaries uuid name homehost resync
+        byteorder super-minor' -- "$cur"))
 }
 
-
 _mdadm()
 {
     local cur prev words cword split
     _init_completion -s || return
 
     case $prev in
-        --config|--bitmap|--backup-file|-!(-*)[cb])
+        --config | --bitmap | --backup-file | -!(-*)[cb])
             _filedir
             return
             ;;
-        --level|-!(-*)l)
+        --level | -!(-*)l)
             _mdadm_raid_level
             return
             ;;
-        --layout|--parity|-!(-*)p)
+        --layout | --parity | -!(-*)p)
             _mdadm_raid_layout
             return
             ;;
-        --auto|-!(-*)a)
+        --auto | -!(-*)a)
             _mdadm_auto_flag
             return
             ;;
-        --update|-!(-*)U)
+        --update | -!(-*)U)
             _mdadm_update_flag
             return
             ;;
@@ -101,50 +100,50 @@ _mdadm()
     local options='--help --help-options --version --verbose --quiet --brief
         --force --config= --scan --metadata= --homehost='
 
-    if [[ "$cur" == -* ]]; then
-        if [[ $cword -eq 1 ]]; then
-            COMPREPLY=( $(compgen -W "$options --assemble --build --create
-                --monitor --grow" -- "$cur") )
+    if [[ $cur == -* ]]; then
+        if ((cword == 1)); then
+            COMPREPLY=($(compgen -W "$options --assemble --build --create
+                --monitor --grow" -- "$cur"))
         else
-            case ${words[cword-1]} in
-                --assemble|-!(-*)A*)
-                    COMPREPLY=( $(compgen -W "$options --uuid= --super-minor=
+            case ${words[cword - 1]} in
+                --assemble | -!(-*)A*)
+                    COMPREPLY=($(compgen -W "$options --uuid= --super-minor=
                         --name= --force --run --no-degraded --auto= --bitmap=
                         --backup-file= --update= --auto-update-homehost" \
-                            -- "$cur") )
+                        -- "$cur"))
                     ;;
-                --build|--create|--grow|-!(-*)[BCG]*)
-                    COMPREPLY=( $(compgen -W "$options --raid-devices=
+                --build | --create | --grow | -!(-*)[BCG]*)
+                    COMPREPLY=($(compgen -W "$options --raid-devices=
                         --spare-devices= --size= --chunk= --rounding= --level=
                         --layout= --parity= --bitmap= --bitmap-chunk=
                         --write-mostly --write-behind= --assume-clean
                         --backup-file= --name= --run --force --auto=" \
-                            -- "$cur") )
+                        -- "$cur"))
                     ;;
-                --follow|--monitor|-!(-*)F)
-                    COMPREPLY=( $(compgen -W "$options --mail --program
+                --follow | --monitor | -!(-*)F)
+                    COMPREPLY=($(compgen -W "$options --mail --program
                         --alert --syslog --delay --daemonise --pid-file
-                        --oneshot --test" -- "$cur") )
+                        --oneshot --test" -- "$cur"))
 
                     ;;
-                /dev/*|--add|--fail|--remove)
-                    COMPREPLY=( $(compgen -W "$options --add --re-add
-                        --remove --fail --set-faulty" -- "$cur") )
+                /dev/* | --add | --fail | --remove)
+                    COMPREPLY=($(compgen -W "$options --add --re-add
+                        --remove --fail --set-faulty" -- "$cur"))
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W "$options --query --detail
+                    COMPREPLY=($(compgen -W "$options --query --detail
                         --examine --sparc2.2 --examine-bitmap --run --stop
                         --readonly --readwrite --zero-superblock --test" \
-                            -- "$cur") )
+                        -- "$cur"))
                     ;;
             esac
         fi
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         cur=${cur:=/dev/}
         _filedir
     fi
 } &&
-complete -F _mdadm mdadm
+    complete -F _mdadm mdadm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mdecrypt b/msys2/usr/share/bash-completion/completions/mdecrypt
index f6094a22f..0c3ab5e68 100644
--- a/msys2/usr/share/bash-completion/completions/mdecrypt
+++ b/msys2/usr/share/bash-completion/completions/mdecrypt
@@ -7,61 +7,61 @@ _mcrypt()
     _init_completion || return
 
     case $prev in
-        -g|--openpgp-z)
-            COMPREPLY=( $(compgen -W '{0..9}' -- "$cur") )
+        -g | --openpgp-z)
+            COMPREPLY=($(compgen -W '{0..9}' -- "$cur"))
             return
             ;;
-        -o|--keymode)
-            COMPREPLY=( $(compgen -W '$($1 --list-keymodes 2>/dev/null )' \
-                                  -- "$cur") )
+        -o | --keymode)
+            COMPREPLY=($(compgen -W '$($1 --list-keymodes 2>/dev/null )' \
+                -- "$cur"))
             return
             ;;
-        -m|--mode)
-            COMPREPLY=( $(compgen -W "$($1 --list 2>/dev/null | cut -d: -f2-)" \
-                                  -- "$cur") )
+        -m | --mode)
+            COMPREPLY=($(compgen -W "$($1 --list 2>/dev/null | cut -d: -f2-)" \
+                -- "$cur"))
             return
             ;;
-        -a|--algorithm)
-            COMPREPLY=( $(compgen -W "$($1 --list 2>/dev/null | \
-                awk '{print $1}')" -- "$cur") )
+        -a | --algorithm)
+            COMPREPLY=($(compgen -W "$($1 --list 2>/dev/null |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
-        -h|--hash)
-            COMPREPLY=( $(compgen -W '$($1 --list-hash 2>/dev/null | \
-                command sed -e 1d)' -- "$cur") )
+        -h | --hash)
+            COMPREPLY=($(compgen -W '$($1 --list-hash 2>/dev/null | \
+                command sed -e 1d)' -- "$cur"))
             return
             ;;
-        -k|-s|--key|--keysize)
+        -k | -s | --key | --keysize)
             return
             ;;
-        -f|-c|--keyfile|--config)
+        -f | -c | --keyfile | --config)
             _filedir
             return
             ;;
-        --algorithms-directory|--modes-directory)
+        --algorithms-directory | --modes-directory)
             _filedir -d
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     elif [[ ${words[0]} == mdecrypt ]]; then
         _filedir nc
     else
         local i decrypt=0
-        for (( i=1; i < ${#words[@]}-1; i++ )); do
+        for ((i = 1; i < ${#words[@]} - 1; i++)); do
             if [[ ${words[i]} == -@(d|-decrypt) ]]; then
                 _filedir nc
                 decrypt=1
                 break
             fi
         done
-        if [[ $decrypt -eq 0 ]]; then
+        if ((decrypt == 0)); then
             _filedir
         fi
     fi
 } &&
-complete -F _mcrypt mcrypt mdecrypt
+    complete -F _mcrypt mcrypt mdecrypt
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mdtool b/msys2/usr/share/bash-completion/completions/mdtool
index 67a3c7c3d..428e33b77 100644
--- a/msys2/usr/share/bash-completion/completions/mdtool
+++ b/msys2/usr/share/bash-completion/completions/mdtool
@@ -7,17 +7,18 @@ _mdtool()
 
     local command i
 
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ ${words[i]} == @(build|generate-makefiles|setup) ]]; then
             command=${words[i]}
+            break
         fi
     done
 
-    if [[ -n "$command" ]]; then
+    if [[ -v command ]]; then
         case $command in
             "build")
-                COMPREPLY=( $(compgen -W '--f --buildfile --p --project' \
-                    -S":" -- "$cur") )
+                COMPREPLY=($(compgen -W '--f --buildfile --p --project' \
+                    -S":" -- "$cur"))
                 # TODO: This does not work :(
                 #if [[ "$prev" == *: ]]; then
                 #   case $prev in
@@ -33,29 +34,29 @@ _mdtool()
                 ;;
             "generate-makefiles")
                 compopt -o filenames
-                COMPREPLY=( $(compgen -o filenames -G"*.mds" -- "$cur") )
-                if [[ "$prev" == *mds ]]; then
-                    COMPREPLY=( $(compgen -W '--simple-makefiles --s --d:' \
-                        -- "$cur") )
+                COMPREPLY=($(compgen -o filenames -G"*.mds" -- "$cur"))
+                if [[ $prev == *mds ]]; then
+                    COMPREPLY=($(compgen -W '--simple-makefiles --s --d:' \
+                        -- "$cur"))
                 fi
                 return
                 ;;
             "setup")
                 # TODO: at least return filenames after these options.
-                COMPREPLY=( $(compgen -W 'install i uninstall u check-install
+                COMPREPLY=($(compgen -W 'install i uninstall u check-install
                     ci update up list l list-av la list-update lu rep-add ra
                     rep-remove rr rep-update ru rep-list rl reg-update
                     reg-build rgu info rep-build rb pack p help h dump-file' \
-                    -- "$cur") )
+                    -- "$cur"))
                 return
                 ;;
         esac
     fi
 
-    COMPREPLY=( $(compgen -W 'gsetup build dbgen project-export
-        generate-makefiles gettext-update setup -q' -- "$cur") )
+    COMPREPLY=($(compgen -W 'gsetup build dbgen project-export
+        generate-makefiles gettext-update setup -q' -- "$cur"))
 
 } &&
-complete -F _mdtool mdtool
+    complete -F _mdtool mdtool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/medusa b/msys2/usr/share/bash-completion/completions/medusa
index f0ca7022f..45129879f 100644
--- a/msys2/usr/share/bash-completion/completions/medusa
+++ b/msys2/usr/share/bash-completion/completions/medusa
@@ -15,16 +15,16 @@ _medusa()
             return
             ;;
         -*M)
-            COMPREPLY=( $(compgen -W "$($1 -d | awk '/^ +\+/ {print $2}' \
-                | command sed -e 's/\.mod$//')") )
+            COMPREPLY=($(compgen -W "$($1 -d | awk '/^ +\+/ {print $2}' |
+                command sed -e 's/\.mod$//')"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _medusa medusa
+    complete -F _medusa medusa
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mencoder b/msys2/usr/share/bash-completion/completions/mencoder
index 525c63e22..d71ebb8e9 100644
--- a/msys2/usr/share/bash-completion/completions/mencoder
+++ b/msys2/usr/share/bash-completion/completions/mencoder
@@ -3,9 +3,9 @@
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $(compgen -W "$($1 -noconfig all $2 help 2>/dev/null | \
-        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 -noconfig all $2 help 2>/dev/null |
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' |
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur"))
 }
 
 _mplayer()
@@ -16,8 +16,8 @@ _mplayer()
     local cmd=${words[0]} i j k=0
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
-        -audio-demuxer|-sub-demuxer)
+        -[av][cfo] | -[av]fm | -vop | -fstype | -demuxer | -o[av]c | -of | -profile | \
+            -audio-demuxer | -sub-demuxer)
             _mplayer_options_list $cmd $prev
             return
             ;;
@@ -25,43 +25,43 @@ _mplayer()
             _mplayer_options_list $cmd -profile
             return
             ;;
-        -audiofile|-audio-file)
+        -audiofile | -audio-file)
             _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ac3|ape)'
             return
             ;;
-        -font|-subfont)
+        -font | -subfont)
             if [[ $prev == -font ]]; then
                 _filedir '@(desc|ttf)'
             else
                 _filedir ttf
             fi
             local IFS=$'\n'
-            COMPREPLY+=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -sub|-sub-file)
+        -sub | -sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
             local IFS=$'\n'
-            COMPREPLY=( $(for i in "${COMPREPLY[@]}"; do
-                        if [[ -f $i && -r $i ]]; then
-                            printf '%s\n' ${i%.*}
-                        else
-                            printf '%s\n' $i
-                        fi
-                        done) )
+            COMPREPLY=($(for i in "${COMPREPLY[@]}"; do
+                if [[ -f $i && -r $i ]]; then
+                    printf '%s\n' ${i%.*}
+                else
+                    printf '%s\n' $i
+                fi
+            done))
             return
             ;;
-        -subcp|-msgcharset)
+        -subcp | -msgcharset)
             local cp
-            cp=( $(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null) )
-            if [[ "$cur" == "${cur,,}" ]]; then
-                COMPREPLY=( $(compgen -W '${cp[@],,}' -- "$cur") )
+            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
+            if [[ $cur == "${cur,,}" ]]; then
+                COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
             else
-                COMPREPLY=( $(compgen -W '${cp[@]^^}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
             fi
             return
             ;;
@@ -107,53 +107,52 @@ _mplayer()
             _filedir -d
             return
             ;;
-        -mixer|-dvdauth|-fb|-zrdev)
+        -mixer | -dvdauth | -fb | -zrdev)
             cur=${cur:=/dev/}
             _filedir
             return
             ;;
-        -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
+            -subfile | -aofile | -fbmodeconfig | -include | -o | -dvdkey | -passlogfile)
             _filedir
             return
             ;;
-        -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
-        -dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
-        -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
-        -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \
-        -fbmode|-geometry|-guiwid|-hue|-icelayer|-screen[wh]|-wid| \
-        -monitor-dotclock|-monitor-[hv]freq|-panscan| \
-        -saturation|-xineramascreen|-zrcrop|-zrnorm|-zrquality| \
-        -zr[xy]doff|-zr[vh]dec|-pp|-x|-y|-xy|-z|-stereo| \
-        -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
-        -ffourcc|-sws|-skiplimit|-format|-ofps|-aadriver| \
-        -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-subdelay|-subfps|-subpos| \
-        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
-        -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-text-scale)
+        -autoq | -autosync | -loop | -menu-root | -speed | -sstep | -aid | -alang | \
+            -bandwidth | -bluray-angle | -bluray-chapter | -cache | -chapter | -dvd-speed | \
+            -dvdangle | -fps | -frames | -mc | -passwd | -user | -sb | -srate | -ss | -vcd | \
+            -vi | -vid | -vivo | -ffactor | -sid | -slang | -spualign | -spuaa | -spugauss | \
+            -vobsubid | -delay | -bpp | -brightness | -contrast | -dfbopts | -display | \
+            -fbmode | -geometry | -guiwid | -hue | -icelayer | -screen[wh] | -wid | \
+            -monitor-dotclock | -monitor-[hv]freq | -panscan | \
+            -saturation | -xineramascreen | -zrcrop | -zrnorm | -zrquality | \
+            -zr[xy]doff | -zr[vh]dec | -pp | -x | -y | -xy | -z | -stereo | \
+            -audio-density | -audio-delay | -audio-preload | -endpos | -osdlevel | \
+            -ffourcc | -sws | -skiplimit | -format | -ofps | -aadriver | \
+            -aaosdcolor | -aasubcolor | -vobsubout | -vobsuboutid | -vobsuboutindex | \
+            -sub-bg-alpha | -sub-bg-color | -subdelay | -subfps | -subpos | \
+            -subalign | -subwidth | -subfont-blur | -subfont-outline | \
+            -subfont-autoscale | -subfont-encoding | -subfont-osd-scale | \
+            -subfont-text-scale)
             return
             ;;
         -channels)
-            COMPREPLY=( $(compgen -W '2 4 6 8' -- "$cur") )
+            COMPREPLY=($(compgen -W '2 4 6 8' -- "$cur"))
             return
             ;;
-        -aspect|-monitoraspect)
-            COMPREPLY=( $(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
-                2.35:1' -- "$cur") )
+        -aspect | -monitoraspect)
+            COMPREPLY=($(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
+                2.35:1' -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         -lavdopts)
-            COMPREPLY=( $(compgen -W 'bitexact bug= debug= ec= er= fast gray
+            COMPREPLY=($(compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
-                threads= vismv= vstats' -- "$cur") )
+                threads= vismv= vstats' -- "$cur"))
             return
             ;;
         -lavcopts)
-            COMPREPLY=( $(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
+            COMPREPLY=($(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
                 mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint=
                 vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate=
                 vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset=
@@ -162,120 +161,120 @@ _mplayer()
                 vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask=
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
-                umv' -- "$cur") )
+                umv' -- "$cur"))
             return
             ;;
         -ssf)
-            COMPREPLY=( $(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur"))
             return
             ;;
         -jpeg)
-            COMPREPLY=( $(compgen -W 'noprogressive progressive nobaseline
-                baseline optimize= smooth= quality= outdir=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noprogressive progressive nobaseline
+                baseline optimize= smooth= quality= outdir=' -- "$cur"))
             return
             ;;
         -xvidopts)
-            COMPREPLY=( $(compgen -W 'dr2 nodr2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dr2 nodr2' -- "$cur"))
             return
             ;;
         -xvidencopts)
-            COMPREPLY=( $(compgen -W 'pass= bitrate= fixed_quant= me_quality=
+            COMPREPLY=($(compgen -W 'pass= bitrate= fixed_quant= me_quality=
                 4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer=
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
-                kfthreshold= kfreduction=' -- "$cur") )
+                kfthreshold= kfreduction=' -- "$cur"))
             return
             ;;
         -divx4opts)
-            COMPREPLY=( $(compgen -W 'br= key= deinterlace q= min_quant=
+            COMPREPLY=($(compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
-                rc_reaction_ratio= pass= vbrpass= help' -- "$cur") )
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur"))
             return
             ;;
         -info)
-            COMPREPLY=( $(compgen -W 'name= artist= genre= subject=
-                copyright= srcform= comment= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'name= artist= genre= subject=
+                copyright= srcform= comment= help' -- "$cur"))
             return
             ;;
         -lameopts)
-            COMPREPLY=( $(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
-                mode= padding= fast preset= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
+                mode= padding= fast preset= help' -- "$cur"))
             return
             ;;
         -rawaudio)
-            COMPREPLY=( $(compgen -W 'on channels= rate= samplesize= format=' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'on channels= rate= samplesize= format=' \
+                -- "$cur"))
             return
             ;;
         -rawvideo)
-            COMPREPLY=( $(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
-                h= y420 yv12 yuy2 y8 format= size=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur"))
             return
             ;;
         -aop)
-            COMPREPLY=( $(compgen -W 'list= delay= format= fout= volume= mul=
-                softclip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list= delay= format= fout= volume= mul=
+                softclip' -- "$cur"))
             return
             ;;
         -dxr2)
-            COMPREPLY=( $(compgen -W 'ar-mode= iec958-encoded iec958-decoded
+            COMPREPLY=($(compgen -W 'ar-mode= iec958-encoded iec958-decoded
                 mute ucode= 75ire bw color interlaced macrovision= norm=
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur") )
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur"))
             return
             ;;
         -tv)
-            COMPREPLY=( $(compgen -W 'on noaudio driver= device= input= freq=
+            COMPREPLY=($(compgen -W 'on noaudio driver= device= input= freq=
                 outfmt= width= height= buffersize= norm= channel= chanlist=
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -mf)
-            COMPREPLY=( $(compgen -W 'on w= h= fps= type=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on w= h= fps= type=' -- "$cur"))
             return
             ;;
         -cdda)
-            COMPREPLY=( $(compgen -W 'speed= paranoia= generic-dev=
+            COMPREPLY=($(compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -input)
-            COMPREPLY=( $(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
-                js-dev file' -- "$cur") )
+            COMPREPLY=($(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
+                js-dev file' -- "$cur"))
             return
             ;;
         -af-adv)
-            COMPREPLY=( $(compgen -W 'force= list=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'force= list=' -- "$cur"))
             return
             ;;
         -noconfig)
-            COMPREPLY=( $(compgen -W 'all gui system user' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all gui system user' -- "$cur"))
             return
             ;;
         -*)
             # Assume arg is required for everything else except options
             # for which -list-options says Type is Flag or Print.
-            $cmd -noconfig all -list-options 2>/dev/null \
-            | while read -r i j k; do
-                if [[ $i == ${prev#-} ]]; then
-                    [[ ${j,,} != @(flag|print) ]] && return 1
-                    break
-                fi
-            done || return
+            $cmd -noconfig all -list-options 2>/dev/null |
+                while read -r i j k; do
+                    if [[ $i == "${prev#-}" ]]; then
+                        [[ ${j,,} != @(flag|print) ]] && return 1
+                        break
+                    fi
+                done || return
             ;;
     esac
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
-                command sed -ne '1,/^[[:space:]]*Name/d' \
+            COMPREPLY=($(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
+                command sed -ne "1,/^[[:space:]]*Name/d" \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
-                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur") )
+                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur"))
             ;;
         *)
             _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS|m[eo]d|M[EO]D|xm|XM|it|IT|s[t3]m|S[T3]M|mtm|MTM|w64|W64)?(.@(crdownload|part))'
@@ -283,6 +282,6 @@ _mplayer()
     esac
 
 } &&
-complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
+    complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/micropython b/msys2/usr/share/bash-completion/completions/micropython
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/micropython
+++ b/msys2/usr/share/bash-completion/completions/micropython
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mii-diag b/msys2/usr/share/bash-completion/completions/mii-diag
index b62174e72..c433a7a24 100644
--- a/msys2/usr/share/bash-completion/completions/mii-diag
+++ b/msys2/usr/share/bash-completion/completions/mii-diag
@@ -6,21 +6,21 @@ _mii_diag()
     _init_completion -s || return
 
     case $prev in
-        -F|-A|--advertise|--fixed-speed)
-            COMPREPLY=( $(compgen -W '100baseT4 100baseTx 100baseTx-FD
-                100baseTx-HD 10baseT 10baseT-FD 10baseT-HD' -- "$cur") )
+        -F | -A | --advertise | --fixed-speed)
+            COMPREPLY=($(compgen -W '100baseT4 100baseTx 100baseTx-FD
+                100baseTx-HD 10baseT 10baseT-FD 10baseT-HD' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _available_interfaces -a
     fi
 } &&
-complete -F _mii_diag -o default mii-diag
+    complete -F _mii_diag -o default mii-diag
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mii-tool b/msys2/usr/share/bash-completion/completions/mii-tool
index 9c88ba14a..1b80202b8 100644
--- a/msys2/usr/share/bash-completion/completions/mii-tool
+++ b/msys2/usr/share/bash-completion/completions/mii-tool
@@ -6,27 +6,27 @@ _mii_tool()
     _init_completion -s || return
 
     case $prev in
-        --force|-!(-*)F)
-            COMPREPLY=( $(compgen -W '100baseTx-FD 100baseTx-HD 10baseT-FD
-                10baseT-HD' -- "$cur") )
+        --force | -!(-*)F)
+            COMPREPLY=($(compgen -W '100baseTx-FD 100baseTx-HD 10baseT-FD
+                10baseT-HD' -- "$cur"))
             return
             ;;
-        --advertise|-!(-*)A)
-            COMPREPLY=( $(compgen -W '100baseT4 100baseTx-FD 100baseTx-HD
-                10baseT-FD 10baseT-HD' -- "$cur") )
+        --advertise | -!(-*)A)
+            COMPREPLY=($(compgen -W '100baseT4 100baseTx-FD 100baseTx-HD
+                10baseT-FD 10baseT-HD' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _available_interfaces -a
     fi
 } &&
-complete -F _mii_tool -o default mii-tool
+    complete -F _mii_tool -o default mii-tool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/minicom b/msys2/usr/share/bash-completion/completions/minicom
index 2e98229ad..57510e98b 100644
--- a/msys2/usr/share/bash-completion/completions/minicom
+++ b/msys2/usr/share/bash-completion/completions/minicom
@@ -6,35 +6,35 @@ _minicom()
     _init_completion -s || return
 
     case $prev in
-        --attrib|--color|-!(-*)[ac])
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        --attrib | --color | -!(-*)[ac])
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
-        --script|--capturefile|-!(-*)[SC])
+        --script | --capturefile | -!(-*)[SC])
             _filedir
             return
             ;;
-        --ptty|-!(-*)p)
-            COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]} ${COMPREPLY[@]#/dev/}' \
-                -- "$cur") )
+        --ptty | -!(-*)p)
+            COMPREPLY=($(printf '%s\n' /dev/tty*))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]} ${COMPREPLY[@]#/dev/}' \
+                -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     COMPREPLY=(
-        $(printf '%s\n' /etc/minirc.* /etc/minicom/minirc.* ~/.minirc.* \
-            | command sed -e '/\*$/d' -e 's/^.*minirc\.//' \
-            | command grep "^${cur}") )
+        $(printf '%s\n' /etc/minirc.* /etc/minicom/minirc.* ~/.minirc.* |
+            command sed -e '/\*$/d' -e 's/^.*minirc\.//' |
+            command grep "^${cur}"))
 } &&
-complete -F _minicom -o default minicom
+    complete -F _minicom -o default minicom
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mkinitrd b/msys2/usr/share/bash-completion/completions/mkinitrd
index 2e1312274..bcb7e0751 100644
--- a/msys2/usr/share/bash-completion/completions/mkinitrd
+++ b/msys2/usr/share/bash-completion/completions/mkinitrd
@@ -6,11 +6,11 @@ _mkinitrd()
     _init_completion -s || return
 
     case $prev in
-        --preload|--with|--builtin)
+        --preload | --with | --builtin)
             _modules
             return
             ;;
-        --fstab|--dsdt)
+        --fstab | --dsdt)
             _filedir
             return
             ;;
@@ -22,14 +22,14 @@ _mkinitrd()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--version --help -v -f --preload \
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--version --help -v -f --preload \
             --force-scsi-probe --omit-scsi-modules \
             --omit-ide-modules --image-version --force-raid-probe \
             --omit-raid-modules --with= --force-lvm-probe \
             --omit-lvm-modules --builtin --omit-dmraid --net-dev \
-            --fstab --nocompress --dsdt --bootchart' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            --fstab --nocompress --dsdt --bootchart' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         local args
         _count_args
@@ -45,6 +45,6 @@ _mkinitrd()
     fi
 
 } &&
-complete -F _mkinitrd mkinitrd
+    complete -F _mkinitrd mkinitrd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mkisofs b/msys2/usr/share/bash-completion/completions/mkisofs
index 52b66bbe9..dfa39c0ab 100644
--- a/msys2/usr/share/bash-completion/completions/mkisofs
+++ b/msys2/usr/share/bash-completion/completions/mkisofs
@@ -6,14 +6,14 @@ _mkisofs()
     _init_completion || return
 
     case $prev in
-        -o|-abstract|-biblio|-check-session|-copyright|-log-file| \
-        -root-info|-prep-boot|-*-list)
+        -o | -abstract | -biblio | -check-session | -copyright | -log-file | \
+            -root-info | -prep-boot | -*-list)
             _filedir
             return
             ;;
         -*-charset)
-            COMPREPLY=( $(compgen -W '$(mkisofs -input-charset \
-                    help 2>&1 | tail -n +3)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(mkisofs -input-charset \
+                    help 2>&1 | tail -n +3)' -- "$cur"))
             return
             ;;
         -uid)
@@ -26,13 +26,13 @@ _mkisofs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
     else
         _filedir
     fi
 
 } &&
-complete -F _mkisofs mkisofs genisoimage
+    complete -F _mkisofs mkisofs genisoimage
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mktemp b/msys2/usr/share/bash-completion/completions/mktemp
index 96c7a1184..e063810da 100644
--- a/msys2/usr/share/bash-completion/completions/mktemp
+++ b/msys2/usr/share/bash-completion/completions/mktemp
@@ -6,10 +6,10 @@ _mktemp()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version|--suffix)
+        --help | --version | --suffix)
             return
             ;;
-        --tmpdir|-!(-*)p)
+        --tmpdir | -!(-*)p)
             _filedir -d
             return
             ;;
@@ -17,13 +17,13 @@ _mktemp()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
         [[ $opts ]] || opts="-d -u -q -p -t" # non-GNU fallback
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _mktemp mktemp
+    complete -F _mktemp mktemp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mmsitepass b/msys2/usr/share/bash-completion/completions/mmsitepass
index fc938d820..49daae619 100644
--- a/msys2/usr/share/bash-completion/completions/mmsitepass
+++ b/msys2/usr/share/bash-completion/completions/mmsitepass
@@ -5,11 +5,11 @@ _mmsitepass()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--listcreator --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--listcreator --help' -- "$cur"))
     fi
 
 } &&
-complete -F _mmsitepass mmsitepass
+    complete -F _mmsitepass mmsitepass
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/modinfo b/msys2/usr/share/bash-completion/completions/modinfo
index c151fad4a..009bcf322 100644
--- a/msys2/usr/share/bash-completion/completions/modinfo
+++ b/msys2/usr/share/bash-completion/completions/modinfo
@@ -6,13 +6,13 @@ _modinfo()
     _init_completion -s || return
 
     case "$prev" in
-        --field|-!(-*)F)
-            COMPREPLY=( $(compgen -W 'alias author depends description
+        --field | -!(-*)F)
+            COMPREPLY=($(compgen -W 'alias author depends description
                 filename firmware license parm srcversion staging vermagic
-                version' -- "${cur,,}") )
+                version' -- "${cur,,}"))
             return
             ;;
-        --set-version|-!(-*)k)
+        --set-version | -!(-*)k)
             _kernel_versions
             return
             ;;
@@ -20,28 +20,28 @@ _modinfo()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local i version=$(uname -r)
-    for (( i=${#words[@]}-1; i>0; i-- )); do
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
         if [[ ${words[i]} == -@(!(-*)k*|-set-version) ]]; then
-            version=${words[i+1]}
+            version=${words[i + 1]}
             break
         fi
     done
 
     # do filename completion if we're giving a path to a module
-    if [[ "$cur" == @(*/|[.~])* ]]; then
-        _filedir '@(?(k)o?(.gz))'
+    if [[ $cur == @(*/|[.~])* ]]; then
+        _filedir '@(?(k)o?(.[gx]z))'
     else
         _modules $version
     fi
 } &&
-complete -F _modinfo modinfo
+    complete -F _modinfo modinfo
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/modprobe b/msys2/usr/share/bash-completion/completions/modprobe
index 16c8453a4..36cb5882c 100644
--- a/msys2/usr/share/bash-completion/completions/modprobe
+++ b/msys2/usr/share/bash-completion/completions/modprobe
@@ -6,18 +6,18 @@ _modprobe()
     _init_completion -s || return
 
     case "$prev" in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --config|-!(-*)C)
+        --config | -!(-*)C)
             _filedir
             return
             ;;
-        --dirname|--type|-!(-*)[dt])
+        --dirname | --type | -!(-*)[dt])
             _filedir -d
             return
             ;;
-        --set-version|-!(-*)S)
+        --set-version | -!(-*)S)
             _kernel_versions
             return
             ;;
@@ -25,44 +25,44 @@ _modprobe()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        if [[ ! $COMPREPLY ]]; then
-            COMPREPLY=( $(compgen -W '-a --all -b --use-blacklist -C --config
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        if [[ ! ${COMPREPLY-} ]]; then
+            COMPREPLY=($(compgen -W '-a --all -b --use-blacklist -C --config
                 -c --showconfig --dump-modversions -d --dirname --first-time
                 --force-vermagic --force-modversion -f --force -i
                 --ignore-install --ignore-remove -l --list -n --dry-run -q
                 --quiet -R --resolve-alias -r --remove -S --set-version
                 --show-depends -s --syslog -t --type -V --version -v
-                --verbose' -- "$cur") )
+                --verbose' -- "$cur"))
         fi
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local i mode=insert module="" version=$(uname -r)
-    for (( i=1; i < $cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case "${words[i]}" in
-            --remove|-!(-*)r*)
+            --remove | -!(-*)r*)
                 mode=remove
                 ;;
-            --list|-!(-*)l*)
+            --list | -!(-*)l*)
                 mode=list
                 ;;
             --dump-modversions)
-                mode=file
+                mode="file"
                 ;;
-            --set-version|-!(-*)S)
-                version=${words[i+1]} # -S is not $prev and not $cur
+            --set-version | -!(-*)S)
+                version=${words[i + 1]} # -S is not $prev and not $cur
                 ;;
-            --config|--dirname|--type|-!(-*)[Cdt])
+            --config | --dirname | --type | -!(-*)[Cdt])
                 ((i++)) # skip option and its argument
                 ;;
             -*)
                 # skip all other options
                 ;;
             *)
-                [ -z "$module" ] && module=${words[i]}
+                [[ -z $module ]] && module=${words[i]}
                 ;;
         esac
     done
@@ -79,45 +79,45 @@ _modprobe()
             ;;
         insert)
             # do filename completion if we're giving a path to a module
-            if [[ "$cur" == @(*/|[.~])* ]]; then
-                _filedir '@(?(k)o?(.gz))'
-            elif [[ -n "$module" ]]; then
+            if [[ $cur == @(*/|[.~])* ]]; then
+                _filedir '@(?(k)o?(.[gx]z))'
+            elif [[ -n $module ]]; then
                 # do module parameter completion
                 if [[ $cur == *=* ]]; then
                     prev=${cur%%=*}
                     cur=${cur#*=}
-                    if PATH="$PATH:/sbin" modinfo -p "$module" 2>/dev/null \
-                            | command grep -q "^$prev:.*(bool)"; then
+                    if PATH="$PATH:/sbin" modinfo -p "$module" 2>/dev/null |
+                        command grep -q "^$prev:.*(bool)"; then
                         local choices="on off"
                         [[ $cur ]] && choices="1 0 y Y n N on off"
-                        COMPREPLY=( $(compgen -W "$choices" -- "$cur") )
+                        COMPREPLY=($(compgen -W "$choices" -- "$cur"))
                     fi
                 else
-                    COMPREPLY=( $(compgen -S = -W "$(PATH="$PATH:/sbin" \
-                        modinfo -p "$module" 2>/dev/null | \
-                        awk -F: '!/^[ \t]/ { print $1 }')" -- "$cur") )
-                    [[ $COMPREPLY == *= ]] && compopt -o nospace
+                    COMPREPLY=($(compgen -S = -W "$(PATH="$PATH:/sbin" \
+                        modinfo -p "$module" 2>/dev/null |
+                        awk -F: '!/^[ \t]/ { print $1 }')" -- "$cur"))
+                    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
                 fi
             else
                 _modules $version
-                if [[ $COMPREPLY ]]; then
+                if [[ ${COMPREPLY-} ]]; then
                     # filter out already installed modules
-                    local -a mods=( "${COMPREPLY[@]}" )
+                    local -a mods=("${COMPREPLY[@]}")
                     _installed_modules "$cur"
                     for i in "${!mods[@]}"; do
                         for module in "${COMPREPLY[@]}"; do
-                            if [[ ${mods[i]} == $module ]]; then
+                            if [[ ${mods[i]} == "$module" ]]; then
                                 unset 'mods[i]'
                                 break
                             fi
                         done
                     done
-                    COMPREPLY=( "${mods[@]}" )
+                    COMPREPLY=("${mods[@]}")
                 fi
             fi
             ;;
     esac
 } &&
-complete -F _modprobe modprobe
+    complete -F _modprobe modprobe
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mogrify b/msys2/usr/share/bash-completion/completions/mogrify
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/mogrify
+++ b/msys2/usr/share/bash-completion/completions/mogrify
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/monodevelop b/msys2/usr/share/bash-completion/completions/monodevelop
index 4aa213b7b..1c5b5ba42 100644
--- a/msys2/usr/share/bash-completion/completions/monodevelop
+++ b/msys2/usr/share/bash-completion/completions/monodevelop
@@ -7,13 +7,13 @@ _monodevelop()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir
     fi
 } &&
-complete -F _monodevelop monodevelop
+    complete -F _monodevelop monodevelop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/montage b/msys2/usr/share/bash-completion/completions/montage
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/montage
+++ b/msys2/usr/share/bash-completion/completions/montage
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mozilla-firefox b/msys2/usr/share/bash-completion/completions/mozilla-firefox
index eeaca9f67..4656f8df4 100644
--- a/msys2/usr/share/bash-completion/completions/mozilla-firefox
+++ b/msys2/usr/share/bash-completion/completions/mozilla-firefox
@@ -8,12 +8,12 @@ _firefox()
     [[ $cur == -MOZ_LOG*=* ]] && prev=${cur%%=*} cur=${cur#*=}
 
     case $prev in
-        --help|--version|--display|--UILocale|-MOZ_LOG|--new-window|--new-tab|\
-        --private-window|--window-size|--search|--start-debugger-server|\
-        --recording|--debugger-args|-[hvPa])
+        --help | --version | --display | --UILocale | -MOZ_LOG | --new-window | --new-tab | \
+            --private-window | --window-size | --search | --start-debugger-server | \
+            --recording | --debugger-args | -[hvPa])
             return
             ;;
-        --profile|--screenshot)
+        --profile | --screenshot)
             _filedir -d
             return
             ;;
@@ -25,8 +25,8 @@ _firefox()
             _filedir
             return
             ;;
-        --debugger|-d)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        --debugger | -d)
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
@@ -34,13 +34,13 @@ _firefox()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir "@(?([xs])htm?(l)|pdf)"
+    _filedir "@(?([xs])htm?(l)|pdf|txt)"
 } &&
-complete -F _firefox firefox mozilla-firefox iceweasel
+    complete -F _firefox firefox mozilla-firefox iceweasel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mplayer b/msys2/usr/share/bash-completion/completions/mplayer
index 525c63e22..d71ebb8e9 100644
--- a/msys2/usr/share/bash-completion/completions/mplayer
+++ b/msys2/usr/share/bash-completion/completions/mplayer
@@ -3,9 +3,9 @@
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $(compgen -W "$($1 -noconfig all $2 help 2>/dev/null | \
-        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 -noconfig all $2 help 2>/dev/null |
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' |
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur"))
 }
 
 _mplayer()
@@ -16,8 +16,8 @@ _mplayer()
     local cmd=${words[0]} i j k=0
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
-        -audio-demuxer|-sub-demuxer)
+        -[av][cfo] | -[av]fm | -vop | -fstype | -demuxer | -o[av]c | -of | -profile | \
+            -audio-demuxer | -sub-demuxer)
             _mplayer_options_list $cmd $prev
             return
             ;;
@@ -25,43 +25,43 @@ _mplayer()
             _mplayer_options_list $cmd -profile
             return
             ;;
-        -audiofile|-audio-file)
+        -audiofile | -audio-file)
             _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ac3|ape)'
             return
             ;;
-        -font|-subfont)
+        -font | -subfont)
             if [[ $prev == -font ]]; then
                 _filedir '@(desc|ttf)'
             else
                 _filedir ttf
             fi
             local IFS=$'\n'
-            COMPREPLY+=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -sub|-sub-file)
+        -sub | -sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
             local IFS=$'\n'
-            COMPREPLY=( $(for i in "${COMPREPLY[@]}"; do
-                        if [[ -f $i && -r $i ]]; then
-                            printf '%s\n' ${i%.*}
-                        else
-                            printf '%s\n' $i
-                        fi
-                        done) )
+            COMPREPLY=($(for i in "${COMPREPLY[@]}"; do
+                if [[ -f $i && -r $i ]]; then
+                    printf '%s\n' ${i%.*}
+                else
+                    printf '%s\n' $i
+                fi
+            done))
             return
             ;;
-        -subcp|-msgcharset)
+        -subcp | -msgcharset)
             local cp
-            cp=( $(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null) )
-            if [[ "$cur" == "${cur,,}" ]]; then
-                COMPREPLY=( $(compgen -W '${cp[@],,}' -- "$cur") )
+            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
+            if [[ $cur == "${cur,,}" ]]; then
+                COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
             else
-                COMPREPLY=( $(compgen -W '${cp[@]^^}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
             fi
             return
             ;;
@@ -107,53 +107,52 @@ _mplayer()
             _filedir -d
             return
             ;;
-        -mixer|-dvdauth|-fb|-zrdev)
+        -mixer | -dvdauth | -fb | -zrdev)
             cur=${cur:=/dev/}
             _filedir
             return
             ;;
-        -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
+            -subfile | -aofile | -fbmodeconfig | -include | -o | -dvdkey | -passlogfile)
             _filedir
             return
             ;;
-        -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
-        -dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
-        -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
-        -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \
-        -fbmode|-geometry|-guiwid|-hue|-icelayer|-screen[wh]|-wid| \
-        -monitor-dotclock|-monitor-[hv]freq|-panscan| \
-        -saturation|-xineramascreen|-zrcrop|-zrnorm|-zrquality| \
-        -zr[xy]doff|-zr[vh]dec|-pp|-x|-y|-xy|-z|-stereo| \
-        -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
-        -ffourcc|-sws|-skiplimit|-format|-ofps|-aadriver| \
-        -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-subdelay|-subfps|-subpos| \
-        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
-        -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-text-scale)
+        -autoq | -autosync | -loop | -menu-root | -speed | -sstep | -aid | -alang | \
+            -bandwidth | -bluray-angle | -bluray-chapter | -cache | -chapter | -dvd-speed | \
+            -dvdangle | -fps | -frames | -mc | -passwd | -user | -sb | -srate | -ss | -vcd | \
+            -vi | -vid | -vivo | -ffactor | -sid | -slang | -spualign | -spuaa | -spugauss | \
+            -vobsubid | -delay | -bpp | -brightness | -contrast | -dfbopts | -display | \
+            -fbmode | -geometry | -guiwid | -hue | -icelayer | -screen[wh] | -wid | \
+            -monitor-dotclock | -monitor-[hv]freq | -panscan | \
+            -saturation | -xineramascreen | -zrcrop | -zrnorm | -zrquality | \
+            -zr[xy]doff | -zr[vh]dec | -pp | -x | -y | -xy | -z | -stereo | \
+            -audio-density | -audio-delay | -audio-preload | -endpos | -osdlevel | \
+            -ffourcc | -sws | -skiplimit | -format | -ofps | -aadriver | \
+            -aaosdcolor | -aasubcolor | -vobsubout | -vobsuboutid | -vobsuboutindex | \
+            -sub-bg-alpha | -sub-bg-color | -subdelay | -subfps | -subpos | \
+            -subalign | -subwidth | -subfont-blur | -subfont-outline | \
+            -subfont-autoscale | -subfont-encoding | -subfont-osd-scale | \
+            -subfont-text-scale)
             return
             ;;
         -channels)
-            COMPREPLY=( $(compgen -W '2 4 6 8' -- "$cur") )
+            COMPREPLY=($(compgen -W '2 4 6 8' -- "$cur"))
             return
             ;;
-        -aspect|-monitoraspect)
-            COMPREPLY=( $(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
-                2.35:1' -- "$cur") )
+        -aspect | -monitoraspect)
+            COMPREPLY=($(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
+                2.35:1' -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         -lavdopts)
-            COMPREPLY=( $(compgen -W 'bitexact bug= debug= ec= er= fast gray
+            COMPREPLY=($(compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
-                threads= vismv= vstats' -- "$cur") )
+                threads= vismv= vstats' -- "$cur"))
             return
             ;;
         -lavcopts)
-            COMPREPLY=( $(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
+            COMPREPLY=($(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
                 mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint=
                 vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate=
                 vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset=
@@ -162,120 +161,120 @@ _mplayer()
                 vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask=
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
-                umv' -- "$cur") )
+                umv' -- "$cur"))
             return
             ;;
         -ssf)
-            COMPREPLY=( $(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur"))
             return
             ;;
         -jpeg)
-            COMPREPLY=( $(compgen -W 'noprogressive progressive nobaseline
-                baseline optimize= smooth= quality= outdir=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noprogressive progressive nobaseline
+                baseline optimize= smooth= quality= outdir=' -- "$cur"))
             return
             ;;
         -xvidopts)
-            COMPREPLY=( $(compgen -W 'dr2 nodr2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dr2 nodr2' -- "$cur"))
             return
             ;;
         -xvidencopts)
-            COMPREPLY=( $(compgen -W 'pass= bitrate= fixed_quant= me_quality=
+            COMPREPLY=($(compgen -W 'pass= bitrate= fixed_quant= me_quality=
                 4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer=
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
-                kfthreshold= kfreduction=' -- "$cur") )
+                kfthreshold= kfreduction=' -- "$cur"))
             return
             ;;
         -divx4opts)
-            COMPREPLY=( $(compgen -W 'br= key= deinterlace q= min_quant=
+            COMPREPLY=($(compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
-                rc_reaction_ratio= pass= vbrpass= help' -- "$cur") )
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur"))
             return
             ;;
         -info)
-            COMPREPLY=( $(compgen -W 'name= artist= genre= subject=
-                copyright= srcform= comment= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'name= artist= genre= subject=
+                copyright= srcform= comment= help' -- "$cur"))
             return
             ;;
         -lameopts)
-            COMPREPLY=( $(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
-                mode= padding= fast preset= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
+                mode= padding= fast preset= help' -- "$cur"))
             return
             ;;
         -rawaudio)
-            COMPREPLY=( $(compgen -W 'on channels= rate= samplesize= format=' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'on channels= rate= samplesize= format=' \
+                -- "$cur"))
             return
             ;;
         -rawvideo)
-            COMPREPLY=( $(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
-                h= y420 yv12 yuy2 y8 format= size=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur"))
             return
             ;;
         -aop)
-            COMPREPLY=( $(compgen -W 'list= delay= format= fout= volume= mul=
-                softclip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list= delay= format= fout= volume= mul=
+                softclip' -- "$cur"))
             return
             ;;
         -dxr2)
-            COMPREPLY=( $(compgen -W 'ar-mode= iec958-encoded iec958-decoded
+            COMPREPLY=($(compgen -W 'ar-mode= iec958-encoded iec958-decoded
                 mute ucode= 75ire bw color interlaced macrovision= norm=
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur") )
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur"))
             return
             ;;
         -tv)
-            COMPREPLY=( $(compgen -W 'on noaudio driver= device= input= freq=
+            COMPREPLY=($(compgen -W 'on noaudio driver= device= input= freq=
                 outfmt= width= height= buffersize= norm= channel= chanlist=
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -mf)
-            COMPREPLY=( $(compgen -W 'on w= h= fps= type=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on w= h= fps= type=' -- "$cur"))
             return
             ;;
         -cdda)
-            COMPREPLY=( $(compgen -W 'speed= paranoia= generic-dev=
+            COMPREPLY=($(compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -input)
-            COMPREPLY=( $(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
-                js-dev file' -- "$cur") )
+            COMPREPLY=($(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
+                js-dev file' -- "$cur"))
             return
             ;;
         -af-adv)
-            COMPREPLY=( $(compgen -W 'force= list=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'force= list=' -- "$cur"))
             return
             ;;
         -noconfig)
-            COMPREPLY=( $(compgen -W 'all gui system user' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all gui system user' -- "$cur"))
             return
             ;;
         -*)
             # Assume arg is required for everything else except options
             # for which -list-options says Type is Flag or Print.
-            $cmd -noconfig all -list-options 2>/dev/null \
-            | while read -r i j k; do
-                if [[ $i == ${prev#-} ]]; then
-                    [[ ${j,,} != @(flag|print) ]] && return 1
-                    break
-                fi
-            done || return
+            $cmd -noconfig all -list-options 2>/dev/null |
+                while read -r i j k; do
+                    if [[ $i == "${prev#-}" ]]; then
+                        [[ ${j,,} != @(flag|print) ]] && return 1
+                        break
+                    fi
+                done || return
             ;;
     esac
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
-                command sed -ne '1,/^[[:space:]]*Name/d' \
+            COMPREPLY=($(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
+                command sed -ne "1,/^[[:space:]]*Name/d" \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
-                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur") )
+                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur"))
             ;;
         *)
             _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS|m[eo]d|M[EO]D|xm|XM|it|IT|s[t3]m|S[T3]M|mtm|MTM|w64|W64)?(.@(crdownload|part))'
@@ -283,6 +282,6 @@ _mplayer()
     esac
 
 } &&
-complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
+    complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mplayer2 b/msys2/usr/share/bash-completion/completions/mplayer2
index 525c63e22..d71ebb8e9 100644
--- a/msys2/usr/share/bash-completion/completions/mplayer2
+++ b/msys2/usr/share/bash-completion/completions/mplayer2
@@ -3,9 +3,9 @@
 _mplayer_options_list()
 {
     cur=${cur%\\}
-    COMPREPLY=( $(compgen -W "$($1 -noconfig all $2 help 2>/dev/null | \
-        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$($1 -noconfig all $2 help 2>/dev/null |
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' |
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//')" -- "$cur"))
 }
 
 _mplayer()
@@ -16,8 +16,8 @@ _mplayer()
     local cmd=${words[0]} i j k=0
 
     case $prev in
-        -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
-        -audio-demuxer|-sub-demuxer)
+        -[av][cfo] | -[av]fm | -vop | -fstype | -demuxer | -o[av]c | -of | -profile | \
+            -audio-demuxer | -sub-demuxer)
             _mplayer_options_list $cmd $prev
             return
             ;;
@@ -25,43 +25,43 @@ _mplayer()
             _mplayer_options_list $cmd -profile
             return
             ;;
-        -audiofile|-audio-file)
+        -audiofile | -audio-file)
             _filedir '@(mp3|mpg|og[ag]|w?(a)v|mid|flac|mka|ac3|ape)'
             return
             ;;
-        -font|-subfont)
+        -font | -subfont)
             if [[ $prev == -font ]]; then
                 _filedir '@(desc|ttf)'
             else
                 _filedir ttf
             fi
             local IFS=$'\n'
-            COMPREPLY+=( $(compgen -W '$(fc-list 2>/dev/null)' -- "$cur") )
+            COMPREPLY+=($(compgen -W '$(fc-list 2>/dev/null)' -- "$cur"))
             return
             ;;
-        -sub|-sub-file)
+        -sub | -sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
             return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
             local IFS=$'\n'
-            COMPREPLY=( $(for i in "${COMPREPLY[@]}"; do
-                        if [[ -f $i && -r $i ]]; then
-                            printf '%s\n' ${i%.*}
-                        else
-                            printf '%s\n' $i
-                        fi
-                        done) )
+            COMPREPLY=($(for i in "${COMPREPLY[@]}"; do
+                if [[ -f $i && -r $i ]]; then
+                    printf '%s\n' ${i%.*}
+                else
+                    printf '%s\n' $i
+                fi
+            done))
             return
             ;;
-        -subcp|-msgcharset)
+        -subcp | -msgcharset)
             local cp
-            cp=( $(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null) )
-            if [[ "$cur" == "${cur,,}" ]]; then
-                COMPREPLY=( $(compgen -W '${cp[@],,}' -- "$cur") )
+            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
+            if [[ $cur == "${cur,,}" ]]; then
+                COMPREPLY=($(compgen -W '${cp[@],,}' -- "$cur"))
             else
-                COMPREPLY=( $(compgen -W '${cp[@]^^}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${cp[@]^^}' -- "$cur"))
             fi
             return
             ;;
@@ -107,53 +107,52 @@ _mplayer()
             _filedir -d
             return
             ;;
-        -mixer|-dvdauth|-fb|-zrdev)
+        -mixer | -dvdauth | -fb | -zrdev)
             cur=${cur:=/dev/}
             _filedir
             return
             ;;
-        -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
-        -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
-        -passlogfile)
+        -edl | -edlout | -lircconf | -menu-cfg | -playlist | -csslib | -dumpfile | \
+            -subfile | -aofile | -fbmodeconfig | -include | -o | -dvdkey | -passlogfile)
             _filedir
             return
             ;;
-        -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
-        -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
-        -dvdangle|-fps|-frames|-mc|-passwd|-user|-sb|-srate|-ss|-vcd| \
-        -vi|-vid|-vivo|-ffactor|-sid|-slang|-spualign|-spuaa|-spugauss| \
-        -vobsubid|-delay|-bpp|-brightness|-contrast|-dfbopts|-display| \
-        -fbmode|-geometry|-guiwid|-hue|-icelayer|-screen[wh]|-wid| \
-        -monitor-dotclock|-monitor-[hv]freq|-panscan| \
-        -saturation|-xineramascreen|-zrcrop|-zrnorm|-zrquality| \
-        -zr[xy]doff|-zr[vh]dec|-pp|-x|-y|-xy|-z|-stereo| \
-        -audio-density|-audio-delay|-audio-preload|-endpos|-osdlevel| \
-        -ffourcc|-sws|-skiplimit|-format|-ofps|-aadriver| \
-        -aaosdcolor|-aasubcolor|-vobsubout|-vobsuboutid|-vobsuboutindex| \
-        -sub-bg-alpha|-sub-bg-color|-subdelay|-subfps|-subpos| \
-        -subalign|-subwidth|-subfont-blur|-subfont-outline| \
-        -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
-        -subfont-text-scale)
+        -autoq | -autosync | -loop | -menu-root | -speed | -sstep | -aid | -alang | \
+            -bandwidth | -bluray-angle | -bluray-chapter | -cache | -chapter | -dvd-speed | \
+            -dvdangle | -fps | -frames | -mc | -passwd | -user | -sb | -srate | -ss | -vcd | \
+            -vi | -vid | -vivo | -ffactor | -sid | -slang | -spualign | -spuaa | -spugauss | \
+            -vobsubid | -delay | -bpp | -brightness | -contrast | -dfbopts | -display | \
+            -fbmode | -geometry | -guiwid | -hue | -icelayer | -screen[wh] | -wid | \
+            -monitor-dotclock | -monitor-[hv]freq | -panscan | \
+            -saturation | -xineramascreen | -zrcrop | -zrnorm | -zrquality | \
+            -zr[xy]doff | -zr[vh]dec | -pp | -x | -y | -xy | -z | -stereo | \
+            -audio-density | -audio-delay | -audio-preload | -endpos | -osdlevel | \
+            -ffourcc | -sws | -skiplimit | -format | -ofps | -aadriver | \
+            -aaosdcolor | -aasubcolor | -vobsubout | -vobsuboutid | -vobsuboutindex | \
+            -sub-bg-alpha | -sub-bg-color | -subdelay | -subfps | -subpos | \
+            -subalign | -subwidth | -subfont-blur | -subfont-outline | \
+            -subfont-autoscale | -subfont-encoding | -subfont-osd-scale | \
+            -subfont-text-scale)
             return
             ;;
         -channels)
-            COMPREPLY=( $(compgen -W '2 4 6 8' -- "$cur") )
+            COMPREPLY=($(compgen -W '2 4 6 8' -- "$cur"))
             return
             ;;
-        -aspect|-monitoraspect)
-            COMPREPLY=( $(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
-                2.35:1' -- "$cur") )
+        -aspect | -monitoraspect)
+            COMPREPLY=($(compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
+                2.35:1' -- "$cur"))
             __ltrim_colon_completions "$cur"
             return
             ;;
         -lavdopts)
-            COMPREPLY=( $(compgen -W 'bitexact bug= debug= ec= er= fast gray
+            COMPREPLY=($(compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
-                threads= vismv= vstats' -- "$cur") )
+                threads= vismv= vstats' -- "$cur"))
             return
             ;;
         -lavcopts)
-            COMPREPLY=( $(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
+            COMPREPLY=($(compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
                 mbqmax= vqdiff= vmax_b_frames= vme= vhq v4mv keyint=
                 vb_strategy= vpass= aspect= vbitrate= vratetol= vrc_maxrate=
                 vrc_minrate= vrc_buf_size= vb_qfactor= vi_qfactor= vb_qoffset=
@@ -162,120 +161,120 @@ _mplayer()
                 vpsize= gray vfdct= idct= lumi_mask= dark_mask= tcplx_mask=
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
-                umv' -- "$cur") )
+                umv' -- "$cur"))
             return
             ;;
         -ssf)
-            COMPREPLY=( $(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lgb= cgb= ls= cs= chs= cvs=' -- "$cur"))
             return
             ;;
         -jpeg)
-            COMPREPLY=( $(compgen -W 'noprogressive progressive nobaseline
-                baseline optimize= smooth= quality= outdir=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noprogressive progressive nobaseline
+                baseline optimize= smooth= quality= outdir=' -- "$cur"))
             return
             ;;
         -xvidopts)
-            COMPREPLY=( $(compgen -W 'dr2 nodr2' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dr2 nodr2' -- "$cur"))
             return
             ;;
         -xvidencopts)
-            COMPREPLY=( $(compgen -W 'pass= bitrate= fixed_quant= me_quality=
+            COMPREPLY=($(compgen -W 'pass= bitrate= fixed_quant= me_quality=
                 4mv rc_reaction_delay_factor= rc_averaging_period= rc_buffer=
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
-                kfthreshold= kfreduction=' -- "$cur") )
+                kfthreshold= kfreduction=' -- "$cur"))
             return
             ;;
         -divx4opts)
-            COMPREPLY=( $(compgen -W 'br= key= deinterlace q= min_quant=
+            COMPREPLY=($(compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
-                rc_reaction_ratio= pass= vbrpass= help' -- "$cur") )
+                rc_reaction_ratio= pass= vbrpass= help' -- "$cur"))
             return
             ;;
         -info)
-            COMPREPLY=( $(compgen -W 'name= artist= genre= subject=
-                copyright= srcform= comment= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'name= artist= genre= subject=
+                copyright= srcform= comment= help' -- "$cur"))
             return
             ;;
         -lameopts)
-            COMPREPLY=( $(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
-                mode= padding= fast preset= help' -- "$cur") )
+            COMPREPLY=($(compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
+                mode= padding= fast preset= help' -- "$cur"))
             return
             ;;
         -rawaudio)
-            COMPREPLY=( $(compgen -W 'on channels= rate= samplesize= format=' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'on channels= rate= samplesize= format=' \
+                -- "$cur"))
             return
             ;;
         -rawvideo)
-            COMPREPLY=( $(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
-                h= y420 yv12 yuy2 y8 format= size=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
+                h= y420 yv12 yuy2 y8 format= size=' -- "$cur"))
             return
             ;;
         -aop)
-            COMPREPLY=( $(compgen -W 'list= delay= format= fout= volume= mul=
-                softclip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'list= delay= format= fout= volume= mul=
+                softclip' -- "$cur"))
             return
             ;;
         -dxr2)
-            COMPREPLY=( $(compgen -W 'ar-mode= iec958-encoded iec958-decoded
+            COMPREPLY=($(compgen -W 'ar-mode= iec958-encoded iec958-decoded
                 mute ucode= 75ire bw color interlaced macrovision= norm=
                 square-pixel ccir601-pixel cr-left= cr-right= cr-top= cr-bot=
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
-                oly-cor= overlay overlay-ratio= update-cache' -- "$cur") )
+                oly-cor= overlay overlay-ratio= update-cache' -- "$cur"))
             return
             ;;
         -tv)
-            COMPREPLY=( $(compgen -W 'on noaudio driver= device= input= freq=
+            COMPREPLY=($(compgen -W 'on noaudio driver= device= input= freq=
                 outfmt= width= height= buffersize= norm= channel= chanlist=
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -mf)
-            COMPREPLY=( $(compgen -W 'on w= h= fps= type=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on w= h= fps= type=' -- "$cur"))
             return
             ;;
         -cdda)
-            COMPREPLY=( $(compgen -W 'speed= paranoia= generic-dev=
+            COMPREPLY=($(compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -input)
-            COMPREPLY=( $(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
-                js-dev file' -- "$cur") )
+            COMPREPLY=($(compgen -W 'conf= ar-delay ar-rate keylist cmdlist
+                js-dev file' -- "$cur"))
             return
             ;;
         -af-adv)
-            COMPREPLY=( $(compgen -W 'force= list=' -- "$cur") )
+            COMPREPLY=($(compgen -W 'force= list=' -- "$cur"))
             return
             ;;
         -noconfig)
-            COMPREPLY=( $(compgen -W 'all gui system user' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all gui system user' -- "$cur"))
             return
             ;;
         -*)
             # Assume arg is required for everything else except options
             # for which -list-options says Type is Flag or Print.
-            $cmd -noconfig all -list-options 2>/dev/null \
-            | while read -r i j k; do
-                if [[ $i == ${prev#-} ]]; then
-                    [[ ${j,,} != @(flag|print) ]] && return 1
-                    break
-                fi
-            done || return
+            $cmd -noconfig all -list-options 2>/dev/null |
+                while read -r i j k; do
+                    if [[ $i == "${prev#-}" ]]; then
+                        [[ ${j,,} != @(flag|print) ]] && return 1
+                        break
+                    fi
+                done || return
             ;;
     esac
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
-                command sed -ne '1,/^[[:space:]]*Name/d' \
+            COMPREPLY=($(compgen -W '$($cmd -noconfig all -list-options 2>/dev/null | \
+                command sed -ne "1,/^[[:space:]]*Name/d" \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
-                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur") )
+                    -e "/^-\(Total\|.*\*\)\{0,1\}$/!p")' -- "$cur"))
             ;;
         *)
             _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS|m[eo]d|M[EO]D|xm|XM|it|IT|s[t3]m|S[T3]M|mtm|MTM|w64|W64)?(.@(crdownload|part))'
@@ -283,6 +282,6 @@ _mplayer()
     esac
 
 } &&
-complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
+    complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mr b/msys2/usr/share/bash-completion/completions/mr
index 15f634a39..930e3c960 100644
--- a/msys2/usr/share/bash-completion/completions/mr
+++ b/msys2/usr/share/bash-completion/completions/mr
@@ -1,6 +1,7 @@
 # mr completion                                            -*- shell-script -*-
 
-_mr() {
+_mr()
+{
     local cur prev words cword
     _init_completion || return
 
@@ -8,7 +9,11 @@ _mr() {
 
     help="$(PERLDOC_PAGER=cat PERLDOC=-otext "${1}" help 2>/dev/null)"
 
-    commands="$(awk '/\[options\]/ { print $3 }' <<<"${help}")"
+    commands="$(
+        printf %s "$help" | while read -r _ options cmd _; do
+            [[ $options != "[options]" ]] || printf "%s\n" "$cmd"
+        done
+    )"
     # Split [online|offline] and remove `action` placeholder.
     commands="${commands//@(action|[\[\|\]])/$'\n'}"
     # Add standard aliases.
@@ -17,7 +22,7 @@ _mr() {
     # Determine if user has entered an `mr` command. Used to block top-level
     # (option and command) completions.
     local cmd i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         if [[ $commands == *"${words[i]}"* ]]; then
             cmd="${words[i]}"
             break
@@ -25,30 +30,30 @@ _mr() {
     done
 
     # Complete options for specific commands.
-    if [[ -n $cmd ]]; then
+    if [[ -v cmd ]]; then
         case $cmd in
             bootstrap)
                 _filedir
                 # Also complete stdin (-) as a potential bootstrap source.
-                if [[ -z "${cur}" || $cur == - ]] && [[ $prev != - ]]; then
-                    COMPREPLY+=( - )
+                if [[ -z ${cur} || $cur == - ]] && [[ $prev != - ]]; then
+                    COMPREPLY+=(-)
                 fi
                 return
                 ;;
             clean)
-                if [[ "${cur}" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '-f' -- "${cur}") )
+                if [[ ${cur} == -* ]]; then
+                    COMPREPLY=($(compgen -W '-f' -- "${cur}"))
                 fi
                 return
                 ;;
-            commit|ci|record)
-                if [[ "${cur}" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '-m' -- "${cur}") )
+            commit | ci | record)
+                if [[ ${cur} == -* ]]; then
+                    COMPREPLY=($(compgen -W '-m' -- "${cur}"))
                 fi
                 return
                 ;;
             run)
-                COMPREPLY=( $(compgen -c -- "${cur}") )
+                COMPREPLY=($(compgen -c -- "${cur}"))
                 return
                 ;;
             *)
@@ -60,27 +65,27 @@ _mr() {
 
     # Complete top-level options and commands.
     case $prev in
-        --config|-!(-*)c)
+        --config | -!(-*)c)
             _filedir
             return
             ;;
-        --directory|-!(-*)d)
+        --directory | -!(-*)d)
             _filedir -d
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        options="$(_parse_help - <<<"${help}")"
+        options="$(printf '%s\n' "$help" | _parse_help -)"
         # Remove short options (all have compatible long options).
         options="${options//-[a-z]$'\n'/}"
         # Remove deprecated options.
         options="${options//--path/}"
-        COMPREPLY=( $(compgen -W "${options}" -- "${cur}") )
+        COMPREPLY=($(compgen -W "${options}" -- "${cur}"))
     else
-        COMPREPLY=( $(compgen -W  "${commands}" -- "${cur}") )
+        COMPREPLY=($(compgen -W "${commands}" -- "${cur}"))
     fi
 } &&
-complete -F _mr mr
+    complete -F _mr mr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/msgsnarf b/msys2/usr/share/bash-completion/completions/msgsnarf
index 01766555a..f959d80fc 100644
--- a/msys2/usr/share/bash-completion/completions/msgsnarf
+++ b/msys2/usr/share/bash-completion/completions/msgsnarf
@@ -12,11 +12,11 @@ _snarf()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _snarf filesnarf mailsnarf msgsnarf
+    complete -F _snarf filesnarf mailsnarf msgsnarf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/msynctool b/msys2/usr/share/bash-completion/completions/msynctool
index 4fd516185..4de37f5b0 100644
--- a/msys2/usr/share/bash-completion/completions/msynctool
+++ b/msys2/usr/share/bash-completion/completions/msynctool
@@ -7,36 +7,36 @@ _msynctool()
 
     case $words in
         --configure)
-            COMPREPLY=( $(compgen -W "$($1 --showgroup \
+            COMPREPLY=($(compgen -W "$($1 --showgroup \
                 $prev | awk '/^Member/ {print $2}' | command sed \
-                -e 's/:$//')" -- "$cur") )
+                -e 's/:$//')" -- "$cur"))
             return
             ;;
         --addmember)
-            COMPREPLY=( $(compgen -W '$($1 --listplugins \
-                | command sed -e 1d)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$($1 --listplugins \
+                | command sed -e 1d)' -- "$cur"))
             return
             ;;
     esac
 
     case $prev in
-        --configure|--addgroup|--delgroup|--showgroup|--sync|--addmember)
-            COMPREPLY=( $(compgen -W '$($1 --listgroups \
-                | command sed -e 1d)' -- "$cur") )
+        --configure | --addgroup | --delgroup | --showgroup | --sync | --addmember)
+            COMPREPLY=($(compgen -W '$($1 --listgroups \
+                | command sed -e 1d)' -- "$cur"))
             return
             ;;
-        --showformats|--filter-objtype|--slow-sync)
-            COMPREPLY=( $(compgen -W '$($1 --listobjects \
-                | command sed -e 1d)' -- "$cur") )
+        --showformats | --filter-objtype | --slow-sync)
+            COMPREPLY=($(compgen -W '$($1 --listobjects \
+                | command sed -e 1d)' -- "$cur"))
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '--listgroups --listplugins --listobjects
+    COMPREPLY=($(compgen -W '--listgroups --listplugins --listobjects
         --showformats --showgroup --sync --filter-objtype --slow-sync --wait
         --multi --addgroup --delgroup --addmember --configure --manual
-        --configdir --conflict' -- "$cur") )
+        --configdir --conflict' -- "$cur"))
 } &&
-complete -F _msynctool msynctool
+    complete -F _msynctool msynctool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mtx b/msys2/usr/share/bash-completion/completions/mtx
index 9266687c4..b5c270bd9 100644
--- a/msys2/usr/share/bash-completion/completions/mtx
+++ b/msys2/usr/share/bash-completion/completions/mtx
@@ -11,22 +11,22 @@ _mtx()
     options="-f nobarcode invert noattach --version inquiry noattach \
         inventory status load unload eepos first last next"
 
-    tapes=$(mtx status 2>/dev/null | \
+    tapes=$(mtx status 2>/dev/null |
         awk '/Storage Element [0-9]+:Full/ { printf "%s ", $3 }')
-    tapes=${tapes//:Full}
+    tapes=${tapes//:Full/}
 
-    drives=$(mtx status 2>/dev/null | \
+    drives=$(mtx status 2>/dev/null |
         awk '/Data Transfer Element [0-9]+:(Full|Empty)/ { printf "%s ", $4 }')
-    drives=${drives//:Full}
-    drives=${drives//:Empty}
+    drives=${drives//:Full/}
+    drives=${drives//:Empty/}
 
-    if [[ $cword -gt 1 ]]; then
+    if ((cword > 1)); then
         case $prev in
             load)
-                COMPREPLY=( $(compgen -W "$tapes" -- "$cur") )
+                COMPREPLY=($(compgen -W "$tapes" -- "$cur"))
                 ;;
-            unload|first|last|next)
-                COMPREPLY=( $(compgen -W "$drives" -- "$cur") )
+            unload | first | last | next)
+                COMPREPLY=($(compgen -W "$drives" -- "$cur"))
                 ;;
             -f)
                 true
@@ -36,9 +36,9 @@ _mtx()
                 ;;
         esac
     else
-        COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+        COMPREPLY=($(compgen -W "$options" -- "$cur"))
     fi
 } &&
-complete -F _mtx mtx
+    complete -F _mtx mtx
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/munin-node-configure b/msys2/usr/share/bash-completion/completions/munin-node-configure
index 1d564d3f4..39d8d64bf 100644
--- a/msys2/usr/share/bash-completion/completions/munin-node-configure
+++ b/msys2/usr/share/bash-completion/completions/munin-node-configure
@@ -10,7 +10,7 @@ _munin_node_configure()
             _filedir
             return
             ;;
-        --servicedir|--libdir)
+        --servicedir | --libdir)
             _filedir -d
             return
             ;;
@@ -19,15 +19,15 @@ _munin_node_configure()
             return
             ;;
         --snmpversion)
-            COMPREPLY=( $(compgen -W '1 2c 3' -- "$cur") )
+            COMPREPLY=($(compgen -W '1 2c 3' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _munin_node_configure munin-node-configure
+    complete -F _munin_node_configure munin-node-configure
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/munin-run b/msys2/usr/share/bash-completion/completions/munin-run
index 6855e02d6..97e526aae 100644
--- a/msys2/usr/share/bash-completion/completions/munin-run
+++ b/msys2/usr/share/bash-completion/completions/munin-run
@@ -6,23 +6,23 @@ _munin_run()
     _init_completion || return
 
     case $prev in
-        --config|--sconffile)
+        --config | --sconffile)
             _filedir
             return
             ;;
-        --servicedir|--sconfdir)
+        --servicedir | --sconfdir)
             _filedir -d
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W \
-            '$(command ls /etc/munin/plugins 2>/dev/null)' -- "$cur") )
+        COMPREPLY=($(compgen -W \
+            '$(command ls /etc/munin/plugins 2>/dev/null)' -- "$cur"))
     fi
 } &&
-complete -F _munin_run munin-run
+    complete -F _munin_run munin-run
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/munin-update b/msys2/usr/share/bash-completion/completions/munin-update
index ac770a6b7..8766eaee2 100644
--- a/msys2/usr/share/bash-completion/completions/munin-update
+++ b/msys2/usr/share/bash-completion/completions/munin-update
@@ -16,12 +16,12 @@ _munin_update()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--force-root --noforce-root --service --host
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--force-root --noforce-root --service --host
             --config --help --debug --nodebug --fork --nofork --stdout
-            --nostdout --timeout' -- "$cur") )
+            --nostdout --timeout' -- "$cur"))
     fi
 } &&
-complete -F _munin_update munin-update
+    complete -F _munin_update munin-update
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/munindoc b/msys2/usr/share/bash-completion/completions/munindoc
index a08399ba3..5c7644a69 100644
--- a/msys2/usr/share/bash-completion/completions/munindoc
+++ b/msys2/usr/share/bash-completion/completions/munindoc
@@ -5,9 +5,9 @@ _munindoc()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W \
-        '$(command ls /usr/share/munin/plugins 2>/dev/null)' -- "$cur") )
+    COMPREPLY=($(compgen -W \
+        '$(command ls /usr/share/munin/plugins 2>/dev/null)' -- "$cur"))
 } &&
-complete -F _munindoc munindoc
+    complete -F _munindoc munindoc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mussh b/msys2/usr/share/bash-completion/completions/mussh
index e76817c77..c2f7a5220 100644
--- a/msys2/usr/share/bash-completion/completions/mussh
+++ b/msys2/usr/share/bash-completion/completions/mussh
@@ -6,47 +6,47 @@ _mussh()
     _init_completion || return
 
     case $prev in
-        --help|-V|-m|-t)
+        --help | -V | -m | -t)
             return
             ;;
         -d)
-            COMPREPLY=( $(compgen -W '{0..2}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..2}' -- "$cur"))
             return
             ;;
         -v)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        -i|-H|-C)
+        -i | -H | -C)
             _filedir
             return
             ;;
-        -o|-po)
+        -o | -po)
             _xfunc ssh _ssh_options
             return
             ;;
-        -l|-L)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        -l | -L)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -s)
             _shells
             return
             ;;
-        -p|-h)
+        -p | -h)
             [[ $cur == *@* ]] && _user_at_host || _known_hosts_real -a -- "$cur"
             return
             ;;
         -c)
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
             return
             ;;
     esac
 
-    [[ $cur != -* ]] || \
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    [[ $cur != -* ]] ||
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _mussh mussh
+    complete -F _mussh mussh
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mutt b/msys2/usr/share/bash-completion/completions/mutt
index 43a8842e1..1161487a0 100644
--- a/msys2/usr/share/bash-completion/completions/mutt
+++ b/msys2/usr/share/bash-completion/completions/mutt
@@ -9,19 +9,18 @@ _muttaddr()
     _muttaliases "$1"
     _muttquery "$1"
 
-    COMPREPLY+=( $(compgen -u -- "$1") )
+    COMPREPLY+=($(compgen -u -- "$1"))
 }
 
-
 # Find muttrc to use
 # @output  muttrc filename
 _muttrc()
 {
     # Search COMP_WORDS for '-F muttrc' or '-Fmuttrc' argument
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 muttrc="$(dequote "${1:2}")"
             else
                 shift
@@ -32,17 +31,16 @@ _muttrc()
         shift
     done
 
-    if [[ -z $muttrc ]]; then
+    if [[ ! -v muttrc ]]; then
         if [[ -f ~/.${muttcmd}rc ]]; then
-            muttrc="~/.${muttcmd}rc"
+            muttrc=\~/.${muttcmd}rc
         elif [[ -f ~/.${muttcmd}/${muttcmd}rc ]]; then
-            muttrc="~/.${muttcmd}/${muttcmd}rc"
+            muttrc=\~/.${muttcmd}/${muttcmd}rc
         fi
     fi
-    printf "%s" "$muttrc"
+    printf "%s" "${muttrc-}"
 }
 
-
 # Recursively build list of sourced config files
 # @param $1  List of config files found so far
 # @param $2  Config file to process
@@ -54,11 +52,11 @@ _muttconffiles()
 
     sofar=" $1 "
     shift
-    while [[ "$1" ]]; do
-        newconffiles=( $(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval printf %s $1) ) )
-        for file in "${newconffiles[@]}"; do
+    while [[ ${1-} ]]; do
+        newconffiles=($(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$(eval printf %s $1)"))
+        for file in ${newconffiles+"${newconffiles[@]}"}; do
             __expand_tilde_by_ref file
-            [[ ! -f "$file" || $sofar == *\ $file\ * ]] && continue
+            [[ ! -f $file || $sofar == *\ $file\ * ]] && continue
             sofar+=" $file"
             sofar=" $(eval _muttconffiles \"$sofar\" $file) "
         done
@@ -67,7 +65,6 @@ _muttconffiles()
     printf '%s\n' $sofar
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttaliases()
 {
@@ -77,13 +74,13 @@ _muttaliases()
     muttrc=$(_muttrc)
     [[ -z $muttrc ]] && return
 
-    conffiles=( $(eval _muttconffiles $muttrc $muttrc) )
-    aliases=( $(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
-        $(eval echo "${conffiles[@]}")) )
-    COMPREPLY+=( $(compgen -W "${aliases[*]}" -- "$cur") )
+    conffiles=($(eval _muttconffiles $muttrc $muttrc))
+    # shellcheck disable=SC2046
+    aliases=("$(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
+        $(eval echo "${conffiles[@]}"))")
+    COMPREPLY+=($(compgen -W "${aliases[*]}" -- "$cur"))
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttquery()
 {
@@ -91,18 +88,17 @@ _muttquery()
     local -a queryresults
 
     querycmd="$($muttcmd -Q query_command 2>/dev/null | command sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'$cur'|')"
-    if [[ -z "$cur" || -z "$querycmd" ]]; then
+    if [[ -z $cur || -z $querycmd ]]; then
         queryresults=()
     else
         __expand_tilde_by_ref querycmd
-        queryresults=( $($querycmd | \
-            command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p') )
+        queryresults=($($querycmd |
+            command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p'))
     fi
 
-    COMPREPLY+=( $(compgen -W "${queryresults[*]}" -- "$cur") )
+    COMPREPLY+=($(compgen -W "${queryresults[*]}" -- "$cur"))
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttfiledir()
 {
@@ -116,50 +112,49 @@ _muttfiledir()
         # Match any file in $folder beginning with $cur
         # (minus the leading '=' sign).
         compopt -o filenames
-        COMPREPLY=( $(compgen -f -- "$folder/${cur:1}") )
-        COMPREPLY=( ${COMPREPLY[@]#$folder/} )
+        COMPREPLY=($(compgen -f -- "$folder/${cur:1}"))
+        COMPREPLY=(${COMPREPLY[@]#$folder/})
         return
     elif [[ $cur == !* ]]; then
-        spoolfile="$($muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null | \
+        spoolfile="$($muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null |
             command sed -e 's|^spoolfile=\"\(.*\)\"$|\1|')"
-        [[ ! -z $spoolfile ]] && eval cur="${cur/^!/$spoolfile}"
+        [[ -n $spoolfile ]] && eval cur="${cur/^!/$spoolfile}"
     fi
     _filedir
 }
 
-
 _mutt()
 {
     local cur prev words cword
     _init_completion -n =+! || return
 
     case $cur in
-    -*)
-        COMPREPLY=( $(compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s
-            -v -x -y -z -Z -h' -- "$cur") )
-        return
-        ;;
-    *)
-        case $prev in
-        -*[afFHi])
-            _muttfiledir "$cur"
-            return
-            ;;
-        -*A)
-            _muttaliases "$cur"
-            return
-            ;;
-        -*[emQshpRvyzZ])
+        -*)
+            COMPREPLY=($(compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s
+            -v -x -y -z -Z -h' -- "$cur"))
             return
             ;;
         *)
-            _muttaddr "$cur"
-            return
+            case $prev in
+                -*[afFHi])
+                    _muttfiledir "$cur"
+                    return
+                    ;;
+                -*A)
+                    _muttaliases "$cur"
+                    return
+                    ;;
+                -*[emQshpRvyzZ])
+                    return
+                    ;;
+                *)
+                    _muttaddr "$cur"
+                    return
+                    ;;
+            esac
             ;;
-        esac
-        ;;
     esac
 } &&
-complete -F _mutt -o default mutt muttng
+    complete -F _mutt -o default mutt muttng
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/muttng b/msys2/usr/share/bash-completion/completions/muttng
index 43a8842e1..1161487a0 100644
--- a/msys2/usr/share/bash-completion/completions/muttng
+++ b/msys2/usr/share/bash-completion/completions/muttng
@@ -9,19 +9,18 @@ _muttaddr()
     _muttaliases "$1"
     _muttquery "$1"
 
-    COMPREPLY+=( $(compgen -u -- "$1") )
+    COMPREPLY+=($(compgen -u -- "$1"))
 }
 
-
 # Find muttrc to use
 # @output  muttrc filename
 _muttrc()
 {
     # Search COMP_WORDS for '-F muttrc' or '-Fmuttrc' argument
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 muttrc="$(dequote "${1:2}")"
             else
                 shift
@@ -32,17 +31,16 @@ _muttrc()
         shift
     done
 
-    if [[ -z $muttrc ]]; then
+    if [[ ! -v muttrc ]]; then
         if [[ -f ~/.${muttcmd}rc ]]; then
-            muttrc="~/.${muttcmd}rc"
+            muttrc=\~/.${muttcmd}rc
         elif [[ -f ~/.${muttcmd}/${muttcmd}rc ]]; then
-            muttrc="~/.${muttcmd}/${muttcmd}rc"
+            muttrc=\~/.${muttcmd}/${muttcmd}rc
         fi
     fi
-    printf "%s" "$muttrc"
+    printf "%s" "${muttrc-}"
 }
 
-
 # Recursively build list of sourced config files
 # @param $1  List of config files found so far
 # @param $2  Config file to process
@@ -54,11 +52,11 @@ _muttconffiles()
 
     sofar=" $1 "
     shift
-    while [[ "$1" ]]; do
-        newconffiles=( $(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval printf %s $1) ) )
-        for file in "${newconffiles[@]}"; do
+    while [[ ${1-} ]]; do
+        newconffiles=($(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$(eval printf %s $1)"))
+        for file in ${newconffiles+"${newconffiles[@]}"}; do
             __expand_tilde_by_ref file
-            [[ ! -f "$file" || $sofar == *\ $file\ * ]] && continue
+            [[ ! -f $file || $sofar == *\ $file\ * ]] && continue
             sofar+=" $file"
             sofar=" $(eval _muttconffiles \"$sofar\" $file) "
         done
@@ -67,7 +65,6 @@ _muttconffiles()
     printf '%s\n' $sofar
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttaliases()
 {
@@ -77,13 +74,13 @@ _muttaliases()
     muttrc=$(_muttrc)
     [[ -z $muttrc ]] && return
 
-    conffiles=( $(eval _muttconffiles $muttrc $muttrc) )
-    aliases=( $(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
-        $(eval echo "${conffiles[@]}")) )
-    COMPREPLY+=( $(compgen -W "${aliases[*]}" -- "$cur") )
+    conffiles=($(eval _muttconffiles $muttrc $muttrc))
+    # shellcheck disable=SC2046
+    aliases=("$(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
+        $(eval echo "${conffiles[@]}"))")
+    COMPREPLY+=($(compgen -W "${aliases[*]}" -- "$cur"))
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttquery()
 {
@@ -91,18 +88,17 @@ _muttquery()
     local -a queryresults
 
     querycmd="$($muttcmd -Q query_command 2>/dev/null | command sed -e 's|^query_command=\"\(.*\)\"$|\1|' -e 's|%s|'$cur'|')"
-    if [[ -z "$cur" || -z "$querycmd" ]]; then
+    if [[ -z $cur || -z $querycmd ]]; then
         queryresults=()
     else
         __expand_tilde_by_ref querycmd
-        queryresults=( $($querycmd | \
-            command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p') )
+        queryresults=($($querycmd |
+            command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p'))
     fi
 
-    COMPREPLY+=( $(compgen -W "${queryresults[*]}" -- "$cur") )
+    COMPREPLY+=($(compgen -W "${queryresults[*]}" -- "$cur"))
 }
 
-
 # @param $1 (cur) Current word to complete
 _muttfiledir()
 {
@@ -116,50 +112,49 @@ _muttfiledir()
         # Match any file in $folder beginning with $cur
         # (minus the leading '=' sign).
         compopt -o filenames
-        COMPREPLY=( $(compgen -f -- "$folder/${cur:1}") )
-        COMPREPLY=( ${COMPREPLY[@]#$folder/} )
+        COMPREPLY=($(compgen -f -- "$folder/${cur:1}"))
+        COMPREPLY=(${COMPREPLY[@]#$folder/})
         return
     elif [[ $cur == !* ]]; then
-        spoolfile="$($muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null | \
+        spoolfile="$($muttcmd -F "$muttrc" -Q spoolfile 2>/dev/null |
             command sed -e 's|^spoolfile=\"\(.*\)\"$|\1|')"
-        [[ ! -z $spoolfile ]] && eval cur="${cur/^!/$spoolfile}"
+        [[ -n $spoolfile ]] && eval cur="${cur/^!/$spoolfile}"
     fi
     _filedir
 }
 
-
 _mutt()
 {
     local cur prev words cword
     _init_completion -n =+! || return
 
     case $cur in
-    -*)
-        COMPREPLY=( $(compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s
-            -v -x -y -z -Z -h' -- "$cur") )
-        return
-        ;;
-    *)
-        case $prev in
-        -*[afFHi])
-            _muttfiledir "$cur"
-            return
-            ;;
-        -*A)
-            _muttaliases "$cur"
-            return
-            ;;
-        -*[emQshpRvyzZ])
+        -*)
+            COMPREPLY=($(compgen -W '-A -a -b -c -e -f -F -H -i -m -n -p -Q -R -s
+            -v -x -y -z -Z -h' -- "$cur"))
             return
             ;;
         *)
-            _muttaddr "$cur"
-            return
+            case $prev in
+                -*[afFHi])
+                    _muttfiledir "$cur"
+                    return
+                    ;;
+                -*A)
+                    _muttaliases "$cur"
+                    return
+                    ;;
+                -*[emQshpRvyzZ])
+                    return
+                    ;;
+                *)
+                    _muttaddr "$cur"
+                    return
+                    ;;
+            esac
             ;;
-        esac
-        ;;
     esac
 } &&
-complete -F _mutt -o default mutt muttng
+    complete -F _mutt -o default mutt muttng
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mypy b/msys2/usr/share/bash-completion/completions/mypy
index 82da1f083..534d5755c 100644
--- a/msys2/usr/share/bash-completion/completions/mypy
+++ b/msys2/usr/share/bash-completion/completions/mypy
@@ -5,12 +5,12 @@ _mypy()
     local cur prev words cword split
     _init_completion -s || return
 
-    [[ $cword -gt 2 && ${words[cword-2]} == --shadow-file ]] && \
-        prev=--shadow-file  # hack; takes two args
+    [[ $cword -gt 2 && ${words[cword - 2]} == --shadow-file ]] &&
+        prev=--shadow-file # hack; takes two args
 
     case $prev in
-        --help|--version|--python-version|--platform|--always-true|\
-        --always-false|--find-occurrences|--package|--command|-!(-*)[hVpc])
+        --help | --version | --python-version | --platform | --always-true | \
+            --always-false | --find-occurrences | --package | --command | -!(-*)[hVpc])
             return
             ;;
         --config-file)
@@ -18,18 +18,18 @@ _mypy()
             return
             ;;
         --follow-imports)
-            COMPREPLY=( $(compgen -W 'normal silent skip error' -- "$cur") )
+            COMPREPLY=($(compgen -W 'normal silent skip error' -- "$cur"))
             return
             ;;
         --python-executable)
-            COMPREPLY=( $(compgen -c -- "${cur:-py}") )
+            COMPREPLY=($(compgen -c -- "${cur:-py}"))
             return
             ;;
-        --*-dir|--*-report)
+        --*-dir | --*-report)
             _filedir -d
             return
             ;;
-        --custom-typing|--module|-!(-*)m)
+        --custom-typing | --module | -!(-*)m)
             _xfunc python _python_modules
             return
             ;;
@@ -46,12 +46,12 @@ _mypy()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir '@(py|pyi)'
 } &&
-complete -F _mypy mypy
+    complete -F _mypy mypy
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mysql b/msys2/usr/share/bash-completion/completions/mysql
index ffb4bcd7d..93631332c 100644
--- a/msys2/usr/share/bash-completion/completions/mysql
+++ b/msys2/usr/share/bash-completion/completions/mysql
@@ -2,12 +2,13 @@
 
 _mysql_character_sets()
 {
-    local IFS=$' \t\n' reset=$(shopt -p failglob); shopt -u failglob
-    local -a charsets=( /usr/share/m{ariadb,ysql}/charsets/*.xml )
+    local IFS=$' \t\n' reset=$(shopt -p failglob)
+    shopt -u failglob
+    local -a charsets=(/usr/share/m{ariadb,ysql}/charsets/*.xml)
     $reset
-    charsets=( "${charsets[@]##*/}" )
-    charsets=( "${charsets[@]%%?(Index|\*).xml}" utf8 )
-    COMPREPLY+=( $(compgen -W '${charsets[@]}' -- "$cur") )
+    charsets=("${charsets[@]##*/}")
+    charsets=("${charsets[@]%%?(Index|\*).xml}" utf8)
+    COMPREPLY+=($(compgen -W '${charsets[@]}' -- "$cur"))
 }
 
 _mysql()
@@ -16,16 +17,16 @@ _mysql()
     _init_completion -s || return
 
     case $prev in
-        --user|-!(-*)u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -!(-*)u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        --database|-!(-*)D)
-            COMPREPLY=( $(compgen -W "$(mysqlshow 2>/dev/null | command sed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')" -- "$cur") )
+        --database | -!(-*)D)
+            COMPREPLY=($(compgen -W "$(mysqlshow 2>/dev/null | command sed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')" -- "$cur"))
             return
             ;;
 
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
@@ -34,23 +35,23 @@ _mysql()
             return
             ;;
 
-        --character-sets-dir|--ssl-capath)
+        --character-sets-dir | --ssl-capath)
             _filedir -d
             return
             ;;
-        --socket|-!(-*)S)
+        --socket | -!(-*)S)
             _filedir sock
             return
             ;;
         --protocol)
-            COMPREPLY=( $(compgen -W 'tcp socket pipe memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'tcp socket pipe memory' -- "$cur"))
             return
             ;;
-        --defaults-file|--defaults-extra-file|--tee)
+        --defaults-file | --defaults-extra-file | --tee)
             _filedir
             return
             ;;
-        --ssl-ca|--ssl-cert)
+        --ssl-ca | --ssl-cert)
             _filedir '@(pem|cer|c?(e)rt)'
             return
             ;;
@@ -58,13 +59,13 @@ _mysql()
             _filedir '@(pem|key)'
             return
             ;;
-        --port|--set-variable|--ssl-cipher|--connect_timeout|\
-        --max_allowed_packet|--prompt|--net_buffer_length|--select_limit|\
-        --max_join_size|--server-arg|--debug|--delimiter|--execute|--pager|\
-        -!(-*)[Pe])
+        --port | --set-variable | --ssl-cipher | --connect_timeout | \
+            --max_allowed_packet | --prompt | --net_buffer_length | --select_limit | \
+            --max_join_size | --server-arg | --debug | --delimiter | --execute | --pager | \
+            -!(-*)[Pe])
             return
             ;;
-        --help|--version|-!(-*)[?IV])
+        --help | --version | -!(-*)[?IV])
             return
             ;;
     esac
@@ -76,23 +77,23 @@ _mysql()
             local help=$(_parse_help "$1")
             help+=" --skip-comments --skip-ssl"
 
-            COMPREPLY=( $(compgen -W "$help" -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W "$help" -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
 
         # only complete long options
         -)
             compopt -o nospace
-            COMPREPLY=( -- )
+            COMPREPLY=(--)
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W \
+    COMPREPLY=($(compgen -W \
         "$(mysqlshow 2>/dev/null | command sed -ne '2d' -e 's/^|.\([^|]*\)|.*/\1/p')" \
-        -- "$cur") )
+        -- "$cur"))
 } &&
-complete -F _mysql mysql
+    complete -F _mysql mysql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/mysqladmin b/msys2/usr/share/bash-completion/completions/mysqladmin
index 1e34a34d2..532953401 100644
--- a/msys2/usr/share/bash-completion/completions/mysqladmin
+++ b/msys2/usr/share/bash-completion/completions/mysqladmin
@@ -6,15 +6,15 @@ _mysqladmin()
     _init_completion -s || return
 
     case $prev in
-        --user|-!(-*)u)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | -!(-*)u)
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --character-sets-dir|--ssl-capath)
+        --character-sets-dir | --ssl-capath)
             _filedir -d
             return
             ;;
@@ -22,15 +22,15 @@ _mysqladmin()
             _xfunc mysql _mysql_character_sets
             return
             ;;
-        --socket|-!(-*)S)
+        --socket | -!(-*)S)
             _filedir sock
             return
             ;;
-        --defaults-file|--defaults-extra-file)
+        --defaults-file | --defaults-extra-file)
             _filedir
             return
             ;;
-        --ssl-ca|--ssl-cert)
+        --ssl-ca | --ssl-cert)
             _filedir '@(pem|cer|c?(e)rt)'
             return
             ;;
@@ -38,26 +38,26 @@ _mysqladmin()
             _filedir '@(pem|key)'
             return
             ;;
-        --count|--port|--set-variable|--sleep|--ssl-cipher|--wait|\
-        --connect_timeout|--shutdown_timeout|-!(-*)[cPOiw])
+        --count | --port | --set-variable | --sleep | --ssl-cipher | --wait | \
+            --connect_timeout | --shutdown_timeout | -!(-*)[cPOiw])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 
-    COMPREPLY+=( $(compgen -W 'create debug drop extended-status flush-hosts
+    COMPREPLY+=($(compgen -W 'create debug drop extended-status flush-hosts
         flush-logs flush-status flush-tables flush-threads flush-privileges
         kill password old-password ping processlist reload refresh shutdown
-        status start-slave stop-slave variables version' -- "$cur") )
+        status start-slave stop-slave variables version' -- "$cur"))
 
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _mysqladmin mysqladmin
+    complete -F _mysqladmin mysqladmin
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nc b/msys2/usr/share/bash-completion/completions/nc
index 0ba618086..6fb099433 100644
--- a/msys2/usr/share/bash-completion/completions/nc
+++ b/msys2/usr/share/bash-completion/completions/nc
@@ -10,7 +10,7 @@ _nc()
             return
             ;;
         -*s)
-            if [[ "${words[*]}" == *-6* ]]; then
+            if [[ ${words[*]} == *-6* ]]; then
                 _ip_addresses -6
                 __ltrim_colon_completions "$cur"
             else
@@ -19,13 +19,13 @@ _nc()
             return
             ;;
         -*T)
-            COMPREPLY=( $(compgen -W 'critical inetcontrol lowcost lowdelay
+            COMPREPLY=($(compgen -W 'critical inetcontrol lowcost lowdelay
                 netcontrol throughput reliability ef af{11..43} cs{0..7}' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -*X)
-            COMPREPLY=( $(compgen -W '4 5 connect' -- "$cur") )
+            COMPREPLY=($(compgen -W '4 5 connect' -- "$cur"))
             return
             ;;
         -*x)
@@ -34,17 +34,18 @@ _nc()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 
     # Complete 1st non-option arg only
-    local args; _count_args "" "-*[IiMmOPpqsTVWwXx]"
-    [[ $args -eq 1 ]] || return
+    local args
+    _count_args "" "-*[IiMmOPpqsTVWwXx]"
+    ((args == 1)) || return
 
     _known_hosts_real -- "$cur"
 } &&
-complete -F _nc nc
+    complete -F _nc nc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ncal b/msys2/usr/share/bash-completion/completions/ncal
index ed304aa71..1eec2674e 100644
--- a/msys2/usr/share/bash-completion/completions/ncal
+++ b/msys2/usr/share/bash-completion/completions/ncal
@@ -11,28 +11,28 @@ _cal()
     case $prev in
         -m)
             if [[ $OSTYPE == *bsd* ]]; then
-                COMPREPLY=( $(compgen -W '{1..12}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
                 return
             fi
             ;;
         -s)
             [[ $OSTYPE == *bsd* ]] && return
             ;;
-        -A|-B|-d|-H)
+        -A | -B | -d | -H)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     local args
     _count_args
-    [[ $args -eq 1 ]] && COMPREPLY=( $(compgen -W '{1..12}' -- "$cur") )
+    ((args == 1)) && COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
 } &&
-complete -F _cal cal ncal
+    complete -F _cal cal ncal
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ncftp b/msys2/usr/share/bash-completion/completions/ncftp
index 35146f3ce..c3f2cf159 100644
--- a/msys2/usr/share/bash-completion/completions/ncftp
+++ b/msys2/usr/share/bash-completion/completions/ncftp
@@ -6,22 +6,22 @@ _ncftp()
     _init_completion || return
 
     case $prev in
-        -u|-p|-P|-j|-F)
+        -u | -p | -P | -j | -F)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 
     if [[ $cword -eq 1 && -f ~/.ncftp/bookmarks ]]; then
-        COMPREPLY=( $(compgen -W '$(command sed -ne "s/^\([^,]\{1,\}\),.*$/\1/p" \
-            ~/.ncftp/bookmarks)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(command sed -ne "s/^\([^,]\{1,\}\),.*$/\1/p" \
+            ~/.ncftp/bookmarks)' -- "$cur"))
     fi
 
 } &&
-complete -F _ncftp -o default ncftp
+    complete -F _ncftp -o default ncftp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nethogs b/msys2/usr/share/bash-completion/completions/nethogs
index 85fc1cb42..5cd3650e4 100644
--- a/msys2/usr/share/bash-completion/completions/nethogs
+++ b/msys2/usr/share/bash-completion/completions/nethogs
@@ -8,19 +8,19 @@ _nethogs()
     case "$prev" in
         -d)
             # expect integer value
-            COMPREPLY+=( $(compgen -W '{0..9}') )
+            COMPREPLY+=($(compgen -W '{0..9}'))
             compopt -o nospace
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h)' -- "$cur"))
         return
     fi
 
     _available_interfaces -a
 } &&
-complete -F _nethogs nethogs
+    complete -F _nethogs nethogs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/newlist b/msys2/usr/share/bash-completion/completions/newlist
index 793928c30..f1f6cf853 100644
--- a/msys2/usr/share/bash-completion/completions/newlist
+++ b/msys2/usr/share/bash-completion/completions/newlist
@@ -6,20 +6,20 @@ _newlist()
     _init_completion -s || return
 
     case $prev in
-        -l|--language|-u|--urlhost|-e|--emailhost|--help)
+        -l | --language | -u | --urlhost | -e | --emailhost | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _xfunc list_lists _mailman_lists
     fi
 } &&
-complete -F _newlist newlist
+    complete -F _newlist newlist
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/newusers b/msys2/usr/share/bash-completion/completions/newusers
index b7792b540..890a5fccb 100644
--- a/msys2/usr/share/bash-completion/completions/newusers
+++ b/msys2/usr/share/bash-completion/completions/newusers
@@ -6,25 +6,25 @@ _newusers()
     _init_completion -s || return
 
     case $prev in
-        -c|--crypt)
-            COMPREPLY=( $(compgen -W 'DES MD5 NONE SHA256 SHA512' -- "$cur") )
+        -c | --crypt)
+            COMPREPLY=($(compgen -W 'DES MD5 NONE SHA256 SHA512' -- "$cur"))
             return
             ;;
-        -s|--sha-rounds)
+        -s | --sha-rounds)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _newusers newusers
+    complete -F _newusers newusers
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ngrep b/msys2/usr/share/bash-completion/completions/ngrep
index 65f4dc6da..7d16c8d64 100644
--- a/msys2/usr/share/bash-completion/completions/ngrep
+++ b/msys2/usr/share/bash-completion/completions/ngrep
@@ -6,20 +6,20 @@ _ngrep()
     _init_completion || return
 
     case $prev in
-        -h|-V|-n|-A|-s|-S|-c|-P)
+        -h | -V | -n | -A | -s | -S | -c | -P)
             return
             ;;
-        -I|-O)
+        -I | -O)
             _filedir 'pcap?(ng)'
             return
             ;;
         -d)
             _available_interfaces -a
-            COMPREPLY+=( $(compgen -W 'any' -- "$cur") )
+            COMPREPLY+=($(compgen -W 'any' -- "$cur"))
             return
             ;;
         -W)
-            COMPREPLY=( $(compgen -W 'normal byline single none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'normal byline single none' -- "$cur"))
             return
             ;;
         -F)
@@ -28,11 +28,11 @@ _ngrep()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 } &&
-complete -F _ngrep ngrep
+    complete -F _ngrep ngrep
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nmap b/msys2/usr/share/bash-completion/completions/nmap
index b4e76baf9..482148e34 100644
--- a/msys2/usr/share/bash-completion/completions/nmap
+++ b/msys2/usr/share/bash-completion/completions/nmap
@@ -2,15 +2,15 @@
 
 _nmap()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword split
+    _init_completion -s || return
 
     case $prev in
-        -iL|-oN|-oX|-oS|-oG|---excludefile|--resume|--stylesheet)
+        -iL | -oN | -oX | -oS | -oG | ---excludefile | --resume | --stylesheet)
             _filedir
             return
             ;;
-        -oA|--datadir)
+        -oA | --datadir)
             _filedir -d
             return
             ;;
@@ -18,33 +18,39 @@ _nmap()
             _available_interfaces -a
             return
             ;;
-        -b|--dns-servers)
+        -b | --dns-servers)
             _known_hosts_real -- "$cur"
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-iL -iR --exclude --excludefile -sL -sP -PN
-            -PS -PA -PU -PY -PE -PP -PM -PO -n -R --dns-servers --system-dns
-            --traceroute -sS -sT -sA -sW -sM -sU -sN -sF -sX --scanflags -sI
-            -sY -sZ -sO -b -p -F -r --top-ports --port-ratio -sV
-            --version-intensity --version-light --version-all --version-trace
-            -sC --script= --script-args= --script-trace --script-updatedb -O
-            --osscan-limit --osscan-guess -T0 -T1 -T2 -T3 -T4 -T5
-            --min-hostgroup --max-hostgroup --min-parallelism --max-parallelism
-            --min-rtt-timeout --max-rtt-timeout --initial-rtt-timeout
-            --max-retries --host-timeout --scan-delay --max-scan-delay
-            --min-rate --max-rate -f --mtu -D -S -e --source-port --data-length
-            --ip-options --ttl --spoof-mac --badsum --adler32 -oN -oX -oS -oG
-            -oA -v -d --reason --open --packet-trace --iflist --log-errors
-            --append-output --resume --stylesheet --webxml --no-stylesheet -6
-            -A --datadir --send-eth --send-ip --privilege--unprivileged -V
-            -h' -- "$cur") )
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        # strip everything following a :, inclusive
+        # strip everything following a =, exclusive
+        # expand -X; -Y to -X -Y
+        # expand -X/-Y/-Z to -X -Y -Z
+        # expand -X/Y/Z to -X -Y -Z
+        # expand --foo/bar to --foo --bar
+        # strip everything following a non-option name or = char
+        # TODO: should expand -T<0-5> to -T0 ... -T5
+        COMPREPLY=($(compgen -W "$(
+            "$1" --help 2>&1 | command sed \
+                -e "s/:.*$//" \
+                -e "s/=.*$/=/" \
+                -e "s/;[[:space:]]*-/ -/g" \
+                -e "s/\/-/ -/g" \
+                -e "/^[[:space:]]*-[^-]/s/\/\([^-]\)/ -\1/g" \
+                -e "/^[[:space:]]*--/s/\/\([^-]\)/ --\1/g" \
+                -e "s/[^[:space:]a-zA-Z0-9=-].*$//"
+        )" \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _nmap nmap
+    complete -F _nmap nmap
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nproc b/msys2/usr/share/bash-completion/completions/nproc
index 84092679c..50273f073 100644
--- a/msys2/usr/share/bash-completion/completions/nproc
+++ b/msys2/usr/share/bash-completion/completions/nproc
@@ -6,7 +6,7 @@ _nproc()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--ignore)
+        --help | --version | --ignore)
             return
             ;;
     esac
@@ -14,10 +14,10 @@ _nproc()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _nproc nproc
+    complete -F _nproc nproc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nslookup b/msys2/usr/share/bash-completion/completions/nslookup
index 267d0c308..3341b1f64 100644
--- a/msys2/usr/share/bash-completion/completions/nslookup
+++ b/msys2/usr/share/bash-completion/completions/nslookup
@@ -2,15 +2,15 @@
 
 _bind_queryclass()
 {
-    COMPREPLY+=( $(compgen -W 'IN CH HS ANY' -- "$cur") )
+    COMPREPLY+=($(compgen -W 'IN CH HS ANY' -- "$cur"))
 }
 
 _bind_querytype()
 {
-    # http://en.wikipedia.org/wiki/List_of_DNS_record_types
-    COMPREPLY+=( $(compgen -W 'A AAAA AFSDB APL CERT CNAME DHCID DLV DNAME
+    # https://en.wikipedia.org/wiki/List_of_DNS_record_types
+    COMPREPLY+=($(compgen -W 'A AAAA AFSDB APL CERT CNAME DHCID DLV DNAME
         DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR
-        RRSIG RP SIG SOA SPF SRV SSHFP TXT' -- "$cur") )
+        RRSIG RP SIG SOA SPF SRV SSHFP TXT' -- "$cur"))
 }
 
 _nslookup()
@@ -19,12 +19,12 @@ _nslookup()
     _init_completion -n = || return
 
     case $cur in
-        -class=*|-cl=*)
+        -class=* | -cl=*)
             cur=${cur#*=}
             _bind_queryclass
             return
             ;;
-        -querytype=*|-type=*|-q=*|-ty=*)
+        -querytype=* | -type=* | -q=* | -ty=*)
             cur=${cur#*=}
             _bind_querytype
             return
@@ -35,21 +35,21 @@ _nslookup()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-all -class= -debug -nodebug -d2 -nod2
+        COMPREPLY=($(compgen -W '-all -class= -debug -nodebug -d2 -nod2
             -domain= -search -nosearch -port= -querytype= -recurse -norecurse
-            -retry= -timeout= -vc -novc -fail -nofail' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+            -retry= -timeout= -vc -novc -fail -nofail' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local args
     _count_args =
-    if [[ $args -le 2 ]]; then
+    if ((args <= 2)); then
         _known_hosts_real -- "$cur"
-        [[ $args -eq 1 && $cur == @(|-) ]] && COMPREPLY+=( - )
+        [[ $args -eq 1 && $cur == @(|-) ]] && COMPREPLY+=(-)
     fi
 } &&
-complete -F _nslookup nslookup
+    complete -F _nslookup nslookup
 
 _host()
 {
@@ -66,21 +66,21 @@ _host()
             return
             ;;
         -m)
-            COMPREPLY=( $(compgen -W 'trace record usage' -- "$cur") )
+            COMPREPLY=($(compgen -W 'trace record usage' -- "$cur"))
             return
             ;;
-        -N|-R|-W)
+        -N | -R | -W)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _known_hosts_real -- "$cur"
 } &&
-complete -F _host host
+    complete -F _host host
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/nsupdate b/msys2/usr/share/bash-completion/completions/nsupdate
index ff3b9a475..68df333e3 100644
--- a/msys2/usr/share/bash-completion/completions/nsupdate
+++ b/msys2/usr/share/bash-completion/completions/nsupdate
@@ -20,21 +20,21 @@ _nsupdate()
             ;;
         -*y)
             if [[ $cur == h* ]]; then
-                COMPREPLY=( $(compgen -W "hmac-{md5,sha{1,224,256,384,512}}" \
-                                      -S : -- "$cur") )
-                [[ $COMPREPLY == *: ]] && compopt -o nospace
+                COMPREPLY=($(compgen -W "hmac-{md5,sha{1,224,256,384,512}}" \
+                    -S : -- "$cur"))
+                [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             fi
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _nsupdate nsupdate
+    complete -F _nsupdate nsupdate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ntpdate b/msys2/usr/share/bash-completion/completions/ntpdate
index 5291336c7..f6ee8f544 100644
--- a/msys2/usr/share/bash-completion/completions/ntpdate
+++ b/msys2/usr/share/bash-completion/completions/ntpdate
@@ -11,11 +11,11 @@ _ntpdate()
             return
             ;;
         -*U)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*p)
-            COMPREPLY=( $(compgen -W '{1..8}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..8}' -- "$cur"))
             return
             ;;
 
@@ -24,12 +24,12 @@ _ntpdate()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _ntpdate ntpdate
+    complete -F _ntpdate ntpdate
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/oggdec b/msys2/usr/share/bash-completion/completions/oggdec
index 9bdf5019a..97bde2054 100644
--- a/msys2/usr/share/bash-completion/completions/oggdec
+++ b/msys2/usr/share/bash-completion/completions/oggdec
@@ -6,18 +6,18 @@ _oggdec()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hV]*)
+        --help | --version | -!(-*)[hV]*)
             return
             ;;
-        --bits|-!(-*)b)
-            COMPREPLY=( $(compgen -W "8 16" -- "$cur") )
+        --bits | -!(-*)b)
+            COMPREPLY=($(compgen -W "8 16" -- "$cur"))
             return
             ;;
-        --endianness|--sign|-!(-*)[es])
-            COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+        --endianness | --sign | -!(-*)[es])
+            COMPREPLY=($(compgen -W "0 1" -- "$cur"))
             return
             ;;
-        --output|-!(-*)o)
+        --output | -!(-*)o)
             _filedir wav
             return
             ;;
@@ -25,14 +25,14 @@ _oggdec()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir ogg
 } &&
-complete -F _oggdec oggdec
+    complete -F _oggdec oggdec
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/op b/msys2/usr/share/bash-completion/completions/op
index ddbe4c730..31d647586 100644
--- a/msys2/usr/share/bash-completion/completions/op
+++ b/msys2/usr/share/bash-completion/completions/op
@@ -3,7 +3,7 @@
 _op_commands()
 {
     "$@" --help 2>/dev/null |
-        awk "/^(Available |Sub)commands/{flag=1;next}/^ /&&flag{print \$1}"
+        awk '/^(Available |Sub)commands/{flag=1;next}/^ /&&flag{print $1}'
 }
 
 _op_command_options()
@@ -11,11 +11,11 @@ _op_command_options()
     case $cur in
         -*)
             for i in "${!words[@]}"; do
-                [[ ${words[i]} == -* || $i -eq 0 ]] && unset words[i]
+                [[ ${words[i]} == -* || $i -eq 0 ]] && unset "words[i]"
             done
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_usage "$1" "${words[*]} --help") --help' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_usage "$1" "${words[*]} --help") --help' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return 0
             ;;
     esac
@@ -28,29 +28,32 @@ _op()
     _init_completion -s || return
 
     local command i
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            --help|--version) return ;;
+            --help | --version) return ;;
             -*) ;;
-            *) command=${words[i]}; break ;;
+            *)
+                command=${words[i]}
+                break
+                ;;
         esac
     done
 
-    if [[ -z $command && $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ ! -v command && $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    [[ $command ]] && _op_command_options "$1" && return
+    [[ -v command ]] && _op_command_options "$1" && return
 
-    if [[ -z $command || $command == $prev ]]; then
-        COMPREPLY=( $(compgen -W '$(_op_commands "$1" $command)' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+    if [[ ! -v command || $command == "$prev" ]]; then
+        COMPREPLY=($(compgen -W '$(_op_commands "$1" ${command-})' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
     # TODO specific command and subcommand completions
 } &&
-complete -F _op op
+    complete -F _op op
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/openssl b/msys2/usr/share/bash-completion/completions/openssl
index 50300a43a..dd7709208 100644
--- a/msys2/usr/share/bash-completion/completions/openssl
+++ b/msys2/usr/share/bash-completion/completions/openssl
@@ -5,9 +5,9 @@ _openssl_sections()
     local config f
 
     # check if a specific configuration file is used
-    for (( i=2; i < cword; i++ )); do
-        if [[ "${words[i]}" == -config ]]; then
-            config=${words[i+1]}
+    for ((i = 2; i < cword; i++)); do
+        if [[ ${words[i]} == -config ]]; then
+            config=${words[i + 1]}
             break
         fi
     done
@@ -22,13 +22,17 @@ _openssl_sections()
 
     [[ ! -f $config ]] && return
 
-    COMPREPLY=( $(compgen -W "$(awk '/\[.*\]/ {print $2}' $config)" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/\[.*\]/ {print $2}' $config)" -- "$cur"))
 }
 
 _openssl_digests()
 {
-    "$1" dgst -h 2>&1 | \
+    "$1" dgst -h 2>&1 |
         awk '/^-.*[ \t]to use the .* message digest algorithm/ { print $1 }'
+    local -a digests=($("$1" help 2>&1 |
+        command sed -ne '/^Message Digest commands/,/^[[:space:]]*$/p' |
+        command sed -e 1d))
+    printf "%s\n" "${digests[@]/#/-}"
 }
 
 _openssl()
@@ -51,29 +55,29 @@ _openssl()
         rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc4-40
         sha224 sha256 sha384 sha512 genpkey pkey pkeyparam pkeyutl'
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W "$commands" -- "$cur"))
     else
         command=${words[1]}
         case $prev in
-            -CA|-CAfile|-CAkey|-CAserial|-cert|-certfile|-config|-content| \
-            -dcert|-dkey|-dhparam|-extfile|-in|-inkey|-kfile|-key|-keyout| \
-            -out|-oid|-paramfile|-peerkey|-prvrify|-rand|-recip|-revoke| \
-            -sess_in|-sess_out|-spkac|-sigfile|-sign|-signkey|-signer| \
-            -signature|-ss_cert|-untrusted|-verify)
+            -CA | -CAfile | -CAkey | -CAserial | -cert | -certfile | -config | -content | \
+                -dcert | -dkey | -dhparam | -extfile | -in | -inkey | -kfile | -key | -keyout | \
+                -out | -oid | -paramfile | -peerkey | -prvrify | -rand | -recip | -revoke | \
+                -sess_in | -sess_out | -spkac | -sigfile | -sign | -signkey | -signer | \
+                -signature | -ss_cert | -untrusted | -verify | -writerand)
                 _filedir
                 return
                 ;;
-            -outdir|-CApath)
+            -outdir | -CApath)
                 _filedir -d
                 return
                 ;;
-            -name|-crlexts|-extensions)
+            -name | -crlexts | -extensions)
                 _openssl_sections
                 return
                 ;;
-            -inform|-outform|-keyform|-certform|-CAform|-CAkeyform|-dkeyform|\
-            -dcertform|-peerform)
+            -inform | -outform | -keyform | -certform | -CAform | -CAkeyform | -dkeyform | \
+                -dcertform | -peerform)
                 formats='DER PEM'
                 case $command in
                     x509)
@@ -86,7 +90,7 @@ _openssl()
                         formats+=" ENGINE"
                         ;;
                 esac
-                COMPREPLY=( $(compgen -W "$formats" -- "$cur") )
+                COMPREPLY=($(compgen -W "$formats" -- "$cur"))
                 return
                 ;;
             -connect)
@@ -94,177 +98,41 @@ _openssl()
                 return
                 ;;
             -starttls)
-                COMPREPLY=( $(compgen -W 'smtp pop3 imap ftp' -- "$cur") )
+                COMPREPLY=($(compgen -W '
+                    smtp pop3 imap ftp xmpp xmpp-server telnet irc mysql
+                    postgres lmtp nntp sieve ldap
+                    ' -- "$cur"))
                 return
                 ;;
             -cipher)
-                COMPREPLY=( $(IFS=: compgen -W "$($1 ciphers)" -- "$cur") )
+                COMPREPLY=($(IFS=: compgen -W "$($1 ciphers)" -- "$cur"))
                 return
                 ;;
             -kdf)
-                COMPREPLY=( $(compgen -W 'TLS1-PRF HKDF' -- "$cur") )
+                COMPREPLY=($(compgen -W 'TLS1-PRF HKDF' -- "$cur"))
                 return
                 ;;
         esac
 
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
+            options=$(_parse_help "$1" "$command -help" 2>/dev/null)
             case $command in
-                asn1parse)
-                    options='-inform -in -out -noout -offset -length -i -oid
-                        -strparse'
-                    ;;
-                ca)
-                    options='-verbose -config -name -gencrl -revoke -crl_reason
-                        -crl_hold -crl_compromise -crl_CA_compromise -crldays
-                        -crlhours -crlexts -startdate -enddate -days -md
-                        -policy -keyfile -key -passin -cert -selfsig -in -out
-                        -notext -outdir -infiles -spkac -ss_cert -preserveDN
-                        -noemailDN -batch -msie_hack -extensions -extfile
-                        -engine -subj -utf8 -multivalue-rdn'
-                        ;;
-                ciphers)
-                    options='-v -ssl2 -ssl3 -tls1'
-                    ;;
-                crl)
-                    options='-inform -outform -text -in -out -noout -hash
-                        -issuer -lastupdate -nextupdate -CAfile -CApath'
-                    ;;
-                crl2pkcs7)
-                    options='-inform -outform -in -out -print_certs'
-                    ;;
-                dgst)
-                    options="-c -d -hex -binary -out -sign -verify -prverify
-                        -signature $(_openssl_digests $1)"
-                    ;;
-                dsa)
-                    options='-inform -outform -in -passin -out -passout -des
-                        -des3 -idea -text -noout -modulus -pubin -pubout'
-                    ;;
-                dsaparam)
-                    options='-inform -outform -in -out -noout -text -C -rand
-                        -genkey'
-                    ;;
-                enc)
-                    options='-ciphername -in -out -pass -e -d -a -A -k -kfile
-                        -S -K -iv -p -P -bufsize -debug'
-                    ;;
-                dhparam)
-                    options='-inform -outform -in -out -dsaparam -noout -text
-                        -C -2 -5 -rand'
-                    ;;
-                gendsa)
-                    options='-out -des -des3 -idea -rand'
-                    ;;
-                genpkey)
-                    options='-out -outform -pass -cipher -engine -paramfile
-                        -algorithm -pkeyopt -genparam -text'
-                    ;;
-                genrsa)
-                    options='-out -passout -des -des3 -idea -f4 -3 -rand'
-                    ;;
-                pkcs7)
-                    options='-inform -outform -in -out -print_certs -text
-                        -noout'
-                    ;;
-                pkey)
-                    options='-inform -outform -in -passin -out -passout
-                        -traditional -cipher -text -text_pub -noout -pubin
-                        -pubout -engine'
-                    ;;
-                pkeyparam)
-                    options='-in -out -text -noout -engine'
-                    ;;
-                pkeyutl)
-                    options='-in -out -sigfile -inkey -keyform -passin -peerkey
-                        -peerform -pubin -certin -rev -sign -verify
-                        -verifyrecover -encrypt -decrypt -derive -kdf -kdflen
-                        -pkeyopt -hexdump -asn1parse -engine -engine_impl'
-                    ;;
-                rand)
-                    options='-out -rand -base64'
-                    ;;
-                req)
-                    options="-inform -outform -in -passin -out -passout -text
-                        -noout -verify -modulus -new -rand -newkey -newkey
-                        -nodes -key -keyform -keyout $(_openssl_digests $1)
-                        -config -x509 -days -asn1-kludge -newhdr -extensions
-                        -reqexts section"
-                    ;;
-                rsa)
-                    options='-inform -outform -in -passin -out -passout
-                        -sgckey -des -des3 -idea -text -noout -modulus -check
-                        -pubin -pubout -engine'
-                    ;;
-                rsautl)
-                    options='-in -out -inkey -pubin -certin -sign -verify
-                        -encrypt -decrypt -pkcs -ssl -raw -hexdump -asn1parse'
-                    ;;
-                s_client)
-                    options='-connect -verify -cert -certform -key -keyform
-                        -pass -CApath -CAfile -reconnect -pause -showcerts
-                        -debug -msg -nbio_test -state -nbio -crlf -ign_eof
-                        -quiet -ssl2 -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1
-                        -bugs -cipher -starttls -engine -tlsextdebug
-                        -no_ticket -sess_out -sess_in -rand'
-                    ;;
-                s_server)
-                    options='-accept -context -verify -Verify -crl_check
-                        -crl_check_all -cert -certform -key -keyform -pass
-                        -dcert -dcertform -dkey -dkeyform -dpass -dhparam
-                        -nbio -nbio_test -crlf -debug -msg -state -CApath
-                        -CAfile -nocert -cipher -quiet -no_tmp_rsa -ssl2
-                        -ssl3 -tls1 -no_ssl2 -no_ssl3 -no_tls1 -no_dhe
-                        -bugs -hack -www -WWW -HTTP -engine -tlsextdebug
-                        -no_ticket -id_prefix -rand'
-                    ;;
-                s_time)
-                    options='-connect -www -cert -key -CApath -CAfile -reuse
-                        -new -verify -nbio -time -ssl2 -ssl3 -bugs -cipher'
-                    ;;
-                sess_id)
-                    options='-inform -outform -in -out -text -noout -context ID'
-                    ;;
-                smime)
-                    options='-encrypt -decrypt -sign -verify -pk7out -des -des3
-                        -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256 -in
-                        -certfile -signer -recip -inform -passin -inkey -out
-                        -outform -content -to -from -subject -text -rand'
-                    ;;
-                speed)
-                    options='-engine'
-                    ;;
-                verify)
-                    options='-CApath -CAfile -purpose -untrusted -help
-                        -issuer_checks -verbose -certificates'
-                    ;;
-                x509)
-                    options="-inform -outform -keyform -CAform -CAkeyform -in
-                        -out -serial -hash -subject_hash -issuer_hash -subject
-                        -issuer -nameopt -email -startdate -enddate -purpose
-                        -dates -modulus -fingerprint -alias -noout -trustout
-                        -clrtrust -clrreject -addtrust -addreject -setalias
-                        -days -set_serial -signkey -x509toreq -req -CA -CAkey
-                        -CAcreateserial -CAserial -text -C -clrext
-                        -extfile -extensions -engine $(_openssl_digests $1)"
-                    ;;
-                md*|sha*|ripemd160)
-                    options='-c -d'
-                    ;;
+                dgst | req | x509) options+=" $(_openssl_digests $1)" ;;
             esac
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
-            if [[ "$command" == speed ]]; then
-                COMPREPLY=( $(compgen -W 'md2 mdc2 md5 hmac sha1 rmd160
+            if [[ $command == speed ]]; then
+                COMPREPLY=($(compgen -W 'md2 mdc2 md5 hmac sha1 rmd160
                     idea-cbc rc2-cbc rc5-cbc bf-cbc des-cbc des-ede3 rc4
                     rsa512 rsa1024 rsa2048 rsa4096 dsa512 dsa1024 dsa2048 idea
-                    rc2 des rsa blowfish' -- "$cur") )
+                    rc2 des rsa blowfish' -- "$cur"))
             else
                 _filedir
             fi
         fi
     fi
 } &&
-complete -F _openssl -o default openssl
+    complete -F _openssl -o default openssl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/opera b/msys2/usr/share/bash-completion/completions/opera
index dc0859ea5..f2bc8c300 100644
--- a/msys2/usr/share/bash-completion/completions/opera
+++ b/msys2/usr/share/bash-completion/completions/opera
@@ -6,8 +6,8 @@ _opera()
     _init_completion || return
 
     case "$prev" in
-        ?(-)-widget|?(-)-urllist|?(-)-uiparserlog|?(-)-uiwidgetsparserlog|\
-        ?(-)-profilinglog)
+        ?(-)-widget | ?(-)-urllist | ?(-)-uiparserlog | ?(-)-uiwidgetsparserlog | \
+            ?(-)-profilinglog)
             _filedir
             return
             ;;
@@ -16,32 +16,32 @@ _opera()
             return
             ;;
         ?(-)-remote)
-            COMPREPLY=( $(compgen -W 'openURL\\( openFile\\( openM2\\(
+            COMPREPLY=($(compgen -W 'openURL\\( openFile\\( openM2\\(
                 openComposer\\( addBookmark\\( raise\\(\\) lower\\(\\)' \
-                -- "$cur") )
-            [[ $COMPREPLY == *\( ]] && compopt -o nospace
+                -- "$cur"))
+            [[ ${COMPREPLY-} == *\( ]] && compopt -o nospace
             return
             ;;
         ?(-)-windowname)
-            COMPREPLY=( $(compgen -W 'first last opera{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'first last opera{1..9}' -- "$cur"))
             return
             ;;
-        ?(-)-geometry|?(-)-window|?(-)-display|?(-)-urllistloadtimeout|\
-        ?(-)-delaycustomizations|?(-)-dialogtest|?(-)-inidialogtest|\
-        ?(-)-gputest)
+        ?(-)-geometry | ?(-)-window | ?(-)-display | ?(-)-urllistloadtimeout | \
+            ?(-)-delaycustomizations | ?(-)-dialogtest | ?(-)-inidialogtest | \
+            ?(-)-gputest)
             # argument required but no completions available
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir '@(?([xX]|[sS])[hH][tT][mM]?([lL]))'
 } &&
-complete -F _opera opera
+    complete -F _opera opera
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/optipng b/msys2/usr/share/bash-completion/completions/optipng
index 22889bf42..0f6b40e11 100644
--- a/msys2/usr/share/bash-completion/completions/optipng
+++ b/msys2/usr/share/bash-completion/completions/optipng
@@ -6,14 +6,14 @@ _optipng()
     _init_completion || return
 
     case $prev in
-        -'?'|-h|--help|-f)
+        -'?' | -h | --help | -f)
             return
             ;;
         -o)
-            COMPREPLY=( $(compgen -W '{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
             return
             ;;
-        -out|-log)
+        -out | -log)
             _filedir
             return
             ;;
@@ -22,31 +22,31 @@ _optipng()
             return
             ;;
         -i)
-            COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1' -- "$cur"))
             return
             ;;
-        -zc|-zm)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+        -zc | -zm)
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             return
             ;;
         -zw)
-            COMPREPLY=( $(compgen -W '256 512 1k 2k 4k 8k 16k 32k' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W '256 512 1k 2k 4k 8k 16k 32k' \
+                -- "$cur"))
             return
             ;;
         -strip)
-            COMPREPLY=( $(compgen -W 'all' -- "$cur") )
+            COMPREPLY=($(compgen -W 'all' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir '@(png|bmp|gif|pnm|tif?(f))'
 } &&
-complete -F _optipng optipng
+    complete -F _optipng optipng
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/p4 b/msys2/usr/share/bash-completion/completions/p4
index e383c8cf7..ed5f20c25 100644
--- a/msys2/usr/share/bash-completion/completions/p4
+++ b/msys2/usr/share/bash-completion/completions/p4
@@ -14,38 +14,38 @@ _p4()
         uresource uxbinary xbinary xltext xtempobj xtext \
         text binary resource"
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "$p4commands" -- "$cur") )
-    elif [[ $cword -eq 2 ]]; then
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W "$p4commands" -- "$cur"))
+    elif ((cword == 2)); then
         case $prev in
             help)
-                COMPREPLY=( $(compgen -W "simple commands environment
+                COMPREPLY=($(compgen -W "simple commands environment
                     filetypes jobview revisions usage views $p4commands" \
-                        -- "$cur") )
+                    -- "$cur"))
                 ;;
             admin)
-                COMPREPLY=( $(compgen -W "checkpoint stop" -- "$cur") )
-                ;;
-            *)
+                COMPREPLY=($(compgen -W "checkpoint stop" -- "$cur"))
                 ;;
+            *) ;;
+
         esac
-    elif [[ $cword -gt 2 ]]; then
+    elif ((cword > 2)); then
         case $prev in
             -t)
-                case ${words[$cword-2]} in
-                    add|edit|reopen)
-                        COMPREPLY=( $(compgen -W "$p4filetypes" -- "$cur") )
-                        ;;
-                    *)
+                case ${words[cword - 2]} in
+                    add | edit | reopen)
+                        COMPREPLY=($(compgen -W "$p4filetypes" -- "$cur"))
                         ;;
+                    *) ;;
+
                 esac
                 ;;
-            *)
-                ;;
+            *) ;;
+
         esac
     fi
 
 } &&
-complete -F _p4 -o default p4 g4
+    complete -F _p4 -o default p4 g4
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pack200 b/msys2/usr/share/bash-completion/completions/pack200
index f35840b03..1a6ded7ab 100644
--- a/msys2/usr/share/bash-completion/completions/pack200
+++ b/msys2/usr/share/bash-completion/completions/pack200
@@ -6,37 +6,37 @@ _pack200()
     _init_completion -s || return
 
     case $prev in
-        -S|--segment-limit|-P|--pass-file|-C|--class-attribute|\
-        -F|--field-attribute|-M|--method-attribute|-D|--code-attribute|\
-        '-?'|-h|--help|-V|--version|-J)
+        -S | --segment-limit | -P | --pass-file | -C | --class-attribute | \
+            -F | --field-attribute | -M | --method-attribute | -D | --code-attribute | \
+            '-?' | -h | --help | -V | --version | -J)
             return
             ;;
-        -E|--effort)
-            COMPREPLY=( $(compgen -W '{0..9}' -- "$cur") )
+        -E | --effort)
+            COMPREPLY=($(compgen -W '{0..9}' -- "$cur"))
             return
             ;;
-        -H|--deflate-hint)
-            COMPREPLY=( $(compgen -W 'true false keep' -- "$cur") )
+        -H | --deflate-hint)
+            COMPREPLY=($(compgen -W 'true false keep' -- "$cur"))
             return
             ;;
-        -m|--modification-time)
-            COMPREPLY=( $(compgen -W 'latest keep' -- "$cur") )
+        -m | --modification-time)
+            COMPREPLY=($(compgen -W 'latest keep' -- "$cur"))
             return
             ;;
-        -U|--unknown-attribute)
-            COMPREPLY=( $(compgen -W 'error strip pass' -- "$cur") )
+        -U | --unknown-attribute)
+            COMPREPLY=($(compgen -W 'error strip pass' -- "$cur"))
             return
             ;;
-        -f|--config-file)
+        -f | --config-file)
             _filedir properties
             return
             ;;
-        -l|--log-file)
-            COMPREPLY=( $(compgen -W '-' -- "$cur") )
+        -l | --log-file)
+            COMPREPLY=($(compgen -W '-' -- "$cur"))
             _filedir log
             return
             ;;
-        -r|--repack)
+        -r | --repack)
             _filedir jar
             return
             ;;
@@ -46,29 +46,29 @@ _pack200()
 
     # Check if a pack or a jar was already given.
     local i pack=false jar=false
-    for (( i=0; i < ${#words[@]}-1; i++ )) ; do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         case ${words[i]} in
-            *.pack|*.pack.gz) pack=true ;;
+            *.pack | *.pack.gz) pack=true ;;
             *.jar) jar=true ;;
         esac
     done
 
-    if ! $pack ; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--no-gzip --gzip --strip-debug
+    if ! $pack; then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--no-gzip --gzip --strip-debug
                 --no-keep-file-order --segment-limit= --effort= --deflate-hint=
                 --modification-time= --pass-file= --unknown-attribute=
                 --class-attribute= --field-attribute= --method-attribute=
                 --code-attribute= --config-file= --verbose --quiet --log-file=
-                --help --version -J --repack' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+                --help --version -J --repack' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir 'pack?(.gz)'
         fi
-    elif ! $jar ; then
+    elif ! $jar; then
         _filedir jar
     fi
 } &&
-complete -F _pack200 pack200
+    complete -F _pack200 pack200
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/passwd b/msys2/usr/share/bash-completion/completions/passwd
index 5a1e56297..652a41e57 100644
--- a/msys2/usr/share/bash-completion/completions/passwd
+++ b/msys2/usr/share/bash-completion/completions/passwd
@@ -6,19 +6,19 @@ _passwd()
     _init_completion || return
 
     case $prev in
-        --minimum|--maximum|--warning|--inactive|--help|--usage|-!(-*)[nxwi?])
+        --minimum | --maximum | --warning | --inactive | --help | --usage | -!(-*)[nxwi?])
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     _allowed_users
 } &&
-complete -F _passwd passwd
+    complete -F _passwd passwd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/patch b/msys2/usr/share/bash-completion/completions/patch
index df85211d4..e883d9cac 100644
--- a/msys2/usr/share/bash-completion/completions/patch
+++ b/msys2/usr/share/bash-completion/completions/patch
@@ -6,42 +6,42 @@ _patch()
     _init_completion -s || return
 
     case $prev in
-        --strip|--ifdef|--prefix|--basename-prefix|--suffix|--get|\
-        -!(-*)[pDBYzg])
+        --strip | --ifdef | --prefix | --basename-prefix | --suffix | --get | \
+            -!(-*)[pDBYzg])
             return
             ;;
-        --fuzz|-!(-*)F)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+        --fuzz | -!(-*)F)
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
-        --input|-!(-*)i)
+        --input | -!(-*)i)
             _filedir '@(?(d)patch|dif?(f))'
             return
             ;;
-        --output|--reject-file|-!(-*)[or])
-            [[ ! $cur || $cur == - ]] && COMPREPLY=( - )
+        --output | --reject-file | -!(-*)[or])
+            [[ ! $cur || $cur == - ]] && COMPREPLY=(-)
             _filedir
             return
             ;;
         --quoting-style)
-            COMPREPLY=( $(compgen -W 'literal shell shell-always c escape' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'literal shell shell-always c escape' \
+                -- "$cur"))
             return
             ;;
-        --version-control|-!(-*)V)
-            COMPREPLY=( $(compgen -W 'simple numbered existing' -- "$cur") )
+        --version-control | -!(-*)V)
+            COMPREPLY=($(compgen -W 'simple numbered existing' -- "$cur"))
             return
             ;;
-        --directory|-!(-*)d)
+        --directory | -!(-*)d)
             _filedir -d
             return
             ;;
         --reject-format)
-            COMPREPLY=( $(compgen -W 'context unified' -- "$cur") )
+            COMPREPLY=($(compgen -W 'context unified' -- "$cur"))
             return
             ;;
         --read-only)
-            COMPREPLY=( $(compgen -W 'ignore warn fail' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ignore warn fail' -- "$cur"))
             return
             ;;
     esac
@@ -49,8 +49,8 @@ _patch()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -65,6 +65,6 @@ _patch()
             ;;
     esac
 } &&
-complete -F _patch patch
+    complete -F _patch patch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pbzip2 b/msys2/usr/share/bash-completion/completions/pbzip2
index 8bd72cc98..40e50fe32 100644
--- a/msys2/usr/share/bash-completion/completions/pbzip2
+++ b/msys2/usr/share/bash-completion/completions/pbzip2
@@ -6,37 +6,37 @@ _bzip2()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)[bhp])
+        --help | -!(-*)[bhp])
             return
             ;;
         -!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local helpopts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
-            -- "$cur") )
+        COMPREPLY=($(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
+            -- "$cur"))
         return
     fi
 
     local IFS=$'\n' xspec="*.?(t)bz2"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --compress ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*z* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --compress ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dt]* ]] && xspec="!"$xspec
+        [[ $prev == -*z* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _bzip2 bzip2 pbzip2 lbzip2
+    complete -F _bzip2 bzip2 pbzip2 lbzip2
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pccardctl b/msys2/usr/share/bash-completion/completions/pccardctl
index 588ea4670..bb3a0dba5 100644
--- a/msys2/usr/share/bash-completion/completions/pccardctl
+++ b/msys2/usr/share/bash-completion/completions/pccardctl
@@ -5,11 +5,11 @@ _cardctl()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'status config ident suspend resume reset
-            eject insert scheme' -- "$cur") )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'status config ident suspend resume reset
+            eject insert scheme' -- "$cur"))
     fi
 } &&
-complete -F _cardctl cardctl pccardctl
+    complete -F _cardctl cardctl pccardctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pdftotext b/msys2/usr/share/bash-completion/completions/pdftotext
index 79c837e03..a3501baae 100644
--- a/msys2/usr/share/bash-completion/completions/pdftotext
+++ b/msys2/usr/share/bash-completion/completions/pdftotext
@@ -6,31 +6,34 @@ _pdftotext()
     _init_completion || return
 
     case $prev in
-        -h|-help|--help|-'?'|-f|-l|-r|-x|-y|-W|-H|-fixed|-opw|-upw)
+        -h | -help | --help | -'?' | -f | -l | -r | -x | -y | -W | -H | -fixed | -opw | -upw)
             return
             ;;
         -enc)
-            COMPREPLY=( $(compgen -W '$("$1" -listenc 2>/dev/null |
-                command sed -e 1d)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$("$1" -listenc 2>/dev/null |
+                command sed -e 1d)' -- "$cur"))
             return
             ;;
         -eol)
-            COMPREPLY=( $(compgen -W "unix dos mac" -- "$cur") )
+            COMPREPLY=($(compgen -W "unix dos mac" -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* && ${prev,,} != *.pdf ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     case ${prev,,} in
-        -|*.txt) ;;
-        *.pdf) COMPREPLY=( $(compgen -W '-' -- "$cur") ) ; _filedir txt ;;
+        - | *.txt) ;;
+        *.pdf)
+            COMPREPLY=($(compgen -W '-' -- "$cur"))
+            _filedir txt
+            ;;
         *) _filedir pdf ;;
     esac
 } &&
-complete -F _pdftotext pdftotext
+    complete -F _pdftotext pdftotext
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pdlzip b/msys2/usr/share/bash-completion/completions/pdlzip
index 0f95722cf..05f169c96 100644
--- a/msys2/usr/share/bash-completion/completions/pdlzip
+++ b/msys2/usr/share/bash-completion/completions/pdlzip
@@ -8,15 +8,15 @@ _lzip()
     local decompress=false
 
     case $prev in
-        --help|--version|--member-size|--match-length|--dictionary-size|\
-        --volume-size|--data-size|-!(-*)@([bmsSB]|[hV]*))
+        --help | --version | --member-size | --match-length | --dictionary-size | \
+            --volume-size | --data-size | -!(-*)@([bmsSB]|[hV]*))
             return
             ;;
         --decompress-!(-*)d)
             decompress=true
             ;;
         --threads-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --output-!(-*)o)
@@ -27,9 +27,9 @@ _lzip()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -40,8 +40,8 @@ _lzip()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzip clzip lzip pdlzip plzip
+    complete -F _lzip clzip lzip pdlzip plzip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/perl b/msys2/usr/share/bash-completion/completions/perl
index bf1179705..9823d7307 100644
--- a/msys2/usr/share/bash-completion/completions/perl
+++ b/msys2/usr/share/bash-completion/completions/perl
@@ -2,9 +2,9 @@
 
 _perl_helper()
 {
-    COMPREPLY=( $(compgen -P "$prefix" -W \
+    COMPREPLY=($(compgen -P "$prefix" -W \
         "$(${2:-perl} ${BASH_SOURCE[0]%/*}/../helpers/perl $1 $cur)" \
-        -- "$cur") )
+        -- "$cur"))
     [[ $1 == functions ]] || __ltrim_colon_completions "$prefix$cur"
 }
 
@@ -16,7 +16,7 @@ _perl()
     local prefix="" temp optPrefix optSuffix
 
     # If option not followed by whitespace, reassign prev and cur
-    if [[ "$cur" == -?* ]]; then
+    if [[ $cur == -?* ]]; then
         temp=$cur
         prev=${temp:0:2}
         cur=${temp:2}
@@ -35,7 +35,7 @@ _perl()
             -*[Ix])
                 local IFS=$'\n'
                 compopt -o filenames
-                COMPREPLY=( $(compgen -d $optPrefix $optSuffix -- "$cur") )
+                COMPREPLY=($(compgen -d $optPrefix $optSuffix -- "$cur"))
                 return
                 ;;
             -*[mM])
@@ -50,14 +50,14 @@ _perl()
                     temp="${cur##+(:)}"
                     prefix+="${cur%$temp}"
                     local IFS=$'\n'
-                    COMPREPLY=( $(compgen -P "$prefix" -W \
+                    COMPREPLY=($(compgen -P "$prefix" -W \
                         '$($1 -MConfig -e "print join \"\\n\",
-                           keys %Config::Config" 2>/dev/null)' -- "$temp") )
+                           keys %Config::Config" 2>/dev/null)' -- "$temp"))
                     __ltrim_colon_completions "$prefix$temp"
                 fi
                 return
                 ;;
-            -*d|-*dt)
+            -*d | -*dt)
                 if [[ $cur == :* ]]; then
                     temp="${cur#:}"
                     prefix="$prefix${cur%$temp}"
@@ -72,25 +72,25 @@ _perl()
     # valid syntax.  However, the argument is neither a filename nor a
     # directory, but one line of perl program, thus do not suggest
     # _filedir completion.
-    elif [[ "$prev" == -e ]] || [[ "$prev" == -E ]]; then
+    elif [[ $prev == -e ]] || [[ $prev == -E ]]; then
         return
 
     # Likewise, `-I' also accepts a space between option and argument
     # and it takes a directory as value.
-    elif [[ "$prev" == -I ]]; then
+    elif [[ $prev == -I ]]; then
         local IFS=$'\n'
         compopt -o filenames
-        COMPREPLY=( $(compgen -d $optPrefix $optSuffix -- "$cur") )
+        COMPREPLY=($(compgen -d ${optPrefix-} ${optSuffix-} -- "$cur"))
         return
 
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
-            -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur") )
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
+            -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _perl perl
+    complete -F _perl perl
 
 _perldoc()
 {
@@ -100,7 +100,7 @@ _perldoc()
     local prefix="" temp
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -?* ]]; then
+    if [[ $cur == -?* ]]; then
         temp=$cur
         prev=${temp:0:2}
         cur=${temp:2}
@@ -108,7 +108,7 @@ _perldoc()
     fi
 
     local perl="${1%doc}"
-    [[ $perl == $1 ]] || ! type $perl &>/dev/null && perl=
+    [[ $perl == "$1" ]] || ! type $perl &>/dev/null && perl=
 
     case $prev in
         -*[hVnoMwL])
@@ -124,23 +124,23 @@ _perldoc()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
         # return available modules (unless it is clearly a file)
-        if [[ "$cur" != @(*/|[.~])* ]]; then
+        if [[ $cur != @(*/|[.~])* ]]; then
             _perl_helper perldocs $perl
             if [[ $cur == p* ]]; then
-                COMPREPLY+=( $(compgen -W \
+                COMPREPLY+=($(compgen -W \
                     '$(PERLDOC_PAGER=cat "$1" -u perl |  \
                        command sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
                        awk "\$NF=2 && \$1 ~ /^perl/ { print \$1 }")' \
-                    -- "$cur") )
+                    -- "$cur"))
             fi
         fi
         _filedir 'p@([lm]|od)'
     fi
 } &&
-complete -F _perldoc -o bashdefault perldoc
+    complete -F _perldoc -o bashdefault perldoc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/perlcritic b/msys2/usr/share/bash-completion/completions/perlcritic
index d9a4063da..784354951 100644
--- a/msys2/usr/share/bash-completion/completions/perlcritic
+++ b/msys2/usr/share/bash-completion/completions/perlcritic
@@ -6,46 +6,46 @@ _perlcritic()
     _init_completion || return
 
     case $prev in
-        --help|--version|--top|--include|--exclude|--single-policy|\
-        --colo?(u)r-severity-*|--program-extensions|-[?HVs])
+        --help | --version | --top | --include | --exclude | --single-policy | \
+            --colo?(u)r-severity-* | --program-extensions | -[?HVs])
             return
             ;;
         --severity)
-            COMPREPLY=( $(compgen -W "{1..5} brutal cruel harsh stern gentle" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..5} brutal cruel harsh stern gentle" \
+                -- "$cur"))
             return
             ;;
-        --profile|-p)
+        --profile | -p)
             _filedir perlcriticrc
             return
             ;;
         --theme)
-            COMPREPLY=( $(compgen -W '$("$1" --list-themes 2>/dev/null)' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W '$("$1" --list-themes 2>/dev/null)' \
+                -- "$cur"))
             return
             ;;
         --profile-strictness)
-            COMPREPLY=( $(compgen -W 'warn fatal quiet' -- "$cur") )
+            COMPREPLY=($(compgen -W 'warn fatal quiet' -- "$cur"))
             return
             ;;
         --verbose)
-            COMPREPLY=( $(compgen -W '{1..11}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..11}' -- "$cur"))
             return
             ;;
         --pager)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _filedir 'p[lm]'
 } &&
-complete -F _perlcritic perlcritic
+    complete -F _perlcritic perlcritic
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/perldoc b/msys2/usr/share/bash-completion/completions/perldoc
index bf1179705..9823d7307 100644
--- a/msys2/usr/share/bash-completion/completions/perldoc
+++ b/msys2/usr/share/bash-completion/completions/perldoc
@@ -2,9 +2,9 @@
 
 _perl_helper()
 {
-    COMPREPLY=( $(compgen -P "$prefix" -W \
+    COMPREPLY=($(compgen -P "$prefix" -W \
         "$(${2:-perl} ${BASH_SOURCE[0]%/*}/../helpers/perl $1 $cur)" \
-        -- "$cur") )
+        -- "$cur"))
     [[ $1 == functions ]] || __ltrim_colon_completions "$prefix$cur"
 }
 
@@ -16,7 +16,7 @@ _perl()
     local prefix="" temp optPrefix optSuffix
 
     # If option not followed by whitespace, reassign prev and cur
-    if [[ "$cur" == -?* ]]; then
+    if [[ $cur == -?* ]]; then
         temp=$cur
         prev=${temp:0:2}
         cur=${temp:2}
@@ -35,7 +35,7 @@ _perl()
             -*[Ix])
                 local IFS=$'\n'
                 compopt -o filenames
-                COMPREPLY=( $(compgen -d $optPrefix $optSuffix -- "$cur") )
+                COMPREPLY=($(compgen -d $optPrefix $optSuffix -- "$cur"))
                 return
                 ;;
             -*[mM])
@@ -50,14 +50,14 @@ _perl()
                     temp="${cur##+(:)}"
                     prefix+="${cur%$temp}"
                     local IFS=$'\n'
-                    COMPREPLY=( $(compgen -P "$prefix" -W \
+                    COMPREPLY=($(compgen -P "$prefix" -W \
                         '$($1 -MConfig -e "print join \"\\n\",
-                           keys %Config::Config" 2>/dev/null)' -- "$temp") )
+                           keys %Config::Config" 2>/dev/null)' -- "$temp"))
                     __ltrim_colon_completions "$prefix$temp"
                 fi
                 return
                 ;;
-            -*d|-*dt)
+            -*d | -*dt)
                 if [[ $cur == :* ]]; then
                     temp="${cur#:}"
                     prefix="$prefix${cur%$temp}"
@@ -72,25 +72,25 @@ _perl()
     # valid syntax.  However, the argument is neither a filename nor a
     # directory, but one line of perl program, thus do not suggest
     # _filedir completion.
-    elif [[ "$prev" == -e ]] || [[ "$prev" == -E ]]; then
+    elif [[ $prev == -e ]] || [[ $prev == -E ]]; then
         return
 
     # Likewise, `-I' also accepts a space between option and argument
     # and it takes a directory as value.
-    elif [[ "$prev" == -I ]]; then
+    elif [[ $prev == -I ]]; then
         local IFS=$'\n'
         compopt -o filenames
-        COMPREPLY=( $(compgen -d $optPrefix $optSuffix -- "$cur") )
+        COMPREPLY=($(compgen -d ${optPrefix-} ${optSuffix-} -- "$cur"))
         return
 
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
-            -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur") )
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d -D -p
+            -n -a -F -l -0 -I -m -M -P -S -x -i -e' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _perl perl
+    complete -F _perl perl
 
 _perldoc()
 {
@@ -100,7 +100,7 @@ _perldoc()
     local prefix="" temp
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -?* ]]; then
+    if [[ $cur == -?* ]]; then
         temp=$cur
         prev=${temp:0:2}
         cur=${temp:2}
@@ -108,7 +108,7 @@ _perldoc()
     fi
 
     local perl="${1%doc}"
-    [[ $perl == $1 ]] || ! type $perl &>/dev/null && perl=
+    [[ $perl == "$1" ]] || ! type $perl &>/dev/null && perl=
 
     case $prev in
         -*[hVnoMwL])
@@ -124,23 +124,23 @@ _perldoc()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
         # return available modules (unless it is clearly a file)
-        if [[ "$cur" != @(*/|[.~])* ]]; then
+        if [[ $cur != @(*/|[.~])* ]]; then
             _perl_helper perldocs $perl
             if [[ $cur == p* ]]; then
-                COMPREPLY+=( $(compgen -W \
+                COMPREPLY+=($(compgen -W \
                     '$(PERLDOC_PAGER=cat "$1" -u perl |  \
                        command sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
                        awk "\$NF=2 && \$1 ~ /^perl/ { print \$1 }")' \
-                    -- "$cur") )
+                    -- "$cur"))
             fi
         fi
         _filedir 'p@([lm]|od)'
     fi
 } &&
-complete -F _perldoc -o bashdefault perldoc
+    complete -F _perldoc -o bashdefault perldoc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/perltidy b/msys2/usr/share/bash-completion/completions/perltidy
index 91bd50942..4404cf80e 100644
--- a/msys2/usr/share/bash-completion/completions/perltidy
+++ b/msys2/usr/share/bash-completion/completions/perltidy
@@ -6,7 +6,7 @@ _perltidy()
     _init_completion -n = || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
         -o)
@@ -22,20 +22,20 @@ _perltidy()
             return
             ;;
         -ole=*)
-            COMPREPLY=( $(compgen -W 'dos win mac unix' -- "${cur#*=}") )
+            COMPREPLY=($(compgen -W 'dos win mac unix' -- "${cur#*=}"))
             return
             ;;
-        -bt=*|-pt=*|-sbt=*|-bvt=*|-pvt=*|-sbvt=*|-bvtc=*|-pvtc=*|-sbvtc=*|\
-        -cti=*|-kbl=*|-vt=*)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "${cur#*=}") )
+        -bt=* | -pt=* | -sbt=* | -bvt=* | -pvt=* | -sbvt=* | -bvtc=* | -pvtc=* | -sbvtc=* | \
+            -cti=* | -kbl=* | -vt=*)
+            COMPREPLY=($(compgen -W '0 1 2' -- "${cur#*=}"))
             return
             ;;
         -vtc=*)
-            COMPREPLY=( $(compgen -W '0 1' -- "${cur#*=}") )
+            COMPREPLY=($(compgen -W '0 1' -- "${cur#*=}"))
             return
             ;;
         -cab=*)
-            COMPREPLY=( $(compgen -W '0 1 2 3' -- "${cur#*=}") )
+            COMPREPLY=($(compgen -W '0 1 2 3' -- "${cur#*=}"))
             return
             ;;
         -*=)
@@ -44,12 +44,12 @@ _perltidy()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _filedir 'p[lm]|t'
     fi
 } &&
-complete -F _perltidy perltidy
+    complete -F _perltidy perltidy
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pgrep b/msys2/usr/share/bash-completion/completions/pgrep
index 1c507a421..62dbb6512 100644
--- a/msys2/usr/share/bash-completion/completions/pgrep
+++ b/msys2/usr/share/bash-completion/completions/pgrep
@@ -6,33 +6,43 @@ _pgrep()
     _init_completion || return
 
     case $prev in
-        --delimiter|--pgroup|--session|--terminal|-!(-*)[cdgJMNstTz])
+        --delimiter | --pgroup | --session | --terminal | -!(-*)[cdgJMNstTz])
             return
             ;;
         --signal)
             _signals
             return
             ;;
-        --pidfile|-!(-*)F)
+        --pidfile | -!(-*)F)
             _filedir
             return
             ;;
-        --group|-!(-*)G)
+        --group | -!(-*)G)
             _gids
             return
             ;;
         -j)
-            COMPREPLY=( $(compgen -W 'any none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any none' -- "$cur"))
             return
             ;;
-        --parent|-!(-*)P)
+        --parent | --ns | -!(-*)P)
             _pids
             return
             ;;
-        --euid|--uid|-!(-*)[uU])
+        --euid | --uid | -!(-*)[uU])
             _uids
             return
             ;;
+        --nslist)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=(
+                $(IFS="$IFS," compgen -W '$($1 --help 2>&1 |
+                    command sed -ne "s/^[[:space:]]*Available namespaces://p")' \
+                    -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
+            return
+            ;;
     esac
 
     if [[ $cur == -* ]]; then
@@ -40,13 +50,13 @@ _pgrep()
         [[ $help ]] || help='$("$1" --usage 2>&1 |
             command sed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//" |
             _parse_usage -)'
-        COMPREPLY=( $(compgen -W "$help" -- "$cur") )
+        COMPREPLY=($(compgen -W "$help" -- "$cur"))
         [[ $cword -eq 1 && $1 == *pkill ]] && _signals -
         return
     fi
 
     _pnames -s
 } &&
-complete -F _pgrep pgrep pkill
+    complete -F _pgrep pgrep pkill
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/phing b/msys2/usr/share/bash-completion/completions/phing
index ba141965d..197c0e96f 100644
--- a/msys2/usr/share/bash-completion/completions/phing
+++ b/msys2/usr/share/bash-completion/completions/phing
@@ -31,14 +31,14 @@ _ant()
     _init_completion || return
 
     case $prev in
-        -h|-help|--h|--help|-projecthelp|-p|-version|-diagnostics)
+        -h | -help | --h | --help | -projecthelp | -p | -version | -diagnostics)
             return
             ;;
-        -buildfile|-file|-f)
+        -buildfile | -file | -f)
             _filedir 'xml'
             return
             ;;
-        -logfile|-l)
+        -logfile | -l)
             [[ $1 != *phing || $prev != -l ]] && _filedir
             return
             ;;
@@ -47,37 +47,37 @@ _ant()
             return
             ;;
         -nice)
-            COMPREPLY=( $(compgen -W '{1..10}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..10}' -- "$cur"))
             return
             ;;
         -lib)
             _filedir -d
             return
             ;;
-        -logger|-listener|-inputhandler|-main|-find|-s)
+        -logger | -listener | -inputhandler | -main | -find | -s)
             return
             ;;
     esac
 
     if [[ $cur == -D* ]]; then
         return
-    elif [[ "$cur" == -* ]]; then
+    elif [[ $cur == -* ]]; then
         # The </dev/null prevents "phing -" weirdness/getting just a literal
         # tab displayed on complete on CentOS 6 with phing 2.6.1.
         COMPREPLY=(
-            $(compgen -W '$(_parse_help "$1" -h </dev/null)' -- "$cur") )
+            $(compgen -W '$(_parse_help "$1" -h </dev/null)' -- "$cur"))
     else
         # available targets completion
         # find which buildfile to use
         local buildfile=build.xml i
-        for (( i=1; i < cword; i++ )); do
-            if [[ "${words[i]}" == -@(?(build)file|f) ]]; then
-                buildfile=${words[i+1]}
+        for ((i = 1; i < cword; i++)); do
+            if [[ ${words[i]} == -@(?(build)file|f) ]]; then
+                buildfile=${words[i + 1]}
                 break
             fi
         done
-        if [[ $i -eq $cword ]]; then
-            for i in $ANT_ARGS; do
+        if ((i == cword)); then
+            for i in ${ANT_ARGS-}; do
                 if [[ $prev == -@(?(build)file|f) ]]; then
                     buildfile=$i
                     break
@@ -92,11 +92,11 @@ _ant()
         # fill targets
         _ant_parse_targets $buildfile
 
-        COMPREPLY=( $(compgen -W '$targets' -- "$cur") )
+        COMPREPLY=($(compgen -W '$targets' -- "$cur"))
     fi
 } &&
-complete -F _ant ant phing
-type complete-ant-cmd.pl &>/dev/null && \
+    complete -F _ant ant phing
+type complete-ant-cmd.pl &>/dev/null &&
     complete -C complete-ant-cmd.pl -F _ant ant || :
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pidof b/msys2/usr/share/bash-completion/completions/pidof
index 9e5c012b9..a11b43231 100644
--- a/msys2/usr/share/bash-completion/completions/pidof
+++ b/msys2/usr/share/bash-completion/completions/pidof
@@ -6,22 +6,22 @@ _pidof()
     _init_completion || return
 
     case $prev in
-        --help|-V|--version|-!(-*)[hV]*)
+        --help | -V | --version | -!(-*)[hV]*)
             return
             ;;
-        --omit-pid|-!(-*)o)
+        --omit-pid | -!(-*)o)
             _pids
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _pnames
 } &&
-complete -F _pidof pidof
+    complete -F _pidof pidof
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pigz b/msys2/usr/share/bash-completion/completions/pigz
index d3bce2821..0144c3a33 100644
--- a/msys2/usr/share/bash-completion/completions/pigz
+++ b/msys2/usr/share/bash-completion/completions/pigz
@@ -6,38 +6,38 @@ _gzip()
     _init_completion || return
 
     case $prev in
-        --blocksize|--suffix|--help|--version|-!(-*)[bShV])
+        --blocksize | --suffix | --help | --version | -!(-*)[bShV])
             return
             ;;
-        --processes|-!(-*)p)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --processes | -!(-*)p)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
     [[ ${1##*/} == pigz ]] && xspec="*.@([gz]z|t[ag]z)"
 
-    if [[ "$prev" == --* ]]; then
-        [[ "$prev" == --@(decompress|list|test) ]] && xspec="!"$xspec
-        [[ "$prev" == --force ]] && xspec=
-    elif [[ "$prev" == -* ]]; then
-        [[ "$prev" == -*[dlt]* ]] && xspec="!"$xspec
-        [[ "$prev" == -*f* ]] && xspec=
+    if [[ $prev == --* ]]; then
+        [[ $prev == --@(decompress|list|test) ]] && xspec="!"$xspec
+        [[ $prev == --force ]] && xspec=
+    elif [[ $prev == -* ]]; then
+        [[ $prev == -*[dlt]* ]] && xspec="!"$xspec
+        [[ $prev == -*f* ]] && xspec=
     fi
 
     _tilde "$cur" || return
 
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") \
-        $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur")
+    $(compgen -d -- "$cur"))
 } &&
-complete -F _gzip gzip pigz
+    complete -F _gzip gzip pigz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pine b/msys2/usr/share/bash-completion/completions/pine
index bf6056e00..319c8d5c7 100644
--- a/msys2/usr/share/bash-completion/completions/pine
+++ b/msys2/usr/share/bash-completion/completions/pine
@@ -6,27 +6,27 @@ _pine()
     _init_completion || return
 
     case $prev in
-        -help|-d|-f|-c|-I|-n|-url|-copy_pinerc|-copy_abook)
+        -help | -d | -f | -c | -I | -n | -url | -copy_pinerc | -copy_abook)
             return
             ;;
-        -attach|-attachlist|-attach_and_delete|-p|-P|-pinerc|-passfile|-x)
+        -attach | -attachlist | -attach_and_delete | -p | -P | -pinerc | -passfile | -x)
             _filedir
             return
             ;;
         -sort)
-            COMPREPLY=( $(compgen -W 'arrival subject threaded orderedsubject
-                date from size score to cc' -- "$cur") )
+            COMPREPLY=($(compgen -W 'arrival subject threaded orderedsubject
+                date from size score to cc' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W '$(awk "{print \$1}" ~/.addressbook \
-            2>/dev/null)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(awk "{print \$1}" ~/.addressbook \
+            2>/dev/null)' -- "$cur"))
     fi
 } &&
-complete -F _pine pine alpine
+    complete -F _pine pine alpine
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pinfo b/msys2/usr/share/bash-completion/completions/pinfo
index 87179ac88..f50f8424a 100644
--- a/msys2/usr/share/bash-completion/completions/pinfo
+++ b/msys2/usr/share/bash-completion/completions/pinfo
@@ -6,13 +6,13 @@ _info()
     _init_completion -s || return
 
     # default completion if parameter looks like a path
-    if [[ "$cur" == @(*/|[.~])* ]]; then
+    if [[ $cur == @(*/|[.~])* ]]; then
         _filedir
         return
     fi
 
     case $prev in
-        --apropos|--index-search|--node|--help|--version|-!(-*)[knhv])
+        --apropos | --index-search | --node | --help | --version | -!(-*)[knhv])
             return
             ;;
         -!(-*)d)
@@ -25,7 +25,7 @@ _info()
             _filedir -d
             return
             ;;
-        --dribble|--file|--output|--restore|--raw-filename|--rcfile|-!(-*)[for])
+        --dribble | --file | --output | --restore | --raw-filename | --rcfile | -!(-*)[for])
             _filedir
             return
             ;;
@@ -34,14 +34,14 @@ _info()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     local i infopath=/usr/share/info
 
-    if [[ $INFOPATH == *: ]]; then
+    if [[ ${INFOPATH-} == *: ]]; then
         infopath=${INFOPATH}${infopath}
     elif [[ ${INFOPATH:+set} ]]; then
         infopath=$INFOPATH
@@ -57,18 +57,18 @@ _info()
     fi
 
     # redirect stderr for when path doesn't exist
-    COMPREPLY=( $(eval command ls "$infopath" 2>/dev/null) )
+    COMPREPLY=($(eval command ls "$infopath" 2>/dev/null))
     # weed out directory path names and paths to info pages
-    COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
+    COMPREPLY=(${COMPREPLY[@]##*/?(:)})
     # weed out info dir file
-    for (( i=0 ; i < ${#COMPREPLY[@]} ; ++i )); do
-        [[ ${COMPREPLY[$i]} == dir ]] && unset "COMPREPLY[$i]"
+    for i in ${!COMPREPLY[*]}; do
+        [[ ${COMPREPLY[i]} == dir ]] && unset "COMPREPLY[i]"
     done
     # strip suffix from info pages
-    COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|xz|lzma)} )
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}") )
+    COMPREPLY=(${COMPREPLY[@]%.@(gz|bz2|xz|lzma)})
+    COMPREPLY=($(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}"))
 
 } &&
-complete -F _info info pinfo
+    complete -F _info info pinfo
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ping b/msys2/usr/share/bash-completion/completions/ping
index d611ae870..446f0267d 100644
--- a/msys2/usr/share/bash-completion/completions/ping
+++ b/msys2/usr/share/bash-completion/completions/ping
@@ -19,22 +19,22 @@ _ping()
             # Path MTU strategy in Linux, mask|time in FreeBSD
             local opts="do want dont"
             [[ $OSTYPE == *bsd* ]] && opts="mask time"
-            COMPREPLY=( $(compgen -W '$opts' -- "$cur") )
+            COMPREPLY=($(compgen -W '$opts' -- "$cur"))
             return
             ;;
         -*N)
             if [[ $cur != *= ]]; then
-                COMPREPLY=( $(compgen -W 'name ipv6 ipv6-global ipv6-sitelocal
+                COMPREPLY=($(compgen -W 'name ipv6 ipv6-global ipv6-sitelocal
                     ipv6-linklocal ipv6-all ipv4 ipv4-all subject-ipv6=
-                    subject-ipv4= subject-name= subject-fqdn=' -- "$cur") )
-                [[ $COMPREPLY == *= ]] && compopt -o nospace
+                    subject-ipv4= subject-name= subject-fqdn=' -- "$cur"))
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             fi
             return
             ;;
         -*Q)
             # TOS in Linux, "somewhat quiet" (no args) in FreeBSD
             if [[ $OSTYPE != *bsd* ]]; then
-                COMPREPLY=( $(compgen -W '{0..7}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
                 return
             fi
             ;;
@@ -45,8 +45,8 @@ _ping()
             ;;
         -*T)
             # Timestamp option in Linux, TTL in FreeBSD
-            [[ $OSTYPE == *bsd* ]] || \
-                COMPREPLY=( $(compgen -W 'tsonly tsandaddr' -- "$cur") )
+            [[ $OSTYPE == *bsd* ]] ||
+                COMPREPLY=($(compgen -W 'tsonly tsandaddr' -- "$cur"))
             return
             ;;
         -*4*)
@@ -59,13 +59,13 @@ _ping()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     [[ $1 == *6 ]] && ipvx=-6
-    _known_hosts_real $ipvx -- "$cur"
+    _known_hosts_real ${ipvx-} -- "$cur"
 } &&
-complete -F _ping ping ping6
+    complete -F _ping ping ping6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ping6 b/msys2/usr/share/bash-completion/completions/ping6
index d611ae870..446f0267d 100644
--- a/msys2/usr/share/bash-completion/completions/ping6
+++ b/msys2/usr/share/bash-completion/completions/ping6
@@ -19,22 +19,22 @@ _ping()
             # Path MTU strategy in Linux, mask|time in FreeBSD
             local opts="do want dont"
             [[ $OSTYPE == *bsd* ]] && opts="mask time"
-            COMPREPLY=( $(compgen -W '$opts' -- "$cur") )
+            COMPREPLY=($(compgen -W '$opts' -- "$cur"))
             return
             ;;
         -*N)
             if [[ $cur != *= ]]; then
-                COMPREPLY=( $(compgen -W 'name ipv6 ipv6-global ipv6-sitelocal
+                COMPREPLY=($(compgen -W 'name ipv6 ipv6-global ipv6-sitelocal
                     ipv6-linklocal ipv6-all ipv4 ipv4-all subject-ipv6=
-                    subject-ipv4= subject-name= subject-fqdn=' -- "$cur") )
-                [[ $COMPREPLY == *= ]] && compopt -o nospace
+                    subject-ipv4= subject-name= subject-fqdn=' -- "$cur"))
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             fi
             return
             ;;
         -*Q)
             # TOS in Linux, "somewhat quiet" (no args) in FreeBSD
             if [[ $OSTYPE != *bsd* ]]; then
-                COMPREPLY=( $(compgen -W '{0..7}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
                 return
             fi
             ;;
@@ -45,8 +45,8 @@ _ping()
             ;;
         -*T)
             # Timestamp option in Linux, TTL in FreeBSD
-            [[ $OSTYPE == *bsd* ]] || \
-                COMPREPLY=( $(compgen -W 'tsonly tsandaddr' -- "$cur") )
+            [[ $OSTYPE == *bsd* ]] ||
+                COMPREPLY=($(compgen -W 'tsonly tsandaddr' -- "$cur"))
             return
             ;;
         -*4*)
@@ -59,13 +59,13 @@ _ping()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     [[ $1 == *6 ]] && ipvx=-6
-    _known_hosts_real $ipvx -- "$cur"
+    _known_hosts_real ${ipvx-} -- "$cur"
 } &&
-complete -F _ping ping ping6
+    complete -F _ping ping ping6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkg-config b/msys2/usr/share/bash-completion/completions/pkg-config
index 571913706..b9db16733 100644
--- a/msys2/usr/share/bash-completion/completions/pkg-config
+++ b/msys2/usr/share/bash-completion/completions/pkg-config
@@ -6,24 +6,24 @@ _pkg_config()
     _init_completion -s || return
 
     case $prev in
-        --define-variable|--atleast-version|--atleast-pkgconfig-version| \
-        --exact-version|--max-version)
+        --define-variable | --atleast-version | --atleast-pkgconfig-version | \
+            --exact-version | --max-version)
             # argument required but no completions available
             return
             ;;
         --variable)
-            local i
-            for (( i=1; i < ${#words[@]}; i++ )); do
-                if [[ ${words[i]} != -* ]]; then
-                    COMPREPLY=( $(compgen -W \
-                        '$("$1" ${words[i]} --print-variables 2>/dev/null)' \
-                        -- "$cur") )
+            local word
+            for word in "${words[@]:1}"; do
+                if [[ $word != -* ]]; then
+                    COMPREPLY=($(compgen -W \
+                        '$("$1" $word --print-variables 2>/dev/null)' \
+                        -- "$cur"))
                     break
                 fi
             done
             return
             ;;
-        -\?|--help|--version|--usage)
+        -\? | --help | --version | --usage)
             # all other arguments are noop with these
             return
             ;;
@@ -31,15 +31,15 @@ _pkg_config()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        COMPREPLY=( $(compgen -W "$($1 --list-all \
-            2>/dev/null | awk '{print $1}')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$($1 --list-all \
+            2>/dev/null | awk '{print $1}')" -- "$cur"))
         _filedir pc
     fi
 } &&
-complete -F _pkg_config pkg-config
+    complete -F _pkg_config pkg-config
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkg-get b/msys2/usr/share/bash-completion/completions/pkg-get
index 2f2513389..72bd0a05e 100644
--- a/msys2/usr/share/bash-completion/completions/pkg-get
+++ b/msys2/usr/share/bash-completion/completions/pkg-get
@@ -15,7 +15,7 @@ _pkg_get_get_catalog_file()
     done
     conffile="${conffile:-/opt/csw/etc/pkg-get.conf}"
 
-    if [[ -z "$url" ]]; then
+    if [[ -z $url ]]; then
         url=$(awk -F= ' $1=="url" { print $2 }' $conffile)
     fi
 
@@ -25,48 +25,48 @@ _pkg_get_get_catalog_file()
 
     echo "$catalog_file"
 } &&
-_pkg_get()
-{
-    local cur prev file catalog_file url command
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    _pkg_get()
+    {
+        local cur prev file catalog_file url command
+        COMPREPLY=()
+        cur="${COMP_WORDS[COMP_CWORD]}"
+        prev="${COMP_WORDS[COMP_CWORD - 1]}"
 
-    if [[ "${prev}" == "-s" ]]; then
-        return 1
-    fi
-
-    local i=${#COMP_WORDS[*]}
-    while [[ $i -gt 0 ]]; do
-        if [[ "${COMP_WORDS[--i]}" == -s ]]; then
-            url="${COMP_WORDS[$((i+1))]}"
+        if [[ ${prev} == "-s" ]]; then
+            return 1
         fi
-        if [[ "${COMP_WORDS[$i]}" == @(-[aDdiUu]|available|describe|download|install|list|updatecatalog|upgrade) ]]; then
-            command="${COMP_WORDS[$i]}"
-        fi
-    done
 
-    if [[ -n "$command" ]]; then
-        if [[ "$command" == @(-[Ddi]|describe|download|install) ]]; then
-            catalog_file=$(_pkg_get_get_catalog_file "$url")
-            if [[ -f $catalog_file ]]; then
-                local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' $catalog_file)
-                COMPREPLY=( $(compgen -W "${packages_list}" -- ${cur}) )
+        local i=${#COMP_WORDS[*]}
+        while ((i > 0)); do
+            if [[ ${COMP_WORDS[--i]} == -s ]]; then
+                url="${COMP_WORDS[i + 1]}"
             fi
+            if [[ ${COMP_WORDS[i]} == @(-[aDdiUu]|available|describe|download|install|list|updatecatalog|upgrade) ]]; then
+                command="${COMP_WORDS[i]}"
+            fi
+        done
+
+        if [[ -v command ]]; then
+            if [[ $command == @(-[Ddi]|describe|download|install) ]]; then
+                catalog_file=$(_pkg_get_get_catalog_file "$url")
+                if [[ -f $catalog_file ]]; then
+                    local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' $catalog_file)
+                    COMPREPLY=($(compgen -W "${packages_list}" -- ${cur}))
+                fi
+            fi
+            return
         fi
-        return
-    fi
 
-    if [[ ${cur} == -* ]]; then
-        local opts="-c -d -D -f -i -l -s -S -u -U -v"
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return
-    fi
+        if [[ ${cur} == -* ]]; then
+            local opts="-c -d -D -f -i -l -s -S -u -U -v"
+            COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            return
+        fi
 
-    local commands="available describe download install list \
+        local commands="available describe download install list \
         updatecatalog upgrade"
-    COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) )
-} &&
-complete -F _pkg_get pkg-get
+        COMPREPLY=($(compgen -W "${commands}" -- ${cur}))
+    } &&
+        complete -F _pkg_get pkg-get
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkg_deinstall b/msys2/usr/share/bash-completion/completions/pkg_deinstall
index 942647d0b..2abb6714b 100644
--- a/msys2/usr/share/bash-completion/completions/pkg_deinstall
+++ b/msys2/usr/share/bash-completion/completions/pkg_deinstall
@@ -7,12 +7,12 @@ _pkg_delete()
 
     local pkgdir=${PKG_DBDIR:-/var/db/pkg}/
 
-    [[ "$prev" == -o || "$prev" == -p || "$prev" == -W ]] && return
+    [[ $prev == -o || $prev == -p || $prev == -W ]] && return
 
-    COMPREPLY=( $(compgen -d -- "$pkgdir$cur") )
-    COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
+    COMPREPLY=($(compgen -d -- "$pkgdir$cur"))
+    ((${#COMPREPLY[@]} == 0)) || COMPREPLY=(${COMPREPLY[@]#$pkgdir})
 
 } &&
-complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
+    complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkg_delete b/msys2/usr/share/bash-completion/completions/pkg_delete
index 942647d0b..2abb6714b 100644
--- a/msys2/usr/share/bash-completion/completions/pkg_delete
+++ b/msys2/usr/share/bash-completion/completions/pkg_delete
@@ -7,12 +7,12 @@ _pkg_delete()
 
     local pkgdir=${PKG_DBDIR:-/var/db/pkg}/
 
-    [[ "$prev" == -o || "$prev" == -p || "$prev" == -W ]] && return
+    [[ $prev == -o || $prev == -p || $prev == -W ]] && return
 
-    COMPREPLY=( $(compgen -d -- "$pkgdir$cur") )
-    COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
+    COMPREPLY=($(compgen -d -- "$pkgdir$cur"))
+    ((${#COMPREPLY[@]} == 0)) || COMPREPLY=(${COMPREPLY[@]#$pkgdir})
 
 } &&
-complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
+    complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkg_info b/msys2/usr/share/bash-completion/completions/pkg_info
index 942647d0b..2abb6714b 100644
--- a/msys2/usr/share/bash-completion/completions/pkg_info
+++ b/msys2/usr/share/bash-completion/completions/pkg_info
@@ -7,12 +7,12 @@ _pkg_delete()
 
     local pkgdir=${PKG_DBDIR:-/var/db/pkg}/
 
-    [[ "$prev" == -o || "$prev" == -p || "$prev" == -W ]] && return
+    [[ $prev == -o || $prev == -p || $prev == -W ]] && return
 
-    COMPREPLY=( $(compgen -d -- "$pkgdir$cur") )
-    COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
+    COMPREPLY=($(compgen -d -- "$pkgdir$cur"))
+    ((${#COMPREPLY[@]} == 0)) || COMPREPLY=(${COMPREPLY[@]#$pkgdir})
 
 } &&
-complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
+    complete -F _pkg_delete -o dirnames pkg_delete pkg_info pkg_deinstall
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkgadd b/msys2/usr/share/bash-completion/completions/pkgadd
index 576b4114c..3f5b6a11e 100644
--- a/msys2/usr/share/bash-completion/completions/pkgadd
+++ b/msys2/usr/share/bash-completion/completions/pkgadd
@@ -2,7 +2,7 @@
 #
 # Copyright 2006 Yann Rouillard <yann@opencsw.org>
 
-_pkgadd ()
+_pkgadd()
 {
     local cur prev words cword
     _init_completion -n : || return
@@ -12,10 +12,10 @@ _pkgadd ()
     # available in this directory
     local device=/var/spool/pkg
     local i=$cword
-    while [[ $((i--)) -gt 0 ]]; do
-        case "${words[$i]}" in
+    while ((i-- > 0)); do
+        case "${words[i]}" in
             -d)
-                device="${words[$((i+1))]}"
+                device="${words[i + 1]}"
                 break
                 ;;
         esac
@@ -26,35 +26,37 @@ _pkgadd ()
             _filedir pkg
             _filedir -d
             ;;
-        -a|-r|-V)
+        -a | -r | -V)
             _filedir
             ;;
-        -k|-s|-R)
+        -k | -s | -R)
             _filedir -d
             ;;
-        -P|-k|-x)
-            ;;
+        -P | -x) ;;
+
         *)
             if [[ ${cur} == -* ]]; then
                 local opts="-a -A -d -k -n -M -P -r -R -s -v -V -x"
-                COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+                COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
             else
                 local pkginst_list
                 if [[ -d $device ]]; then
+                    local -a tmplist
                     for filedir in $(/bin/ls -1 $device); do
                         if [[ -d "$device/$filedir" ]] && [[ -f "$device/$filedir/pkginfo" ]]; then
-                            pkginst_list+=( ${pkginst_list[@]:-} "$filedir" )
+                            tmplist+=(${tmplist[@]:-} "$filedir")
                         fi
                     done
-                        pkginst_list="${pkginst_list[@]}"
+                    pkginst_list="${tmplist[*]}"
                 else
-                    pkginst_list=$(strings $(dequote $device) | \
-                        command grep "^PKG=" | sort -u | cut -d= -f2)
+                    pkginst_list="$(strings "$(dequote $device)" |
+                        command grep ^PKG= | sort -u | cut -d= -f2)"
+                fi
+                COMPREPLY=($(compgen -W "$pkginst_list" -- ${cur}))
             fi
-            COMPREPLY=( $(compgen -W "$pkginst_list" -- ${cur}) )
-        fi
+            ;;
     esac
 } &&
-complete -F _pkgadd pkgadd
+    complete -F _pkgadd pkgadd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkgrm b/msys2/usr/share/bash-completion/completions/pkgrm
index ef3b2a8d1..2449d3497 100644
--- a/msys2/usr/share/bash-completion/completions/pkgrm
+++ b/msys2/usr/share/bash-completion/completions/pkgrm
@@ -2,7 +2,7 @@
 #
 # Copyright 2006 Yann Rouillard <yann@opencsw.org>
 
-_pkgrm ()
+_pkgrm()
 {
     local cur prev words cword
     _init_completion || return
@@ -12,13 +12,13 @@ _pkgrm ()
     # available in this directory
     local spool=/var/sadm/pkg
     local i=$cword
-    while [[ $((i--)) -gt 0 ]]; do
-        (( i-- ))
-        case "${words[$i]}" in
+    while ((i-- > 0)); do
+        ((i--))
+        case "${words[i]}" in
             -s)
-                spool="${words[$((i+1))]}"
+                spool="${words[i + 1]}"
                 break
-            ;;
+                ;;
         esac
     done
 
@@ -29,8 +29,8 @@ _pkgrm ()
         -s | -R)
             _filedir -d
             ;;
-        -Y)
-            ;;
+        -Y) ;;
+
         *)
             if [[ ${cur} == -* ]]; then
                 local opts="-a -A -n -M -R -s -v -V -Y"
@@ -38,9 +38,9 @@ _pkgrm ()
             else
                 COMPREPLY=($(compgen -W "$(/bin/ls -1 $spool)" -- ${cur}))
             fi
-        ;;
+            ;;
     esac
 } &&
-complete -F _pkgrm pkgrm
+    complete -F _pkgrm pkgrm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkgtool b/msys2/usr/share/bash-completion/completions/pkgtool
index 8bea9cdde..951bae40b 100644
--- a/msys2/usr/share/bash-completion/completions/pkgtool
+++ b/msys2/usr/share/bash-completion/completions/pkgtool
@@ -6,7 +6,7 @@ _pkgtool()
     _init_completion || return
 
     case "$prev" in
-        --source_dir|--target_dir)
+        --source_dir | --target_dir)
             _filedir -d
             return
             ;;
@@ -15,7 +15,7 @@ _pkgtool()
             return
             ;;
         --source_device)
-            COMPREPLY=( $(compgen -f -d -- "${cur:-/dev/}") )
+            COMPREPLY=($(compgen -f -d -- "${cur:-/dev/}"))
             return
             ;;
         --tagfile)
@@ -24,12 +24,12 @@ _pkgtool()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--sets --ignore-tagfiles --tagfile
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--sets --ignore-tagfiles --tagfile
             --source-mounted --source_dir --target_dir --source_device' \
-            -- "$cur") )
+            -- "$cur"))
     fi
 } &&
-complete -F _pkgtool pkgtool
+    complete -F _pkgtool pkgtool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkgutil b/msys2/usr/share/bash-completion/completions/pkgutil
index febc21357..91d874804 100644
--- a/msys2/usr/share/bash-completion/completions/pkgutil
+++ b/msys2/usr/share/bash-completion/completions/pkgutil
@@ -22,74 +22,74 @@ _pkgutil()
     declare -a catalog_files=()
 
     local i=$cword
-    while [[ $((i--)) -gt 1 ]]; do
-        if [[ "${words[$i]}" == -@(t|-temp) ]]; then
-            local url="${words[$((i+1))]}"
+    while ((i-- > 1)); do
+        if [[ ${words[i]} == -@(t|-temp) ]]; then
+            local url="${words[i + 1]}"
             local catalog=$(_pkgutil_url2catalog "$url")
             catalog_files=("$catalog")
-        elif [[ "${words[$i]}" == --config ]]; then
-            configuration_files=( "$(dequote ${words[$((i+1))]})" )
-        elif [[ "${words[$i]}" == -@([iurdacUS]|-install|-upgrade|-remove|-download|-available|-compare|-catalog|-stream) ]]; then
-            command="${words[$i]}"
+        elif [[ ${words[i]} == --config ]]; then
+            configuration_files=("$(dequote ${words[i + 1]})")
+        elif [[ ${words[i]} == -@([iurdacUS]|-install|-upgrade|-remove|-download|-available|-compare|-catalog|-stream) ]]; then
+            command="${words[i]}"
         fi
     done
 
-    if [[ "$prev" == -@([WPR]|-workdir|-pkgdir|-rootpath) ]]; then
+    if [[ $prev == -@([WPR]|-workdir|-pkgdir|-rootpath) ]]; then
         _filedir -d
         return
     fi
 
-    if [[ "$prev" == -@(o|-output|-config) ]]; then
+    if [[ $prev == -@(o|-output|-config) ]]; then
         _filedir
         return
     fi
 
-    if [[ "$prev" == -@(p|-param) ]]; then
+    if [[ $prev == -@(p|-param) ]]; then
         compopt -o nospace
-        COMPREPLY=( $(compgen -W "mirror: pkgaddopts: pkgrmopts: wgetopts: use_gpg: use_md5: pkgliststyle: maxpkglist: noncsw: stop_on_hook_soft_error: exclude_pattern: gpg_homedir: root_path: deptree_filter_common: show_current: catalog_not_cached: catalog_update:" -- $cur) )
+        COMPREPLY=($(compgen -W "mirror: pkgaddopts: pkgrmopts: wgetopts: use_gpg: use_md5: pkgliststyle: maxpkglist: noncsw: stop_on_hook_soft_error: exclude_pattern: gpg_homedir: root_path: deptree_filter_common: show_current: catalog_not_cached: catalog_update:" -- $cur))
         return
     fi
 
-    if [[ "$prev" == @(-T|--target) ]]; then
+    if [[ $prev == @(-T|--target) ]]; then
         # Work-around bash_completion issue where bash interprets a colon
         # as a separator, borrowed from maven completion code which borrowed
         # it from darcs completion code :)
         local colonprefixes=${cur%"${cur##*:}"}
-        COMPREPLY=( $(compgen -W "sparc:5.9 sparc:5.10 sparc:5.11 i386:5.9 i386:5.10 i386:5.11" -- $cur) )
+        COMPREPLY=($(compgen -W "sparc:5.9 sparc:5.10 sparc:5.11 i386:5.9 i386:5.10 i386:5.11" -- $cur))
         local i=${#COMPREPLY[*]}
-        while [ $((--i)) -ge 0 ]; do
-            COMPREPLY[$i]=${COMPREPLY[$i]#"$colonprefixes"}
+        while ((i-- > 0)); do
+            COMPREPLY[i]=${COMPREPLY[i]#"$colonprefixes"}
         done
         return
     fi
 
-    if [[ -n "$command" ]] && [[ ! "$cur" == -* ]]; then
+    if [[ -v command && $cur != -* ]]; then
 
         local mirrors mirror_url
         mirrors=$(awk -F= ' $1 ~ /^ *mirror *$/ { print $2 }' "${configuration_files[@]}")
         mirrors=${mirrors:-http://mirror.opencsw.org/opencsw/testing}
         for mirror_url in $mirrors; do
             local catalog=$(_pkgutil_url2catalog "$mirror_url")
-            catalog_files=( "${catalog_files[@]}" "$catalog" )
+            catalog_files=("${catalog_files[@]}" "$catalog")
         done
 
-        if [[ "$command" == -@([dius]|-download|-install|-upgrade|-stream) ]]; then
+        if [[ $command == -@([dius]|-download|-install|-upgrade|-stream) ]]; then
             local packages_list=$(awk ' $0 ~ /BEGIN PGP SIGNATURE/ { exit } $1 ~ /^Hash:/ || $1 ~ /^ *(-|#|$)/ { next } { print $1 }' "${catalog_files[@]}")
-            COMPREPLY=( $(compgen -W "${packages_list}" -- $cur) )
+            COMPREPLY=($(compgen -W "${packages_list}" -- $cur))
 
-        elif [[ "$command" == @(-r|--remove) ]]; then
-                local packages_list=$(pkginfo | awk ' $2 ~ /^CSW/ { printf ("%s|",$2) }')
+        elif [[ $command == @(-r|--remove) ]]; then
+            local packages_list=$(pkginfo | awk ' $2 ~ /^CSW/ { printf ("%s|",$2) }')
             packages_list=${packages_list%|}
             packages_list=$(nawk " \$3 ~ /^$packages_list\$/ { print \$1 }" "${catalog_files[@]}")
-            COMPREPLY=( $(compgen -W "${packages_list}" -- $cur) )
+            COMPREPLY=($(compgen -W "${packages_list}" -- $cur))
         fi
         return
     fi
 
     local commands="-i --install -u --upgrade -r --remove -d --download -U --catalog -a --available --describe -c --compare -C --compare-diff -A --compare-avail -e --email -t --temp -x --exclude -W --workdir -P --pkgdir -R --rootpath --config -y --yes -f --force -n --nomod -N --nodeps -D --debug --trace -h --help -v --version -V --syscheck -l --list -L --listfile -F --findfile --deptree --extract -s --stream -o --output -T --target --single -p --param --parse --cleanup --catinfo"
-    COMPREPLY=( $(compgen -W "${commands}" -- $cur) )
+    COMPREPLY=($(compgen -W "${commands}" -- $cur))
 
 } &&
-complete -F _pkgutil pkgutil
+    complete -F _pkgutil pkgutil
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pkill b/msys2/usr/share/bash-completion/completions/pkill
index 1c507a421..62dbb6512 100644
--- a/msys2/usr/share/bash-completion/completions/pkill
+++ b/msys2/usr/share/bash-completion/completions/pkill
@@ -6,33 +6,43 @@ _pgrep()
     _init_completion || return
 
     case $prev in
-        --delimiter|--pgroup|--session|--terminal|-!(-*)[cdgJMNstTz])
+        --delimiter | --pgroup | --session | --terminal | -!(-*)[cdgJMNstTz])
             return
             ;;
         --signal)
             _signals
             return
             ;;
-        --pidfile|-!(-*)F)
+        --pidfile | -!(-*)F)
             _filedir
             return
             ;;
-        --group|-!(-*)G)
+        --group | -!(-*)G)
             _gids
             return
             ;;
         -j)
-            COMPREPLY=( $(compgen -W 'any none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any none' -- "$cur"))
             return
             ;;
-        --parent|-!(-*)P)
+        --parent | --ns | -!(-*)P)
             _pids
             return
             ;;
-        --euid|--uid|-!(-*)[uU])
+        --euid | --uid | -!(-*)[uU])
             _uids
             return
             ;;
+        --nslist)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=(
+                $(IFS="$IFS," compgen -W '$($1 --help 2>&1 |
+                    command sed -ne "s/^[[:space:]]*Available namespaces://p")' \
+                    -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
+            return
+            ;;
     esac
 
     if [[ $cur == -* ]]; then
@@ -40,13 +50,13 @@ _pgrep()
         [[ $help ]] || help='$("$1" --usage 2>&1 |
             command sed -e "s/\[-signal\]//" -e "s/\[-SIGNAL\]//" |
             _parse_usage -)'
-        COMPREPLY=( $(compgen -W "$help" -- "$cur") )
+        COMPREPLY=($(compgen -W "$help" -- "$cur"))
         [[ $cword -eq 1 && $1 == *pkill ]] && _signals -
         return
     fi
 
     _pnames -s
 } &&
-complete -F _pgrep pgrep pkill
+    complete -F _pgrep pgrep pkill
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/plague-client b/msys2/usr/share/bash-completion/completions/plague-client
index d8b2140e3..4e9820631 100644
--- a/msys2/usr/share/bash-completion/completions/plague-client
+++ b/msys2/usr/share/bash-completion/completions/plague-client
@@ -5,10 +5,10 @@ _plague_client()
     local cur prev words cword
     _init_completion || return
 
-    [[ $cword -eq 1 ]] && \
-        COMPREPLY=( $(compgen -W 'build detail finish help is_paused kill list
-            list_builders pause requeue unpause update_builders' -- "$cur") )
+    ((cword == 1)) &&
+        COMPREPLY=($(compgen -W 'build detail finish help is_paused kill list
+            list_builders pause requeue unpause update_builders' -- "$cur"))
 } &&
-complete -F _plague_client plague-client
+    complete -F _plague_client plague-client
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/plzip b/msys2/usr/share/bash-completion/completions/plzip
index 0f95722cf..05f169c96 100644
--- a/msys2/usr/share/bash-completion/completions/plzip
+++ b/msys2/usr/share/bash-completion/completions/plzip
@@ -8,15 +8,15 @@ _lzip()
     local decompress=false
 
     case $prev in
-        --help|--version|--member-size|--match-length|--dictionary-size|\
-        --volume-size|--data-size|-!(-*)@([bmsSB]|[hV]*))
+        --help | --version | --member-size | --match-length | --dictionary-size | \
+            --volume-size | --data-size | -!(-*)@([bmsSB]|[hV]*))
             return
             ;;
         --decompress-!(-*)d)
             decompress=true
             ;;
         --threads-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --output-!(-*)o)
@@ -27,9 +27,9 @@ _lzip()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -40,8 +40,8 @@ _lzip()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "*.lz" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _lzip clzip lzip pdlzip plzip
+    complete -F _lzip clzip lzip pdlzip plzip
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pm-hibernate b/msys2/usr/share/bash-completion/completions/pm-hibernate
index 1deadd11d..ea3b0aa74 100644
--- a/msys2/usr/share/bash-completion/completions/pm-hibernate
+++ b/msys2/usr/share/bash-completion/completions/pm-hibernate
@@ -5,8 +5,8 @@ _pm_action()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W "--help $(_parse_help "$1")" -- "$cur") )
+    COMPREPLY=($(compgen -W "--help $(_parse_help "$1")" -- "$cur"))
 } &&
-complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
+    complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pm-is-supported b/msys2/usr/share/bash-completion/completions/pm-is-supported
index 6a112aeb4..adc7fde75 100644
--- a/msys2/usr/share/bash-completion/completions/pm-is-supported
+++ b/msys2/usr/share/bash-completion/completions/pm-is-supported
@@ -5,9 +5,9 @@ _pm_is_supported()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W '--help --suspend --hibernate --suspend-hybrid' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W '--help --suspend --hibernate --suspend-hybrid' \
+        -- "$cur"))
 } &&
-complete -F _pm_is_supported pm-is-supported
+    complete -F _pm_is_supported pm-is-supported
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pm-powersave b/msys2/usr/share/bash-completion/completions/pm-powersave
index 06f93de0b..affb195d8 100644
--- a/msys2/usr/share/bash-completion/completions/pm-powersave
+++ b/msys2/usr/share/bash-completion/completions/pm-powersave
@@ -5,8 +5,8 @@ _pm_powersave()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W "true false" -- "$cur") )
+    COMPREPLY=($(compgen -W "true false" -- "$cur"))
 } &&
-complete -F _pm_powersave pm-powersave
+    complete -F _pm_powersave pm-powersave
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pm-suspend b/msys2/usr/share/bash-completion/completions/pm-suspend
index 1deadd11d..ea3b0aa74 100644
--- a/msys2/usr/share/bash-completion/completions/pm-suspend
+++ b/msys2/usr/share/bash-completion/completions/pm-suspend
@@ -5,8 +5,8 @@ _pm_action()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W "--help $(_parse_help "$1")" -- "$cur") )
+    COMPREPLY=($(compgen -W "--help $(_parse_help "$1")" -- "$cur"))
 } &&
-complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
+    complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pm-suspend-hybrid b/msys2/usr/share/bash-completion/completions/pm-suspend-hybrid
index 1deadd11d..ea3b0aa74 100644
--- a/msys2/usr/share/bash-completion/completions/pm-suspend-hybrid
+++ b/msys2/usr/share/bash-completion/completions/pm-suspend-hybrid
@@ -5,8 +5,8 @@ _pm_action()
     local cur prev words cword
     _init_completion || return
 
-    COMPREPLY=( $(compgen -W "--help $(_parse_help "$1")" -- "$cur") )
+    COMPREPLY=($(compgen -W "--help $(_parse_help "$1")" -- "$cur"))
 } &&
-complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
+    complete -F _pm_action pm-hibernate pm-suspend pm-suspend-hybrid
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pmake b/msys2/usr/share/bash-completion/completions/pmake
index f119dcc3d..96517c217 100644
--- a/msys2/usr/share/bash-completion/completions/pmake
+++ b/msys2/usr/share/bash-completion/completions/pmake
@@ -8,7 +8,7 @@ _make_target_extract_script()
     local prefix="$1"
     local prefix_pat=$(command sed 's/[][\,.*^$(){}?+|/]/\\&/g' <<<"$prefix")
     local basename=${prefix##*/}
-    local dirname_len=$(( ${#prefix} - ${#basename} ))
+    local dirname_len=$((${#prefix} - ${#basename}))
 
     if [[ $mode == -d ]]; then
         # display mode, only output current path component to the next slash
@@ -67,8 +67,8 @@ _make_target_extract_script()
 EOF
 
     # don't complete with hidden targets unless we are doing a partial completion
-    if [[ -z "${prefix_pat}" || "${prefix_pat}" = */ ]]; then
-      cat <<EOF
+    if [[ -z ${prefix_pat} || ${prefix_pat} == */ ]]; then
+        cat <<EOF
       /^${prefix_pat}[^a-zA-Z0-9]/d;            # convention for hidden tgt
 EOF
     fi
@@ -86,37 +86,37 @@ _make()
     local cur prev words cword split
     _init_completion -s || return
 
-    local file makef makef_dir=( "-C" "." ) makef_inc i
+    local makef makef_dir=("-C" ".") i
 
     case $prev in
-        --file|--makefile|--old-file|--assume-old|--what-if| --new-file|\
-        --assume-new|-!(-*)[foW])
+        --file | --makefile | --old-file | --assume-old | --what-if | --new-file | \
+            --assume-new | -!(-*)[foW])
             _filedir
             return
             ;;
-        --include-dir|--directory|-!(-*)[ICm])
+        --include-dir | --directory | -!(-*)[ICm])
             _filedir -d
             return
             ;;
         -!(-*)E)
-            COMPREPLY=( $(compgen -v -- "$cur") )
+            COMPREPLY=($(compgen -v -- "$cur"))
             return
             ;;
-        --eval|-!(-*)[DVx])
+        --eval | -!(-*)[DVx])
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(( $(_ncpus)*2 ))}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(($(_ncpus) * 2))}" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     elif [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
@@ -126,20 +126,20 @@ _make()
     else
         # before we check for makefiles, see if a path was specified
         # with -C/--directory
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(C|-directory) ]]; then
                 # eval for tilde expansion
-                eval "makef_dir=( -C \"${words[i+1]}\" )"
+                eval "makef_dir=( -C \"${words[i + 1]}\" )"
                 break
             fi
         done
 
         # before we scan for targets, see if a Makefile name was
         # specified with -f/--file/--makefile
-        for (( i=0; i < ${#words[@]}; i++ )); do
+        for ((i = 1; i < ${#words[@]}; i++)); do
             if [[ ${words[i]} == -@(f|-?(make)file) ]]; then
                 # eval for tilde expansion
-                eval "makef=( -f \"${words[i+1]}\" )"
+                eval "makef=( -f \"${words[i + 1]}\" )"
                 break
             fi
         done
@@ -147,24 +147,24 @@ _make()
         # recognise that possible completions are only going to be displayed
         # so only the base name is shown
         local mode=--
-        if (( COMP_TYPE != 9 )); then
+        if ((COMP_TYPE != 9)); then
             mode=-d # display-only mode
         fi
 
         local IFS=$' \t\n' script=$(_make_target_extract_script $mode "$cur")
-        COMPREPLY=( $(LC_ALL=C \
+        COMPREPLY=($(LC_ALL=C \
             $1 -npq __BASH_MAKE_COMPLETION__=1 \
-                "${makef[@]}" "${makef_dir[@]}" .DEFAULT 2>/dev/null | \
-            command sed -ne "$script") )
+            ${makef+"${makef[@]}"} "${makef_dir[@]}" .DEFAULT 2>/dev/null |
+            command sed -ne "$script"))
 
         if [[ $mode != -d ]]; then
             # Completion will occur if there is only one suggestion
             # so set options for completion based on the first one
-            [[ $COMPREPLY == */ ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
         fi
 
     fi
 } &&
-complete -F _make make gmake gnumake pmake colormake
+    complete -F _make make gmake gnumake pmake colormake bmake
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pngfix b/msys2/usr/share/bash-completion/completions/pngfix
index b4b58e830..64b5481dd 100644
--- a/msys2/usr/share/bash-completion/completions/pngfix
+++ b/msys2/usr/share/bash-completion/completions/pngfix
@@ -6,7 +6,7 @@ _pngfix()
     _init_completion -s || return
 
     case $prev in
-        --suffix|--prefix)
+        --suffix | --prefix)
             return
             ;;
         --output)
@@ -14,9 +14,9 @@ _pngfix()
             return
             ;;
         --strip)
-            COMPREPLY=( $(IFS='|' compgen -W '$("$1" --help 2>&1 |
+            COMPREPLY=($(IFS='|' compgen -W '$("$1" --help 2>&1 |
                 command sed -ne "s/.*--strip=\[\([^]]*\)\].*/\1/p")' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -24,13 +24,13 @@ _pngfix()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir png
 } &&
-complete -F _pngfix pngfix
+    complete -F _pngfix pngfix
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/portinstall b/msys2/usr/share/bash-completion/completions/portinstall
index 8a70b136f..803374071 100644
--- a/msys2/usr/share/bash-completion/completions/portinstall
+++ b/msys2/usr/share/bash-completion/completions/portinstall
@@ -13,19 +13,19 @@ _portinstall()
     # First try INDEX-5
     indexfile=$portsdir/INDEX-5
     # Then INDEX if INDEX-5 does not exist or system is not FreeBSD 5.x
-    [[ "${OSTYPE%.*}" == freebsd5 && -f $indexfile ]] ||
+    [[ ${OSTYPE%.*} == freebsd5 && -f $indexfile ]] ||
         indexfile=$portsdir/INDEX
 
-    [[ "$prev" == -l || "$prev" == -L || "$prev" == -o ]] && return
+    [[ $prev == -l || $prev == -L || $prev == -o ]] && return
 
-    COMPREPLY=( $(command grep -E "^$cur" 2>/dev/null <$indexfile | \
-        cut -d'|' -f1) )
-    COMPREPLY2=( $(command grep -E "^[^\|]+\|$portsdir$cur" 2>/dev/null \
-        <$indexfile | cut -d'|' -f2) )
-    COMPREPLY2=( ${COMPREPLY2[@]#$portsdir} )
-    COMPREPLY+=( "${COMPREPLY2[@]}" )
+    COMPREPLY=($(command grep -E "^$cur" 2>/dev/null <$indexfile |
+        cut -d'|' -f1))
+    COMPREPLY2=($(command grep -E "^[^\|]+\|$portsdir$cur" 2>/dev/null \
+        <$indexfile | cut -d'|' -f2))
+    COMPREPLY2=(${COMPREPLY2[@]#$portsdir})
+    COMPREPLY+=("${COMPREPLY2[@]}")
 
 } &&
-complete -F _portinstall -o dirnames portinstall
+    complete -F _portinstall -o dirnames portinstall
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/portsnap b/msys2/usr/share/bash-completion/completions/portsnap
index f865183b6..a2f0a936a 100644
--- a/msys2/usr/share/bash-completion/completions/portsnap
+++ b/msys2/usr/share/bash-completion/completions/portsnap
@@ -8,18 +8,18 @@ _portsnap()
     _init_completion || return
 
     case $prev in
-        -d|-p)
+        -d | -p)
             _filedir -d
             return
             ;;
-        -l|-f)
+        -l | -f)
             _filedir
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W "fetch cron extract update" -- $cur) )
+    COMPREPLY=($(compgen -W "fetch cron extract update" -- $cur))
 } &&
-complete -F _portsnap  portsnap
+    complete -F _portsnap portsnap
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/portupgrade b/msys2/usr/share/bash-completion/completions/portupgrade
index 425380775..ffe63056a 100644
--- a/msys2/usr/share/bash-completion/completions/portupgrade
+++ b/msys2/usr/share/bash-completion/completions/portupgrade
@@ -5,15 +5,15 @@ _portupgrade()
     local cur prev words cword
     _init_completion || return
 
-    [[ "$prev" == -l || "$prev" == -L || "$prev" == -o ]] && return
+    [[ $prev == -l || $prev == -L || $prev == -o ]] && return
 
     local pkgdir=${PKG_DBDIR:-/var/db/pkg}/
 
-    COMPREPLY=( $(compgen -d -- "$pkgdir$cur") )
-    COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
-    COMPREPLY=( ${COMPREPLY[@]%-*} )
+    COMPREPLY=($(compgen -d -- "$pkgdir$cur"))
+    COMPREPLY=(${COMPREPLY[@]#$pkgdir})
+    COMPREPLY=(${COMPREPLY[@]%-*})
 
 } &&
-complete -F _portupgrade -o dirnames portupgrade
+    complete -F _portupgrade -o dirnames portupgrade
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postalias b/msys2/usr/share/bash-completion/completions/postalias
index 66756c1e6..35c4ada15 100644
--- a/msys2/usr/share/bash-completion/completions/postalias
+++ b/msys2/usr/share/bash-completion/completions/postalias
@@ -16,26 +16,26 @@ _postmap()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         compopt -o filenames
-        COMPREPLY=( $(compgen -f -- "${cur#*:}") )
+        COMPREPLY=($(compgen -f -- "${cur#*:}"))
     else
         local len=${#cur} pval
         for pval in $(/usr/sbin/postconf -m 2>/dev/null); do
-            if [[ "$cur" == "${pval:0:$len}" ]]; then
-                COMPREPLY+=( "$pval:" )
+            if [[ $cur == "${pval:0:len}" ]]; then
+                COMPREPLY+=("$pval:")
             fi
         done
-        if [[ ! $COMPREPLY ]]; then
+        if [[ ! ${COMPREPLY-} ]]; then
             compopt -o filenames
-            COMPREPLY=( $(compgen -f -- "$cur") )
+            COMPREPLY=($(compgen -f -- "$cur"))
         fi
     fi
 } &&
-complete -F _postmap postmap postalias
+    complete -F _postmap postmap postalias
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postcat b/msys2/usr/share/bash-completion/completions/postcat
index 22006233e..a58b0e578 100644
--- a/msys2/usr/share/bash-completion/completions/postcat
+++ b/msys2/usr/share/bash-completion/completions/postcat
@@ -13,20 +13,20 @@ _postcat()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     local idx qfile=0
     for idx in "${words[@]}"; do
-        [[ "$idx" == -q ]] && qfile=1 && break
+        [[ $idx == -q ]] && qfile=1 && break
     done
-    if [[ $qfile -eq 1 ]]; then
+    if ((qfile == 1)); then
         local len=${#cur} pval
-        for pval in $(mailq 2>/dev/null | \
+        for pval in $(mailq 2>/dev/null |
             command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//'); do
-            if [[ "$cur" == "${pval:0:$len}" ]]; then
-                COMPREPLY+=( $pval )
+            if [[ $cur == "${pval:0:len}" ]]; then
+                COMPREPLY+=($pval)
             fi
         done
         return
@@ -34,6 +34,6 @@ _postcat()
 
     _filedir
 } &&
-complete -F _postcat postcat
+    complete -F _postcat postcat
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postconf b/msys2/usr/share/bash-completion/completions/postconf
index 45b376bec..4cb324c12 100644
--- a/msys2/usr/share/bash-completion/completions/postconf
+++ b/msys2/usr/share/bash-completion/completions/postconf
@@ -8,7 +8,7 @@ _postconf()
     local eqext
 
     case $prev in
-        -b|-t)
+        -b | -t)
             _filedir
             return
             ;;
@@ -23,17 +23,17 @@ _postconf()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     local len=${#cur} pval
     for pval in $(/usr/sbin/postconf 2>/dev/null | cut -d ' ' -f 1); do
-        if [[ "$cur" == "${pval:0:$len}" ]]; then
-            COMPREPLY+=( "$pval$eqext" )
+        if [[ $cur == "${pval:0:len}" ]]; then
+            COMPREPLY+=("$pval${eqext-}")
         fi
     done
 } &&
-complete -F _postconf postconf
+    complete -F _postconf postconf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postfix b/msys2/usr/share/bash-completion/completions/postfix
index eda9ad466..f96055027 100644
--- a/msys2/usr/share/bash-completion/completions/postfix
+++ b/msys2/usr/share/bash-completion/completions/postfix
@@ -11,21 +11,23 @@ _postfix()
             return
             ;;
         -D)
-            COMPREPLY=( $(compgen -W 'start' -- "$cur") )
+            COMPREPLY=($(compgen -W 'start' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        # TODO: doesn't seem to work; the usage message doesn't get output
-        #       if we try to grep it, it's only output on the console?
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(
+            compgen -W \
+                '$(_bashcomp_try_faketty "$1" --help 2>&1 | _parse_usage -)' \
+                -- "$cur"
+        ))
         return
     fi
 
-    COMPREPLY=( $(compgen -W 'check start stop abort flush reload status
-        set-permissions upgrade-configuration' -- "$cur") )
+    COMPREPLY=($(compgen -W 'check start stop abort flush reload status
+        set-permissions upgrade-configuration' -- "$cur"))
 } &&
-complete -F _postfix postfix
+    complete -F _postfix postfix
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postmap b/msys2/usr/share/bash-completion/completions/postmap
index 66756c1e6..35c4ada15 100644
--- a/msys2/usr/share/bash-completion/completions/postmap
+++ b/msys2/usr/share/bash-completion/completions/postmap
@@ -16,26 +16,26 @@ _postmap()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         compopt -o filenames
-        COMPREPLY=( $(compgen -f -- "${cur#*:}") )
+        COMPREPLY=($(compgen -f -- "${cur#*:}"))
     else
         local len=${#cur} pval
         for pval in $(/usr/sbin/postconf -m 2>/dev/null); do
-            if [[ "$cur" == "${pval:0:$len}" ]]; then
-                COMPREPLY+=( "$pval:" )
+            if [[ $cur == "${pval:0:len}" ]]; then
+                COMPREPLY+=("$pval:")
             fi
         done
-        if [[ ! $COMPREPLY ]]; then
+        if [[ ! ${COMPREPLY-} ]]; then
             compopt -o filenames
-            COMPREPLY=( $(compgen -f -- "$cur") )
+            COMPREPLY=($(compgen -f -- "$cur"))
         fi
     fi
 } &&
-complete -F _postmap postmap postalias
+    complete -F _postmap postmap postalias
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/postsuper b/msys2/usr/share/bash-completion/completions/postsuper
index 509d2484f..559449aa0 100644
--- a/msys2/usr/share/bash-completion/completions/postsuper
+++ b/msys2/usr/share/bash-completion/completions/postsuper
@@ -14,30 +14,30 @@ _postsuper()
             ;;
         -[dr])
             len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null | \
+            for pval in ALL $(mailq 2>/dev/null |
                 command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//'); do
-                if [[ "$cur" == "${pval:0:$len}" ]]; then
-                    COMPREPLY+=( $pval )
+                if [[ $cur == "${pval:0:len}" ]]; then
+                    COMPREPLY+=($pval)
                 fi
             done
             return
             ;;
         -h)
             len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null | \
+            for pval in ALL $(mailq 2>/dev/null |
                 command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* ].*$//; /!$/d'); do
-                if [[ "$cur" == "${pval:0:$len}" ]]; then
-                    COMPREPLY+=( $pval )
+                if [[ $cur == "${pval:0:len}" ]]; then
+                    COMPREPLY+=($pval)
                 fi
             done
             return
             ;;
         -H)
             len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null | \
+            for pval in ALL $(mailq 2>/dev/null |
                 command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; /^[0-9A-Z]*[* ]/d; s/!.*$//'); do
-                if [[ "$cur" == "${pval:0:$len}" ]]; then
-                    COMPREPLY+=( $pval )
+                if [[ $cur == "${pval:0:len}" ]]; then
+                    COMPREPLY+=($pval)
                 fi
             done
             return
@@ -45,12 +45,12 @@ _postsuper()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -W 'hold incoming active deferred' -- "$cur") )
+    COMPREPLY=($(compgen -W 'hold incoming active deferred' -- "$cur"))
 } &&
-complete -F _postsuper postsuper
+    complete -F _postsuper postsuper
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/povray b/msys2/usr/share/bash-completion/completions/povray
index c5af018aa..56dfd94d2 100644
--- a/msys2/usr/share/bash-completion/completions/povray
+++ b/msys2/usr/share/bash-completion/completions/povray
@@ -16,35 +16,41 @@ _povray()
             cur="${povcur#[-+]I}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir pov
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
         [-+]O*)
             # guess what output file type user may want
-            case $(IFS=$'\n'; command grep '^[-+]F' <<<"${words[*]}") in
+            case $(
+                IFS=$'\n'
+                command grep '^[-+]F' <<<"${words[*]}"
+            ) in
                 [-+]FN) oext=png ;;
                 [-+]FP) oext=ppm ;;
                 [-+]F[CT]) oext=tga ;;
                 *) oext=$defoext ;;
             esac
             # complete filename corresponding to previously specified +I
-            COMPREPLY=( $(IFS=$'\n'; command grep '^[-+]I' <<<"${words[*]}") )
-            COMPREPLY=( ${COMPREPLY[@]#[-+]I} )
-            COMPREPLY=( ${COMPREPLY[@]/%.pov/.$oext} )
+            COMPREPLY=($(
+                IFS=$'\n'
+                command grep '^[-+]I' <<<"${words[*]}"
+            ))
+            COMPREPLY=(${COMPREPLY[@]#[-+]I})
+            COMPREPLY=(${COMPREPLY[@]/%.pov/.$oext})
             cur="${povcur#[-+]O}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir $oext
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
-        *.ini\[|*.ini\[*[^]]) # sections in .ini files
+        *.ini\[ | *.ini\[*[^]]) # sections in .ini files
             cur="${povcur#*\[}"
             pfx="${povcur%\["$cur"}" # prefix == filename
             [[ -r $pfx ]] || return
-            COMPREPLY=( $(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
-                -e 't' -e 'd' -- "$pfx") )
+            COMPREPLY=($(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
+                -e 't' -e 'd' -- "$pfx"))
             # to prevent [bar] expand to nothing.  can be done more easily?
-            COMPREPLY=( "${COMPREPLY[@]/#/${pfx}[}" )
+            COMPREPLY=("${COMPREPLY[@]/#/${pfx}[}")
             return
             ;;
         *)
@@ -53,6 +59,6 @@ _povray()
             ;;
     esac
 } &&
-complete -F _povray povray xpovray spovray
+    complete -F _povray povray xpovray spovray
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ppc-koji b/msys2/usr/share/bash-completion/completions/ppc-koji
index be43f0a24..8efef9a7f 100644
--- a/msys2/usr/share/bash-completion/completions/ppc-koji
+++ b/msys2/usr/share/bash-completion/completions/ppc-koji
@@ -2,8 +2,8 @@
 
 _koji_search()
 {
-    COMPREPLY+=( $(compgen -W \
-        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur"))
 }
 
 _koji_build()
@@ -23,13 +23,13 @@ _koji_user()
 
 _koji_tag()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur"))
 }
 
 _koji_target()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-targets 2>/dev/null |
-        awk "{ print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-targets 2>/dev/null |
+        awk "{ print \$1 }")' -- "$cur"))
 }
 
 _koji()
@@ -38,7 +38,7 @@ _koji()
     _init_completion -s || return
 
     local commandix command
-    for (( commandix=1; commandix < cword; commandix++ )); do
+    for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
             break
@@ -46,19 +46,19 @@ _koji()
     done
 
     case $prev in
-        --help|--help-commands|-!(-*)h*)
+        --help | --help-commands | -!(-*)h*)
             return
             ;;
-        --config|--keytab|-!(-*)[co])
+        --config | --keytab | -!(-*)[co])
             _filedir
             return
             ;;
-        --runas|--user|--editor|--by)
+        --runas | --user | --editor | --by)
             _koji_user "$1"
             return
             ;;
         --authtype)
-            COMPREPLY=( $(compgen -W 'noauth ssl password kerberos' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noauth ssl password kerberos' -- "$cur"))
             return
             ;;
         --topdir)
@@ -66,15 +66,15 @@ _koji()
             return
             ;;
         --type)
-            case $command in
-                latest-pkg|list-tagged)
-                    COMPREPLY=( $(compgen -W 'maven' -- "$cur") )
+            case ${command-} in
+                latest-pkg | list-tagged)
+                    COMPREPLY=($(compgen -W 'maven' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --name)
-            case $command in
+            case ${command-} in
                 list-targets)
                     _koji_target "$1"
                     ;;
@@ -85,7 +85,7 @@ _koji()
             _koji_user "$1"
             return
             ;;
-        --tag|--latestfrom)
+        --tag | --latestfrom)
             _koji_tag "$1"
             return
             ;;
@@ -105,22 +105,22 @@ _koji()
 
     $split && return
 
-    if [[ $command ]]; then
+    if [[ -v command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
 
         # How many'th non-option arg (1-based) for $command are we completing?
         local i nth=1
-        for (( i=commandix+1; i < cword; i++ )); do
-            [[ ${words[i]} == -* ]] || (( nth++ ))
+        for ((i = commandix + 1; i < cword; i++)); do
+            [[ ${words[i]} == -* ]] || ((nth++))
         done
 
         case $command in
-            build|maven-build|win-build)
+            build | maven-build | win-build)
                 case $nth in
                     1)
                         _koji_target "$1"
@@ -160,7 +160,7 @@ _koji()
             latest-by-tag)
                 _koji_package "$1"
                 ;;
-            latest-pkg|list-groups|list-tag-inheritance|show-groups)
+            latest-pkg | list-groups | list-tag-inheritance | show-groups)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -186,7 +186,7 @@ _koji()
                 ;;
             move-pkg)
                 case $nth in
-                    1|2)
+                    1 | 2)
                         _koji_tag "$1"
                         ;;
                     *)
@@ -197,12 +197,12 @@ _koji()
             search)
                 case $nth in
                     1)
-                        COMPREPLY=( $(compgen -W 'package build tag target
-                            user host rpm' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'package build tag target
+                            user host rpm' -- "$cur"))
                         ;;
                 esac
                 ;;
-            tag-pkg|untag-pkg)
+            tag-pkg | untag-pkg)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -218,7 +218,7 @@ _koji()
             wait-repo)
                 case $nth in
                     1)
-                        for (( i=commandix+1; i < cword; i++ )); do
+                        for ((i = commandix + 1; i < cword; i++)); do
                             if [[ ${words[i]} == --target ]]; then
                                 _koji_target "$1"
                                 return
@@ -233,13 +233,13 @@ _koji()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ ! $command ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help-commands 2>/dev/null | \
-            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v command ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
+            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
+    complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/prelink b/msys2/usr/share/bash-completion/completions/prelink
index 62580a95f..1c39611f6 100644
--- a/msys2/usr/share/bash-completion/completions/prelink
+++ b/msys2/usr/share/bash-completion/completions/prelink
@@ -6,18 +6,18 @@ _prelink()
     _init_completion -s || return
 
     case $prev in
-        -'?'|--help|--usage|-V|--version|-r|--reloc-only)
+        -'?' | --help | --usage | -V | --version | -r | --reloc-only)
             return
             ;;
-        -b|--black-list|--dynamic-linker|--undo-output)
+        -b | --black-list | --dynamic-linker | --undo-output)
             _filedir
             return
             ;;
-        -c|--config-file)
+        -c | --config-file)
             _filedir conf
             return
             ;;
-        -C|--cache)
+        -C | --cache)
             _filedir cache
             return
             ;;
@@ -30,13 +30,13 @@ _prelink()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _prelink prelink
+    complete -F _prelink prelink
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/printenv b/msys2/usr/share/bash-completion/completions/printenv
new file mode 100644
index 000000000..3553e83db
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/printenv
@@ -0,0 +1,23 @@
+# printenv(1) completion                                   -*- shell-script -*-
+
+_printenv()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        --help | --version)
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        return
+    fi
+
+    COMPREPLY=($(compgen -v -- "$cur"))
+} &&
+    complete -F _printenv printenv
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/protoc b/msys2/usr/share/bash-completion/completions/protoc
index d43814466..fdd77be64 100644
--- a/msys2/usr/share/bash-completion/completions/protoc
+++ b/msys2/usr/share/bash-completion/completions/protoc
@@ -6,11 +6,7 @@ _protoc()
     _init_completion -s || return
 
     case $prev in
-        --proto_path|--cpp_out|--java_out|--python_out)
-            _filedir -d
-            return
-            ;;
-        --version|-h|--help|--encode|--decode)
+        --version | -h | --help | --encode | --decode)
             return
             ;;
         --descriptor_set_out)
@@ -18,16 +14,20 @@ _protoc()
             return
             ;;
         --error_format)
-            COMPREPLY=( $(compgen -W 'gcc msvs' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gcc msvs' -- "$cur"))
             return
             ;;
         --plugin)
             if [[ $cur != *=* ]]; then
                 compopt -o filenames
-                COMPREPLY=( $(compgen -c -- "$cur") )
+                COMPREPLY=($(compgen -c -- "$cur"))
             fi
             return
             ;;
+        --proto_path | --*_out)
+            _filedir -d
+            return
+            ;;
     esac
 
     $split && return
@@ -36,28 +36,28 @@ _protoc()
         -o*)
             cur=${cur:2}
             _filedir
-            COMPREPLY=( "${COMPREPLY[@]/#/-o}" )
+            COMPREPLY=("${COMPREPLY[@]/#/-o}")
             return
             ;;
         -I*)
             cur=${cur:2}
             _filedir -d
-            COMPREPLY=( "${COMPREPLY[@]/#/-I}" )
+            COMPREPLY=("${COMPREPLY[@]/#/-I}")
             return
             ;;
         -*)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
             local i
             for i in "${!COMPREPLY[@]}"; do
                 [[ ${COMPREPLY[i]} == -oFILE ]] && unset 'COMPREPLY[i]'
             done
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
     esac
 
     _filedir proto
 } &&
-complete -F _protoc protoc
+    complete -F _protoc protoc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/psql b/msys2/usr/share/bash-completion/completions/psql
index ceedf07e1..4bc6049f5 100644
--- a/msys2/usr/share/bash-completion/completions/psql
+++ b/msys2/usr/share/bash-completion/completions/psql
@@ -4,16 +4,16 @@ _pg_databases()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
     # "Access privileges" in output may contain linefeeds, hence the NF > 1
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null | \
-        awk 'NF > 1 { print $1 }')" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwlF $'\t' 2>/dev/null |
+        awk 'NF > 1 { print $1 }')" -- "$cur"))
 }
 
 _pg_users()
 {
     # -w was introduced in 8.4, https://launchpad.net/bugs/164772
-    COMPREPLY=( $(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
-        template1 2>/dev/null)" -- "$cur") )
-    [[ ${#COMPREPLY[@]} -eq 0 ]] && COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -W "$(psql -XAtqwc 'select usename from pg_user' \
+        template1 2>/dev/null)" -- "$cur"))
+    ((${#COMPREPLY[@]} == 0)) && COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 # createdb(1) completion
@@ -24,29 +24,29 @@ _createdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|--owner|-!(-*)[UO])
+        --username | --owner | -!(-*)[UO])
             _pg_users
             return
             ;;
-        --help|--version|--port|--tablespace|--encoding|--template|-!(-*)[pDET])
+        --help | --version | --port | --tablespace | --encoding | --template | -!(-*)[pDET])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _createdb createdb
+    complete -F _createdb createdb
 
 # createuser(1) completion
 #
@@ -56,14 +56,14 @@ _createuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|--connection-limit|-!(-*)[pc])
+        --help | --version | --port | --connection-limit | -!(-*)[pc])
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -71,12 +71,12 @@ _createuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _createuser createuser
+    complete -F _createuser createuser
 
 # dropdb(1) completion
 #
@@ -86,29 +86,29 @@ _dropdb()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_databases
     fi
 } &&
-complete -F _dropdb dropdb
+    complete -F _dropdb dropdb
 
 # dropuser(1) completion
 #
@@ -118,14 +118,14 @@ _dropuser()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--port|-!(-*)p)
+        --help | --version | --port | -!(-*)p)
             return
             ;;
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
@@ -133,14 +133,14 @@ _dropuser()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _pg_users
     fi
 } &&
-complete -F _dropuser dropuser
+    complete -F _dropuser dropuser
 
 # psql(1) completion
 #
@@ -150,39 +150,39 @@ _psql()
     _init_completion -s || return
 
     case $prev in
-        --host|-!(-*)h)
+        --host | -!(-*)h)
             _known_hosts_real -- "$cur"
             return
             ;;
-        --username|-!(-*)U)
+        --username | -!(-*)U)
             _pg_users
             return
             ;;
-        --dbname|-!(-*)d)
+        --dbname | -!(-*)d)
             _pg_databases
             return
             ;;
-        --output|--file|--log-file|-!(-*)[ofL])
+        --output | --file | --log-file | -!(-*)[ofL])
             _filedir
             return
             ;;
-        --help|--version|--command|--field-separator|--port|--pset|\
-        --record-separator|--table-attr|--set|--variable|-!(-*)[?VcFpPRTv])
+        --help | --version | --command | --field-separator | --port | --pset | \
+            --record-separator | --table-attr | --set | --variable | -!(-*)[?VcFpPRTv])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         # return list of available databases
         _pg_databases
     fi
 } &&
-complete -F _psql psql
+    complete -F _psql psql
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppet b/msys2/usr/share/bash-completion/completions/puppet
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppet
+++ b/msys2/usr/share/bash-completion/completions/puppet
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetca b/msys2/usr/share/bash-completion/completions/puppetca
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetca
+++ b/msys2/usr/share/bash-completion/completions/puppetca
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetd b/msys2/usr/share/bash-completion/completions/puppetd
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetd
+++ b/msys2/usr/share/bash-completion/completions/puppetd
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetdoc b/msys2/usr/share/bash-completion/completions/puppetdoc
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetdoc
+++ b/msys2/usr/share/bash-completion/completions/puppetdoc
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetmasterd b/msys2/usr/share/bash-completion/completions/puppetmasterd
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetmasterd
+++ b/msys2/usr/share/bash-completion/completions/puppetmasterd
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetqd b/msys2/usr/share/bash-completion/completions/puppetqd
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetqd
+++ b/msys2/usr/share/bash-completion/completions/puppetqd
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/puppetrun b/msys2/usr/share/bash-completion/completions/puppetrun
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/puppetrun
+++ b/msys2/usr/share/bash-completion/completions/puppetrun
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pv b/msys2/usr/share/bash-completion/completions/pv
index 007bb36bc..99933f29c 100644
--- a/msys2/usr/share/bash-completion/completions/pv
+++ b/msys2/usr/share/bash-completion/completions/pv
@@ -6,26 +6,26 @@ _pv()
     _init_completion || return
 
     case $prev in
-        --help|--version|--last-written|--format|--delay-start|--interval|\
-        --width|--height|--name|--rate-limit|--buffer-size|-!(-*)[hVAFDiwHNLB])
+        --help | --version | --last-written | --format | --delay-start | --interval | \
+            --width | --height | --name | --rate-limit | --buffer-size | -!(-*)[hVAFDiwHNLB])
             return
             ;;
-        --remote|-!(-*)R)
+        --remote | -!(-*)R)
             _pids
             return
             ;;
-        --pidfile|--watchfd|-!(-*)[Pd])
+        --pidfile | --watchfd | -!(-*)[Pd])
             _filedir pid
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _pv pv
+    complete -F _pv pv
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvchange b/msys2/usr/share/bash-completion/completions/pvchange
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvchange
+++ b/msys2/usr/share/bash-completion/completions/pvchange
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvcreate b/msys2/usr/share/bash-completion/completions/pvcreate
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvcreate
+++ b/msys2/usr/share/bash-completion/completions/pvcreate
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvdisplay b/msys2/usr/share/bash-completion/completions/pvdisplay
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvdisplay
+++ b/msys2/usr/share/bash-completion/completions/pvdisplay
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvmove b/msys2/usr/share/bash-completion/completions/pvmove
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvmove
+++ b/msys2/usr/share/bash-completion/completions/pvmove
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvremove b/msys2/usr/share/bash-completion/completions/pvremove
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvremove
+++ b/msys2/usr/share/bash-completion/completions/pvremove
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvs b/msys2/usr/share/bash-completion/completions/pvs
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvs
+++ b/msys2/usr/share/bash-completion/completions/pvs
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pvscan b/msys2/usr/share/bash-completion/completions/pvscan
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/pvscan
+++ b/msys2/usr/share/bash-completion/completions/pvscan
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pwck b/msys2/usr/share/bash-completion/completions/pwck
index cc5f2e423..fa07b0e1d 100644
--- a/msys2/usr/share/bash-completion/completions/pwck
+++ b/msys2/usr/share/bash-completion/completions/pwck
@@ -5,14 +5,14 @@ _pwck()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _pwck pwck
+    complete -F _pwck pwck
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pwd b/msys2/usr/share/bash-completion/completions/pwd
index 561001731..b9c4fbc0e 100644
--- a/msys2/usr/share/bash-completion/completions/pwd
+++ b/msys2/usr/share/bash-completion/completions/pwd
@@ -6,15 +6,15 @@ _pwd()
     _init_completion || return
 
     case $prev in
-        --help|--version)
+        --help | --version)
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    [[ $COMPREPLY ]] || \
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+    [[ ${COMPREPLY-} ]] ||
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
 } &&
-complete -F _pwd pwd
+    complete -F _pwd pwd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pwdx b/msys2/usr/share/bash-completion/completions/pwdx
index 675c41ffc..25a1a1e11 100644
--- a/msys2/usr/share/bash-completion/completions/pwdx
+++ b/msys2/usr/share/bash-completion/completions/pwdx
@@ -6,7 +6,7 @@ _pwdx()
     _init_completion || return
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -14,11 +14,11 @@ _pwdx()
     if [[ $cur == -* ]]; then
         local help='$(_parse_help "$1")'
         [[ $help ]] || help=-V
-        COMPREPLY=( $(compgen -W "$help" -- "$cur") )
+        COMPREPLY=($(compgen -W "$help" -- "$cur"))
     else
         _pids
     fi
 } &&
-complete -F _pwdx pwdx
+    complete -F _pwdx pwdx
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pwgen b/msys2/usr/share/bash-completion/completions/pwgen
index 8781cb9a8..50d31d5f4 100644
--- a/msys2/usr/share/bash-completion/completions/pwgen
+++ b/msys2/usr/share/bash-completion/completions/pwgen
@@ -6,10 +6,10 @@ _pwgen()
     _init_completion -s || return
 
     case $prev in
-        --num-passwords|--help|-!(-*)[Nh])
+        --num-passwords | --help | -!(-*)[Nh])
             return
             ;;
-        --sha1|-!(-*)H)
+        --sha1 | -!(-*)H)
             _filedir
             return
             ;;
@@ -18,11 +18,11 @@ _pwgen()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _pwgen pwgen
+    complete -F _pwgen pwgen
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pxz b/msys2/usr/share/bash-completion/completions/pxz
index b64921f15..73958c50d 100644
--- a/msys2/usr/share/bash-completion/completions/pxz
+++ b/msys2/usr/share/bash-completion/completions/pxz
@@ -8,40 +8,40 @@ _xz()
     local xspec="*.@(xz|lzma|txz|tlz)"
 
     case $prev in
-        --decompress|--list|--test|-!(-*)[dlt]*)
+        --decompress | --list | --test | -!(-*)[dlt]*)
             xspec="!"$xspec
             ;;
-        --files|--files0)
+        --files | --files0)
             _filedir
             return
             ;;
-        --check|-!(-*)C)
-            COMPREPLY=( $(compgen -W 'crc32 crc64 sha256 none' -- "$cur") )
+        --check | -!(-*)C)
+            COMPREPLY=($(compgen -W 'crc32 crc64 sha256 none' -- "$cur"))
             return
             ;;
-        --format|-!(-*)F)
-            COMPREPLY=( $(compgen -W 'auto xz lzma raw' -- "$cur") )
+        --format | -!(-*)F)
+            COMPREPLY=($(compgen -W 'auto xz lzma raw' -- "$cur"))
             return
             ;;
-        --threads|-!(-*)T)
-            COMPREPLY=( $(compgen -W "{0..$(_ncpus)}" -- "$cur") )
+        --threads | -!(-*)T)
+            COMPREPLY=($(compgen -W "{0..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        --memlimit|--memlimit-compress|--memlimit-decompress|--memory|\
-        --suffix|--delta|--lzma1|--lzma2|-!(-*)[MS])
+        --memlimit | --memlimit-compress | --memlimit-decompress | --memory | \
+            --suffix | --delta | --lzma1 | --lzma2 | -!(-*)[MS])
             return
             ;;
-        --help|--long-help|--version|--info-memory|-!(-*)[hHV])
+        --help | --long-help | --version | --info-memory | -!(-*)[hHV])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --long-help) {-1..-9}' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --long-help) {-1..-9}' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -49,8 +49,8 @@ _xz()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _xz xz pxz
+    complete -F _xz xz pxz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/py.test b/msys2/usr/share/bash-completion/completions/py.test
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/py.test
+++ b/msys2/usr/share/bash-completion/completions/py.test
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/py.test-2 b/msys2/usr/share/bash-completion/completions/py.test-2
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/py.test-2
+++ b/msys2/usr/share/bash-completion/completions/py.test-2
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/py.test-3 b/msys2/usr/share/bash-completion/completions/py.test-3
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/py.test-3
+++ b/msys2/usr/share/bash-completion/completions/py.test-3
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pycodestyle b/msys2/usr/share/bash-completion/completions/pycodestyle
index 2eac748c2..dec6f3759 100644
--- a/msys2/usr/share/bash-completion/completions/pycodestyle
+++ b/msys2/usr/share/bash-completion/completions/pycodestyle
@@ -6,11 +6,11 @@ _pycodestyle()
     _init_completion -s || return
 
     case $prev in
-        -h|--help|--version)
+        -h | --help | --version)
             return
             ;;
         --format)
-            COMPREPLY=( $(compgen -W 'default pylint' -- "$cur") )
+            COMPREPLY=($(compgen -W 'default pylint' -- "$cur"))
             return
             ;;
         --config)
@@ -22,13 +22,13 @@ _pycodestyle()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir py
 } &&
-complete -F _pycodestyle pycodestyle
+    complete -F _pycodestyle pycodestyle
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pydoc b/msys2/usr/share/bash-completion/completions/pydoc
index 1e9048855..e7b117886 100644
--- a/msys2/usr/share/bash-completion/completions/pydoc
+++ b/msys2/usr/share/bash-completion/completions/pydoc
@@ -6,7 +6,7 @@ _pydoc()
     _init_completion || return
 
     case $prev in
-        -k|-p)
+        -k | -p)
             return
             ;;
         -w)
@@ -15,27 +15,28 @@ _pydoc()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W \
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W \
             '$("$1" | command sed -e "s/^pydoc3\{0,1\} //" | _parse_help -)' \
-            -- "$cur") )
+            -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -W 'keywords topics modules' -- "$cur") )
+    COMPREPLY=($(compgen -W 'keywords topics modules' -- "$cur"))
 
     if [[ $cur != @(.|*/)* ]]; then
-        local python=python; [[ ${1##*/} == *3* ]] && python=python3
+        local python=python
+        [[ ${1##*/} == *3* ]] && python=python3
         _xfunc python _python_modules $python
     fi
 
     # Note that we don't do "pydoc modules" as it is known to hang on
     # some systems; _python_modules tends to work better and faster.
-    COMPREPLY+=( $(compgen -W \
-        '$($1 keywords topics | command sed -e /^Here/d)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$($1 keywords topics | command sed -e /^Here/d)' -- "$cur"))
 
     _filedir py
 } &&
-complete -F _pydoc pydoc pydoc3
+    complete -F _pydoc pydoc pydoc3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pydoc3 b/msys2/usr/share/bash-completion/completions/pydoc3
index 1e9048855..e7b117886 100644
--- a/msys2/usr/share/bash-completion/completions/pydoc3
+++ b/msys2/usr/share/bash-completion/completions/pydoc3
@@ -6,7 +6,7 @@ _pydoc()
     _init_completion || return
 
     case $prev in
-        -k|-p)
+        -k | -p)
             return
             ;;
         -w)
@@ -15,27 +15,28 @@ _pydoc()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W \
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W \
             '$("$1" | command sed -e "s/^pydoc3\{0,1\} //" | _parse_help -)' \
-            -- "$cur") )
+            -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -W 'keywords topics modules' -- "$cur") )
+    COMPREPLY=($(compgen -W 'keywords topics modules' -- "$cur"))
 
     if [[ $cur != @(.|*/)* ]]; then
-        local python=python; [[ ${1##*/} == *3* ]] && python=python3
+        local python=python
+        [[ ${1##*/} == *3* ]] && python=python3
         _xfunc python _python_modules $python
     fi
 
     # Note that we don't do "pydoc modules" as it is known to hang on
     # some systems; _python_modules tends to work better and faster.
-    COMPREPLY+=( $(compgen -W \
-        '$($1 keywords topics | command sed -e /^Here/d)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$($1 keywords topics | command sed -e /^Here/d)' -- "$cur"))
 
     _filedir py
 } &&
-complete -F _pydoc pydoc pydoc3
+    complete -F _pydoc pydoc pydoc3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pydocstyle b/msys2/usr/share/bash-completion/completions/pydocstyle
index eb8589015..acbf1ece4 100644
--- a/msys2/usr/share/bash-completion/completions/pydocstyle
+++ b/msys2/usr/share/bash-completion/completions/pydocstyle
@@ -6,8 +6,8 @@ _pydocstyle()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--match|--ignore-decorators|--select|--ignore|\
-        --add-select|--add-ignore|-!(-*)h)
+        --help | --version | --match | --ignore-decorators | --select | --ignore | \
+            --add-select | --add-ignore | -!(-*)h)
             return
             ;;
         --config)
@@ -15,21 +15,21 @@ _pydocstyle()
             return
             ;;
         --convention)
-            COMPREPLY=( $(compgen -W "pep257 numpy" -- "$cur") )
+            COMPREPLY=($(compgen -W "pep257 numpy" -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir py
 } &&
-complete -F _pydocstyle pydocstyle
+    complete -F _pydocstyle pydocstyle
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyflakes b/msys2/usr/share/bash-completion/completions/pyflakes
index 4a9827842..0a4e97719 100644
--- a/msys2/usr/share/bash-completion/completions/pyflakes
+++ b/msys2/usr/share/bash-completion/completions/pyflakes
@@ -6,18 +6,18 @@ _pyflakes()
     _init_completion || return
 
     case $prev in
-        -h|--help|--version)
+        -h | --help | --version)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir py
 } &&
-complete -F _pyflakes pyflakes
+    complete -F _pyflakes pyflakes
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pylint b/msys2/usr/share/bash-completion/completions/pylint
index 35655964f..8726f8bb4 100644
--- a/msys2/usr/share/bash-completion/completions/pylint
+++ b/msys2/usr/share/bash-completion/completions/pylint
@@ -5,63 +5,66 @@ _pylint()
     local cur prev words cword split
     _init_completion -s || return
 
-    local python=python; [[ ${1##*/} == *3* ]] && python=python3
+    local python=python
+    [[ ${1##*/} == *3* ]] && python=python3
 
     case $prev in
-        --version|--help|--long-help|--help-msg|--init-hook|--ignore|--enable|\
-        --evaluation|--max-line-length|--max-module-lines|\
-        --indent-string|--min-similarity-lines|--max-args|\
-        --ignored-argument-names|--max-locals|--max-returns|--max-branchs|\
-        --max-statements|--max-parents|--max-attributes|--min-public-methods|\
-        --max-public-methods|--required-attributes|--bad-functions|\
-        --module-rgx|--const-rgx|--class-rgx|--function-rgx|--method-rgx|\
-        --attr-rgx|--argument-rgx|--variable-rgx|--inlinevar-rgx|--good-names|\
-        --bad-names|--no-docstring-rgx|--dummy-variables-rgx|\
-        --additional-builtins|--notes|--ignored-classes|--generated-members|\
-        --overgeneral-exceptions|--ignore-iface-methods|\
-        --defining-attr-methods|--valid-classmethod-first-arg|\
-        --valid-metaclass-classmethod-first-arg|-!(-*)[he])
+        --version | --help | --long-help | --help-msg | --init-hook | --ignore | --enable | \
+            --evaluation | --max-line-length | --max-module-lines | \
+            --indent-string | --min-similarity-lines | --max-args | \
+            --ignored-argument-names | --max-locals | --max-returns | --max-branchs | \
+            --max-statements | --max-parents | --max-attributes | --min-public-methods | \
+            --max-public-methods | --required-attributes | --bad-functions | \
+            --module-rgx | --const-rgx | --class-rgx | --function-rgx | --method-rgx | \
+            --attr-rgx | --argument-rgx | --variable-rgx | --inlinevar-rgx | --good-names | \
+            --bad-names | --no-docstring-rgx | --dummy-variables-rgx | \
+            --additional-builtins | --notes | --ignored-classes | --generated-members | \
+            --overgeneral-exceptions | --ignore-iface-methods | \
+            --defining-attr-methods | --valid-classmethod-first-arg | \
+            --valid-metaclass-classmethod-first-arg | -!(-*)[he])
             return
             ;;
-        --disable|-!(-*)d)
-            COMPREPLY=( $(compgen -W 'all' -- "$cur") )
+        --disable | -!(-*)d)
+            COMPREPLY=($(compgen -W 'all' -- "$cur"))
             return
             ;;
         --rcfile)
             _filedir
             return
             ;;
-        --persistent|--include-ids|--symbols|--files-output|--reports|\
-        --comment|--ignore-comments|--ignore-docstrings|--ignore-imports|\
-        --init-import|--ignore-mixin-members|--zope|--suggestion-mode|\
-        -!(-*)[isr])
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        --persistent | --include-ids | --symbols | --files-output | --reports | \
+            --comment | --ignore-comments | --ignore-docstrings | --ignore-imports | \
+            --init-import | --ignore-mixin-members | --zope | --suggestion-mode | \
+            -!(-*)[isr])
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             return
             ;;
-        --load-plugins|--deprecated-modules)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
+        --load-plugins | --deprecated-modules)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
             cur="${cur##*,}"
             _xfunc python _python_modules $python
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --confidence)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
-                UNDEFINED" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
+                UNDEFINED" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'text parseable colorized json msvs' \
-                -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'text parseable colorized json msvs' \
+                -- "$cur"))
             return
             ;;
-        --import-graph|--ext-import-graph|--int-import-graph)
+        --import-graph | --ext-import-graph | --int-import-graph)
             _filedir dot
             return
             ;;
@@ -70,15 +73,15 @@ _pylint()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$(_parse_help "$1" --long-help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W \
+            '$(_parse_help "$1" --long-help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     [[ $cur == @(.|*/)* ]] || _xfunc python _python_modules $python
     _filedir py
 } &&
-complete -F _pylint pylint pylint-2 pylint-3
+    complete -F _pylint pylint pylint-2 pylint-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pylint-2 b/msys2/usr/share/bash-completion/completions/pylint-2
index 35655964f..8726f8bb4 100644
--- a/msys2/usr/share/bash-completion/completions/pylint-2
+++ b/msys2/usr/share/bash-completion/completions/pylint-2
@@ -5,63 +5,66 @@ _pylint()
     local cur prev words cword split
     _init_completion -s || return
 
-    local python=python; [[ ${1##*/} == *3* ]] && python=python3
+    local python=python
+    [[ ${1##*/} == *3* ]] && python=python3
 
     case $prev in
-        --version|--help|--long-help|--help-msg|--init-hook|--ignore|--enable|\
-        --evaluation|--max-line-length|--max-module-lines|\
-        --indent-string|--min-similarity-lines|--max-args|\
-        --ignored-argument-names|--max-locals|--max-returns|--max-branchs|\
-        --max-statements|--max-parents|--max-attributes|--min-public-methods|\
-        --max-public-methods|--required-attributes|--bad-functions|\
-        --module-rgx|--const-rgx|--class-rgx|--function-rgx|--method-rgx|\
-        --attr-rgx|--argument-rgx|--variable-rgx|--inlinevar-rgx|--good-names|\
-        --bad-names|--no-docstring-rgx|--dummy-variables-rgx|\
-        --additional-builtins|--notes|--ignored-classes|--generated-members|\
-        --overgeneral-exceptions|--ignore-iface-methods|\
-        --defining-attr-methods|--valid-classmethod-first-arg|\
-        --valid-metaclass-classmethod-first-arg|-!(-*)[he])
+        --version | --help | --long-help | --help-msg | --init-hook | --ignore | --enable | \
+            --evaluation | --max-line-length | --max-module-lines | \
+            --indent-string | --min-similarity-lines | --max-args | \
+            --ignored-argument-names | --max-locals | --max-returns | --max-branchs | \
+            --max-statements | --max-parents | --max-attributes | --min-public-methods | \
+            --max-public-methods | --required-attributes | --bad-functions | \
+            --module-rgx | --const-rgx | --class-rgx | --function-rgx | --method-rgx | \
+            --attr-rgx | --argument-rgx | --variable-rgx | --inlinevar-rgx | --good-names | \
+            --bad-names | --no-docstring-rgx | --dummy-variables-rgx | \
+            --additional-builtins | --notes | --ignored-classes | --generated-members | \
+            --overgeneral-exceptions | --ignore-iface-methods | \
+            --defining-attr-methods | --valid-classmethod-first-arg | \
+            --valid-metaclass-classmethod-first-arg | -!(-*)[he])
             return
             ;;
-        --disable|-!(-*)d)
-            COMPREPLY=( $(compgen -W 'all' -- "$cur") )
+        --disable | -!(-*)d)
+            COMPREPLY=($(compgen -W 'all' -- "$cur"))
             return
             ;;
         --rcfile)
             _filedir
             return
             ;;
-        --persistent|--include-ids|--symbols|--files-output|--reports|\
-        --comment|--ignore-comments|--ignore-docstrings|--ignore-imports|\
-        --init-import|--ignore-mixin-members|--zope|--suggestion-mode|\
-        -!(-*)[isr])
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        --persistent | --include-ids | --symbols | --files-output | --reports | \
+            --comment | --ignore-comments | --ignore-docstrings | --ignore-imports | \
+            --init-import | --ignore-mixin-members | --zope | --suggestion-mode | \
+            -!(-*)[isr])
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             return
             ;;
-        --load-plugins|--deprecated-modules)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
+        --load-plugins | --deprecated-modules)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
             cur="${cur##*,}"
             _xfunc python _python_modules $python
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --confidence)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
-                UNDEFINED" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
+                UNDEFINED" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'text parseable colorized json msvs' \
-                -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'text parseable colorized json msvs' \
+                -- "$cur"))
             return
             ;;
-        --import-graph|--ext-import-graph|--int-import-graph)
+        --import-graph | --ext-import-graph | --int-import-graph)
             _filedir dot
             return
             ;;
@@ -70,15 +73,15 @@ _pylint()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$(_parse_help "$1" --long-help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W \
+            '$(_parse_help "$1" --long-help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     [[ $cur == @(.|*/)* ]] || _xfunc python _python_modules $python
     _filedir py
 } &&
-complete -F _pylint pylint pylint-2 pylint-3
+    complete -F _pylint pylint pylint-2 pylint-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pylint-3 b/msys2/usr/share/bash-completion/completions/pylint-3
index 35655964f..8726f8bb4 100644
--- a/msys2/usr/share/bash-completion/completions/pylint-3
+++ b/msys2/usr/share/bash-completion/completions/pylint-3
@@ -5,63 +5,66 @@ _pylint()
     local cur prev words cword split
     _init_completion -s || return
 
-    local python=python; [[ ${1##*/} == *3* ]] && python=python3
+    local python=python
+    [[ ${1##*/} == *3* ]] && python=python3
 
     case $prev in
-        --version|--help|--long-help|--help-msg|--init-hook|--ignore|--enable|\
-        --evaluation|--max-line-length|--max-module-lines|\
-        --indent-string|--min-similarity-lines|--max-args|\
-        --ignored-argument-names|--max-locals|--max-returns|--max-branchs|\
-        --max-statements|--max-parents|--max-attributes|--min-public-methods|\
-        --max-public-methods|--required-attributes|--bad-functions|\
-        --module-rgx|--const-rgx|--class-rgx|--function-rgx|--method-rgx|\
-        --attr-rgx|--argument-rgx|--variable-rgx|--inlinevar-rgx|--good-names|\
-        --bad-names|--no-docstring-rgx|--dummy-variables-rgx|\
-        --additional-builtins|--notes|--ignored-classes|--generated-members|\
-        --overgeneral-exceptions|--ignore-iface-methods|\
-        --defining-attr-methods|--valid-classmethod-first-arg|\
-        --valid-metaclass-classmethod-first-arg|-!(-*)[he])
+        --version | --help | --long-help | --help-msg | --init-hook | --ignore | --enable | \
+            --evaluation | --max-line-length | --max-module-lines | \
+            --indent-string | --min-similarity-lines | --max-args | \
+            --ignored-argument-names | --max-locals | --max-returns | --max-branchs | \
+            --max-statements | --max-parents | --max-attributes | --min-public-methods | \
+            --max-public-methods | --required-attributes | --bad-functions | \
+            --module-rgx | --const-rgx | --class-rgx | --function-rgx | --method-rgx | \
+            --attr-rgx | --argument-rgx | --variable-rgx | --inlinevar-rgx | --good-names | \
+            --bad-names | --no-docstring-rgx | --dummy-variables-rgx | \
+            --additional-builtins | --notes | --ignored-classes | --generated-members | \
+            --overgeneral-exceptions | --ignore-iface-methods | \
+            --defining-attr-methods | --valid-classmethod-first-arg | \
+            --valid-metaclass-classmethod-first-arg | -!(-*)[he])
             return
             ;;
-        --disable|-!(-*)d)
-            COMPREPLY=( $(compgen -W 'all' -- "$cur") )
+        --disable | -!(-*)d)
+            COMPREPLY=($(compgen -W 'all' -- "$cur"))
             return
             ;;
         --rcfile)
             _filedir
             return
             ;;
-        --persistent|--include-ids|--symbols|--files-output|--reports|\
-        --comment|--ignore-comments|--ignore-docstrings|--ignore-imports|\
-        --init-import|--ignore-mixin-members|--zope|--suggestion-mode|\
-        -!(-*)[isr])
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        --persistent | --include-ids | --symbols | --files-output | --reports | \
+            --comment | --ignore-comments | --ignore-docstrings | --ignore-imports | \
+            --init-import | --ignore-mixin-members | --zope | --suggestion-mode | \
+            -!(-*)[isr])
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             return
             ;;
-        --load-plugins|--deprecated-modules)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
+        --load-plugins | --deprecated-modules)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
             cur="${cur##*,}"
             _xfunc python _python_modules $python
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --jobs|-!(-*)j)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)}" -- "$cur") )
+        --jobs | -!(-*)j)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)}" -- "$cur"))
             return
             ;;
         --confidence)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
-                UNDEFINED" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
+                UNDEFINED" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'text parseable colorized json msvs' \
-                -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'text parseable colorized json msvs' \
+                -- "$cur"))
             return
             ;;
-        --import-graph|--ext-import-graph|--int-import-graph)
+        --import-graph | --ext-import-graph | --int-import-graph)
             _filedir dot
             return
             ;;
@@ -70,15 +73,15 @@ _pylint()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$(_parse_help "$1" --long-help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W \
+            '$(_parse_help "$1" --long-help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     [[ $cur == @(.|*/)* ]] || _xfunc python _python_modules $python
     _filedir py
 } &&
-complete -F _pylint pylint pylint-2 pylint-3
+    complete -F _pylint pylint pylint-2 pylint-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pypy b/msys2/usr/share/bash-completion/completions/pypy
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/pypy
+++ b/msys2/usr/share/bash-completion/completions/pypy
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pypy3 b/msys2/usr/share/bash-completion/completions/pypy3
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/pypy3
+++ b/msys2/usr/share/bash-completion/completions/pypy3
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pytest b/msys2/usr/share/bash-completion/completions/pytest
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/pytest
+++ b/msys2/usr/share/bash-completion/completions/pytest
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pytest-2 b/msys2/usr/share/bash-completion/completions/pytest-2
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/pytest-2
+++ b/msys2/usr/share/bash-completion/completions/pytest-2
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pytest-3 b/msys2/usr/share/bash-completion/completions/pytest-3
index 9239766cf..7457a8409 100644
--- a/msys2/usr/share/bash-completion/completions/pytest-3
+++ b/msys2/usr/share/bash-completion/completions/pytest-3
@@ -3,38 +3,46 @@
 _pytest()
 {
     local cur prev words cword split
-    _init_completion -s || return
+    _init_completion -s -n : || return
 
     case $prev in
-        --help|--maxfail|--report|--junit-prefix|--doctest-glob|-!(-*)[hkmrp])
+        --help | --maxfail | --report | --junit-prefix | --doctest-glob | -!(-*)[hkmorp])
             return
             ;;
         --import-mode)
-            COMPREPLY=( $(compgen -W "prepend append" -- "$cur") )
+            COMPREPLY=($(compgen -W "prepend append" -- "$cur"))
             return
             ;;
         --capture)
-            COMPREPLY=( $(compgen -W "fd sys no" -- "$cur") )
+            COMPREPLY=($(compgen -W "fd sys no tee-sys" -- "$cur"))
+            return
+            ;;
+        --lfnf | --last-failed-no-failures)
+            COMPREPLY=($(compgen -W "all none" -- "$cur"))
             return
             ;;
         --tb)
-            COMPREPLY=( $(compgen -W "auto long short line native no" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "auto long short line native no" \
+                -- "$cur"))
+            return
+            ;;
+        --show-capture)
+            COMPREPLY=($(compgen -W "no stdout stderr log all" -- "$cur"))
             return
             ;;
         --color)
-            COMPREPLY=( $(compgen -W "yes no auto" -- "$cur") )
+            COMPREPLY=($(compgen -W "yes no auto" -- "$cur"))
             return
             ;;
         --pastebin)
-            COMPREPLY=( $(compgen -W "failed all" -- "$cur") )
+            COMPREPLY=($(compgen -W "failed all" -- "$cur"))
             return
             ;;
         --junit-xml)
             _filedir xml
             return
             ;;
-        --result-log)
+        --result-log | --log-file)
             _filedir log
             return
             ;;
@@ -42,45 +50,85 @@ _pytest()
             _filedir
             return
             ;;
-        --confcutdir|--basetemp|--rsyncdir)
+        --confcutdir | --basetemp | --rsyncdir | --rootdir)
             _filedir -d
             return
             ;;
+        --doctest-report)
+            COMPREPLY=($(compgen -W "none cdiff ndiff udiff only_first_failure" -- "$cur"))
+            return
+            ;;
         --assert)
-            COMPREPLY=( $(compgen -W "plain reinterp rewrite" -- "$cur") )
+            COMPREPLY=($(compgen -W "plain reinterp rewrite" -- "$cur"))
             return
             ;;
         --genscript)
             _filedir py
             return
             ;;
-        --pythonwarnings|-!(-*)W)
+        --pythonwarnings | -!(-*)W)
             _xfunc python _python_warning_actions
             return
             ;;
-        --numprocesses|-!(-*)n)
-            COMPREPLY=( $(compgen -W "{1..$(_ncpus)} auto" -- "$cur") )
+        --numprocesses | -!(-*)n)
+            COMPREPLY=($(compgen -W "{1..$(_ncpus)} auto" -- "$cur"))
             return
             ;;
         --dist)
-            local modes=$("$1" --dist=nonexistent-distmode 2>&1 | \
+            local modes=$("$1" --dist=nonexistent-distmode 2>&1 |
                 command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
-                           -ne 's/.*choose from //p')
-            COMPREPLY=( $(compgen -W '$modes' -- "$cur") )
+                    -ne 's/.*choose from //p')
+            COMPREPLY=($(compgen -W '$modes' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+        return
+    fi
+
+    if [[ $cur == *.py::*:* ]]; then
+        local file=${cur/.py:*/.py}
+        local class=${cur#*.py::} in_class=false
+        local line
+        class=${class%%:*}
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+${class}[[:space:]:\(] ]]; then
+                in_class=true
+            elif [[ $line =~ ^class[[:space:]] ]]; then
+                in_class=false
+            fi
+            if $in_class && [[ $line =~ ^[[:space:]]+(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::$class::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*:?(:)}"))
+        __ltrim_colon_completions "$cur"
+        return
+    elif [[ $cur == *.py:* ]]; then
+        local file="${cur/.py:*/.py}" line
+        while IFS= read -r line; do
+            if [[ $line =~ ^class[[:space:]]+(Test[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[1]})
+            elif [[ $line =~ ^(async[[:space:]]+)?def[[:space:]]+(test_[A-Za-z0-9_]+) ]]; then
+                COMPREPLY+=(${BASH_REMATCH[2]})
+            fi
+        done 2>/dev/null <"$file"
+        ((!${#COMPREPLY[@]})) ||
+            COMPREPLY=($(compgen -P "$file::" -W '${COMPREPLY[@]}' \
+                -- "${cur##*.py:?(:)}"))
+        __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir py
 } &&
-complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
+    complete -F _pytest pytest pytest-2 pytest-3 py.test py.test-2 py.test-3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python b/msys2/usr/share/bash-completion/completions/python
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/python
+++ b/msys2/usr/share/bash-completion/completions/python
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python2 b/msys2/usr/share/bash-completion/completions/python2
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/python2
+++ b/msys2/usr/share/bash-completion/completions/python2
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python2.7 b/msys2/usr/share/bash-completion/completions/python2.7
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python2.7
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3 b/msys2/usr/share/bash-completion/completions/python3
index 5e69ff121..d50c18f0d 100644
--- a/msys2/usr/share/bash-completion/completions/python3
+++ b/msys2/usr/share/bash-completion/completions/python3
@@ -2,15 +2,15 @@
 
 _python_modules()
 {
-    COMPREPLY+=( $(compgen -W \
+    COMPREPLY+=($(compgen -W \
         "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
-           2>/dev/null)" -- "$cur") )
+            2>/dev/null)" -- "$cur"))
 }
 
 _python_warning_actions()
 {
-    COMPREPLY+=( $(compgen -W "ignore default all module once error" \
-                           ${prefix:+-P "$prefix"} -- "$cur") )
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
 }
 
 _python()
@@ -23,11 +23,11 @@ _python()
             prefix=${cur:0:2}
             prev=$prefix
             cur=${cur:2}
-        ;;
+            ;;
     esac
 
     case $prev in
-        --help|--version|-!(-*)[?hVcX])
+        --help | --version | -!(-*)[?hVcX])
             return
             ;;
         -!(-*)m)
@@ -35,8 +35,8 @@ _python()
             return
             ;;
         -!(-*)Q)
-            COMPREPLY=( $(compgen -W "old new warn warnall" -P "$prefix" \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
             return
             ;;
         -!(-*)W)
@@ -45,24 +45,23 @@ _python()
             ;;
         --jit)
             # TODO: quite a few others, parse from "--jit help" output?
-            COMPREPLY=( $(compgen -W "help off" -- "$cur") )
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
             return
             ;;
         !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
-            [[ $cword -lt 2 || ${words[cword-2]} != -[QWX] ]] && _filedir
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
             ;;
     esac
 
-
     # if -c or -m is already given, complete all kind of files.
-    if [[ "${words[*]::$cword}" == *\ -[cm]\ * ]]; then
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
         _filedir
-    elif [[ "$cur" != -* ]]; then
+    elif [[ $cur != -* ]]; then
         _filedir 'py?([cowz])'
     else
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _python python python2 python3 pypy pypy3 micropython
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.3 b/msys2/usr/share/bash-completion/completions/python3.3
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.3
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.4 b/msys2/usr/share/bash-completion/completions/python3.4
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.4
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.5 b/msys2/usr/share/bash-completion/completions/python3.5
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.5
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.6 b/msys2/usr/share/bash-completion/completions/python3.6
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.6
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.7 b/msys2/usr/share/bash-completion/completions/python3.7
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.7
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/python3.8 b/msys2/usr/share/bash-completion/completions/python3.8
new file mode 100644
index 000000000..d50c18f0d
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/python3.8
@@ -0,0 +1,67 @@
+# bash completion for python                               -*- shell-script -*-
+
+_python_modules()
+{
+    COMPREPLY+=($(compgen -W \
+        "$(${1:-python} ${BASH_SOURCE[0]%/*}/../helpers/python $cur \
+            2>/dev/null)" -- "$cur"))
+}
+
+_python_warning_actions()
+{
+    COMPREPLY+=($(compgen -W "ignore default all module once error" \
+        ${prefix:+-P "$prefix"} -- "$cur"))
+}
+
+_python()
+{
+    local cur prev words cword prefix
+    _init_completion || return
+
+    case $cur in
+        -[QWX]?*)
+            prefix=${cur:0:2}
+            prev=$prefix
+            cur=${cur:2}
+            ;;
+    esac
+
+    case $prev in
+        --help | --version | -!(-*)[?hVcX])
+            return
+            ;;
+        -!(-*)m)
+            _python_modules "$1"
+            return
+            ;;
+        -!(-*)Q)
+            COMPREPLY=($(compgen -W "old new warn warnall" -P "$prefix" \
+                -- "$cur"))
+            return
+            ;;
+        -!(-*)W)
+            _python_warning_actions
+            return
+            ;;
+        --jit)
+            # TODO: quite a few others, parse from "--jit help" output?
+            COMPREPLY=($(compgen -W "help off" -- "$cur"))
+            return
+            ;;
+        !(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
+            [[ $cword -lt 2 || ${words[cword - 2]} != -[QWX] ]] && _filedir
+            ;;
+    esac
+
+    # if -c or -m is already given, complete all kind of files.
+    if [[ ${words[*]::cword} == *\ -[cm]\ * ]]; then
+        _filedir
+    elif [[ $cur != -* ]]; then
+        _filedir 'py?([cowz])'
+    else
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+    fi
+} &&
+    complete -F _python python python2 python2.7 python3 python3.{3..8} pypy pypy3 micropython
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv b/msys2/usr/share/bash-completion/completions/pyvenv
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv
+++ b/msys2/usr/share/bash-completion/completions/pyvenv
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv-3.4 b/msys2/usr/share/bash-completion/completions/pyvenv-3.4
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv-3.4
+++ b/msys2/usr/share/bash-completion/completions/pyvenv-3.4
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv-3.5 b/msys2/usr/share/bash-completion/completions/pyvenv-3.5
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv-3.5
+++ b/msys2/usr/share/bash-completion/completions/pyvenv-3.5
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv-3.6 b/msys2/usr/share/bash-completion/completions/pyvenv-3.6
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv-3.6
+++ b/msys2/usr/share/bash-completion/completions/pyvenv-3.6
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv-3.7 b/msys2/usr/share/bash-completion/completions/pyvenv-3.7
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv-3.7
+++ b/msys2/usr/share/bash-completion/completions/pyvenv-3.7
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/pyvenv-3.8 b/msys2/usr/share/bash-completion/completions/pyvenv-3.8
index d5135e87d..527a3840a 100644
--- a/msys2/usr/share/bash-completion/completions/pyvenv-3.8
+++ b/msys2/usr/share/bash-completion/completions/pyvenv-3.8
@@ -6,20 +6,20 @@ _pyvenv()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _longopt "$1"
         return
     fi
 
     _filedir -d
 } &&
-complete -F _pyvenv pyvenv pyvenv-3.{4..8}
+    complete -F _pyvenv pyvenv pyvenv-3.{4..8}
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qdbus b/msys2/usr/share/bash-completion/completions/qdbus
index 9a22e8000..5b5a5e377 100644
--- a/msys2/usr/share/bash-completion/completions/qdbus
+++ b/msys2/usr/share/bash-completion/completions/qdbus
@@ -5,10 +5,10 @@ _qdbus()
     local cur prev words cword
     _init_completion || return
 
-    [[ -n $cur ]] && unset "words[$((${#words[@]}-1))]"
-    COMPREPLY=( $(compgen -W '$(command ${words[@]} 2>/dev/null | \
-        command sed "s/(.*)//")' -- "$cur") )
+    [[ -n $cur ]] && unset "words[$((${#words[@]} - 1))]"
+    COMPREPLY=($(compgen -W '$(command ${words[@]} 2>/dev/null | \
+        command sed "s/(.*)//")' -- "$cur"))
 } &&
-complete -F _qdbus qdbus dcop
+    complete -F _qdbus qdbus dcop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qemu b/msys2/usr/share/bash-completion/completions/qemu
index 8602cebdc..838298127 100644
--- a/msys2/usr/share/bash-completion/completions/qemu
+++ b/msys2/usr/share/bash-completion/completions/qemu
@@ -6,88 +6,88 @@ _qemu()
     _init_completion || return
 
     case $prev in
-        -fd[ab]|-hd[abcd]|-cdrom|-option-rom|-kernel|-initrd|-bootp|-pidfile| \
-        -loadvm|-mtdblock|-sd|-pflash|-bios)
+        -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | -bootp | -pidfile | \
+            -loadvm | -mtdblock | -sd | -pflash | -bios)
             _filedir
             return
             ;;
-        -tftp|-smb|-L|-chroot)
+        -tftp | -smb | -L | -chroot)
             _filedir -d
             return
             ;;
         -boot)
-            COMPREPLY=( $(compgen -W 'a c d n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'a c d n' -- "$cur"))
             return
             ;;
         -k)
-            COMPREPLY=( $(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
+            COMPREPLY=($(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
                 sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr
-                it lv nl-be pt sl tr' -- "$cur") )
+                it lv nl-be pt sl tr' -- "$cur"))
             return
             ;;
         -soundhw)
-            COMPREPLY=( $(compgen -W "$($1 -soundhw ? | awk \
-                '/^[[:lower:]]/ {print $1}') all" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -soundhw help | awk \
+                '/^[[:lower:]]/ {print $1}') all" -- "$cur"))
             return
             ;;
-        -M)
-            COMPREPLY=( $(compgen -W "$($1 -M ? | awk \
-                '/^[[:lower:]]/ {print $1}')" -- "$cur") )
+        -machine | -M)
+            COMPREPLY=($(compgen -W "$($1 $prev help | awk \
+                '/^[[:lower:]]/ {print $1}')" -- "$cur"))
             return
             ;;
         -cpu)
-            COMPREPLY=( $(compgen -W "$($1 -cpu ? | awk '{print $2}')" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -cpu help | awk '{print $2}')" \
+                -- "$cur"))
             return
             ;;
         -usbdevice)
-            COMPREPLY=( $(compgen -W 'mouse tablet disk: host: serial: braille
-                net' -- "$cur") )
+            COMPREPLY=($(compgen -W 'mouse tablet disk: host: serial: braille
+                net' -- "$cur"))
             return
             ;;
         -net)
-            COMPREPLY=( $(compgen -W 'nic user tap socket vde none dump' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'nic user tap socket vde none dump' \
+                -- "$cur"))
             return
             ;;
-        -serial|-parallel|-monitor)
-            COMPREPLY=( $(compgen -W 'vc pty none null /dev/ file: stdio pipe:
-                COM udp: tcp: telnet: unix: mon: braille' -- "$cur") )
+        -serial | -parallel | -monitor)
+            COMPREPLY=($(compgen -W 'vc pty none null /dev/ file: stdio pipe:
+                COM udp: tcp: telnet: unix: mon: braille' -- "$cur"))
             return
             ;;
         -redir)
-            COMPREPLY=( $(compgen -S":" -W 'tcp udp' -- "$cur") )
+            COMPREPLY=($(compgen -S":" -W 'tcp udp' -- "$cur"))
             return
             ;;
         -bt)
-            COMPREPLY=( $(compgen -W 'hci vhci device' -- "$cur") )
+            COMPREPLY=($(compgen -W 'hci vhci device' -- "$cur"))
             return
             ;;
         -vga)
-            COMPREPLY=( $(compgen -W 'cirrus std vmware xenfb none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cirrus std vmware xenfb none' -- "$cur"))
             return
             ;;
         -drive)
-            COMPREPLY=( $(compgen -S"=" -W 'file if bus unit index media cyls
-                snapshot cache format serial addr' -- "$cur") )
+            COMPREPLY=($(compgen -S"=" -W 'file if bus unit index media cyls
+                snapshot cache format serial addr' -- "$cur"))
             return
             ;;
         -balloon)
-            COMPREPLY=( $(compgen -W 'none virtio' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none virtio' -- "$cur"))
             return
             ;;
         -smbios)
-            COMPREPLY=( $(compgen -W 'file type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'file type' -- "$cur"))
             return
             ;;
         -watchdog)
-            COMPREPLY=( $(compgen -W "$($1 -watchdog ? 2>&1 | \
-                awk '{print $1}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -watchdog help 2>&1 |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
         -watchdog-action)
-            COMPREPLY=( $(compgen -W 'reset shutdown poweroff pause debug
-                none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'reset shutdown poweroff pause debug
+                none' -- "$cur"))
             return
             ;;
         -runas)
@@ -96,14 +96,13 @@ _qemu()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
-            -hd{a..d}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
+            -hd{a..d}' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
+    complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qemu-kvm b/msys2/usr/share/bash-completion/completions/qemu-kvm
index 8602cebdc..838298127 100644
--- a/msys2/usr/share/bash-completion/completions/qemu-kvm
+++ b/msys2/usr/share/bash-completion/completions/qemu-kvm
@@ -6,88 +6,88 @@ _qemu()
     _init_completion || return
 
     case $prev in
-        -fd[ab]|-hd[abcd]|-cdrom|-option-rom|-kernel|-initrd|-bootp|-pidfile| \
-        -loadvm|-mtdblock|-sd|-pflash|-bios)
+        -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | -bootp | -pidfile | \
+            -loadvm | -mtdblock | -sd | -pflash | -bios)
             _filedir
             return
             ;;
-        -tftp|-smb|-L|-chroot)
+        -tftp | -smb | -L | -chroot)
             _filedir -d
             return
             ;;
         -boot)
-            COMPREPLY=( $(compgen -W 'a c d n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'a c d n' -- "$cur"))
             return
             ;;
         -k)
-            COMPREPLY=( $(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
+            COMPREPLY=($(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
                 sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr
-                it lv nl-be pt sl tr' -- "$cur") )
+                it lv nl-be pt sl tr' -- "$cur"))
             return
             ;;
         -soundhw)
-            COMPREPLY=( $(compgen -W "$($1 -soundhw ? | awk \
-                '/^[[:lower:]]/ {print $1}') all" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -soundhw help | awk \
+                '/^[[:lower:]]/ {print $1}') all" -- "$cur"))
             return
             ;;
-        -M)
-            COMPREPLY=( $(compgen -W "$($1 -M ? | awk \
-                '/^[[:lower:]]/ {print $1}')" -- "$cur") )
+        -machine | -M)
+            COMPREPLY=($(compgen -W "$($1 $prev help | awk \
+                '/^[[:lower:]]/ {print $1}')" -- "$cur"))
             return
             ;;
         -cpu)
-            COMPREPLY=( $(compgen -W "$($1 -cpu ? | awk '{print $2}')" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -cpu help | awk '{print $2}')" \
+                -- "$cur"))
             return
             ;;
         -usbdevice)
-            COMPREPLY=( $(compgen -W 'mouse tablet disk: host: serial: braille
-                net' -- "$cur") )
+            COMPREPLY=($(compgen -W 'mouse tablet disk: host: serial: braille
+                net' -- "$cur"))
             return
             ;;
         -net)
-            COMPREPLY=( $(compgen -W 'nic user tap socket vde none dump' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'nic user tap socket vde none dump' \
+                -- "$cur"))
             return
             ;;
-        -serial|-parallel|-monitor)
-            COMPREPLY=( $(compgen -W 'vc pty none null /dev/ file: stdio pipe:
-                COM udp: tcp: telnet: unix: mon: braille' -- "$cur") )
+        -serial | -parallel | -monitor)
+            COMPREPLY=($(compgen -W 'vc pty none null /dev/ file: stdio pipe:
+                COM udp: tcp: telnet: unix: mon: braille' -- "$cur"))
             return
             ;;
         -redir)
-            COMPREPLY=( $(compgen -S":" -W 'tcp udp' -- "$cur") )
+            COMPREPLY=($(compgen -S":" -W 'tcp udp' -- "$cur"))
             return
             ;;
         -bt)
-            COMPREPLY=( $(compgen -W 'hci vhci device' -- "$cur") )
+            COMPREPLY=($(compgen -W 'hci vhci device' -- "$cur"))
             return
             ;;
         -vga)
-            COMPREPLY=( $(compgen -W 'cirrus std vmware xenfb none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cirrus std vmware xenfb none' -- "$cur"))
             return
             ;;
         -drive)
-            COMPREPLY=( $(compgen -S"=" -W 'file if bus unit index media cyls
-                snapshot cache format serial addr' -- "$cur") )
+            COMPREPLY=($(compgen -S"=" -W 'file if bus unit index media cyls
+                snapshot cache format serial addr' -- "$cur"))
             return
             ;;
         -balloon)
-            COMPREPLY=( $(compgen -W 'none virtio' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none virtio' -- "$cur"))
             return
             ;;
         -smbios)
-            COMPREPLY=( $(compgen -W 'file type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'file type' -- "$cur"))
             return
             ;;
         -watchdog)
-            COMPREPLY=( $(compgen -W "$($1 -watchdog ? 2>&1 | \
-                awk '{print $1}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -watchdog help 2>&1 |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
         -watchdog-action)
-            COMPREPLY=( $(compgen -W 'reset shutdown poweroff pause debug
-                none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'reset shutdown poweroff pause debug
+                none' -- "$cur"))
             return
             ;;
         -runas)
@@ -96,14 +96,13 @@ _qemu()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
-            -hd{a..d}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
+            -hd{a..d}' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
+    complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qemu-system-i386 b/msys2/usr/share/bash-completion/completions/qemu-system-i386
index 8602cebdc..838298127 100644
--- a/msys2/usr/share/bash-completion/completions/qemu-system-i386
+++ b/msys2/usr/share/bash-completion/completions/qemu-system-i386
@@ -6,88 +6,88 @@ _qemu()
     _init_completion || return
 
     case $prev in
-        -fd[ab]|-hd[abcd]|-cdrom|-option-rom|-kernel|-initrd|-bootp|-pidfile| \
-        -loadvm|-mtdblock|-sd|-pflash|-bios)
+        -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | -bootp | -pidfile | \
+            -loadvm | -mtdblock | -sd | -pflash | -bios)
             _filedir
             return
             ;;
-        -tftp|-smb|-L|-chroot)
+        -tftp | -smb | -L | -chroot)
             _filedir -d
             return
             ;;
         -boot)
-            COMPREPLY=( $(compgen -W 'a c d n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'a c d n' -- "$cur"))
             return
             ;;
         -k)
-            COMPREPLY=( $(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
+            COMPREPLY=($(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
                 sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr
-                it lv nl-be pt sl tr' -- "$cur") )
+                it lv nl-be pt sl tr' -- "$cur"))
             return
             ;;
         -soundhw)
-            COMPREPLY=( $(compgen -W "$($1 -soundhw ? | awk \
-                '/^[[:lower:]]/ {print $1}') all" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -soundhw help | awk \
+                '/^[[:lower:]]/ {print $1}') all" -- "$cur"))
             return
             ;;
-        -M)
-            COMPREPLY=( $(compgen -W "$($1 -M ? | awk \
-                '/^[[:lower:]]/ {print $1}')" -- "$cur") )
+        -machine | -M)
+            COMPREPLY=($(compgen -W "$($1 $prev help | awk \
+                '/^[[:lower:]]/ {print $1}')" -- "$cur"))
             return
             ;;
         -cpu)
-            COMPREPLY=( $(compgen -W "$($1 -cpu ? | awk '{print $2}')" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -cpu help | awk '{print $2}')" \
+                -- "$cur"))
             return
             ;;
         -usbdevice)
-            COMPREPLY=( $(compgen -W 'mouse tablet disk: host: serial: braille
-                net' -- "$cur") )
+            COMPREPLY=($(compgen -W 'mouse tablet disk: host: serial: braille
+                net' -- "$cur"))
             return
             ;;
         -net)
-            COMPREPLY=( $(compgen -W 'nic user tap socket vde none dump' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'nic user tap socket vde none dump' \
+                -- "$cur"))
             return
             ;;
-        -serial|-parallel|-monitor)
-            COMPREPLY=( $(compgen -W 'vc pty none null /dev/ file: stdio pipe:
-                COM udp: tcp: telnet: unix: mon: braille' -- "$cur") )
+        -serial | -parallel | -monitor)
+            COMPREPLY=($(compgen -W 'vc pty none null /dev/ file: stdio pipe:
+                COM udp: tcp: telnet: unix: mon: braille' -- "$cur"))
             return
             ;;
         -redir)
-            COMPREPLY=( $(compgen -S":" -W 'tcp udp' -- "$cur") )
+            COMPREPLY=($(compgen -S":" -W 'tcp udp' -- "$cur"))
             return
             ;;
         -bt)
-            COMPREPLY=( $(compgen -W 'hci vhci device' -- "$cur") )
+            COMPREPLY=($(compgen -W 'hci vhci device' -- "$cur"))
             return
             ;;
         -vga)
-            COMPREPLY=( $(compgen -W 'cirrus std vmware xenfb none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cirrus std vmware xenfb none' -- "$cur"))
             return
             ;;
         -drive)
-            COMPREPLY=( $(compgen -S"=" -W 'file if bus unit index media cyls
-                snapshot cache format serial addr' -- "$cur") )
+            COMPREPLY=($(compgen -S"=" -W 'file if bus unit index media cyls
+                snapshot cache format serial addr' -- "$cur"))
             return
             ;;
         -balloon)
-            COMPREPLY=( $(compgen -W 'none virtio' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none virtio' -- "$cur"))
             return
             ;;
         -smbios)
-            COMPREPLY=( $(compgen -W 'file type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'file type' -- "$cur"))
             return
             ;;
         -watchdog)
-            COMPREPLY=( $(compgen -W "$($1 -watchdog ? 2>&1 | \
-                awk '{print $1}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -watchdog help 2>&1 |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
         -watchdog-action)
-            COMPREPLY=( $(compgen -W 'reset shutdown poweroff pause debug
-                none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'reset shutdown poweroff pause debug
+                none' -- "$cur"))
             return
             ;;
         -runas)
@@ -96,14 +96,13 @@ _qemu()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
-            -hd{a..d}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
+            -hd{a..d}' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
+    complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qemu-system-x86_64 b/msys2/usr/share/bash-completion/completions/qemu-system-x86_64
index 8602cebdc..838298127 100644
--- a/msys2/usr/share/bash-completion/completions/qemu-system-x86_64
+++ b/msys2/usr/share/bash-completion/completions/qemu-system-x86_64
@@ -6,88 +6,88 @@ _qemu()
     _init_completion || return
 
     case $prev in
-        -fd[ab]|-hd[abcd]|-cdrom|-option-rom|-kernel|-initrd|-bootp|-pidfile| \
-        -loadvm|-mtdblock|-sd|-pflash|-bios)
+        -fd[ab] | -hd[abcd] | -cdrom | -option-rom | -kernel | -initrd | -bootp | -pidfile | \
+            -loadvm | -mtdblock | -sd | -pflash | -bios)
             _filedir
             return
             ;;
-        -tftp|-smb|-L|-chroot)
+        -tftp | -smb | -L | -chroot)
             _filedir -d
             return
             ;;
         -boot)
-            COMPREPLY=( $(compgen -W 'a c d n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'a c d n' -- "$cur"))
             return
             ;;
         -k)
-            COMPREPLY=( $(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
+            COMPREPLY=($(compgen -W 'ar de-ch es fo fr-ca hu ja mk no pt-br
                 sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr
-                it lv nl-be pt sl tr' -- "$cur") )
+                it lv nl-be pt sl tr' -- "$cur"))
             return
             ;;
         -soundhw)
-            COMPREPLY=( $(compgen -W "$($1 -soundhw ? | awk \
-                '/^[[:lower:]]/ {print $1}') all" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -soundhw help | awk \
+                '/^[[:lower:]]/ {print $1}') all" -- "$cur"))
             return
             ;;
-        -M)
-            COMPREPLY=( $(compgen -W "$($1 -M ? | awk \
-                '/^[[:lower:]]/ {print $1}')" -- "$cur") )
+        -machine | -M)
+            COMPREPLY=($(compgen -W "$($1 $prev help | awk \
+                '/^[[:lower:]]/ {print $1}')" -- "$cur"))
             return
             ;;
         -cpu)
-            COMPREPLY=( $(compgen -W "$($1 -cpu ? | awk '{print $2}')" \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -cpu help | awk '{print $2}')" \
+                -- "$cur"))
             return
             ;;
         -usbdevice)
-            COMPREPLY=( $(compgen -W 'mouse tablet disk: host: serial: braille
-                net' -- "$cur") )
+            COMPREPLY=($(compgen -W 'mouse tablet disk: host: serial: braille
+                net' -- "$cur"))
             return
             ;;
         -net)
-            COMPREPLY=( $(compgen -W 'nic user tap socket vde none dump' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'nic user tap socket vde none dump' \
+                -- "$cur"))
             return
             ;;
-        -serial|-parallel|-monitor)
-            COMPREPLY=( $(compgen -W 'vc pty none null /dev/ file: stdio pipe:
-                COM udp: tcp: telnet: unix: mon: braille' -- "$cur") )
+        -serial | -parallel | -monitor)
+            COMPREPLY=($(compgen -W 'vc pty none null /dev/ file: stdio pipe:
+                COM udp: tcp: telnet: unix: mon: braille' -- "$cur"))
             return
             ;;
         -redir)
-            COMPREPLY=( $(compgen -S":" -W 'tcp udp' -- "$cur") )
+            COMPREPLY=($(compgen -S":" -W 'tcp udp' -- "$cur"))
             return
             ;;
         -bt)
-            COMPREPLY=( $(compgen -W 'hci vhci device' -- "$cur") )
+            COMPREPLY=($(compgen -W 'hci vhci device' -- "$cur"))
             return
             ;;
         -vga)
-            COMPREPLY=( $(compgen -W 'cirrus std vmware xenfb none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cirrus std vmware xenfb none' -- "$cur"))
             return
             ;;
         -drive)
-            COMPREPLY=( $(compgen -S"=" -W 'file if bus unit index media cyls
-                snapshot cache format serial addr' -- "$cur") )
+            COMPREPLY=($(compgen -S"=" -W 'file if bus unit index media cyls
+                snapshot cache format serial addr' -- "$cur"))
             return
             ;;
         -balloon)
-            COMPREPLY=( $(compgen -W 'none virtio' -- "$cur") )
+            COMPREPLY=($(compgen -W 'none virtio' -- "$cur"))
             return
             ;;
         -smbios)
-            COMPREPLY=( $(compgen -W 'file type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'file type' -- "$cur"))
             return
             ;;
         -watchdog)
-            COMPREPLY=( $(compgen -W "$($1 -watchdog ? 2>&1 | \
-                awk '{print $1}')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$($1 -watchdog help 2>&1 |
+                awk '{print $1}')" -- "$cur"))
             return
             ;;
         -watchdog-action)
-            COMPREPLY=( $(compgen -W 'reset shutdown poweroff pause debug
-                none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'reset shutdown poweroff pause debug
+                none' -- "$cur"))
             return
             ;;
         -runas)
@@ -96,14 +96,13 @@ _qemu()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
-            -hd{a..d}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help) -fd{a,b}
+            -hd{a..d}' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
+    complete -F _qemu qemu qemu-kvm qemu-system-i386 qemu-system-x86_64
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/qrunner b/msys2/usr/share/bash-completion/completions/qrunner
index b0421a097..3919ea25b 100644
--- a/msys2/usr/share/bash-completion/completions/qrunner
+++ b/msys2/usr/share/bash-completion/completions/qrunner
@@ -7,12 +7,12 @@ _qrunner()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--runner --once --list --verbose --subproc
-            --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--runner --once --list --verbose --subproc
+            --help' -- "$cur"))
     fi
 
 } &&
-complete -F _qrunner qrunner
+    complete -F _qrunner qrunner
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/querybts b/msys2/usr/share/bash-completion/completions/querybts
index 69c5aa08e..edeba9675 100644
--- a/msys2/usr/share/bash-completion/completions/querybts
+++ b/msys2/usr/share/bash-completion/completions/querybts
@@ -6,18 +6,18 @@ _querybts()
     _init_completion -s || return
 
     case $prev in
-        --bts|-!(-*)B)
-            COMPREPLY=( $(compgen -W "debian guug kde mandrake help" \
-                -- "$cur") )
+        --bts | -!(-*)B)
+            COMPREPLY=($(compgen -W "debian guug kde mandrake help" \
+                -- "$cur"))
             return
             ;;
-        --ui|--interface|-!(-*)u)
-            COMPREPLY=( $(compgen -W "newt text gnome" -- "$cur") )
+        --ui | --interface | -!(-*)u)
+            COMPREPLY=($(compgen -W "newt text gnome" -- "$cur"))
             return
             ;;
         --mbox-reader-cmd)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
@@ -25,16 +25,16 @@ _querybts()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        COMPREPLY=( $(compgen -W 'wnpp boot-floppies kernel bugs.debian.org
+        COMPREPLY=($(compgen -W 'wnpp boot-floppies kernel bugs.debian.org
             cdimage.debian.org general installation-reports listarchives
             lists.debian.org mirrors nm.debian.org press project qa.debian.org
             release-notes security.debian.org tech-ctte upgrade-reports
-            www.debian.org $(apt-cache pkgnames 2>/dev/null)' -- "$cur") )
+            www.debian.org $(_xfunc apt-cache _apt_cache_packages)' -- "$cur"))
     fi
 } &&
-complete -F _querybts querybts
+    complete -F _querybts querybts
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/quota b/msys2/usr/share/bash-completion/completions/quota
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/quota
+++ b/msys2/usr/share/bash-completion/completions/quota
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/quotacheck b/msys2/usr/share/bash-completion/completions/quotacheck
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/quotacheck
+++ b/msys2/usr/share/bash-completion/completions/quotacheck
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/quotaoff b/msys2/usr/share/bash-completion/completions/quotaoff
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/quotaoff
+++ b/msys2/usr/share/bash-completion/completions/quotaoff
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/quotaon b/msys2/usr/share/bash-completion/completions/quotaon
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/quotaon
+++ b/msys2/usr/share/bash-completion/completions/quotaon
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/radvdump b/msys2/usr/share/bash-completion/completions/radvdump
index 469c8f12b..850628fda 100644
--- a/msys2/usr/share/bash-completion/completions/radvdump
+++ b/msys2/usr/share/bash-completion/completions/radvdump
@@ -6,17 +6,17 @@ _radvdump()
     _init_completion || return
 
     case $prev in
-        -h|--help|-v|--version)
+        -h | --help | -v | --version)
             return
             ;;
-        -d|--debug)
-            COMPREPLY=( $(compgen -W '{1..4}' -- "$cur") )
+        -d | --debug)
+            COMPREPLY=($(compgen -W '{1..4}' -- "$cur"))
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 } &&
-complete -F _radvdump radvdump
+    complete -F _radvdump radvdump
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ralsh b/msys2/usr/share/bash-completion/completions/ralsh
index b9e1bcd6b..e8767de18 100644
--- a/msys2/usr/share/bash-completion/completions/ralsh
+++ b/msys2/usr/share/bash-completion/completions/ralsh
@@ -3,54 +3,54 @@
 _puppet_logdest()
 {
     if [[ -z $cur ]]; then
-        COMPREPLY=( $(compgen -W 'syslog console /' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console /' -- "$cur"))
     else
-        COMPREPLY=( $(compgen -W 'syslog console' -- "$cur") )
+        COMPREPLY=($(compgen -W 'syslog console' -- "$cur"))
         _filedir
     fi
 }
 
 _puppet_digest()
 {
-    COMPREPLY=( $(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur") )
+    COMPREPLY=($(compgen -W 'MD5 MD2 SHA1 SHA256' -- "$cur"))
 }
 
 _puppet_certs()
 {
     local puppetca="puppet cert"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca  &>/dev/null \
-        && puppetca=puppetca
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetca &>/dev/null &&
+        puppetca=puppetca
 
-    if [[ "$1" == --all ]]; then
+    if [[ $1 == --all ]]; then
         cert_list=$($puppetca --list --all | command sed -e 's/^[+-]\{0,1\}\s*\(\S\+\)\s\+.*$/\1/')
     else
         cert_list=$($puppetca --list)
     fi
-    COMPREPLY+=( $(compgen -W "$cert_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
 }
 
 _puppet_types()
 {
     puppet_types=$(puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_types" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
 }
 
 _puppet_references()
 {
     local puppetdoc="puppet doc"
-    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc  &>/dev/null \
-        && puppetdoc=puppetdoc
+    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type puppetdoc &>/dev/null &&
+        puppetdoc=puppetdoc
 
     puppet_doc_list=$($puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/')
-    COMPREPLY+=( $(compgen -W "$puppet_doc_list" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
 }
 
 _puppet_subcmd_opts()
 {
     # puppet cmd help is somewhat slow, avoid if possible
-    [[ -z $cur || $cur == -* ]] && \
-        COMPREPLY+=( $(compgen -W \
-        '$(_parse_usage "$1" "help $2")' -- "$cur") )
+    [[ -z $cur || $cur == -* ]] &&
+        COMPREPLY+=($(compgen -W \
+            '$(_parse_usage "$1" "help $2")' -- "$cur"))
 }
 
 _puppet()
@@ -58,10 +58,10 @@ _puppet()
     local cur prev words cword
     _init_completion || return
 
-    local xspec helpopts subcommand action
+    local subcommand action
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
@@ -96,19 +96,20 @@ _puppet()
             ;;
         puppet)
             case ${words[1]} in
-                agent|apply|cert|describe|doc|filebucket|kick|master|parser|queue|resource)
+                agent | apply | cert | describe | doc | filebucket | kick | master | parser | queue | resource)
                     subcommand=${words[1]}
                     ;;
-                *.pp|*.rb)
+                *.pp | *.rb)
                     subcommand=apply
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'agent apply cert describe doc
+                    COMPREPLY=($(compgen -W 'agent apply cert describe doc
                         filebucket kick master parser queue resource' \
-                        -- "$cur") )
+                        -- "$cur"))
                     return
                     ;;
             esac
+            ;;
     esac
 
     case $subcommand in
@@ -126,46 +127,48 @@ _puppet()
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 --masterport)
-                    COMPREPLY=( $(compgen -W '8140' -- "$cur") )
+                    COMPREPLY=($(compgen -W '8140' -- "$cur"))
                     return
                     ;;
-                -w|--waitforcert)
-                    COMPREPLY=( $(compgen -W '0 15 30 60 120' -- "$cur") )
+                -w | --waitforcert)
+                    COMPREPLY=($(compgen -W '0 15 30 60 120' -- "$cur"))
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         apply)
             case $prev in
                 --catalog)
-                    COMPREPLY=( $(compgen -W '-' -- "$cur") )
+                    COMPREPLY=($(compgen -W '-' -- "$cur"))
                     _filedir json
                     return
                     ;;
                 --execute)
                     return
                     ;;
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         cert)
@@ -176,117 +179,123 @@ _puppet()
                     ;;
                 *)
                     action=$prev
-                    COMPREPLY=( $(compgen -W '--digest --debug --help --verbose --version' \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W '--digest --debug --help --verbose --version' \
+                        -- "$cur"))
                     case $action in
-                        fingerprint|list|verify|--fingerprint|--list|--verify)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        fingerprint | list | verify | --fingerprint | --list | --verify)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs --all
                             return
                             ;;
-                        generate|--generate)
+                        generate | --generate)
                             _known_hosts_real -- "$cur"
                             return
                             ;;
-                        clean|print|revoke|--clean|--print|--revoke)
+                        clean | print | revoke | --clean | --print | --revoke)
                             _puppet_certs --all
                             return
                             ;;
-                        sign|--sign)
-                            COMPREPLY+=( $(compgen -W '--all' -- "$cur") )
+                        sign | --sign)
+                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
                             _puppet_certs
                             return
                             ;;
                         *)
-                            COMPREPLY+=( $(compgen -W 'clean fingerprint generate
-                                list print revoke sign verify reinventory' -- "$cur") )
+                            COMPREPLY+=($(compgen -W 'clean fingerprint generate
+                                list print revoke sign verify reinventory' -- "$cur"))
                             return
+                            ;;
                     esac
+                    ;;
             esac
             ;;
         describe)
             _puppet_subcmd_opts "$1" $subcommand
-            if [[ "$cur" != -* ]]; then
+            if [[ $cur != -* ]]; then
                 _puppet_types
             fi
             return
             ;;
         doc)
             case $prev in
-                -o|--outputdir)
+                -o | --outputdir)
                     _filedir -d
                     return
                     ;;
-                -m|--mode)
-                    COMPREPLY=( $(compgen -W 'text trac pdf rdoc' -- "$cur") )
+                -m | --mode)
+                    COMPREPLY=($(compgen -W 'text trac pdf rdoc' -- "$cur"))
                     return
                     ;;
-                -r|--reference)
+                -r | --reference)
                     _puppet_references
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         filebucket)
             case $prev in
-                -s|--server)
+                -s | --server)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -b|--bucket)
+                -b | --bucket)
                     _filedir -d
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
-                        COMPREPLY=( $(compgen -W 'backup get restore' \
-                            -- "$cur") )
+                        COMPREPLY=($(compgen -W 'backup get restore' \
+                            -- "$cur"))
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
         kick)
             case $prev in
-                -c|--class)
+                -c | --class)
                     return
                     ;;
                 --host)
                     _known_hosts_real -- "$cur"
                     return
                     ;;
-                -t|--tag)
+                -t | --tag)
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _known_hosts_real -- "$cur"
                     fi
                     return
+                    ;;
             esac
             ;;
         master)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
                     _puppet_subcmd_opts "$1" $subcommand
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=( $(compgen -W '--no-daemonize' -- "$cur") )
+                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         parser)
@@ -297,31 +306,33 @@ _puppet()
                     return
                     ;;
                 *)
-                    COMPREPLY=( $(compgen -W 'validate' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'validate' -- "$cur"))
                     return
+                    ;;
             esac
             ;;
         queue)
             case $prev in
-                -l|--logdest)
+                -l | --logdest)
                     _puppet_logdest
                     return
                     ;;
                 *)
-                    if [[ "$cur" == -* ]]; then
+                    if [[ $cur == -* ]]; then
                         _puppet_subcmd_opts "$1" $subcommand
                     else
                         _filedir
                     fi
                     return
+                    ;;
             esac
             ;;
-        resource|*)
+        resource | *)
             _puppet_subcmd_opts "$1" $subcommand
             return
             ;;
     esac
 } &&
-complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
+    complete -F _puppet puppetmasterd puppetd puppetca ralsh puppetrun puppetqd filebucket puppetdoc puppet
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rcs b/msys2/usr/share/bash-completion/completions/rcs
index cfad02119..c04d89d2d 100644
--- a/msys2/usr/share/bash-completion/completions/rcs
+++ b/msys2/usr/share/bash-completion/completions/rcs
@@ -11,26 +11,26 @@ _rcs()
     dir=${cur%/*}
 
     # deal with relative directory
-    [[ $file == $dir ]] && dir=.
+    [[ $file == "$dir" ]] && dir=.
 
-    COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
+    COMPREPLY=($(compgen -f -- "$dir/RCS/$file"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        file=${COMPREPLY[$i]##*/}
-        dir=${COMPREPLY[$i]%RCS/*}
-        COMPREPLY[$i]=$dir$file
+    for i in ${!COMPREPLY[*]}; do
+        file=${COMPREPLY[i]##*/}
+        dir=${COMPREPLY[i]%RCS/*}
+        COMPREPLY[i]=$dir$file
     done
 
-    COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
+    COMPREPLY+=($(compgen -G "$dir/$file*,v"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        COMPREPLY[$i]=${COMPREPLY[$i]%,v}
+    for i in ${!COMPREPLY[*]}; do
+        COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 
     # default to files if nothing returned and we're checking in.
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rcsdiff b/msys2/usr/share/bash-completion/completions/rcsdiff
index cfad02119..c04d89d2d 100644
--- a/msys2/usr/share/bash-completion/completions/rcsdiff
+++ b/msys2/usr/share/bash-completion/completions/rcsdiff
@@ -11,26 +11,26 @@ _rcs()
     dir=${cur%/*}
 
     # deal with relative directory
-    [[ $file == $dir ]] && dir=.
+    [[ $file == "$dir" ]] && dir=.
 
-    COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
+    COMPREPLY=($(compgen -f -- "$dir/RCS/$file"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        file=${COMPREPLY[$i]##*/}
-        dir=${COMPREPLY[$i]%RCS/*}
-        COMPREPLY[$i]=$dir$file
+    for i in ${!COMPREPLY[*]}; do
+        file=${COMPREPLY[i]##*/}
+        dir=${COMPREPLY[i]%RCS/*}
+        COMPREPLY[i]=$dir$file
     done
 
-    COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
+    COMPREPLY+=($(compgen -G "$dir/$file*,v"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        COMPREPLY[$i]=${COMPREPLY[$i]%,v}
+    for i in ${!COMPREPLY[*]}; do
+        COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 
     # default to files if nothing returned and we're checking in.
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rdesktop b/msys2/usr/share/bash-completion/completions/rdesktop
index 5226a123b..54c1ae668 100644
--- a/msys2/usr/share/bash-completion/completions/rdesktop
+++ b/msys2/usr/share/bash-completion/completions/rdesktop
@@ -7,34 +7,34 @@ _rdesktop()
 
     case $prev in
         -*k)
-            COMPREPLY=( $(command ls \
-                /usr/share/rdesktop/keymaps 2>/dev/null | \
-                command grep -E -v '(common|modifiers)') )
-            COMPREPLY+=( $(command ls $HOME/.rdesktop/keymaps 2>/dev/null) )
-            COMPREPLY+=( $(command ls ./keymaps 2>/dev/null) )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- "$cur") )
+            COMPREPLY=($(command ls \
+                /usr/share/rdesktop/keymaps 2>/dev/null |
+                command grep -E -v '(common|modifiers)'))
+            COMPREPLY+=($(command ls $HOME/.rdesktop/keymaps 2>/dev/null))
+            COMPREPLY+=($(command ls ./keymaps 2>/dev/null))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
         -*a)
-            COMPREPLY=( $(compgen -W '8 15 16 24' -- "$cur") )
+            COMPREPLY=($(compgen -W '8 15 16 24' -- "$cur"))
             return
             ;;
         -*x)
-            COMPREPLY=( $(compgen -W 'broadband modem lan' -- "$cur") )
+            COMPREPLY=($(compgen -W 'broadband modem lan' -- "$cur"))
             return
             ;;
         -*r)
             case $cur in
                 sound:*)
-                    COMPREPLY=( $(compgen -W 'local off remote' \
-                        -- "${cur#sound:}") )
-                    ;;
-                *:*)
+                    COMPREPLY=($(compgen -W 'local off remote' \
+                        -- "${cur#sound:}"))
                     ;;
+                *:*) ;;
+
                 *)
-                    COMPREPLY=( $(compgen -W 'comport: disk: lptport:
-                        printer: sound: lspci scard' -- "$cur") )
-                    [[ $COMPREPLY == *: ]] && compopt -o nospace
+                    COMPREPLY=($(compgen -W 'comport: disk: lptport:
+                        printer: sound: lspci scard' -- "$cur"))
+                    [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
                     ;;
             esac
             return
@@ -44,14 +44,14 @@ _rdesktop()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        local opts=( $(_parse_help "$1") )
-        COMPREPLY=( $(compgen -W '${opts[@]%:}' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        local opts=($(_parse_help "$1"))
+        COMPREPLY=($(compgen -W '${opts[@]%:}' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 
 } &&
-complete -F _rdesktop rdesktop
+    complete -F _rdesktop rdesktop
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rdict b/msys2/usr/share/bash-completion/completions/rdict
index c3ea9906e..f3426ffd2 100644
--- a/msys2/usr/share/bash-completion/completions/rdict
+++ b/msys2/usr/share/bash-completion/completions/rdict
@@ -13,35 +13,35 @@ _dict()
 
     local host port db i
 
-    for (( i=1; i < cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         case ${words[i]} in
-            --host|-!(-*)h)
+            --host | -!(-*)h)
                 host=${words[++i]}
                 [[ -n $host ]] && host="-h $host"
                 ;;
-            --port|-!(-*)p)
+            --port | -!(-*)p)
                 port=${words[++i]}
                 [[ -n $port ]] && port="-p $port"
                 ;;
-            --database|-!(-*)d)
+            --database | -!(-*)d)
                 db=${words[++i]}
                 [[ -n $db ]] && host="-d $db"
                 ;;
         esac
     done
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     case $prev in
-        --database|-info|-!(-*)[di])
-            COMPREPLY=( $(compgen -W '$(_dictdata -D)' -- "$cur") )
+        --database | -info | -!(-*)[di])
+            COMPREPLY=($(compgen -W '$(_dictdata -D)' -- "$cur"))
             return
             ;;
-        --strategy|-!(-*)s)
-            COMPREPLY=( $(compgen -W '$(_dictdata -S)' -- "$cur") )
+        --strategy | -!(-*)s)
+            COMPREPLY=($(compgen -W '$(_dictdata -S)' -- "$cur"))
             return
             ;;
     esac
@@ -52,13 +52,13 @@ _dict()
         # it down with grep if $cur looks like something that's safe to embed
         # in a pattern instead.
         if [[ $cur == +([-A-Za-z0-9/.]) ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(command grep "^${cur//./\\.}" $dictfile)' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                '$(command grep "^${cur//./\\.}" $dictfile)' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W '$(cat $dictfile)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(cat $dictfile)' -- "$cur"))
         fi
     fi
 } &&
-complete -F _dict -o default dict rdict
+    complete -F _dict -o default dict rdict
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/remove_members b/msys2/usr/share/bash-completion/completions/remove_members
index c22286f10..db7ad0bcc 100644
--- a/msys2/usr/share/bash-completion/completions/remove_members
+++ b/msys2/usr/share/bash-completion/completions/remove_members
@@ -6,7 +6,7 @@ _remove_members()
     _init_completion -s || return
 
     case $prev in
-        -f|--file)
+        -f | --file)
             _filedir
             return
             ;;
@@ -14,14 +14,14 @@ _remove_members()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--file --all --fromall --nouserack
-            --noadminack --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--file --all --fromall --nouserack
+            --noadminack --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _remove_members remove_members
+    complete -F _remove_members remove_members
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/removepkg b/msys2/usr/share/bash-completion/completions/removepkg
index 77f414f69..a56beb07a 100644
--- a/msys2/usr/share/bash-completion/completions/removepkg
+++ b/msys2/usr/share/bash-completion/completions/removepkg
@@ -4,20 +4,22 @@ _removepkg()
 {
     local cur prev words cword
     _init_completion || return
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-copy -keep -preserve -warn' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-copy -keep -preserve -warn' -- "$cur"))
         return
     fi
 
-    if [[ "$cur" == */* ]]; then
+    if [[ $cur == */* ]]; then
         _filedir
         return
     fi
 
     local root=${ROOT:-/}
-    COMPREPLY=( $(cd "$root/var/log/packages" 2>/dev/null || return 1; \
-        compgen -f -- "$cur") )
+    COMPREPLY=($(
+        cd "$root/var/log/packages" 2>/dev/null || return 1
+        compgen -f -- "$cur"
+    ))
 } &&
-complete -F _removepkg removepkg
+    complete -F _removepkg removepkg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/reportbug b/msys2/usr/share/bash-completion/completions/reportbug
index f5eaadf3b..69b12e98e 100644
--- a/msys2/usr/share/bash-completion/completions/reportbug
+++ b/msys2/usr/share/bash-completion/completions/reportbug
@@ -6,65 +6,64 @@ _reportbug()
     _init_completion -s || return
 
     case $prev in
-        --class|--header|--pseudo-header|--mirror|--list-cc|--subject|\
-        --http_proxy|--proxy|--email|--realname|--smtpuser|--smtppasswd|\
-        --replyto|--reply-to|--justification|--package-version|--body|\
-        --body-file|--timeout|--max-attachment-size|--envelope-from|\
-        -!(-*)[CHPsjV])
+        --class | --header | --pseudo-header | --mirror | --list-cc | --subject | \
+            --http_proxy | --proxy | --email | --realname | --smtpuser | --smtppasswd | \
+            --replyto | --reply-to | --justification | --package-version | --body | \
+            --body-file | --timeout | --max-attachment-size | --envelope-from | \
+            -!(-*)[CHPsjV])
             return
             ;;
-        --filename|--include|--mta|--output|--attach|-[fioA])
+        --filename | --include | --mta | --output | --attach | -[fioA])
             _filedir
             return
             ;;
-        --keyid|-!(-*)K)
-            COMPREPLY=( $(compgen -W '$(IFS=: ; \
+        --keyid | -!(-*)K)
+            COMPREPLY=($(compgen -W '$(IFS=: ; \
                 gpg --list-keys --with-colons 2>/dev/null \
                 | while read -ra row ; do
                     [[ "${row[0]}" == [ps]ub && ${row[11]} == *s* ]] && \
                         printf "%s\n" "${row[4]}"
-                done)' -- "$cur") )
+                done)' -- "$cur"))
             return
             ;;
-        --bts|-!(-*)B)
-            COMPREPLY=( $(compgen -W "debian guug kde mandrake help" -- \
-                "$cur") )
+        --bts | -!(-*)B)
+            COMPREPLY=($(compgen -W "debian guug kde mandrake help" -- \
+                "$cur"))
             return
             ;;
-        --editor|--mua|--mbox-reader-cmd|-!(-*)e)
-            words=( words[0] "$cur" )
-            cword=1
-            _command
+        --editor | --mua | --mbox-reader-cmd | -!(-*)e)
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
         --mode)
-            COMPREPLY=( $(compgen -W "novice standard expert" -- "$cur") )
+            COMPREPLY=($(compgen -W "novice standard expert" -- "$cur"))
             return
             ;;
-        --severity|-!(-*)S)
-            COMPREPLY=( $(compgen -W "grave serious important normal minor
-                wishlist" -- "$cur") )
+        --severity | -!(-*)S)
+            COMPREPLY=($(compgen -W "grave serious important normal minor
+                wishlist" -- "$cur"))
             return
             ;;
-        --ui|--interface|-!(-*)u)
-            COMPREPLY=( $(compgen -W "newt text gnome" -- "$cur") )
+        --ui | --interface | -!(-*)u)
+            COMPREPLY=($(compgen -W "newt text gnome" -- "$cur"))
             return
             ;;
-        --type|-!(-*)t)
-            COMPREPLY=( $(compgen -W "gnats debbugs" -- "$cur") )
+        --type | -!(-*)t)
+            COMPREPLY=($(compgen -W "gnats debbugs" -- "$cur"))
             return
             ;;
-        --tag|-!(-*)T)
-            COMPREPLY=( $(compgen -W "none woody potato sarge sarge-ignore
+        --tag | -!(-*)T)
+            COMPREPLY=($(compgen -W "none woody potato sarge sarge-ignore
                 etch etch-ignore lenny lenny-ignore sid experimental confirmed
                 d-i fixed fixed-in-experimental fixed-upstream help l10n
                 moreinfo patch pending security unreproducible upstream wontfix
-                ipv6 lfs" -- "$cur") )
+                ipv6 lfs" -- "$cur"))
             return
             ;;
         --from-buildd)
-            COMPREPLY=( $(compgen -S "_" -W '$(apt-cache dumpavail | \
-                command grep "^Source: $cur" | sort -u | cut -f2 -d" ")') )
+            COMPREPLY=($(compgen -S "_" -W '$(apt-cache dumpavail | \
+                command grep "^Source: $cur" | sort -u | cut -f2 -d" ")'))
             return
             ;;
         --smtphost)
@@ -80,18 +79,18 @@ _reportbug()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == -*= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == -*= ]] && compopt -o nospace
         return
     fi
 
-    COMPREPLY=( $(compgen -W 'wnpp boot-floppies kernel bugs.debian.org
+    COMPREPLY=($(compgen -W 'wnpp boot-floppies kernel bugs.debian.org
         cdimage.debian.org general installation-reports listarchives
         lists.debian.org mirrors nm.debian.org press project qa.debian.org
         release-notes security.debian.org tech-ctte upgrade-reports
-        www.debian.org $(apt-cache pkgnames 2>/dev/null)' -- "$cur") )
+        www.debian.org $(_xfunc apt-cache _apt_cache_packages)' -- "$cur"))
     _filedir
 } &&
-complete -F _reportbug reportbug
+    complete -F _reportbug reportbug
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/repquota b/msys2/usr/share/bash-completion/completions/repquota
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/repquota
+++ b/msys2/usr/share/bash-completion/completions/repquota
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/resolvconf b/msys2/usr/share/bash-completion/completions/resolvconf
index b4659612b..b407488c9 100644
--- a/msys2/usr/share/bash-completion/completions/resolvconf
+++ b/msys2/usr/share/bash-completion/completions/resolvconf
@@ -6,16 +6,16 @@ _resolvconf()
     _init_completion || return
 
     case $prev in
-        -a|-d)
+        -a | -d)
             _available_interfaces
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-a -d -u' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-a -d -u' -- "$cur"))
     fi
 } &&
-complete -F _resolvconf resolvconf
+    complete -F _resolvconf resolvconf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rfcomm b/msys2/usr/share/bash-completion/completions/rfcomm
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/rfcomm
+++ b/msys2/usr/share/bash-completion/completions/rfcomm
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ri b/msys2/usr/share/bash-completion/completions/ri
index 7d1e7cf97..9c34b27fb 100644
--- a/msys2/usr/share/bash-completion/completions/ri
+++ b/msys2/usr/share/bash-completion/completions/ri
@@ -14,21 +14,21 @@ _ri_get_methods()
             regex=Class
         fi
 
-        COMPREPLY+=( \
+        COMPREPLY+=(
             "$(ri "${classes[@]}" 2>/dev/null | ruby -ane \
-            'if /^'"$regex"' methods:/.../^------------------|^$/ and \
+                'if /^'"$regex"' methods:/.../^------------------|^$/ and \
             /^ / then print $_.split(/, |,$/).grep(/^[^\[]*$/).join("\n"); \
-            end' 2>/dev/null | sort -u)" )
+            end' 2>/dev/null | sort -u)")
     else
         # older versions of ri didn't distinguish between class/module and
         # instance methods
-        COMPREPLY+=( \
+        COMPREPLY+=(
             "$(ruby -W0 $ri_path "${classes[@]}" 2>/dev/null | ruby -ane \
-            'if /^-/.../^-/ and ! /^-/ and ! /^ +(class|module): / then \
+                'if /^-/.../^-/ and ! /^-/ and ! /^ +(class|module): / then \
             print $_.split(/, |,$| +/).grep(/^[^\[]*$/).join("\n"); \
-            end' | sort -u)" )
+            end' | sort -u)")
     fi
-    COMPREPLY=( $(compgen $prefix -W '${COMPREPLY[@]}' -- $method) )
+    COMPREPLY=($(compgen $prefix -W '${COMPREPLY[@]}' -- $method))
 }
 
 # needs at least Ruby 1.8.0 in order to use -W0
@@ -38,14 +38,14 @@ _ri()
     _init_completion -s -n : || return
 
     case $prev in
-        --help|--width|-!(-*)[hw])
+        --help | --width | -!(-*)[hw])
             return
             ;;
-        --format|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'ansi bs html rdoc' -- "$cur") )
+        --format | -!(-*)f)
+            COMPREPLY=($(compgen -W 'ansi bs html rdoc' -- "$cur"))
             return
             ;;
-        --doc-dir|-!(-*)d)
+        --doc-dir | -!(-*)d)
             _filedir -d
             return
             ;;
@@ -57,9 +57,9 @@ _ri()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -71,17 +71,17 @@ _ri()
     # -W0 is required here to stop warnings from older versions of ri
     # from being captured when used with Ruby 1.8.1 and later
     ri_version="$(ruby -W0 $ri_path -v 2>&1)" || ri_version=integrated
-    [[ $ri_version != ${ri_version%200*} ]] && ri_version=integrated
+    [[ $ri_version != "${ri_version%200*}" ]] && ri_version=integrated
     [[ $ri_version =~ ri[[:space:]]v?([0-9]+) ]] && ri_major=${BASH_REMATCH[1]}
 
     # need to also split on commas
     IFS=$', \n\t'
-    if [[ "$cur" == [A-Z]*[#.]* ]]; then
-        [[ "$cur" == *#* ]] && separator=# || separator=.
+    if [[ $cur == [A-Z]*[#.]* ]]; then
+        [[ $cur == *#* ]] && separator=# || separator=.
         # we're completing on class and method
         class=${cur%$separator*}
         method=${cur#*$separator}
-        classes=( $class )
+        classes=($class)
         prefix="-P $class$separator"
         _ri_get_methods
         return
@@ -89,24 +89,24 @@ _ri()
 
     if [[ $ri_version == integrated ]]; then
         # integrated ri from Ruby 1.9
-        classes=( $(ri -c 2>/dev/null | ruby -ne 'if /^\s*$/..$stdin.eof then \
-        if /^ +[A-Z]/ then print; end; end' 2>/dev/null) )
+        classes=($(ri -c 2>/dev/null | ruby -ne 'if /^\s*$/..$stdin.eof then \
+        if /^ +[A-Z]/ then print; end; end' 2>/dev/null))
     elif [[ $ri_major && $ri_major -ge 3 ]]; then
-        classes=( $(ri -l 2>/dev/null) )
+        classes=($(ri -l 2>/dev/null))
     elif [[ $ri_version == "ri 1.8a" ]]; then
-        classes=( $(ruby -W0 $ri_path | \
+        classes=($(ruby -W0 $ri_path |
             ruby -ne 'if /^'"'"'ri'"'"' has/..$stdin.eof then \
-            if /^ .*[A-Z]/ then print; end; end') )
+            if /^ .*[A-Z]/ then print; end; end'))
     else
-        classes=( $(ruby -W0 $ri_path | \
+        classes=($(ruby -W0 $ri_path |
             ruby -ne 'if /^I have/..$stdin.eof then \
-                if /^ .*[A-Z]/ then print; end; end') )
+                if /^ .*[A-Z]/ then print; end; end'))
     fi
 
-    COMPREPLY=( $(compgen -W '${classes[@]}' -- "$cur") )
+    COMPREPLY=($(compgen -W '${classes[@]}' -- "$cur"))
     __ltrim_colon_completions "$cur"
 
-    if [[ "$cur" == [A-Z]* ]]; then
+    if [[ $cur == [A-Z]* ]]; then
         # we're completing on class or module alone
         return
     fi
@@ -115,6 +115,6 @@ _ri()
     method=$cur
     _ri_get_methods
 } &&
-complete -F _ri ri
+    complete -F _ri ri
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rlog b/msys2/usr/share/bash-completion/completions/rlog
index cfad02119..c04d89d2d 100644
--- a/msys2/usr/share/bash-completion/completions/rlog
+++ b/msys2/usr/share/bash-completion/completions/rlog
@@ -11,26 +11,26 @@ _rcs()
     dir=${cur%/*}
 
     # deal with relative directory
-    [[ $file == $dir ]] && dir=.
+    [[ $file == "$dir" ]] && dir=.
 
-    COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
+    COMPREPLY=($(compgen -f -- "$dir/RCS/$file"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        file=${COMPREPLY[$i]##*/}
-        dir=${COMPREPLY[$i]%RCS/*}
-        COMPREPLY[$i]=$dir$file
+    for i in ${!COMPREPLY[*]}; do
+        file=${COMPREPLY[i]##*/}
+        dir=${COMPREPLY[i]%RCS/*}
+        COMPREPLY[i]=$dir$file
     done
 
-    COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
+    COMPREPLY+=($(compgen -G "$dir/$file*,v"))
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-        COMPREPLY[$i]=${COMPREPLY[$i]%,v}
+    for i in ${!COMPREPLY[*]}; do
+        COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 
     # default to files if nothing returned and we're checking in.
     # otherwise, default to directories
     [[ ${#COMPREPLY[@]} -eq 0 && $1 == *ci ]] && _filedir || _filedir -d
 } &&
-complete -F _rcs ci co rlog rcs rcsdiff
+    complete -F _rcs ci co rlog rcs rcsdiff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rmlist b/msys2/usr/share/bash-completion/completions/rmlist
index d096352cd..0cc473a9b 100644
--- a/msys2/usr/share/bash-completion/completions/rmlist
+++ b/msys2/usr/share/bash-completion/completions/rmlist
@@ -5,13 +5,13 @@ _rmlist()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--archives --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--archives --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _rmlist rmlist
+    complete -F _rmlist rmlist
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rmmod b/msys2/usr/share/bash-completion/completions/rmmod
index 12f2334e6..7ec29e6cb 100644
--- a/msys2/usr/share/bash-completion/completions/rmmod
+++ b/msys2/usr/share/bash-completion/completions/rmmod
@@ -7,18 +7,18 @@ _rmmod()
     _init_completion || return
 
     case $prev in
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _installed_modules "$cur"
 } &&
-complete -F _rmmod rmmod
+    complete -F _rmmod rmmod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/route b/msys2/usr/share/bash-completion/completions/route
index a7c06d6d7..f9b319648 100644
--- a/msys2/usr/share/bash-completion/completions/route
+++ b/msys2/usr/share/bash-completion/completions/route
@@ -17,14 +17,14 @@ _route()
     for opt in add del -host -net netmask metric mss window irtt reject mod \
         dyn reinstate dev default gw; do
         found=false
-        for (( i=1; i < ${#words[@]}-1; i++ )); do
-            [[ ${words[i]} == $opt ]] && found=true && break
+        for ((i = 1; i < ${#words[@]} - 1; i++)); do
+            [[ ${words[i]} == "$opt" ]] && found=true && break
         done
-        $found || COMPREPLY[${#COMPREPLY[@]}]="$opt"
+        $found || COMPREPLY+=("$opt")
     done
 
-    COMPREPLY=( $(compgen -W '"${COMPREPLY[@]}"' -- "$cur") )
+    COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "$cur"))
 } &&
-complete -F _route route
+    complete -F _route route
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpcdebug b/msys2/usr/share/bash-completion/completions/rpcdebug
index ce4f93728..6e2b88c56 100644
--- a/msys2/usr/share/bash-completion/completions/rpcdebug
+++ b/msys2/usr/share/bash-completion/completions/rpcdebug
@@ -2,18 +2,18 @@
 
 _rpcdebug_flags()
 {
-
     local i module
 
-    for (( i=0; i < ${#words[@]}; i++ )); do
+    for ((i = 1; i < ${#words[@]}; i++)); do
         if [[ ${words[i]} == -m ]]; then
-            module=${words[i+1]}
+            module=${words[i + 1]}
+            break
         fi
     done
 
     if [[ -n $module ]]; then
-        COMPREPLY=( $(compgen -W "$(rpcdebug -vh 2>&1 | \
-            command sed -ne 's/^'$module'[[:space:]]\{1,\}//p')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(rpcdebug -vh 2>&1 |
+            command sed -ne 's/^'$module'[[:space:]]\{1,\}//p')" -- "$cur"))
     fi
 }
 
@@ -32,15 +32,15 @@ _rpcdebug()
             return
             ;;
         -*m)
-            COMPREPLY=( $(compgen -W 'rpc nfs nfsd nlm' -- "$cur") )
+            COMPREPLY=($(compgen -W 'rpc nfs nfsd nlm' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" -h) -s -c' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" -h) -s -c' -- "$cur"))
     fi
 } &&
-complete -F _rpcdebug rpcdebug
+    complete -F _rpcdebug rpcdebug
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpm b/msys2/usr/share/bash-completion/completions/rpm
index b797e9fb2..8299a37a4 100644
--- a/msys2/usr/share/bash-completion/completions/rpm
+++ b/msys2/usr/share/bash-completion/completions/rpm
@@ -7,38 +7,38 @@ _rpm_installed_packages()
     if [[ -r /var/log/rpmpkgs && \
         /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then
         # using RHL 7.2 or later - this is quicker than querying the DB
-        COMPREPLY=( $(compgen -W "$(command sed -ne \
+        COMPREPLY=($(compgen -W "$(command sed -ne \
             's|^\([^[:space:]]\{1,\}\)-[^[:space:]-]\{1,\}-[^[:space:]-]\{1,\}\.rpm$|\1|p' \
-            /var/log/rpmpkgs)" -- "$cur") )
-    elif type rpmqpack &>/dev/null ; then
+            /var/log/rpmpkgs)" -- "$cur"))
+    elif type rpmqpack &>/dev/null; then
         # SUSE's rpmqpack is faster than rpm -qa
-        COMPREPLY=( $(compgen -W '$(rpmqpack)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(rpmqpack)' -- "$cur"))
     else
-        COMPREPLY=( $(${1:-rpm} -qa --nodigest --nosignature \
-            --queryformat='%{NAME} ' "$cur*" 2>/dev/null) )
+        COMPREPLY=($(${1:-rpm} -qa --nodigest --nosignature \
+            --queryformat='%{NAME} ' "$cur*" 2>/dev/null))
     fi
 }
 
 _rpm_groups()
 {
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
-        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
+        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur"))
 }
 
 _rpm_macros()
 {
     # get a list of macros
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^-\{0,1\}[0-9]\{1,\}[:=][[:space:]]\{1,\}\([^[:space:](]\{3,\}\).*/%\1/p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 _rpm_buildarchs()
 {
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^\s*compatible\s\s*build\s\s*archs\s*:\s*\(.*\)/\1/ p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 # rpm(8) completion
@@ -48,35 +48,35 @@ _rpm()
     local cur prev words cword split
     _init_completion -s || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         # first parameter on line
         case $cur in
             --*)
-                COMPREPLY=( $(compgen -W '--help --version --initdb
+                COMPREPLY=($(compgen -W '--help --version --initdb
                     --checksig --addsign --delsign --rebuilddb --showrc
                     --setperms --setugids --eval --install --upgrade --query
                     --freshen --erase --verify --querytags --import' \
-                        -- "$cur") )
+                    -- "$cur"))
                 ;;
             *)
-                COMPREPLY=( $(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur") )
+                COMPREPLY=($(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur"))
                 ;;
         esac
         return
     fi
 
     case $prev in
-        --dbpath|--excludepath|--prefix|--relocate|--root|-!(-*)r)
+        --dbpath | --excludepath | --prefix | --relocate | --root | -!(-*)r)
             _filedir -d
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $1
             return
             ;;
         --pipe)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
         --rcfile)
@@ -88,28 +88,28 @@ _rpm()
             _filedir spec
             return
             ;;
-        --whatenhances|--whatprovides|--whatrecommends|--whatrequires|\
-        --whatsuggests|--whatsupplements)
-            if [[ "$cur" == */* ]]; then
+        --whatenhances | --whatprovides | --whatrecommends | --whatrequires | \
+            --whatsuggests | --whatsupplements)
+            if [[ $cur == */* ]]; then
                 _filedir
             else
                 # complete on capabilities
                 local IFS=$'\n' fmt
                 case $prev in
-                    *enhances) fmt=ENHANCENAME ;;
-                    *provides) fmt=PROVIDENAME ;;
-                    *recommends) fmt=RECOMMENDNAME ;;
-                    *requires) fmt=REQUIRENAME ;;
-                    *suggests) fmt=SUGGESTNAME ;;
-                    *supplements) fmt=SUPPLEMENTNAME ;;
+                    *enhances) fmt="%{ENHANCENAME}" ;;
+                    *provides) fmt="%{PROVIDENAME}" ;;
+                    *recommends) fmt="%{RECOMMENDNAME}" ;;
+                    *requires) fmt="%{REQUIRENAME}" ;;
+                    *suggests) fmt="%{SUGGESTNAME}" ;;
+                    *supplements) fmt="%{SUPPLEMENTNAME}" ;;
                 esac
-                COMPREPLY=( $(compgen -W "$($1 -qa --nodigest --nosignature \
-                    --queryformat=\"%{$fmt}\\n\" 2>/dev/null |
-                    command grep -vF '(none)')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$($1 -qa --nodigest --nosignature \
+                    --queryformat=\"$fmt\\n\" 2>/dev/null |
+                    command grep -vF '(none)')" -- "$cur"))
             fi
             return
             ;;
-        --define|--fileid|--hdrid|--pkgid|-!(-*)D)
+        --define | --fileid | --hdrid | --pkgid | -!(-*)D)
             # argument required but no completions available
             return
             ;;
@@ -122,28 +122,28 @@ _rpm()
         --quiet --pipe --verbose"
 
     case ${words[1]} in
-        -[iFU]*|--install|--freshen|--upgrade)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --percent --force --test
+        -[iFU]* | --install | --freshen | --upgrade)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --percent --force --test
                 --replacepkgs --replacefiles --root --excludedocs --includedocs
                 --noscripts --ignorearch --dbpath --prefix= --ignoreos --nodeps
                 --allfiles --ftpproxy --ftpport --justdb --httpproxy --httpport
                 --noorder --relocate= --badreloc --notriggers --excludepath=
                 --ignoresize --oldpackage --queryformat --repackage
-                --nosuggests" -- "$cur") )
+                --nosuggests" -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -e|--erase)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --allmatches --noscripts
-                    --notriggers --nodeps --test --repackage" -- "$cur") )
+        -e | --erase)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --allmatches --noscripts
+                    --notriggers --nodeps --test --repackage" -- "$cur"))
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        -q*|--query)
+        -q* | --query)
             # options common to all query types
             opts+=" --changelog --configfiles --conflicts --docfiles --dump
                 --enhances --filesbypkg --filecaps --fileclass --filecolor
@@ -152,85 +152,85 @@ _rpm()
                 --scripts --suggests --triggers --xml --recommends
                 --supplements --filetriggers --licensefiles"
 
-            if [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            if [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --dbpath --fscontext
-                        --last --root --state" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --dbpath --fscontext
+                        --last --root --state" -- "$cur"))
                 else
                     _filedir
                 fi
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 # -qg completion
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --ftpport --ftpproxy
-                        --httpport --httpproxy --nomanifest" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --ftpport --ftpproxy
+                        --httpport --httpproxy --nomanifest" -- "$cur"))
                 else
                     _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --all --file --fileid
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --all --file --fileid
                         --dbpath --fscontext --ftswalk --group --hdrid --last
                         --package --pkgid --root= --specfile --state
                         --triggeredby --whatenhances --whatprovides
                         --whatrecommends --whatrequires --whatsuggests
                         --whatsupplements" \
-                            -- "$cur") )
-                elif [[ "${words[*]}" != *\ -@(*([^ -])a|-all )* ]]; then
+                        -- "$cur"))
+                elif [[ ${words[*]} != *\ -@(*([^ -])a|-all )* ]]; then
                     _rpm_installed_packages $1
                 fi
             fi
             ;;
-        -K*|--checksig)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --nopgp --nogpg --nomd5" \
-                    -- "$cur") )
+        -K* | --checksig)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --nopgp --nogpg --nomd5" \
+                    -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -[Vy]*|--verify)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --root= --dbpath --nodeps
+        -[Vy]* | --verify)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --root= --dbpath --nodeps
                     --nogroup --nolinkto --nomode --nomtime --nordev --nouser
                     --nofiles --noscripts --nomd5 --querytags --specfile
                     --whatenhances --whatprovides --whatrecommends
                     --whatrequires --whatsuggests --whatsupplements" \
-                        -- "$cur") )
+                    -- "$cur"))
             # check whether we're doing file completion
-            elif [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 _filedir
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 _filedir '[rs]pm'
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        --resign|--addsign|--delsign)
+        --resign | --addsign | --delsign)
             _filedir '[rs]pm'
             ;;
-        --setperms|--setgids)
+        --setperms | --setgids)
             _rpm_installed_packages $1
             ;;
-        --import|--dbpath|--root)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W '--import --dbpath --root=' \
-                    -- "$cur") )
+        --import | --dbpath | --root)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '--import --dbpath --root=' \
+                    -- "$cur"))
             else
                 _filedir
             fi
             ;;
     esac
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _rpm rpm
+    complete -F _rpm rpm
 
 _rpmbuild()
 {
@@ -238,33 +238,33 @@ _rpmbuild()
     _init_completion -s || return
 
     local rpm="${1%build*}"
-    [[ $rpm == $1 ]] || ! type $rpm &>/dev/null && rpm=
+    [[ $rpm == "$1" ]] || ! type $rpm &>/dev/null && rpm=
 
     case $prev in
-        --buildroot|--root|--dbpath|-!(-*)r)
+        --buildroot | --root | --dbpath | -!(-*)r)
             _filedir -d
             return
             ;;
         --target)
-            _rpm_buildarchs
+            _rpm_buildarchs $rpm
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $rpm
             return
             ;;
-        --macros|--rcfile)
+        --macros | --rcfile)
             _filedir
             return
             ;;
         --buildpolicy)
             local cfgdir=$($rpm --eval '%{_rpmconfigdir}' 2>/dev/null)
             if [[ $cfgdir ]]; then
-                COMPREPLY=( $(compgen -W "$(command ls $cfgdir 2>/dev/null \
-                    | command sed -ne 's/^brp-//p')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(command ls $cfgdir 2>/dev/null |
+                    command sed -ne 's/^brp-//p')" -- "$cur"))
             fi
             ;;
-        --define|--with|--without|-!(-*)D)
+        --define | --with | --without | -!(-*)D)
             return
             ;;
     esac
@@ -272,8 +272,8 @@ _rpmbuild()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -281,15 +281,15 @@ _rpmbuild()
     local word ext
     for word in "${words[@]}"; do
         case $word in
-            -b?|--clean|--nobuild)
+            -b? | --clean | --nobuild)
                 ext=spec
                 break
                 ;;
-            -t?|--tarbuild)
+            -t? | --tarbuild)
                 ext='@(t?(ar.)@([gx]z|bz?(2))|tar?(.@(lzma|Z)))'
                 break
                 ;;
-            --rebuild|--recompile)
+            --rebuild | --recompile)
                 ext='@(?(no)src.r|s)pm'
                 break
                 ;;
@@ -297,6 +297,6 @@ _rpmbuild()
     done
     [[ -n $ext ]] && _filedir $ext
 } &&
-complete -F _rpmbuild rpmbuild rpmbuild-md5
+    complete -F _rpmbuild rpmbuild rpmbuild-md5
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpm2targz b/msys2/usr/share/bash-completion/completions/rpm2targz
index da4b7e5e8..5ddcfd593 100644
--- a/msys2/usr/share/bash-completion/completions/rpm2targz
+++ b/msys2/usr/share/bash-completion/completions/rpm2targz
@@ -5,13 +5,13 @@ _rpm2tgz()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-s -S -n -r -d -c' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-s -S -n -r -d -c' -- "$cur"))
         return
     fi
 
     _filedir "rpm"
 } &&
-complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
+    complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpm2tgz b/msys2/usr/share/bash-completion/completions/rpm2tgz
index da4b7e5e8..5ddcfd593 100644
--- a/msys2/usr/share/bash-completion/completions/rpm2tgz
+++ b/msys2/usr/share/bash-completion/completions/rpm2tgz
@@ -5,13 +5,13 @@ _rpm2tgz()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-s -S -n -r -d -c' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-s -S -n -r -d -c' -- "$cur"))
         return
     fi
 
     _filedir "rpm"
 } &&
-complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
+    complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpm2txz b/msys2/usr/share/bash-completion/completions/rpm2txz
index da4b7e5e8..5ddcfd593 100644
--- a/msys2/usr/share/bash-completion/completions/rpm2txz
+++ b/msys2/usr/share/bash-completion/completions/rpm2txz
@@ -5,13 +5,13 @@ _rpm2tgz()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-s -S -n -r -d -c' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-s -S -n -r -d -c' -- "$cur"))
         return
     fi
 
     _filedir "rpm"
 } &&
-complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
+    complete -F _rpm2tgz rpm2tgz rpm2txz rpm2targz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpmbuild b/msys2/usr/share/bash-completion/completions/rpmbuild
index b797e9fb2..8299a37a4 100644
--- a/msys2/usr/share/bash-completion/completions/rpmbuild
+++ b/msys2/usr/share/bash-completion/completions/rpmbuild
@@ -7,38 +7,38 @@ _rpm_installed_packages()
     if [[ -r /var/log/rpmpkgs && \
         /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then
         # using RHL 7.2 or later - this is quicker than querying the DB
-        COMPREPLY=( $(compgen -W "$(command sed -ne \
+        COMPREPLY=($(compgen -W "$(command sed -ne \
             's|^\([^[:space:]]\{1,\}\)-[^[:space:]-]\{1,\}-[^[:space:]-]\{1,\}\.rpm$|\1|p' \
-            /var/log/rpmpkgs)" -- "$cur") )
-    elif type rpmqpack &>/dev/null ; then
+            /var/log/rpmpkgs)" -- "$cur"))
+    elif type rpmqpack &>/dev/null; then
         # SUSE's rpmqpack is faster than rpm -qa
-        COMPREPLY=( $(compgen -W '$(rpmqpack)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(rpmqpack)' -- "$cur"))
     else
-        COMPREPLY=( $(${1:-rpm} -qa --nodigest --nosignature \
-            --queryformat='%{NAME} ' "$cur*" 2>/dev/null) )
+        COMPREPLY=($(${1:-rpm} -qa --nodigest --nosignature \
+            --queryformat='%{NAME} ' "$cur*" 2>/dev/null))
     fi
 }
 
 _rpm_groups()
 {
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
-        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
+        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur"))
 }
 
 _rpm_macros()
 {
     # get a list of macros
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^-\{0,1\}[0-9]\{1,\}[:=][[:space:]]\{1,\}\([^[:space:](]\{3,\}\).*/%\1/p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 _rpm_buildarchs()
 {
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^\s*compatible\s\s*build\s\s*archs\s*:\s*\(.*\)/\1/ p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 # rpm(8) completion
@@ -48,35 +48,35 @@ _rpm()
     local cur prev words cword split
     _init_completion -s || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         # first parameter on line
         case $cur in
             --*)
-                COMPREPLY=( $(compgen -W '--help --version --initdb
+                COMPREPLY=($(compgen -W '--help --version --initdb
                     --checksig --addsign --delsign --rebuilddb --showrc
                     --setperms --setugids --eval --install --upgrade --query
                     --freshen --erase --verify --querytags --import' \
-                        -- "$cur") )
+                    -- "$cur"))
                 ;;
             *)
-                COMPREPLY=( $(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur") )
+                COMPREPLY=($(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur"))
                 ;;
         esac
         return
     fi
 
     case $prev in
-        --dbpath|--excludepath|--prefix|--relocate|--root|-!(-*)r)
+        --dbpath | --excludepath | --prefix | --relocate | --root | -!(-*)r)
             _filedir -d
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $1
             return
             ;;
         --pipe)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
         --rcfile)
@@ -88,28 +88,28 @@ _rpm()
             _filedir spec
             return
             ;;
-        --whatenhances|--whatprovides|--whatrecommends|--whatrequires|\
-        --whatsuggests|--whatsupplements)
-            if [[ "$cur" == */* ]]; then
+        --whatenhances | --whatprovides | --whatrecommends | --whatrequires | \
+            --whatsuggests | --whatsupplements)
+            if [[ $cur == */* ]]; then
                 _filedir
             else
                 # complete on capabilities
                 local IFS=$'\n' fmt
                 case $prev in
-                    *enhances) fmt=ENHANCENAME ;;
-                    *provides) fmt=PROVIDENAME ;;
-                    *recommends) fmt=RECOMMENDNAME ;;
-                    *requires) fmt=REQUIRENAME ;;
-                    *suggests) fmt=SUGGESTNAME ;;
-                    *supplements) fmt=SUPPLEMENTNAME ;;
+                    *enhances) fmt="%{ENHANCENAME}" ;;
+                    *provides) fmt="%{PROVIDENAME}" ;;
+                    *recommends) fmt="%{RECOMMENDNAME}" ;;
+                    *requires) fmt="%{REQUIRENAME}" ;;
+                    *suggests) fmt="%{SUGGESTNAME}" ;;
+                    *supplements) fmt="%{SUPPLEMENTNAME}" ;;
                 esac
-                COMPREPLY=( $(compgen -W "$($1 -qa --nodigest --nosignature \
-                    --queryformat=\"%{$fmt}\\n\" 2>/dev/null |
-                    command grep -vF '(none)')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$($1 -qa --nodigest --nosignature \
+                    --queryformat=\"$fmt\\n\" 2>/dev/null |
+                    command grep -vF '(none)')" -- "$cur"))
             fi
             return
             ;;
-        --define|--fileid|--hdrid|--pkgid|-!(-*)D)
+        --define | --fileid | --hdrid | --pkgid | -!(-*)D)
             # argument required but no completions available
             return
             ;;
@@ -122,28 +122,28 @@ _rpm()
         --quiet --pipe --verbose"
 
     case ${words[1]} in
-        -[iFU]*|--install|--freshen|--upgrade)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --percent --force --test
+        -[iFU]* | --install | --freshen | --upgrade)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --percent --force --test
                 --replacepkgs --replacefiles --root --excludedocs --includedocs
                 --noscripts --ignorearch --dbpath --prefix= --ignoreos --nodeps
                 --allfiles --ftpproxy --ftpport --justdb --httpproxy --httpport
                 --noorder --relocate= --badreloc --notriggers --excludepath=
                 --ignoresize --oldpackage --queryformat --repackage
-                --nosuggests" -- "$cur") )
+                --nosuggests" -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -e|--erase)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --allmatches --noscripts
-                    --notriggers --nodeps --test --repackage" -- "$cur") )
+        -e | --erase)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --allmatches --noscripts
+                    --notriggers --nodeps --test --repackage" -- "$cur"))
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        -q*|--query)
+        -q* | --query)
             # options common to all query types
             opts+=" --changelog --configfiles --conflicts --docfiles --dump
                 --enhances --filesbypkg --filecaps --fileclass --filecolor
@@ -152,85 +152,85 @@ _rpm()
                 --scripts --suggests --triggers --xml --recommends
                 --supplements --filetriggers --licensefiles"
 
-            if [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            if [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --dbpath --fscontext
-                        --last --root --state" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --dbpath --fscontext
+                        --last --root --state" -- "$cur"))
                 else
                     _filedir
                 fi
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 # -qg completion
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --ftpport --ftpproxy
-                        --httpport --httpproxy --nomanifest" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --ftpport --ftpproxy
+                        --httpport --httpproxy --nomanifest" -- "$cur"))
                 else
                     _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --all --file --fileid
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --all --file --fileid
                         --dbpath --fscontext --ftswalk --group --hdrid --last
                         --package --pkgid --root= --specfile --state
                         --triggeredby --whatenhances --whatprovides
                         --whatrecommends --whatrequires --whatsuggests
                         --whatsupplements" \
-                            -- "$cur") )
-                elif [[ "${words[*]}" != *\ -@(*([^ -])a|-all )* ]]; then
+                        -- "$cur"))
+                elif [[ ${words[*]} != *\ -@(*([^ -])a|-all )* ]]; then
                     _rpm_installed_packages $1
                 fi
             fi
             ;;
-        -K*|--checksig)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --nopgp --nogpg --nomd5" \
-                    -- "$cur") )
+        -K* | --checksig)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --nopgp --nogpg --nomd5" \
+                    -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -[Vy]*|--verify)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --root= --dbpath --nodeps
+        -[Vy]* | --verify)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --root= --dbpath --nodeps
                     --nogroup --nolinkto --nomode --nomtime --nordev --nouser
                     --nofiles --noscripts --nomd5 --querytags --specfile
                     --whatenhances --whatprovides --whatrecommends
                     --whatrequires --whatsuggests --whatsupplements" \
-                        -- "$cur") )
+                    -- "$cur"))
             # check whether we're doing file completion
-            elif [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 _filedir
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 _filedir '[rs]pm'
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        --resign|--addsign|--delsign)
+        --resign | --addsign | --delsign)
             _filedir '[rs]pm'
             ;;
-        --setperms|--setgids)
+        --setperms | --setgids)
             _rpm_installed_packages $1
             ;;
-        --import|--dbpath|--root)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W '--import --dbpath --root=' \
-                    -- "$cur") )
+        --import | --dbpath | --root)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '--import --dbpath --root=' \
+                    -- "$cur"))
             else
                 _filedir
             fi
             ;;
     esac
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _rpm rpm
+    complete -F _rpm rpm
 
 _rpmbuild()
 {
@@ -238,33 +238,33 @@ _rpmbuild()
     _init_completion -s || return
 
     local rpm="${1%build*}"
-    [[ $rpm == $1 ]] || ! type $rpm &>/dev/null && rpm=
+    [[ $rpm == "$1" ]] || ! type $rpm &>/dev/null && rpm=
 
     case $prev in
-        --buildroot|--root|--dbpath|-!(-*)r)
+        --buildroot | --root | --dbpath | -!(-*)r)
             _filedir -d
             return
             ;;
         --target)
-            _rpm_buildarchs
+            _rpm_buildarchs $rpm
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $rpm
             return
             ;;
-        --macros|--rcfile)
+        --macros | --rcfile)
             _filedir
             return
             ;;
         --buildpolicy)
             local cfgdir=$($rpm --eval '%{_rpmconfigdir}' 2>/dev/null)
             if [[ $cfgdir ]]; then
-                COMPREPLY=( $(compgen -W "$(command ls $cfgdir 2>/dev/null \
-                    | command sed -ne 's/^brp-//p')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(command ls $cfgdir 2>/dev/null |
+                    command sed -ne 's/^brp-//p')" -- "$cur"))
             fi
             ;;
-        --define|--with|--without|-!(-*)D)
+        --define | --with | --without | -!(-*)D)
             return
             ;;
     esac
@@ -272,8 +272,8 @@ _rpmbuild()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -281,15 +281,15 @@ _rpmbuild()
     local word ext
     for word in "${words[@]}"; do
         case $word in
-            -b?|--clean|--nobuild)
+            -b? | --clean | --nobuild)
                 ext=spec
                 break
                 ;;
-            -t?|--tarbuild)
+            -t? | --tarbuild)
                 ext='@(t?(ar.)@([gx]z|bz?(2))|tar?(.@(lzma|Z)))'
                 break
                 ;;
-            --rebuild|--recompile)
+            --rebuild | --recompile)
                 ext='@(?(no)src.r|s)pm'
                 break
                 ;;
@@ -297,6 +297,6 @@ _rpmbuild()
     done
     [[ -n $ext ]] && _filedir $ext
 } &&
-complete -F _rpmbuild rpmbuild rpmbuild-md5
+    complete -F _rpmbuild rpmbuild rpmbuild-md5
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpmbuild-md5 b/msys2/usr/share/bash-completion/completions/rpmbuild-md5
index b797e9fb2..8299a37a4 100644
--- a/msys2/usr/share/bash-completion/completions/rpmbuild-md5
+++ b/msys2/usr/share/bash-completion/completions/rpmbuild-md5
@@ -7,38 +7,38 @@ _rpm_installed_packages()
     if [[ -r /var/log/rpmpkgs && \
         /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then
         # using RHL 7.2 or later - this is quicker than querying the DB
-        COMPREPLY=( $(compgen -W "$(command sed -ne \
+        COMPREPLY=($(compgen -W "$(command sed -ne \
             's|^\([^[:space:]]\{1,\}\)-[^[:space:]-]\{1,\}-[^[:space:]-]\{1,\}\.rpm$|\1|p' \
-            /var/log/rpmpkgs)" -- "$cur") )
-    elif type rpmqpack &>/dev/null ; then
+            /var/log/rpmpkgs)" -- "$cur"))
+    elif type rpmqpack &>/dev/null; then
         # SUSE's rpmqpack is faster than rpm -qa
-        COMPREPLY=( $(compgen -W '$(rpmqpack)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(rpmqpack)' -- "$cur"))
     else
-        COMPREPLY=( $(${1:-rpm} -qa --nodigest --nosignature \
-            --queryformat='%{NAME} ' "$cur*" 2>/dev/null) )
+        COMPREPLY=($(${1:-rpm} -qa --nodigest --nosignature \
+            --queryformat='%{NAME} ' "$cur*" 2>/dev/null))
     fi
 }
 
 _rpm_groups()
 {
     local IFS=$'\n'
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
-        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(${1:-rpm} -qa --nodigest --nosignature \
+        --queryformat='%{GROUP}\n' 2>/dev/null)" -- "$cur"))
 }
 
 _rpm_macros()
 {
     # get a list of macros
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^-\{0,1\}[0-9]\{1,\}[:=][[:space:]]\{1,\}\([^[:space:](]\{3,\}\).*/%\1/p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 _rpm_buildarchs()
 {
-    COMPREPLY=( $(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
+    COMPREPLY=($(compgen -W "$(${1:-rpm} --showrc | command sed -ne \
         's/^\s*compatible\s\s*build\s\s*archs\s*:\s*\(.*\)/\1/ p')" \
-        -- "$cur") )
+        -- "$cur"))
 }
 
 # rpm(8) completion
@@ -48,35 +48,35 @@ _rpm()
     local cur prev words cword split
     _init_completion -s || return
 
-    if [[ $cword -eq 1 ]]; then
+    if ((cword == 1)); then
         # first parameter on line
         case $cur in
             --*)
-                COMPREPLY=( $(compgen -W '--help --version --initdb
+                COMPREPLY=($(compgen -W '--help --version --initdb
                     --checksig --addsign --delsign --rebuilddb --showrc
                     --setperms --setugids --eval --install --upgrade --query
                     --freshen --erase --verify --querytags --import' \
-                        -- "$cur") )
+                    -- "$cur"))
                 ;;
             *)
-                COMPREPLY=( $(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur") )
+                COMPREPLY=($(compgen -W '-e -E -F -i -q -t -U -V' -- "$cur"))
                 ;;
         esac
         return
     fi
 
     case $prev in
-        --dbpath|--excludepath|--prefix|--relocate|--root|-!(-*)r)
+        --dbpath | --excludepath | --prefix | --relocate | --root | -!(-*)r)
             _filedir -d
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $1
             return
             ;;
         --pipe)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
         --rcfile)
@@ -88,28 +88,28 @@ _rpm()
             _filedir spec
             return
             ;;
-        --whatenhances|--whatprovides|--whatrecommends|--whatrequires|\
-        --whatsuggests|--whatsupplements)
-            if [[ "$cur" == */* ]]; then
+        --whatenhances | --whatprovides | --whatrecommends | --whatrequires | \
+            --whatsuggests | --whatsupplements)
+            if [[ $cur == */* ]]; then
                 _filedir
             else
                 # complete on capabilities
                 local IFS=$'\n' fmt
                 case $prev in
-                    *enhances) fmt=ENHANCENAME ;;
-                    *provides) fmt=PROVIDENAME ;;
-                    *recommends) fmt=RECOMMENDNAME ;;
-                    *requires) fmt=REQUIRENAME ;;
-                    *suggests) fmt=SUGGESTNAME ;;
-                    *supplements) fmt=SUPPLEMENTNAME ;;
+                    *enhances) fmt="%{ENHANCENAME}" ;;
+                    *provides) fmt="%{PROVIDENAME}" ;;
+                    *recommends) fmt="%{RECOMMENDNAME}" ;;
+                    *requires) fmt="%{REQUIRENAME}" ;;
+                    *suggests) fmt="%{SUGGESTNAME}" ;;
+                    *supplements) fmt="%{SUPPLEMENTNAME}" ;;
                 esac
-                COMPREPLY=( $(compgen -W "$($1 -qa --nodigest --nosignature \
-                    --queryformat=\"%{$fmt}\\n\" 2>/dev/null |
-                    command grep -vF '(none)')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$($1 -qa --nodigest --nosignature \
+                    --queryformat=\"$fmt\\n\" 2>/dev/null |
+                    command grep -vF '(none)')" -- "$cur"))
             fi
             return
             ;;
-        --define|--fileid|--hdrid|--pkgid|-!(-*)D)
+        --define | --fileid | --hdrid | --pkgid | -!(-*)D)
             # argument required but no completions available
             return
             ;;
@@ -122,28 +122,28 @@ _rpm()
         --quiet --pipe --verbose"
 
     case ${words[1]} in
-        -[iFU]*|--install|--freshen|--upgrade)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --percent --force --test
+        -[iFU]* | --install | --freshen | --upgrade)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --percent --force --test
                 --replacepkgs --replacefiles --root --excludedocs --includedocs
                 --noscripts --ignorearch --dbpath --prefix= --ignoreos --nodeps
                 --allfiles --ftpproxy --ftpport --justdb --httpproxy --httpport
                 --noorder --relocate= --badreloc --notriggers --excludepath=
                 --ignoresize --oldpackage --queryformat --repackage
-                --nosuggests" -- "$cur") )
+                --nosuggests" -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -e|--erase)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --allmatches --noscripts
-                    --notriggers --nodeps --test --repackage" -- "$cur") )
+        -e | --erase)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --allmatches --noscripts
+                    --notriggers --nodeps --test --repackage" -- "$cur"))
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        -q*|--query)
+        -q* | --query)
             # options common to all query types
             opts+=" --changelog --configfiles --conflicts --docfiles --dump
                 --enhances --filesbypkg --filecaps --fileclass --filecolor
@@ -152,85 +152,85 @@ _rpm()
                 --scripts --suggests --triggers --xml --recommends
                 --supplements --filetriggers --licensefiles"
 
-            if [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            if [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 # -qf completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --dbpath --fscontext
-                        --last --root --state" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --dbpath --fscontext
+                        --last --root --state" -- "$cur"))
                 else
                     _filedir
                 fi
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 # -qg completion
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 # -qp; uninstalled package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --ftpport --ftpproxy
-                        --httpport --httpproxy --nomanifest" -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --ftpport --ftpproxy
+                        --httpport --httpproxy --nomanifest" -- "$cur"))
                 else
                     _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W "$opts --all --file --fileid
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W "$opts --all --file --fileid
                         --dbpath --fscontext --ftswalk --group --hdrid --last
                         --package --pkgid --root= --specfile --state
                         --triggeredby --whatenhances --whatprovides
                         --whatrecommends --whatrequires --whatsuggests
                         --whatsupplements" \
-                            -- "$cur") )
-                elif [[ "${words[*]}" != *\ -@(*([^ -])a|-all )* ]]; then
+                        -- "$cur"))
+                elif [[ ${words[*]} != *\ -@(*([^ -])a|-all )* ]]; then
                     _rpm_installed_packages $1
                 fi
             fi
             ;;
-        -K*|--checksig)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --nopgp --nogpg --nomd5" \
-                    -- "$cur") )
+        -K* | --checksig)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --nopgp --nogpg --nomd5" \
+                    -- "$cur"))
             else
                 _filedir '[rs]pm'
             fi
             ;;
-        -[Vy]*|--verify)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W "$opts --root= --dbpath --nodeps
+        -[Vy]* | --verify)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "$opts --root= --dbpath --nodeps
                     --nogroup --nolinkto --nomode --nomtime --nordev --nouser
                     --nofiles --noscripts --nomd5 --querytags --specfile
                     --whatenhances --whatprovides --whatrecommends
                     --whatrequires --whatsuggests --whatsupplements" \
-                        -- "$cur") )
+                    -- "$cur"))
             # check whether we're doing file completion
-            elif [[ "${words[*]}" == *\ -@(*([^ -])f|-file )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])f|-file )* ]]; then
                 _filedir
-            elif [[ "${words[*]}" == *\ -@(*([^ -])g|-group )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups $1
-            elif [[ "${words[*]}" == *\ -@(*([^ -])p|-package )* ]]; then
+            elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 _filedir '[rs]pm'
             else
                 _rpm_installed_packages $1
             fi
             ;;
-        --resign|--addsign|--delsign)
+        --resign | --addsign | --delsign)
             _filedir '[rs]pm'
             ;;
-        --setperms|--setgids)
+        --setperms | --setgids)
             _rpm_installed_packages $1
             ;;
-        --import|--dbpath|--root)
-            if [[ "$cur" == -* ]]; then
-                COMPREPLY=( $(compgen -W '--import --dbpath --root=' \
-                    -- "$cur") )
+        --import | --dbpath | --root)
+            if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W '--import --dbpath --root=' \
+                    -- "$cur"))
             else
                 _filedir
             fi
             ;;
     esac
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _rpm rpm
+    complete -F _rpm rpm
 
 _rpmbuild()
 {
@@ -238,33 +238,33 @@ _rpmbuild()
     _init_completion -s || return
 
     local rpm="${1%build*}"
-    [[ $rpm == $1 ]] || ! type $rpm &>/dev/null && rpm=
+    [[ $rpm == "$1" ]] || ! type $rpm &>/dev/null && rpm=
 
     case $prev in
-        --buildroot|--root|--dbpath|-!(-*)r)
+        --buildroot | --root | --dbpath | -!(-*)r)
             _filedir -d
             return
             ;;
         --target)
-            _rpm_buildarchs
+            _rpm_buildarchs $rpm
             return
             ;;
-        --eval|-!(-*)E)
+        --eval | -!(-*)E)
             _rpm_macros $rpm
             return
             ;;
-        --macros|--rcfile)
+        --macros | --rcfile)
             _filedir
             return
             ;;
         --buildpolicy)
             local cfgdir=$($rpm --eval '%{_rpmconfigdir}' 2>/dev/null)
             if [[ $cfgdir ]]; then
-                COMPREPLY=( $(compgen -W "$(command ls $cfgdir 2>/dev/null \
-                    | command sed -ne 's/^brp-//p')" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(command ls $cfgdir 2>/dev/null |
+                    command sed -ne 's/^brp-//p')" -- "$cur"))
             fi
             ;;
-        --define|--with|--without|-!(-*)D)
+        --define | --with | --without | -!(-*)D)
             return
             ;;
     esac
@@ -272,8 +272,8 @@ _rpmbuild()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W "$(_parse_help "$1")" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W "$(_parse_help "$1")" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -281,15 +281,15 @@ _rpmbuild()
     local word ext
     for word in "${words[@]}"; do
         case $word in
-            -b?|--clean|--nobuild)
+            -b? | --clean | --nobuild)
                 ext=spec
                 break
                 ;;
-            -t?|--tarbuild)
+            -t? | --tarbuild)
                 ext='@(t?(ar.)@([gx]z|bz?(2))|tar?(.@(lzma|Z)))'
                 break
                 ;;
-            --rebuild|--recompile)
+            --rebuild | --recompile)
                 ext='@(?(no)src.r|s)pm'
                 break
                 ;;
@@ -297,6 +297,6 @@ _rpmbuild()
     done
     [[ -n $ext ]] && _filedir $ext
 } &&
-complete -F _rpmbuild rpmbuild rpmbuild-md5
+    complete -F _rpmbuild rpmbuild rpmbuild-md5
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rpmcheck b/msys2/usr/share/bash-completion/completions/rpmcheck
index f8577c4e2..cf4ed9587 100644
--- a/msys2/usr/share/bash-completion/completions/rpmcheck
+++ b/msys2/usr/share/bash-completion/completions/rpmcheck
@@ -12,13 +12,13 @@ _rpmcheck()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-explain -failures -successes -dump
-            -dump-all -base -help -compressed-input' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-explain -failures -successes -dump
+            -dump-all -base -help -compressed-input' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _rpmcheck rpmcheck
+    complete -F _rpmcheck rpmcheck
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rrdtool b/msys2/usr/share/bash-completion/completions/rrdtool
index c8214a49a..dcb9ce67a 100644
--- a/msys2/usr/share/bash-completion/completions/rrdtool
+++ b/msys2/usr/share/bash-completion/completions/rrdtool
@@ -1,17 +1,17 @@
 # bash completion for rrdtool                              -*- shell-script -*-
 
-_rrdtool ()
+_rrdtool()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ ${#words[@]} -eq 2 ]]; then
-        COMPREPLY=( $(compgen -W 'create update updatev graph dump restore
-            last lastupdate first info fetch tune resize xport' -- "$cur") )
+    if ((${#words[@]} == 2)); then
+        COMPREPLY=($(compgen -W 'create update updatev graph dump restore
+            last lastupdate first info fetch tune resize xport' -- "$cur"))
     else
         _filedir rrd
     fi
 } &&
-complete -F _rrdtool rrdtool
+    complete -F _rrdtool rrdtool
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/rsync b/msys2/usr/share/bash-completion/completions/rsync
index 034952446..0bf538987 100644
--- a/msys2/usr/share/bash-completion/completions/rsync
+++ b/msys2/usr/share/bash-completion/completions/rsync
@@ -6,26 +6,26 @@ _rsync()
     _init_completion -s -n : || return
 
     case $prev in
-        --config|--password-file|--include-from|--exclude-from|--files-from|\
-        --log-file|--write-batch|--only-write-batch|--read-batch)
+        --config | --password-file | --include-from | --exclude-from | --files-from | \
+            --log-file | --write-batch | --only-write-batch | --read-batch)
             compopt +o nospace
             _filedir
             return
             ;;
-        --temp-dir|--compare-dest|--backup-dir|--partial-dir|--copy-dest|\
-        --link-dest|-!(-*)T)
+        --temp-dir | --compare-dest | --backup-dir | --partial-dir | --copy-dest | \
+            --link-dest | -!(-*)T)
             compopt +o nospace
             _filedir -d
             return
             ;;
-        --rsh|-!(-*)e)
+        --rsh | -!(-*)e)
             compopt +o nospace
-            COMPREPLY=( $(compgen -W 'rsh ssh' -- "$cur") )
+            COMPREPLY=($(compgen -W 'rsh ssh' -- "$cur"))
             return
             ;;
         --compress-level)
             compopt +o nospace
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             return
             ;;
     esac
@@ -36,7 +36,7 @@ _rsync()
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '--verbose --quiet --no-motd --checksum
+            COMPREPLY=($(compgen -W '--verbose --quiet --no-motd --checksum
                 --archive --recursive --relative --no-implied-dirs
                 --backup --backup-dir= --suffix= --update --inplace --append
                 --append-verify --dirs --old-dirs --links --copy-links
@@ -61,15 +61,15 @@ _rsync()
                 --out-format= --log-file= --log-file-format= --password-file=
                 --list-only --bwlimit= --write-batch= --only-write-batch=
                 --read-batch= --protocol= --iconv= --ipv4 --ipv6 --version
-                --help --daemon --config= --no-detach' -- "$cur") )
-            [[ $COMPREPLY == *= ]] || compopt +o nospace
+                --help --daemon --config= --no-detach' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] || compopt +o nospace
             ;;
         *:*)
             # find which remote shell is used
             local i shell=ssh
-            for (( i=1; i < cword; i++ )); do
-                if [[ "${words[i]}" == -@(e|-rsh) ]]; then
-                    shell=${words[i+1]}
+            for ((i = 1; i < cword; i++)); do
+                if [[ ${words[i]} == -@(e|-rsh) ]]; then
+                    shell=${words[i + 1]}
                     break
                 fi
             done
@@ -81,6 +81,6 @@ _rsync()
             ;;
     esac
 } &&
-complete -F _rsync -o nospace rsync
+    complete -F _rsync -o nospace rsync
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/s390-koji b/msys2/usr/share/bash-completion/completions/s390-koji
index be43f0a24..8efef9a7f 100644
--- a/msys2/usr/share/bash-completion/completions/s390-koji
+++ b/msys2/usr/share/bash-completion/completions/s390-koji
@@ -2,8 +2,8 @@
 
 _koji_search()
 {
-    COMPREPLY+=( $(compgen -W \
-        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur"))
 }
 
 _koji_build()
@@ -23,13 +23,13 @@ _koji_user()
 
 _koji_tag()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur"))
 }
 
 _koji_target()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-targets 2>/dev/null |
-        awk "{ print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-targets 2>/dev/null |
+        awk "{ print \$1 }")' -- "$cur"))
 }
 
 _koji()
@@ -38,7 +38,7 @@ _koji()
     _init_completion -s || return
 
     local commandix command
-    for (( commandix=1; commandix < cword; commandix++ )); do
+    for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
             break
@@ -46,19 +46,19 @@ _koji()
     done
 
     case $prev in
-        --help|--help-commands|-!(-*)h*)
+        --help | --help-commands | -!(-*)h*)
             return
             ;;
-        --config|--keytab|-!(-*)[co])
+        --config | --keytab | -!(-*)[co])
             _filedir
             return
             ;;
-        --runas|--user|--editor|--by)
+        --runas | --user | --editor | --by)
             _koji_user "$1"
             return
             ;;
         --authtype)
-            COMPREPLY=( $(compgen -W 'noauth ssl password kerberos' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noauth ssl password kerberos' -- "$cur"))
             return
             ;;
         --topdir)
@@ -66,15 +66,15 @@ _koji()
             return
             ;;
         --type)
-            case $command in
-                latest-pkg|list-tagged)
-                    COMPREPLY=( $(compgen -W 'maven' -- "$cur") )
+            case ${command-} in
+                latest-pkg | list-tagged)
+                    COMPREPLY=($(compgen -W 'maven' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --name)
-            case $command in
+            case ${command-} in
                 list-targets)
                     _koji_target "$1"
                     ;;
@@ -85,7 +85,7 @@ _koji()
             _koji_user "$1"
             return
             ;;
-        --tag|--latestfrom)
+        --tag | --latestfrom)
             _koji_tag "$1"
             return
             ;;
@@ -105,22 +105,22 @@ _koji()
 
     $split && return
 
-    if [[ $command ]]; then
+    if [[ -v command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
 
         # How many'th non-option arg (1-based) for $command are we completing?
         local i nth=1
-        for (( i=commandix+1; i < cword; i++ )); do
-            [[ ${words[i]} == -* ]] || (( nth++ ))
+        for ((i = commandix + 1; i < cword; i++)); do
+            [[ ${words[i]} == -* ]] || ((nth++))
         done
 
         case $command in
-            build|maven-build|win-build)
+            build | maven-build | win-build)
                 case $nth in
                     1)
                         _koji_target "$1"
@@ -160,7 +160,7 @@ _koji()
             latest-by-tag)
                 _koji_package "$1"
                 ;;
-            latest-pkg|list-groups|list-tag-inheritance|show-groups)
+            latest-pkg | list-groups | list-tag-inheritance | show-groups)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -186,7 +186,7 @@ _koji()
                 ;;
             move-pkg)
                 case $nth in
-                    1|2)
+                    1 | 2)
                         _koji_tag "$1"
                         ;;
                     *)
@@ -197,12 +197,12 @@ _koji()
             search)
                 case $nth in
                     1)
-                        COMPREPLY=( $(compgen -W 'package build tag target
-                            user host rpm' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'package build tag target
+                            user host rpm' -- "$cur"))
                         ;;
                 esac
                 ;;
-            tag-pkg|untag-pkg)
+            tag-pkg | untag-pkg)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -218,7 +218,7 @@ _koji()
             wait-repo)
                 case $nth in
                     1)
-                        for (( i=commandix+1; i < cword; i++ )); do
+                        for ((i = commandix + 1; i < cword; i++)); do
                             if [[ ${words[i]} == --target ]]; then
                                 _koji_target "$1"
                                 return
@@ -233,13 +233,13 @@ _koji()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ ! $command ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help-commands 2>/dev/null | \
-            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v command ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
+            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
+    complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sbcl b/msys2/usr/share/bash-completion/completions/sbcl
index a8dd5345b..22a93e4ad 100644
--- a/msys2/usr/share/bash-completion/completions/sbcl
+++ b/msys2/usr/share/bash-completion/completions/sbcl
@@ -8,14 +8,14 @@ _sbcl()
     _init_completion || return
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--core --noinform --help --version
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--core --noinform --help --version
             --sysinit --userinit --eval --noprint --disable-debugger
-            --end-runtime-options --end-toplevel-options ' -- "$cur") )
+            --end-runtime-options --end-toplevel-options ' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _sbcl sbcl sbcl-mt
+    complete -F _sbcl sbcl sbcl-mt
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sbcl-mt b/msys2/usr/share/bash-completion/completions/sbcl-mt
index a8dd5345b..22a93e4ad 100644
--- a/msys2/usr/share/bash-completion/completions/sbcl-mt
+++ b/msys2/usr/share/bash-completion/completions/sbcl-mt
@@ -8,14 +8,14 @@ _sbcl()
     _init_completion || return
 
     # completing an option (may or may not be separated by a space)
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--core --noinform --help --version
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--core --noinform --help --version
             --sysinit --userinit --eval --noprint --disable-debugger
-            --end-runtime-options --end-toplevel-options ' -- "$cur") )
+            --end-runtime-options --end-toplevel-options ' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _sbcl sbcl sbcl-mt
+    complete -F _sbcl sbcl sbcl-mt
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sbopkg b/msys2/usr/share/bash-completion/completions/sbopkg
index 1504a54e6..16bd58f95 100644
--- a/msys2/usr/share/bash-completion/completions/sbopkg
+++ b/msys2/usr/share/bash-completion/completions/sbopkg
@@ -5,14 +5,14 @@ _sbopkg()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
-        [[ $COMPREPLY ]] && return
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
+        [[ ${COMPREPLY-} ]] && return
     fi
 
     case "$prev" in
         -e)
-            COMPREPLY=( $(compgen -W 'ask continue stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'ask continue stop' -- "$cur"))
             return
             ;;
         -f)
@@ -24,12 +24,12 @@ _sbopkg()
             return
             ;;
         -V)
-            COMPREPLY=( $(compgen -W "?
-                $(sbopkg -V ? 2>&1 | cut -s -f1)" -- "$cur") )
+            COMPREPLY=($(compgen -W "?
+                $(sbopkg -V '?' 2>&1 | cut -s -f1)" -- "$cur"))
             return
             ;;
-        -i|-b)
-            ;;
+        -i | -b) ;;
+
         *)
             return
             ;;
@@ -37,34 +37,37 @@ _sbopkg()
 
     local i config
     config="/etc/sbopkg/sbopkg.conf"
-    for (( i=${#words[@]}-1; i>0; i-- )); do
-        if [[ "${words[i]}" == -f ]]; then
-            config="${words[i+1]}"
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
+        if [[ ${words[i]} == -f ]]; then
+            config="${words[i + 1]}"
             __expand_tilde_by_ref config
             break
         fi
     done
 
-    [[ -r "$config" ]] || return
+    [[ -r $config ]] || return
     . $config
 
-    for (( i=1; i<${#words[@]}; i++ )); do
+    for ((i = 1; i < ${#words[@]}; i++)); do
         case "${words[i]}" in
             -V)
-                REPO_NAME="${words[i+1]%%/*}"
-                REPO_BRANCH="${words[i+1]#*/}"
+                REPO_NAME="${words[i + 1]%%/*}"
+                REPO_BRANCH="${words[i + 1]#*/}"
                 ;;
             -d)
-                REPO_ROOT="${words[i+1]}"
+                REPO_ROOT="${words[i + 1]}"
                 ;;
         esac
     done
     [[ -r $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ]] || return
 
-    COMPREPLY=( $(command sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\
+    COMPREPLY=($(command sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}" \
         $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT)
-        $(cd $QUEUEDIR; compgen -f -X "!*.sqf"  -- "$cur") )
+    $(
+        cd $QUEUEDIR
+        compgen -f -X "!*.sqf" -- "$cur"
+    ))
 } &&
-complete -F _sbopkg sbopkg
+    complete -F _sbopkg sbopkg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/scp b/msys2/usr/share/bash-completion/completions/scp
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/scp
+++ b/msys2/usr/share/bash-completion/completions/scp
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/screen b/msys2/usr/share/bash-completion/completions/screen
index 17642863d..651ca2c94 100644
--- a/msys2/usr/share/bash-completion/completions/screen
+++ b/msys2/usr/share/bash-completion/completions/screen
@@ -2,11 +2,11 @@
 
 _screen_sessions()
 {
-    local sessions=( $(command screen -ls | command sed -ne \
-        's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p') )
+    local sessions=($(command screen -ls | command sed -ne \
+        's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p'))
     if [[ $cur == +([0-9])?(.*) ]]; then
         # Complete sessions including pid prefixes
-        COMPREPLY=( $(compgen -W '${sessions[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${sessions[@]}' -- "$cur"))
     else
         # Create unique completions, dropping pids where possible
         local -A res
@@ -15,106 +15,109 @@ _screen_sessions()
             res[${i/#+([0-9])./}]+=" $i"
         done
         for i in "${!res[@]}"; do
-            [[ ${res[$i]} == \ *\ * ]] && tmp+=" ${res[$i]}" || tmp+=" $i"
+            [[ ${res[i]} == \ *\ * ]] && tmp+=" ${res[i]}" || tmp+=" $i"
         done
-        COMPREPLY=( $(compgen -W '$tmp' -- "$cur") )
+        COMPREPLY=($(compgen -W '$tmp' -- "$cur"))
     fi
 } &&
-_screen()
-{
-    local cur prev words cword
-    _init_completion || return
+    _screen()
+    {
+        local cur prev words cword
+        _init_completion || return
 
-    if ((cword == 1)); then
-        if [[ $cur == /dev* ]]; then
-            COMPREPLY=( $(compgen -W "$(shopt -s nullglob; printf '%s\n' \
-                /dev/serial/by-id/* /dev/ttyUSB* /dev/ttyACM* 2>/dev/null)" \
-                -- "$cur") )
-            return
-        fi
-        if [[ $cur == //* ]]; then
-            COMPREPLY=( $(compgen -W '//telnet' -- "$cur") )
-            return
-        fi
-    fi
-
-    case ${words[1]} in
-        /dev*)
-            if ((cword == 2)); then
-                COMPREPLY=( $(compgen -W '110 300 600 1200 2400 4800 9600 \
-                14400 19200 38400 57600 115200 128000 256000' -- "$cur") )
-                # TODO more, comma separated options
+        if ((cword == 1)); then
+            if [[ $cur == /dev* ]]; then
+                COMPREPLY=($(compgen -W "$(
+                    shopt -s nullglob
+                    printf '%s\n' \
+                        /dev/serial/by-id/* /dev/ttyUSB* /dev/ttyACM* 2>/dev/null
+                )" \
+                    -- "$cur"))
+                return
             fi
-            return
-            ;;
-        //telnet)
-            ((cword == 2)) && _known_hosts_real -- "$cur"
-            return
-            ;;
-    esac
+            if [[ $cur == //* ]]; then
+                COMPREPLY=($(compgen -W '//telnet' -- "$cur"))
+                return
+            fi
+        fi
 
-    if ((cword > 2)); then
-        case ${words[cword-2]} in
-            -*[dD])
-                _screen_sessions
+        case ${words[1]} in
+            /dev*)
+                if ((cword == 2)); then
+                    COMPREPLY=($(compgen -W '110 300 600 1200 2400 4800 9600 \
+                14400 19200 38400 57600 115200 128000 256000' -- "$cur"))
+                    # TODO more, comma separated options
+                fi
+                return
+                ;;
+            //telnet)
+                ((cword == 2)) && _known_hosts_real -- "$cur"
                 return
                 ;;
         esac
-    fi
 
-    local i
-    for (( i=1; i <= cword; i++ )); do
-        case ${words[i]} in
-            -*[rRdDxscTehpSt])
-                (( i++ ))
-                continue
+        if ((cword > 2)); then
+            case ${words[cword - 2]} in
+                -*[dD])
+                    _screen_sessions
+                    return
+                    ;;
+            esac
+        fi
+
+        local i
+        for ((i = 1; i <= cword; i++)); do
+            case ${words[i]} in
+                -*[rRdDxscTehpSt])
+                    ((i++))
+                    continue
+                    ;;
+                -*)
+                    continue
+                    ;;
+            esac
+
+            _command_offset $i
+            return
+        done
+
+        case $prev in
+            -*[rR])
+                # list detached
+                _screen_sessions 'Detached'
+                return
                 ;;
-            -*)
-                continue
+            -*[dD])
+                # list attached
+                _screen_sessions 'Attached'
+                return
+                ;;
+            -*x)
+                # list both
+                _screen_sessions
+                return
+                ;;
+            -*s)
+                _shells
+                return
+                ;;
+            -*c)
+                _filedir
+                return
+                ;;
+            -T)
+                _terms
+                return
+                ;;
+            -*[ehpSt])
+                return
                 ;;
         esac
 
-        _command_offset $i
-        return
-    done
-
-    case $prev in
-        -*[rR])
-            # list detached
-            _screen_sessions 'Detached'
-            return
-            ;;
-        -*[dD])
-            # list attached
-            _screen_sessions 'Attached'
-            return
-            ;;
-        -*x)
-            # list both
-            _screen_sessions
-            return
-            ;;
-        -*s)
-            _shells
-            return
-            ;;
-        -*c)
-            _filedir
-            return
-            ;;
-        -T)
-            _terms
-            return
-            ;;
-        -*[ehpSt])
-            return
-            ;;
-    esac
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-    fi
-} &&
-complete -F _screen screen
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        fi
+    } &&
+        complete -F _screen screen
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/scrub b/msys2/usr/share/bash-completion/completions/scrub
index 7fca6077a..bbb37be4c 100644
--- a/msys2/usr/share/bash-completion/completions/scrub
+++ b/msys2/usr/share/bash-completion/completions/scrub
@@ -6,16 +6,16 @@ _scrub()
     _init_completion -s || return
 
     case $prev in
-        --version|--help|--blocksize|--device-size|--dirent|-!(-*)[vhbsD])
+        --version | --help | --blocksize | --device-size | --dirent | -!(-*)[vhbsD])
             return
             ;;
-        --pattern|-!(-*)p)
-            COMPREPLY=( $(compgen -W '$("$1" --help 2>&1 |
+        --pattern | -!(-*)p)
+            COMPREPLY=($(compgen -W '$("$1" --help 2>&1 |
                 awk "/^Available/{flag=1;next}/^ /&&flag{print \$1}")' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
-        --freespace|-!(-*)X)
+        --freespace | -!(-*)X)
             _filedir -d
             return
             ;;
@@ -24,13 +24,13 @@ _scrub()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _scrub scrub
+    complete -F _scrub scrub
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sdptool b/msys2/usr/share/bash-completion/completions/sdptool
index ccc64f18e..58bf5a7a6 100644
--- a/msys2/usr/share/bash-completion/completions/sdptool
+++ b/msys2/usr/share/bash-completion/completions/sdptool
@@ -3,28 +3,28 @@
 _bluetooth_addresses()
 {
     if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=( $(compgen -W "$(hcitool scan | \
-            awk '/^\t/{print $1}')" -- "$cur") )
+        COMPREPLY+=($(compgen -W "$(hcitool scan |
+            awk '/^\t/{print $1}')" -- "$cur"))
     fi
 }
 
 _bluetooth_devices()
 {
-    COMPREPLY+=( $(compgen -W "$(hcitool dev | \
-        awk '/^\t/{print $1}')" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$(hcitool dev |
+        awk '/^\t/{print $1}')" -- "$cur"))
 }
 
 _bluetooth_services()
 {
-    COMPREPLY=( $(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
         GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-            -- "$cur") )
+        -- "$cur"))
 }
 
 _bluetooth_packet_types()
 {
-    COMPREPLY=( $(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
+        -- "$cur"))
 }
 
 _hcitool()
@@ -38,7 +38,7 @@ _hcitool()
             return
             ;;
         --role)
-            COMPREPLY=( $(compgen -W 'm s' -- "$cur") )
+            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
             return
             ;;
         --pkt-type)
@@ -52,60 +52,60 @@ _hcitool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'dev inq scan name info spinq epinq cmd
+            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
                 con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur") )
+                clock' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            name|info|dc|rssi|lq|afh|auth|key|clkoff|lst)
+            name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             cc)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--role --pkt-type' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
                 else
                     _count_args
-                    if [[ $args -eq 2 ]]; then
+                    if ((args == 2)); then
                         _bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W 'master slave' -- "$cur") )
+                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
                 fi
                 ;;
             cpt)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
                     _bluetooth_packet_types
                 fi
                 ;;
-            tpl|enc|clock)
+            tpl | enc | clock)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 else
-                    COMPREPLY=( $(compgen -W '0 1' -- "$cur") )
+                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hcitool hcitool
+    complete -F _hcitool hcitool
 
 _sdptool()
 {
@@ -124,46 +124,46 @@ _sdptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur") )
+            COMPREPLY=($(compgen -W 'search browse records add del get
+                setattr setseq' -- "$cur"))
         fi
     else
         case $arg in
             search)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
-            browse|records)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--tree --raw --xml' -- "$cur") )
+            browse | records)
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
                 else
                     _bluetooth_addresses
                 fi
                 ;;
             add)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--handle --channel' -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
                 else
                     _bluetooth_services
                 fi
                 ;;
             get)
-                if [[ "$cur" == -* ]]; then
-                    COMPREPLY=( $(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur") )
+                if [[ $cur == -* ]]; then
+                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
+                        -- "$cur"))
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _sdptool sdptool
+    complete -F _sdptool sdptool
 
 _l2ping()
 {
@@ -175,18 +175,18 @@ _l2ping()
             _bluetooth_devices
             return
             ;;
-        -s|-c|-t|-d)
+        -s | -c | -t | -d)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _bluetooth_addresses
     fi
 } &&
-complete -F _l2ping l2ping
+    complete -F _l2ping l2ping
 
 _rfcomm()
 {
@@ -194,7 +194,7 @@ _rfcomm()
     _init_completion || return
 
     case $prev in
-        -f|--config)
+        -f | --config)
             _filedir
             return
             ;;
@@ -208,21 +208,21 @@ _rfcomm()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show connect listen watch bind
-                release' -- "$cur") )
+            COMPREPLY=($(compgen -W 'show connect listen watch bind
+                release' -- "$cur"))
         fi
     else
         local args
         _count_args
-        if [[ $args -eq 2 ]]; then
+        if ((args == 2)); then
             _bluetooth_devices
         else
             case $arg in
-                connect|bind)
-                    if [[ $args -eq 3 ]]; then
+                connect | bind)
+                    if ((args == 3)); then
                         _bluetooth_addresses
                     fi
                     ;;
@@ -230,7 +230,7 @@ _rfcomm()
         fi
     fi
 } &&
-complete -F _rfcomm rfcomm
+    complete -F _rfcomm rfcomm
 
 _ciptool()
 {
@@ -248,25 +248,25 @@ _ciptool()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'show search connect release loopback' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'show search connect release loopback' \
+                -- "$cur"))
         fi
     else
         local args
         case $arg in
-            connect|release|loopback)
+            connect | release | loopback)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _ciptool ciptool
+    complete -F _ciptool ciptool
 
 _dfutool()
 {
@@ -274,21 +274,21 @@ _dfutool()
     _init_completion || return
 
     case $prev in
-        -d|--device)
+        -d | --device)
             _bluetooth_devices
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
+                    -- "$cur"))
                 ;;
             2)
                 _filedir
@@ -296,7 +296,7 @@ _dfutool()
         esac
     fi
 } &&
-complete -F _dfutool dfutool
+    complete -F _dfutool dfutool
 
 _hciconfig()
 {
@@ -306,68 +306,68 @@ _hciconfig()
     local arg
     _get_first_arg
     if [[ -z $arg ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --all' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W 'up down reset rstat auth noauth encrypt
+            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
                 noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
                 class voice iac inqmode inqdata inqtype inqparams pageparms
                 pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur") )
+                version revision lm' -- "$cur"))
         fi
     else
         local args
         case $arg in
-            putkey|delkey)
+            putkey | delkey)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_addresses
                 fi
                 ;;
             lm)
                 _count_args
-                if [[ $args -eq 2 ]]; then
-                    COMPREPLY=( $(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur") )
+                if ((args == 2)); then
+                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
+                        -- "$cur"))
                 fi
                 ;;
             ptype)
                 _count_args
-                if [[ $args -eq 2 ]]; then
+                if ((args == 2)); then
                     _bluetooth_packet_types
                 fi
                 ;;
         esac
     fi
 } &&
-complete -F _hciconfig hciconfig
+    complete -F _hciconfig hciconfig
 
 _hciattach()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-n -p -t -b -s -l' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
     else
         local args
         _count_args
         case $args in
             1)
-                COMPREPLY=( $(printf '%s\n' /dev/tty*) )
-                COMPREPLY=( $(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur") )
+                COMPREPLY=($(printf '%s\n' /dev/tty*))
+                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
+                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
                 ;;
             2)
-                COMPREPLY=( $(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur") )
+                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
+                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
                 ;;
             3)
-                COMPREPLY=( $(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur") )
+                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
+                    460800 921600' -- "$cur"))
                 ;;
             4)
-                COMPREPLY=( $(compgen -W 'flow noflow' -- "$cur") )
+                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
                 ;;
             5)
                 _bluetooth_addresses
@@ -375,6 +375,6 @@ _hciattach()
         esac
     fi
 } &&
-complete -F _hciattach hciattach
+    complete -F _hciattach hciattach
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/secret-tool b/msys2/usr/share/bash-completion/completions/secret-tool
new file mode 100644
index 000000000..5462fc067
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/secret-tool
@@ -0,0 +1,50 @@
+# bash completion for secret-tool(1)                       -*- shell-script -*-
+
+_secret_tool()
+{
+    local cur prev words cword split
+    _init_completion -s || return
+
+    $split && return
+
+    local -i i
+    local mode word
+    for i in ${!words[*]}; do
+        if [[ $i -gt 0 && ${words[i]} != -* ]]; then
+            ((i != cword)) && mode=${words[i]}
+            break
+        fi
+    done
+    if [[ ! -v mode ]]; then
+        local -a modes
+        modes=($("$1" nonexistent-mode 2>&1 |
+            while read -r first second third rest; do
+                if [[ $first == "${1##*/}" ]]; then
+                    printf "%s\n" "$second"
+                elif [[ $first == usage: && $second == "${1##*/}" ]]; then
+                    printf "%s\n" "$third"
+                fi
+            done))
+        COMPREPLY=($(compgen -W '${modes[@]}' -- "$cur"))
+        return
+    fi
+
+    case $mode in
+        store)
+            if [[ ${words[*]} != *\ --label[\ =]* ]]; then
+                COMPREPLY=($(compgen -W "--label=" -- "$cur"))
+                [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+            fi
+            ;;
+        search)
+            local -A opts=([--all]="" [--unlock]="")
+            for word in "${words[@]:2}"; do
+                [[ $word ]] && unset opts["$word"]
+            done
+            COMPREPLY=($(compgen -W '${opts[@]}' -- "$cur"))
+            ;;
+    esac
+} &&
+    complete -F _secret_tool secret-tool
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/setquota b/msys2/usr/share/bash-completion/completions/setquota
index bf7319bc0..f5f9cc824 100644
--- a/msys2/usr/share/bash-completion/completions/setquota
+++ b/msys2/usr/share/bash-completion/completions/setquota
@@ -5,35 +5,35 @@ _user_or_group()
     local i
 
     # complete on groups if -g was given
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == -@(g|-group) ]]; then
-            COMPREPLY=( $(compgen -g -- "$cur") )
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == -@(g|-group) ]]; then
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
         fi
     done
 
     # otherwise complete on users
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 }
 
 _quota_parse_help()
 {
     local opts=$(_parse_help "$1")
-    COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 }
 
 _quota_formats()
 {
-    COMPREPLY=( $(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur") )
+    COMPREPLY=($(compgen -W 'vfsold vfsv0 rpc xfs' -- "$cur"))
 }
 
 _filesystems()
 {
     #  Only list filesystems starting with "/", otherwise we also get
     #+ "binfmt_misc", "proc", "tmpfs", ...
-    COMPREPLY=( $(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W "$(awk '/^\// {print $1}' /etc/mtab)" \
+        -- "$cur"))
 }
 
 _quota()
@@ -42,24 +42,24 @@ _quota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _quota -o default quota
+    complete -F _quota -o default quota
 
 _setquota()
 {
@@ -67,22 +67,22 @@ _setquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         local args
@@ -99,7 +99,7 @@ _setquota()
 
     fi
 } &&
-complete -F _setquota -o default setquota
+    complete -F _setquota -o default setquota
 
 _edquota()
 {
@@ -107,32 +107,32 @@ _edquota()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -f|--filesystem)
+        -f | --filesystem)
             _filesystems
             return
             ;;
-        -p|--prototype)
+        -p | --prototype)
             _user_or_group
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _user_or_group
     fi
 } &&
-complete -F _edquota -o default edquota
+    complete -F _edquota -o default edquota
 
 _quotacheck()
 {
@@ -140,24 +140,24 @@ _quotacheck()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotacheck -o default quotacheck repquota
+    complete -F _quotacheck -o default quotacheck repquota
 
 _quotaon()
 {
@@ -165,27 +165,27 @@ _quotaon()
     _init_completion -s || return
 
     case $prev in
-        -F|--format)
+        -F | --format)
             _quota_formats
             return
             ;;
-        -x|--xfs-command)
-            COMPREPLY=( $(compgen -W 'delete enforce' -- "$cur") )
+        -x | --xfs-command)
+            COMPREPLY=($(compgen -W 'delete enforce' -- "$cur"))
             return
             ;;
-        -h|--help|-V|--version)
+        -h | --help | -V | --version)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         _quota_parse_help "$1"
     else
         _filesystems
     fi
 } &&
-complete -F _quotaon -o default quotaon quotaoff
+    complete -F _quotaon -o default quotaon quotaoff
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sftp b/msys2/usr/share/bash-completion/completions/sftp
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/sftp
+++ b/msys2/usr/share/bash-completion/completions/sftp
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sh b/msys2/usr/share/bash-completion/completions/sh
index 93f00952b..5624ffa3d 100644
--- a/msys2/usr/share/bash-completion/completions/sh
+++ b/msys2/usr/share/bash-completion/completions/sh
@@ -9,28 +9,28 @@ _sh()
         -c)
             return
             ;;
-        -o|+o)
-            COMPREPLY=( $(compgen -W 'allexport errexit ignoreeof monitor
+        -o | +o)
+            COMPREPLY=($(compgen -W 'allexport errexit ignoreeof monitor
                 noclobber noglob noexec nolog notify nounset verbose vi
-                xtrace' -- "$cur") )
+                xtrace' -- "$cur"))
             return
             ;;
     esac
 
     local opts="-a -b -C -e -f -h -i -m -n -o -u -v -x"
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$opts -c -s" -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W "$opts -c -s" -- "$cur"))
         return
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W "${opts//-/+}" -- "$cur") )
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W "${opts//-/+}" -- "$cur"))
         return
     fi
 
     local args ext=
     _count_args "" "@(-c|[-+]o)"
-    [[ $args -eq 1 ]] && ext=sh
+    ((args == 1)) && ext="sh"
     _filedir $ext
 } &&
-complete -F _sh sh
+    complete -F _sh sh
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/shellcheck b/msys2/usr/share/bash-completion/completions/shellcheck
index 4a40c8f9e..6421d7b6e 100644
--- a/msys2/usr/share/bash-completion/completions/shellcheck
+++ b/msys2/usr/share/bash-completion/completions/shellcheck
@@ -2,9 +2,9 @@
 
 _shellcheck_optarg()
 {
-    local args=$("$1" --help 2>&1 | \
+    local args=$("$1" --help 2>&1 |
         command sed -e 's/,/ /g' -ne 's/^.*'$2'\>.*(\([^)]*\)).*/\1/p')
-    COMPREPLY+=( $(compgen -W '$args' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$args' -- "$cur"))
 }
 
 _shellcheck()
@@ -13,51 +13,51 @@ _shellcheck()
     _init_completion -s || return
 
     case $prev in
-        --version|-!(-*)V*)
+        --version | -!(-*)V*)
             return
             ;;
-        --exclude|--include|-!(-*)[ei])
+        --exclude | --include | -!(-*)[ei])
             return
             ;;
-        --format|-!(-*)f)
-            local args=$("$1" --format=nonexistent-format /dev/null 2>&1 | \
-                command sed -ne '/^Supported formats/,//p' | \
+        --format | -!(-*)f)
+            local args=$("$1" --format=nonexistent-format /dev/null 2>&1 |
+                command sed -ne '/^Supported formats/,//p' |
                 command sed -ne '/^[[:space:]]/p')
-            COMPREPLY=( $(compgen -W '$args' -- "$cur") )
+            COMPREPLY=($(compgen -W '$args' -- "$cur"))
             return
             ;;
-        --color|-!(-*)C)
+        --color | -!(-*)C)
             _shellcheck_optarg "$1" --color
             return
             ;;
-        --shell|-!(-*)s)
+        --shell | -!(-*)s)
             _shellcheck_optarg "$1" --shell
             return
             ;;
-        --enable|-!(-*)o)
-            COMPREPLY=( $(compgen -W 'all' -- "$cur") )  # TODO others?
+        --enable | -!(-*)o)
+            COMPREPLY=($(compgen -W 'all' -- "$cur")) # TODO others?
             return
             ;;
-        --source-path|-!(-*)P)
+        --source-path | -!(-*)P)
             _filedir -d
-            COMPREPLY+=( $(compgen -W 'SCRIPTDIR' -- "$cur") )
+            COMPREPLY+=($(compgen -W 'SCRIPTDIR' -- "$cur"))
             return
             ;;
-        --wiki-link-count|-!(-*)W)
+        --wiki-link-count | -!(-*)W)
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir
 } &&
-complete -F _shellcheck shellcheck
+    complete -F _shellcheck shellcheck
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sidedoor b/msys2/usr/share/bash-completion/completions/sidedoor
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/sidedoor
+++ b/msys2/usr/share/bash-completion/completions/sidedoor
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sitecopy b/msys2/usr/share/bash-completion/completions/sitecopy
index dae0548d3..85156875b 100644
--- a/msys2/usr/share/bash-completion/completions/sitecopy
+++ b/msys2/usr/share/bash-completion/completions/sitecopy
@@ -9,17 +9,17 @@ _sitecopy()
     _init_completion -s || return
 
     case $prev in
-        --debug|-!(-*)d)
-            COMPREPLY=( $(compgen -W "socket files rcfile ftp http httpbody
-                rsh sftp xml xmlparse cleartext" -- "$cur") )
+        --debug | -!(-*)d)
+            COMPREPLY=($(compgen -W "socket files rcfile ftp http httpbody
+                rsh sftp xml xmlparse cleartext" -- "$cur"))
             compopt -o nospace
             return
             ;;
-        --logfile|--rcfile|-!(-*)[gr])
+        --logfile | --rcfile | -!(-*)[gr])
             _filedir
             return
             ;;
-        --storepath|-!(-*)p)
+        --storepath | -!(-*)p)
             _filedir -d
             return
             ;;
@@ -27,24 +27,24 @@ _sitecopy()
 
     case $cur in
         --*)
-            COMPREPLY=( $(compgen -W "$(_parse_help $1)" -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W "$(_parse_help $1)" -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
 
         # only complete long options
         -)
             compopt -o nospace
-            COMPREPLY=( -- )
+            COMPREPLY=(--)
             return
             ;;
     esac
 
     if [[ -r ~/.sitecopyrc ]]; then
-        COMPREPLY=( $(compgen -W "$($1 -v | \
-                      command sed -n '/^Site:/s/Site: //p')" -- "$cur") )
+        COMPREPLY=($(compgen -W "$($1 -v |
+            command sed -n '/^Site:/s/Site: //p')" -- "$cur"))
     fi
 } &&
-complete -F _sitecopy -o default sitecopy
+    complete -F _sitecopy -o default sitecopy
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/slackpkg b/msys2/usr/share/bash-completion/completions/slackpkg
index a1d500dcf..1d8792806 100644
--- a/msys2/usr/share/bash-completion/completions/slackpkg
+++ b/msys2/usr/share/bash-completion/completions/slackpkg
@@ -7,23 +7,23 @@ _slackpkg()
     _init_completion -n = || return
 
     local split=false
-    if [[ "$cur" == -?*=* ]]; then
+    if [[ $cur == -?*=* ]]; then
         prev="${cur%%?(\\)=*}"
         cur="${cur#*=}"
         split=true
     fi
 
     case "$prev" in
-        -delall|-checkmd5|-checkgpg|-checksize|-postinst|-onoff|-download_all|\
-        -dialog|-batch|-only_new_dotnew|-use_includes|-spinning)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        -delall | -checkmd5 | -checkgpg | -checksize | -postinst | -onoff | -download_all | \
+            -dialog | -batch | -only_new_dotnew | -use_includes | -spinning)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         -default_answer)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             return
             ;;
-        -dialog_maxargs|-mirror)
+        -dialog_maxargs | -mirror)
             # argument required but no completions available
             return
             ;;
@@ -31,77 +31,82 @@ _slackpkg()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         compopt -o nospace
-        COMPREPLY=( $(compgen -W '-delall= -checkmd5= -checkgpg=
+        COMPREPLY=($(compgen -W '-delall= -checkmd5= -checkgpg=
             -checksize= -postinst= -onoff= -download_all= -dialog=
             -dialog_maxargs= -batch= -only_new_dotnew= -use_includes=
-            -spinning= -default_answer= -mirror=' -- "$cur") )
+            -spinning= -default_answer= -mirror=' -- "$cur"))
         return
     fi
 
     local confdir="/etc/slackpkg"
     local config="$confdir/slackpkg.conf"
 
-    [[ -r "$config" ]] || return
+    [[ -r $config ]] || return
     . "$config"
 
     local i action
-    for (( i=1; i<${#words[@]}; i++ )); do
-        if [[ "${words[i]}" != -* ]]; then
+    for ((i = 1; i < ${#words[@]}; i++)); do
+        if [[ ${words[i]} != -* ]]; then
             action="${words[i]}"
             break
         fi
     done
 
     case "$action" in
-        generate-template|search|file-search)
+        generate-template | search | file-search)
             # argument required but no completions available
             return
             ;;
-        install-template|remove-template)
+        install-template | remove-template)
             if [[ -e $confdir/templates ]]; then
-                COMPREPLY=( $(cd "$confdir/templates"; \
-                    compgen -f -X "!*.template" -- "$cur") )
-                COMPREPLY=( ${COMPREPLY[@]%.template} )
+                COMPREPLY=($(
+                    cd "$confdir/templates"
+                    compgen -f -X "!*.template" -- "$cur"
+                ))
+                COMPREPLY=(${COMPREPLY[@]%.template})
             fi
             return
             ;;
         remove)
             _filedir
-            COMPREPLY+=( $(compgen -W 'a ap d e f k kde kdei l n t tcl x
-                xap xfce y' -- "$cur") )
-            COMPREPLY+=( $(cd /var/log/packages; compgen -f -- "$cur") )
+            COMPREPLY+=($(compgen -W 'a ap d e f k kde kdei l n t tcl x
+                xap xfce y' -- "$cur"))
+            COMPREPLY+=($(
+                cd /var/log/packages
+                compgen -f -- "$cur"
+            ))
             return
             ;;
-        install|reinstall|upgrade|blacklist|download)
+        install | reinstall | upgrade | blacklist | download)
             _filedir
-            COMPREPLY+=( $(compgen -W 'a ap d e f k kde kdei l n t tcl x
-                xap xfce y' -- "$cur") )
-            COMPREPLY+=( $(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null | \
-                command grep "^$cur") )
+            COMPREPLY+=($(compgen -W 'a ap d e f k kde kdei l n t tcl x
+                xap xfce y' -- "$cur"))
+            COMPREPLY+=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
+                command grep "^$cur"))
             return
             ;;
         info)
-            COMPREPLY=( $(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null | \
-                command grep "^$cur") )
+            COMPREPLY=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
+                command grep "^$cur"))
             return
             ;;
         update)
             # we should complete the same as the next `list` + "gpg"
-            COMPREPLY=( $(compgen -W 'gpg' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gpg' -- "$cur"))
             ;&
         *)
-            COMPREPLY+=( $(compgen -W 'install reinstall upgrade remove
+            COMPREPLY+=($(compgen -W 'install reinstall upgrade remove
                 blacklist download update install-new upgrade-all
                 clean-system new-config check-updates help generate-template
                 install-template remove-template search file-search info' -- \
-                "$cur") )
+                "$cur"))
             return
             ;;
     esac
 
 } &&
-complete -F _slackpkg slackpkg
+    complete -F _slackpkg slackpkg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/slapt-get b/msys2/usr/share/bash-completion/completions/slapt-get
index 9b249f190..14c2dbea7 100644
--- a/msys2/usr/share/bash-completion/completions/slapt-get
+++ b/msys2/usr/share/bash-completion/completions/slapt-get
@@ -6,25 +6,27 @@ _slapt_get()
     _init_completion || return
 
     case "$prev" in
-        --config|-c)
+        --config | -c)
             _filedir
             return
             ;;
-        --retry|--search)
+        --retry | --search)
             # argument required but no completions available
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-        [[ $COMPREPLY ]] && return
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        if [[ ${COMPREPLY-} ]]; then
+            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            return
+        fi
     fi
 
     local i t
     # search for last action (--install|--install-set|--remove|--show|--filelist)
-    for (( i=${#words[@]}-1; i>0; i-- )); do
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
         if [[ ${words[i]} == --show ]]; then
             t="all"
             break
@@ -42,40 +44,43 @@ _slapt_get()
 
     local config="/etc/slapt-get/slapt-getrc" # default config location
     # search for config
-    for (( i=${#words[@]}-1; i>0; i-- )); do
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
         if [[ ${words[i]} == -@(c|-config) ]]; then
-            config="${words[i+1]}"
+            config="${words[i + 1]}"
             __expand_tilde_by_ref config
             break
         fi
     done
-    [[ -r "$config" ]] || return
+    [[ -r $config ]] || return
 
     case $t in
         all) # --show
             # slapt-get will fail to search for "^name-version"
             # it can search for names only
             local name=${cur%%-*}
-            COMPREPLY=( $(LC_ALL=C "$1" -c "$config" --search "^$name" \
-                2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}") )
+            COMPREPLY=($(LC_ALL=C "$1" -c "$config" --search "^$name" \
+                2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}"))
             return
             ;;
         avl) # --install|-i|
-            COMPREPLY=( $(LC_ALL=C "$1" -c "$config" --available \
-                2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}") )
+            COMPREPLY=($(LC_ALL=C "$1" -c "$config" --available \
+                2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}"))
             return
             ;;
         ins) # --remove|--filelist
-            COMPREPLY=( $(cd /var/log/packages; compgen -f -- "$cur") )
+            COMPREPLY=($(
+                cd /var/log/packages
+                compgen -f -- "$cur"
+            ))
             return
             ;;
         set) # --install-set
-            COMPREPLY=( $(compgen -W 'a ap d e f k kde kdei l n t tcl x
-                xap xfce y' -- "$cur") )
+            COMPREPLY=($(compgen -W 'a ap d e f k kde kdei l n t tcl x
+                xap xfce y' -- "$cur"))
             return
             ;;
     esac
 } &&
-complete -F _slapt_get slapt-get
+    complete -F _slapt_get slapt-get
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/slapt-src b/msys2/usr/share/bash-completion/completions/slapt-src
index 64458babc..1e3828c08 100644
--- a/msys2/usr/share/bash-completion/completions/slapt-src
+++ b/msys2/usr/share/bash-completion/completions/slapt-src
@@ -6,11 +6,11 @@ _slapt_src()
     _init_completion -s -n : || return
 
     case "$prev" in
-        --config|-c)
+        --config | -c)
             _filedir
             return
             ;;
-        --search|-s|--postprocess|-p)
+        --search | -s | --postprocess | -p)
             # argument required but no completions available
             return
             ;;
@@ -18,15 +18,17 @@ _slapt_src()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-        [[ $COMPREPLY ]] && return
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --help)' -- "$cur"))
+        if [[ ${COMPREPLY-} ]]; then
+            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            return
+        fi
     fi
 
     local i t
     # search for last action (-i|-w|-b|-f)
-    for (( i=${#words[@]}-1; i>0; i-- )); do
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
         if [[ ${words[i]} == -@([iwfb]|-install|-show|-build|-fetch) ]]; then
             t="all"
             break
@@ -38,9 +40,9 @@ _slapt_src()
 
     local config="/etc/slapt-get/slapt-srcrc" # default config location
     # search for config
-    for (( i=${#words[@]}-1; i>0; i-- )); do
+    for ((i = ${#words[@]} - 1; i > 0; i--)); do
         if [[ ${words[i]} == -@(c|-config) ]]; then
-            config="${words[i+1]}"
+            config="${words[i + 1]}"
             __expand_tilde_by_ref config
             break
         fi
@@ -49,19 +51,18 @@ _slapt_src()
             break
         fi
     done
-    [[ -r "$config" ]] || return
+    [[ -r $config ]] || return
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         local name=${cur%:*}
-        local version=${cur##*:}
-        COMPREPLY=( $(LC_ALL=C "$1" --config "$config" --search "^$name" \
+        COMPREPLY=($(LC_ALL=C "$1" --config "$config" --search "^$name" \
             2>/dev/null | LC_ALL=C command sed -ne \
-            "/^$cur/{s/^$name:\([^ ]*\) .*$/\1/;p}") )
+            "/^$cur/{s/^$name:\([^ ]*\) .*$/\1/;p}"))
     else
-        COMPREPLY=( $(LC_ALL=C "$1" --config "$config" --search "^$cur" \
-            2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}") )
+        COMPREPLY=($(LC_ALL=C "$1" --config "$config" --search "^$cur" \
+            2>/dev/null | LC_ALL=C command sed -ne "/^$cur/{s/ .*$//;p}"))
     fi
 } &&
-complete -F _slapt_src slapt-src
+    complete -F _slapt_src slapt-src
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/slogin b/msys2/usr/share/bash-completion/completions/slogin
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/slogin
+++ b/msys2/usr/share/bash-completion/completions/slogin
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smartctl b/msys2/usr/share/bash-completion/completions/smartctl
index ecef0b99b..ee45a7c32 100644
--- a/msys2/usr/share/bash-completion/completions/smartctl
+++ b/msys2/usr/share/bash-completion/completions/smartctl
@@ -2,25 +2,27 @@
 
 _smartctl_quietmode()
 {
-    COMPREPLY=( $(compgen -W 'errorsonly silent noserial' -- "$cur") )
+    COMPREPLY=($(compgen -W 'errorsonly silent noserial' -- "$cur"))
 }
 _smartctl_device()
 {
     case $cur in
-        areca*|3ware*|megaraid*|cciss*)
-            COMPREPLY+=( ${cur%%,*},{0..31} )
-            COMPREPLY=( $(compgen -W '"${COMPREPLY[@]}"' -- "$cur") )
+        areca* | 3ware* | megaraid* | cciss*)
+            # shellcheck disable=SC2054
+            COMPREPLY+=(${cur%%,*},{0..31})
+            COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "$cur"))
             ;;
         hpt*)
-            COMPREPLY+=( hpt,{1..4}/{1..8} hpt,{1..4}/{1..8}/{1..5} )
-            COMPREPLY=( $(compgen -W '"${COMPREPLY[@]}"' -- "$cur") )
+            # shellcheck disable=SC2054
+            COMPREPLY+=(hpt,{1..4}/{1..8} hpt,{1..4}/{1..8}/{1..5})
+            COMPREPLY=($(compgen -W '"${COMPREPLY[@]}"' -- "$cur"))
             ;;
         *)
-            COMPREPLY=( $(compgen -W "ata scsi sat usbcypress usbjmicron
+            COMPREPLY=($(compgen -W "ata scsi sat usbcypress usbjmicron
                 usbsunplus marvell areca 3ware hpt megaraid cciss auto test" \
-                    -- "$cur") )
+                -- "$cur"))
             case "${COMPREPLY[@]}" in
-                areca|3ware|hpt|megaraid|cciss)
+                areca | 3ware | hpt | megaraid | cciss)
                     compopt -o nospace
                     ;;
             esac
@@ -29,54 +31,54 @@ _smartctl_device()
 }
 _smartctl_tolerance()
 {
-    COMPREPLY=( $(compgen -W 'normal conservative permissive verypermissive' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'normal conservative permissive verypermissive' \
+        -- "$cur"))
 }
 _smartctl_badsum()
 {
-    COMPREPLY=( $(compgen -W 'warn exit ignore' -- "$cur") )
+    COMPREPLY=($(compgen -W 'warn exit ignore' -- "$cur"))
 }
 _smartctl_report()
 {
-    COMPREPLY=( $(compgen -W 'ioctl ataioctl scsiioctl' -- "$cur") )
+    COMPREPLY=($(compgen -W 'ioctl ataioctl scsiioctl' -- "$cur"))
 }
 _smartctl_powermode()
 {
-    COMPREPLY=( $(compgen -W 'never sleep standby idle' -- "$cur") )
+    COMPREPLY=($(compgen -W 'never sleep standby idle' -- "$cur"))
 }
 _smartctl_feature()
 {
-    COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off' -- "$cur"))
 }
 _smartctl_log()
 {
-    COMPREPLY=( $(compgen -W 'error selftest selective directory background
+    COMPREPLY=($(compgen -W 'error selftest selective directory background
         sasphy sasphy,reset sataphy sataphy,reset scttemp scttempsts
-        scttemphist scterc gplog smartlog xerror xselftest' -- "$cur") )
+        scttemphist scterc gplog smartlog xerror xselftest' -- "$cur"))
 }
 _smartctl_vendorattribute()
 {
-    COMPREPLY=( $(compgen -W 'help 9,minutes 9,seconds 9,halfminutes 9,temp
+    COMPREPLY=($(compgen -W 'help 9,minutes 9,seconds 9,halfminutes 9,temp
         192,emergencyretractcyclect 193,loadunload 194,10xCelsius 194,unknown
         198,offlinescanuncsectorct 200,writeerrorcount 201,detectedtacount
-        220,temp' -- "$cur") )
+        220,temp' -- "$cur"))
 }
 _smartctl_firmwarebug()
 {
-    COMPREPLY=( $(compgen -W 'none samsung samsung2 samsung3 swapid' \
-        -- "$cur") )
+    COMPREPLY=($(compgen -W 'none samsung samsung2 samsung3 swapid' \
+        -- "$cur"))
 }
 _smartctl_presets()
 {
-    COMPREPLY=( $(compgen -W 'use ignore show showall' -- "$cur") )
+    COMPREPLY=($(compgen -W 'use ignore show showall' -- "$cur"))
 }
 _smartctl_test()
 {
     [[ $cur == @(pending|scttempint|vendor), ]] && return
-    COMPREPLY=( $(compgen -W 'offline short long conveyance select,
+    COMPREPLY=($(compgen -W 'offline short long conveyance select,
         select,redo select,next afterselect,on afterselect,off pending,
-        scttempint, vendor,' -- "$cur") )
-    [[ $COMPREPLY == *, ]] && compopt -o nospace
+        scttempint, vendor,' -- "$cur"))
+    [[ ${COMPREPLY-} == *, ]] && compopt -o nospace
 }
 _smartctl_drivedb()
 {
@@ -86,7 +88,7 @@ _smartctl_drivedb()
         cur="${cur#+}"
     fi
     _filedir h
-    [[ -n $prefix ]] && COMPREPLY=( "${COMPREPLY[@]/#/$prefix}" )
+    [[ -n $prefix ]] && COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
 }
 
 _smartctl()
@@ -95,54 +97,54 @@ _smartctl()
     _init_completion -s || return
 
     case $prev in
-        --quietmode|-!(-*)q)
+        --quietmode | -!(-*)q)
             _smartctl_quietmode
             ;;
-        --device|-!(-*)d)
+        --device | -!(-*)d)
             _smartctl_device
             return
             ;;
-        --tolerance|-!(-*)T)
+        --tolerance | -!(-*)T)
             _smartctl_tolerance
             return
             ;;
-        --badsum|-!(-*)b)
+        --badsum | -!(-*)b)
             _smartctl_badsum
             return
             ;;
-        --report|-!(-*)r)
+        --report | -!(-*)r)
             _smartctl_report
             return
             ;;
-        --nocheck|-!(-*)n)
+        --nocheck | -!(-*)n)
             _smartctl_powermode
             return
             ;;
-        --smart|--offlineauto|--saveauto|-!(-*)[soS])
+        --smart | --offlineauto | --saveauto | -!(-*)[soS])
             _smartctl_feature
             return
             ;;
-        --log|-!(-*)l)
+        --log | -!(-*)l)
             _smartctl_log
             return
             ;;
-        --vendorattribute|-!(-*)v)
+        --vendorattribute | -!(-*)v)
             _smartctl_vendorattribute
             return
             ;;
-        --firmwarebug|-!(-*)F)
+        --firmwarebug | -!(-*)F)
             _smartctl_firmwarebug
             return
             ;;
-        --presets|-!(-*)P)
+        --presets | -!(-*)P)
             _smartctl_presets
             return
             ;;
-        --drivedb|-!(-*)B)
+        --drivedb | -!(-*)B)
             _smartctl_drivedb
             return
             ;;
-        --test|-!(-*)t)
+        --test | -!(-*)t)
             _smartctl_test
             return
             ;;
@@ -150,14 +152,14 @@ _smartctl()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         cur=${cur:=/dev/}
         _filedir
     fi
 } &&
-complete -F _smartctl smartctl
+    complete -F _smartctl smartctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbcacls b/msys2/usr/share/bash-completion/completions/smbcacls
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbcacls
+++ b/msys2/usr/share/bash-completion/completions/smbcacls
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbclient b/msys2/usr/share/bash-completion/completions/smbclient
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbclient
+++ b/msys2/usr/share/bash-completion/completions/smbclient
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbcquotas b/msys2/usr/share/bash-completion/completions/smbcquotas
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbcquotas
+++ b/msys2/usr/share/bash-completion/completions/smbcquotas
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbget b/msys2/usr/share/bash-completion/completions/smbget
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbget
+++ b/msys2/usr/share/bash-completion/completions/smbget
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbpasswd b/msys2/usr/share/bash-completion/completions/smbpasswd
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbpasswd
+++ b/msys2/usr/share/bash-completion/completions/smbpasswd
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbtar b/msys2/usr/share/bash-completion/completions/smbtar
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbtar
+++ b/msys2/usr/share/bash-completion/completions/smbtar
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/smbtree b/msys2/usr/share/bash-completion/completions/smbtree
index c896ce42f..cea210761 100644
--- a/msys2/usr/share/bash-completion/completions/smbtree
+++ b/msys2/usr/share/bash-completion/completions/smbtree
@@ -2,40 +2,41 @@
 
 _samba_resolve_order()
 {
-    COMPREPLY=( $(compgen -W 'lmhosts host wins bcast' -- "$cur") )
+    COMPREPLY=($(compgen -W 'lmhosts host wins bcast' -- "$cur"))
 }
 
 _samba_domains()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W '$(smbtree -N -D)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(smbtree -N -D)' -- "$cur"))
     fi
 }
 
 _samba_hosts()
 {
     if [[ -n ${COMP_SAMBA_SCAN:-} ]]; then
-        COMPREPLY=( $(compgen -W "$(smbtree -N -S | \
-            command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p' \
-            )" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(
+            smbtree -N -S |
+                command sed -ne 's/^[[:space:]]*\\\\*\([^[:space:]]*\).*/\1/p'
+        )" -- "$cur"))
     fi
 }
 
 _samba_debuglevel()
 {
-    COMPREPLY=( $(compgen -W '{0..10}' -- "$cur") )
+    COMPREPLY=($(compgen -W '{0..10}' -- "$cur"))
 }
 
 _samba_sockopts()
 {
-    COMPREPLY=( $(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
+    COMPREPLY=($(compgen -W 'SO_KEEPALIVE SO_REUSEADDR SO_BROADCAST
         TCP_NODELAY IPTOS_LOWDELAY IPTOS_THROUGHPUT SO_SNDBUF SO_RCVBUF
-        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur") )
+        SO_SNDLOWAT SO_RCVLOWAT' -- "$cur"))
 }
 
 _samba_signing()
 {
-    COMPREPLY=( $(compgen -W 'on off required' -- "$cur") )
+    COMPREPLY=($(compgen -W 'on off required' -- "$cur"))
 }
 
 _smbclient()
@@ -44,64 +45,64 @@ _smbclient()
     _init_completion -s || return
 
     case $prev in
-        --name-resolve|-!(-*)R)
+        --name-resolve | -!(-*)R)
             _samba_resolve_order
             return
             ;;
         -!(-*)t)
-            COMPREPLY=( $(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
+                -- "$cur"))
             return
             ;;
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|--directory|-!(-*)[lD])
+        --log-basename | --directory | -!(-*)[lD])
             _filedir -d
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'c x I X F b g q r N a' -- "$cur") )
+            COMPREPLY=($(compgen -W 'c x I X F b g q r N a' -- "$cur"))
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --list|-!(-*)L)
+        --list | -!(-*)L)
             _samba_hosts
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --port|--message|--ip-address|--send-buffer|--user|--netbiosname|\
-        --scope|--tar|--command|--max-protocol|-!(-*)[pMIbUniTcm])
+        --port | --message | --ip-address | --send-buffer | --user | --netbiosname | \
+            --scope | --tar | --command | --max-protocol | -!(-*)[pMIbUniTcm])
             return
             ;;
-        --help|--version|-!(-*)[?V])
+        --help | --version | -!(-*)[?V])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbclient smbclient
+    complete -F _smbclient smbclient
 
 _smbget()
 {
@@ -109,31 +110,31 @@ _smbget()
     _init_completion -s || return
 
     case $prev in
-        --outputfile|--rcfile|-!(-*)[of])
+        --outputfile | --rcfile | -!(-*)[of])
             _filedir
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --workgroup|-!(-*)w)
+        --workgroup | -!(-*)w)
             _samba_domains
             return
             ;;
-        --username|--password|--blocksize|-!(-*)[upb])
+        --username | --password | --blocksize | -!(-*)[upb])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbget smbget
+    complete -F _smbget smbget
 
 _smbcacls()
 {
@@ -141,15 +142,15 @@ _smbcacls()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[As])
+        --configfile | --authentication-file | -!(-*)[As])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -157,28 +158,28 @@ _smbcacls()
             _samba_signing
             return
             ;;
-        --socket-options|-!(-*)O)
+        --socket-options | -!(-*)O)
             _samba_sockopts
             return
             ;;
-        --workgroup|-!(-*)W)
+        --workgroup | -!(-*)W)
             _samba_domains
             return
             ;;
-        --help|--usage|--delete|--modify|--add|--set|--chown|--chgrp|\
-        --netbiosname|--scope|--user|-!(-*)[?DMaSCGniU])
+        --help | --usage | --delete | --modify | --add | --set | --chown | --chgrp | \
+            --netbiosname | --scope | --user | -!(-*)[?DMaSCGniU])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcacls smbcacls
+    complete -F _smbcacls smbcacls
 
 _smbcquotas()
 {
@@ -186,15 +187,15 @@ _smbcquotas()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
@@ -202,19 +203,19 @@ _smbcquotas()
             _samba_signing
             return
             ;;
-        --help|--usage|--user|--set|-!(-*)[?UuS])
+        --help | --usage | --user | --set | -!(-*)[?UuS])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbcquotas smbcquotas
+    complete -F _smbcquotas smbcquotas
 
 _smbpasswd()
 {
@@ -243,11 +244,11 @@ _smbpasswd()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
     fi
 } &&
-complete -F _smbpasswd smbpasswd
+    complete -F _smbpasswd smbpasswd
 
 _smbtar()
 {
@@ -276,11 +277,11 @@ _smbtar()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _smbtar smbtar
+    complete -F _smbtar smbtar
 
 _smbtree()
 {
@@ -288,34 +289,34 @@ _smbtree()
     _init_completion -s || return
 
     case $prev in
-        --configfile|--authentication-file|-!(-*)[sA])
+        --configfile | --authentication-file | -!(-*)[sA])
             _filedir
             return
             ;;
-        --log-basename|-!(-*)l)
+        --log-basename | -!(-*)l)
             _filedir -d
             return
             ;;
-        --debuglevel|-!(-*)d)
+        --debuglevel | -!(-*)d)
             _samba_debuglevel
             return
             ;;
-        --signing|-!(-*)S)
+        --signing | -!(-*)S)
             _samba_signing
             return
             ;;
-        --help|--usage|--user|-!(-*)[?U])
+        --help | --usage | --user | -!(-*)[?U])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _smbtree smbtree
+    complete -F _smbtree smbtree
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/snownews b/msys2/usr/share/bash-completion/completions/snownews
index 3938454f0..5b585d924 100644
--- a/msys2/usr/share/bash-completion/completions/snownews
+++ b/msys2/usr/share/bash-completion/completions/snownews
@@ -5,11 +5,11 @@ _snownews()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # return list of available options
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi
 } &&
-complete -F _snownews snownews
+    complete -F _snownews snownews
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sparc-koji b/msys2/usr/share/bash-completion/completions/sparc-koji
index be43f0a24..8efef9a7f 100644
--- a/msys2/usr/share/bash-completion/completions/sparc-koji
+++ b/msys2/usr/share/bash-completion/completions/sparc-koji
@@ -2,8 +2,8 @@
 
 _koji_search()
 {
-    COMPREPLY+=( $(compgen -W \
-        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        '$("$1" -q search $2 "$cur*" 2>/dev/null)' -- "$cur"))
 }
 
 _koji_build()
@@ -23,13 +23,13 @@ _koji_user()
 
 _koji_tag()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-tags 2>/dev/null)' -- "$cur"))
 }
 
 _koji_target()
 {
-    COMPREPLY+=( $(compgen -W '$("$1" -q list-targets 2>/dev/null |
-        awk "{ print \$1 }")' -- "$cur") )
+    COMPREPLY+=($(compgen -W '$("$1" -q list-targets 2>/dev/null |
+        awk "{ print \$1 }")' -- "$cur"))
 }
 
 _koji()
@@ -38,7 +38,7 @@ _koji()
     _init_completion -s || return
 
     local commandix command
-    for (( commandix=1; commandix < cword; commandix++ )); do
+    for ((commandix = 1; commandix < cword; commandix++)); do
         if [[ ${words[commandix]} != -* ]]; then
             command=${words[commandix]}
             break
@@ -46,19 +46,19 @@ _koji()
     done
 
     case $prev in
-        --help|--help-commands|-!(-*)h*)
+        --help | --help-commands | -!(-*)h*)
             return
             ;;
-        --config|--keytab|-!(-*)[co])
+        --config | --keytab | -!(-*)[co])
             _filedir
             return
             ;;
-        --runas|--user|--editor|--by)
+        --runas | --user | --editor | --by)
             _koji_user "$1"
             return
             ;;
         --authtype)
-            COMPREPLY=( $(compgen -W 'noauth ssl password kerberos' -- "$cur") )
+            COMPREPLY=($(compgen -W 'noauth ssl password kerberos' -- "$cur"))
             return
             ;;
         --topdir)
@@ -66,15 +66,15 @@ _koji()
             return
             ;;
         --type)
-            case $command in
-                latest-pkg|list-tagged)
-                    COMPREPLY=( $(compgen -W 'maven' -- "$cur") )
+            case ${command-} in
+                latest-pkg | list-tagged)
+                    COMPREPLY=($(compgen -W 'maven' -- "$cur"))
                     ;;
             esac
             return
             ;;
         --name)
-            case $command in
+            case ${command-} in
                 list-targets)
                     _koji_target "$1"
                     ;;
@@ -85,7 +85,7 @@ _koji()
             _koji_user "$1"
             return
             ;;
-        --tag|--latestfrom)
+        --tag | --latestfrom)
             _koji_tag "$1"
             return
             ;;
@@ -105,22 +105,22 @@ _koji()
 
     $split && return
 
-    if [[ $command ]]; then
+    if [[ -v command ]]; then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W \
-                '$(_parse_help "$1" "$command --help")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W \
+                '$(_parse_help "$1" "$command --help")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
         fi
 
         # How many'th non-option arg (1-based) for $command are we completing?
         local i nth=1
-        for (( i=commandix+1; i < cword; i++ )); do
-            [[ ${words[i]} == -* ]] || (( nth++ ))
+        for ((i = commandix + 1; i < cword; i++)); do
+            [[ ${words[i]} == -* ]] || ((nth++))
         done
 
         case $command in
-            build|maven-build|win-build)
+            build | maven-build | win-build)
                 case $nth in
                     1)
                         _koji_target "$1"
@@ -160,7 +160,7 @@ _koji()
             latest-by-tag)
                 _koji_package "$1"
                 ;;
-            latest-pkg|list-groups|list-tag-inheritance|show-groups)
+            latest-pkg | list-groups | list-tag-inheritance | show-groups)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -186,7 +186,7 @@ _koji()
                 ;;
             move-pkg)
                 case $nth in
-                    1|2)
+                    1 | 2)
                         _koji_tag "$1"
                         ;;
                     *)
@@ -197,12 +197,12 @@ _koji()
             search)
                 case $nth in
                     1)
-                        COMPREPLY=( $(compgen -W 'package build tag target
-                            user host rpm' -- "$cur") )
+                        COMPREPLY=($(compgen -W 'package build tag target
+                            user host rpm' -- "$cur"))
                         ;;
                 esac
                 ;;
-            tag-pkg|untag-pkg)
+            tag-pkg | untag-pkg)
                 case $nth in
                     1)
                         _koji_tag "$1"
@@ -218,7 +218,7 @@ _koji()
             wait-repo)
                 case $nth in
                     1)
-                        for (( i=commandix+1; i < cword; i++ )); do
+                        for ((i = commandix + 1; i < cword; i++)); do
                             if [[ ${words[i]} == --target ]]; then
                                 _koji_target "$1"
                                 return
@@ -233,13 +233,13 @@ _koji()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-    elif [[ ! $command ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help-commands 2>/dev/null | \
-            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
+    elif [[ ! -v command ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help-commands 2>/dev/null | \
+            awk "/^(  +|\t)/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
+    complete -F _koji koji arm-koji ppc-koji s390-koji sparc-koji
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/spovray b/msys2/usr/share/bash-completion/completions/spovray
index c5af018aa..56dfd94d2 100644
--- a/msys2/usr/share/bash-completion/completions/spovray
+++ b/msys2/usr/share/bash-completion/completions/spovray
@@ -16,35 +16,41 @@ _povray()
             cur="${povcur#[-+]I}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir pov
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
         [-+]O*)
             # guess what output file type user may want
-            case $(IFS=$'\n'; command grep '^[-+]F' <<<"${words[*]}") in
+            case $(
+                IFS=$'\n'
+                command grep '^[-+]F' <<<"${words[*]}"
+            ) in
                 [-+]FN) oext=png ;;
                 [-+]FP) oext=ppm ;;
                 [-+]F[CT]) oext=tga ;;
                 *) oext=$defoext ;;
             esac
             # complete filename corresponding to previously specified +I
-            COMPREPLY=( $(IFS=$'\n'; command grep '^[-+]I' <<<"${words[*]}") )
-            COMPREPLY=( ${COMPREPLY[@]#[-+]I} )
-            COMPREPLY=( ${COMPREPLY[@]/%.pov/.$oext} )
+            COMPREPLY=($(
+                IFS=$'\n'
+                command grep '^[-+]I' <<<"${words[*]}"
+            ))
+            COMPREPLY=(${COMPREPLY[@]#[-+]I})
+            COMPREPLY=(${COMPREPLY[@]/%.pov/.$oext})
             cur="${povcur#[-+]O}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir $oext
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
-        *.ini\[|*.ini\[*[^]]) # sections in .ini files
+        *.ini\[ | *.ini\[*[^]]) # sections in .ini files
             cur="${povcur#*\[}"
             pfx="${povcur%\["$cur"}" # prefix == filename
             [[ -r $pfx ]] || return
-            COMPREPLY=( $(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
-                -e 't' -e 'd' -- "$pfx") )
+            COMPREPLY=($(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
+                -e 't' -e 'd' -- "$pfx"))
             # to prevent [bar] expand to nothing.  can be done more easily?
-            COMPREPLY=( "${COMPREPLY[@]/#/${pfx}[}" )
+            COMPREPLY=("${COMPREPLY[@]/#/${pfx}[}")
             return
             ;;
         *)
@@ -53,6 +59,6 @@ _povray()
             ;;
     esac
 } &&
-complete -F _povray povray xpovray spovray
+    complete -F _povray povray xpovray spovray
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sqlite3 b/msys2/usr/share/bash-completion/completions/sqlite3
index a7005489a..26d38a1fb 100644
--- a/msys2/usr/share/bash-completion/completions/sqlite3
+++ b/msys2/usr/share/bash-completion/completions/sqlite3
@@ -8,8 +8,8 @@ _sqlite3()
     local dbexts='@(sqlite?(3)|?(s?(3))db)'
 
     case $prev in
-        -help|-version|-lookaside|-mmap|-newline|-nullvalue|-pagecache|\
-        -scratch|-separator|*.$dbexts)
+        -help | -version | -lookaside | -mmap | -newline | -nullvalue | -pagecache | \
+            -scratch | -separator | *.$dbexts)
             return
             ;;
         -init)
@@ -18,21 +18,21 @@ _sqlite3()
             ;;
         -cmd)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
 
-    [[ $cword -gt 2 && ${words[cword-2]} == -@(lookaside|pagecache|scratch) ]] \
-        && return
+    [[ $cword -gt 2 && ${words[cword - 2]} == -@(lookaside|pagecache|scratch) ]] &&
+        return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
         return
     fi
 
     _filedir "$dbexts"
 } &&
-complete -F _sqlite3 sqlite3
+    complete -F _sqlite3 sqlite3
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ss b/msys2/usr/share/bash-completion/completions/ss
index 05e4e4b2a..4a27d514f 100644
--- a/msys2/usr/share/bash-completion/completions/ss
+++ b/msys2/usr/share/bash-completion/completions/ss
@@ -6,23 +6,24 @@ _ss()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
-        --family|-!(-*)f)
-            COMPREPLY=( $(compgen -W 'unix inet inet6 link netlink' \
-                -- "$cur") )
+        --family | -!(-*)f)
+            COMPREPLY=($(compgen -W 'unix inet inet6 link netlink' \
+                -- "$cur"))
             return
             ;;
-        --query|-!(-*)A)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -W '$("$1" --help | \
+        --query | -!(-*)A)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -W '$("$1" --help | \
                 command sed -e "s/|/ /g" -ne "s/.*QUERY := {\([^}]*\)}.*/\1/p")' \
-                -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+                -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --diag|--filter|-!(-*)[DF])
+        --diag | --filter | -!(-*)[DF])
             _filedir
             return
             ;;
@@ -31,10 +32,10 @@ _ss()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _ss ss
+    complete -F _ss ss
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ssh b/msys2/usr/share/bash-completion/completions/ssh
index ecbd58964..907c0390f 100644
--- a/msys2/usr/share/bash-completion/completions/ssh
+++ b/msys2/usr/share/bash-completion/completions/ssh
@@ -2,9 +2,12 @@
 
 _ssh_queries()
 {
-    COMPREPLY+=( $(compgen -W \
-        "cipher cipher-auth mac kex key key-cert key-plain protocol-version sig" \
-        -- "$cur") )
+    COMPREPLY+=($(compgen -W \
+        "cipher cipher-auth help mac kex key key-cert key-plain key-sig
+         protocol-version compression sig
+         ciphers macs kexalgorithms pubkeyacceptedkeytypes
+         hostkeyalgorithms hostbasedkeytypes hostbasedacceptedkeytypes" \
+        -- "${cur,,}"))
 }
 
 _ssh_query()
@@ -18,7 +21,7 @@ _ssh_ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=( $(compgen -W "$ciphers" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
 }
 
 _ssh_macs()
@@ -26,7 +29,7 @@ _ssh_macs()
     local macs='$(_ssh_query "$1" mac)'
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=( $(compgen -W "$macs" -- "$cur") )
+    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
 _ssh_options()
@@ -55,19 +58,20 @@ _ssh_options()
         ServerAliveInterval SmartcardDevice StreamLocalBindMask
         StreamLocalBindUnlink StrictHostKeyChecking SyslogFacility TCPKeepAlive
         Tunnel TunnelDevice UpdateHostKeys UsePrivilegedPort User
-        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation )
+        UserKnownHostsFile VerifyHostKeyDNS VisualHostKey XAuthLocation)
     local protocols=$(_ssh_query "$1" protocol-version)
     if [[ -z $protocols || $protocols == *1* ]]; then
-        opts+=( Cipher CompressionLevel Protocol RhostsRSAAuthentication
-                RSAAuthentication )
+        opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
+            RSAAuthentication)
     fi
 
     compopt -o nospace
-    local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+    local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+    shopt -s nocasematch
     local option
-    COMPREPLY=( $(for option in "${opts[@]}"; do
-                      [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
-                  done) )
+    COMPREPLY=($(for option in "${opts[@]}"; do
+        [[ $option == "$cur"* ]] && printf '%s=\n' "$option"
+    done))
     $reset
 }
 
@@ -82,68 +86,68 @@ _ssh_suboption()
     local prev=${1%%=*} cur=${1#*=}
 
     case ${prev,,} in
-        batchmode|canonicaldomains|canonicalizefallbacklocal|\
-        challengeresponseauthentication|checkhostip|\
-        clearallforwardings|controlpersist|compression|enablesshkeysign|\
-        exitonforwardfailure|forwardagent|forwardx11|forwardx11trusted|\
-        gatewayports|gssapiauthentication|gssapikeyexchange|\
-        gssapidelegatecredentials|gssapirenewalforcesrekey|gssapitrustdns|\
-        hashknownhosts|hostbasedauthentication|identitiesonly|\
-        kbdinteractiveauthentication|kbdinteractivedevices|\
-        nohostauthenticationforlocalhost|passwordauthentication|permitlocalcommand|\
-        proxyusefdpass|pubkeyauthentication|rhostsrsaauthentication|\
-        rsaauthentication|streamlocalbindunlink|\
-        tcpkeepalive|useprivilegedport|visualhostkey)
-            COMPREPLY=( $(compgen -W 'yes no' -- "$cur") )
+        batchmode | canonicaldomains | canonicalizefallbacklocal | \
+            challengeresponseauthentication | checkhostip | \
+            clearallforwardings | controlpersist | compression | enablesshkeysign | \
+            exitonforwardfailure | forwardagent | forwardx11 | forwardx11trusted | \
+            gatewayports | gssapiauthentication | gssapikeyexchange | \
+            gssapidelegatecredentials | gssapirenewalforcesrekey | gssapitrustdns | \
+            hashknownhosts | hostbasedauthentication | identitiesonly | \
+            kbdinteractiveauthentication | kbdinteractivedevices | \
+            nohostauthenticationforlocalhost | passwordauthentication | permitlocalcommand | \
+            proxyusefdpass | pubkeyauthentication | rhostsrsaauthentication | \
+            rsaauthentication | streamlocalbindunlink | \
+            tcpkeepalive | useprivilegedport | visualhostkey)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
             ;;
         addkeystoagent)
-            COMPREPLY=( $(compgen -W 'yes ask confirm no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask confirm no' -- "$cur"))
             ;;
         addressfamily)
-            COMPREPLY=( $(compgen -W 'any inet inet6' -- "$cur") )
+            COMPREPLY=($(compgen -W 'any inet inet6' -- "$cur"))
             ;;
         bindaddress)
             _ip_addresses
             ;;
         canonicalizehostname)
-            COMPREPLY=( $(compgen -W 'yes no always' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
             _ssh_identityfile
             ;;
-        *file|identityagent|include|controlpath|revokedhostkeys|xauthlocation)
+        *file | identityagent | include | controlpath | revokedhostkeys | xauthlocation)
             _filedir
             ;;
         casignaturealgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" sig)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" sig)' -- "$cur"))
             ;;
         cipher)
-            COMPREPLY=( $(compgen -W 'blowfish des 3des' -- "$cur") )
+            COMPREPLY=($(compgen -W 'blowfish des 3des' -- "$cur"))
             ;;
         ciphers)
             _ssh_ciphers "$2"
             ;;
         controlmaster)
-            COMPREPLY=( $(compgen -W 'yes ask auto autoask no' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes ask auto autoask no' -- "$cur"))
             ;;
         compressionlevel)
-            COMPREPLY=( $(compgen -W '{1..9}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{1..9}' -- "$cur"))
             ;;
         fingerprinthash)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             ;;
         ipqos)
-            COMPREPLY=( $(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
-                cs{0..7} ef lowdelay throughput reliability' -- "$cur") )
+            COMPREPLY=($(compgen -W 'af1{1..4} af2{2..3} af3{1..3} af4{1..3}
+                cs{0..7} ef lowdelay throughput reliability' -- "$cur"))
             ;;
-        hostbasedkeytypes|hostkeyalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+        hostbasedkeytypes | hostkeyalgorithms)
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         kexalgorithms)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" kex)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" kex)' -- "$cur"))
             ;;
         loglevel)
-            COMPREPLY=( $(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}' -- "$cur"))
             ;;
         macs)
             _ssh_macs "$2"
@@ -152,40 +156,40 @@ _ssh_suboption()
             _filedir so
             ;;
         preferredauthentications)
-            COMPREPLY=( $(compgen -W 'gssapi-with-mic host-based publickey
-                keyboard-interactive password' -- "$cur") )
+            COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
+                keyboard-interactive password' -- "$cur"))
             ;;
         protocol)
-            local protocols=( $(_ssh_query "$2" protocol-version) )
+            local protocols=($(_ssh_query "$2" protocol-version))
             [[ $protocols ]] || protocols=(1 2)
-            if [[ ${#protocols[@]} -gt 1 ]]; then
-                COMPREPLY=( $(compgen -W '${protocols[@]}' -- "$cur") )
+            if ((${#protocols[@]} > 1)); then
+                COMPREPLY=($(compgen -W '${protocols[@]}' -- "$cur"))
             fi
             ;;
         proxyjump)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             ;;
-        proxycommand|remotecommand|localcommand)
-            COMPREPLY=( $(compgen -c -- "$cur") )
+        proxycommand | remotecommand | localcommand)
+            COMPREPLY=($(compgen -c -- "$cur"))
             ;;
         pubkeyacceptedkeytypes)
-            COMPREPLY=( $(compgen -W '$(_ssh_query "$2" key)' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_ssh_query "$2" key)' -- "$cur"))
             ;;
         requesttty)
-            COMPREPLY=( $(compgen -W 'no yes force auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'no yes force auto' -- "$cur"))
             ;;
         stricthostkeychecking)
-            COMPREPLY=( $(compgen -W 'accept-new ask no off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'accept-new ask no off' -- "$cur"))
             ;;
         syslogfacility)
-            COMPREPLY=( $(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur") )
+            COMPREPLY=($(compgen -W 'DAEMON USER AUTH LOCAL{0..7}' -- "$cur"))
             ;;
         tunnel)
-            COMPREPLY=( $(compgen -W 'yes no point-to-point ethernet' \
-                                  -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no point-to-point ethernet' \
+                -- "$cur"))
             ;;
-        updatehostkeys|verifyhostkeydns)
-            COMPREPLY=( $(compgen -W 'yes no ask' -- "$cur") )
+        updatehostkeys | verifyhostkeydns)
+            COMPREPLY=($(compgen -W 'yes no ask' -- "$cur"))
             ;;
     esac
     return 0
@@ -197,7 +201,7 @@ _ssh_suboption()
 _ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
-    local cureq=`_get_cword :=` preveq=`_get_pword :=`
+    local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
     if [[ $cureq == *=* && $preveq == -*o ]]; then
         _ssh_suboption $cureq "$1"
         return $?
@@ -209,13 +213,13 @@ _ssh_suboption_check()
 _ssh_configfile()
 {
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -F* ]]; then
-            if [[ ${#1} -gt 2 ]]; then
+            if ((${#1} > 2)); then
                 configfile="$(dequote "${1:2}")"
             else
                 shift
-                [[ $1 ]] && configfile="$(dequote "$1")"
+                [[ ${1-} ]] && configfile="$(dequote "$1")"
             fi
             break
         fi
@@ -224,13 +228,14 @@ _ssh_configfile()
 }
 
 # With $1 set, look for public key files, else private
+# shellcheck disable=SC2120
 _ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
-    if (( ${#COMPREPLY[@]} > 0 )); then
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' \
-                              -X "${1:+!}*.pub" -- "$cur") )
+    if ((${#COMPREPLY[@]} > 0)); then
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]}' \
+            -X "${1:+!}*.pub" -- "$cur"))
     fi
 }
 
@@ -239,8 +244,6 @@ _ssh()
     local cur prev words cword
     _init_completion -n : || return
 
-    local -a config
-
     local configfile
     _ssh_configfile
 
@@ -249,12 +252,6 @@ _ssh()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*b)
             _ip_addresses
             return
@@ -279,11 +276,11 @@ _ssh()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*l)
-            COMPREPLY=( $(compgen -u -- "$cur") )
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
         -*m)
@@ -291,7 +288,7 @@ _ssh()
             return
             ;;
         -*O)
-            COMPREPLY=( $(compgen -W 'check forward cancel exit stop' -- "$cur") )
+            COMPREPLY=($(compgen -W 'check forward cancel exit stop' -- "$cur"))
             return
             ;;
         -*o)
@@ -306,28 +303,34 @@ _ssh()
             _available_interfaces
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
 
         local args
         _count_args
-        if [[ $args -gt 1 ]]; then
+        if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=( $(compgen -c -- "$cur") )
+            COMPREPLY+=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
+    shopt -u hostcomplete && complete -F _ssh ssh slogin autossh sidedoor
 
 # sftp(1) completion
 #
@@ -344,12 +347,6 @@ _sftp()
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*[BDlPRs])
             return
             ;;
@@ -366,7 +363,7 @@ _sftp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*o)
@@ -374,30 +371,39 @@ _sftp()
             return
             ;;
         -*S)
-            _command
+            compopt -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         _filedir
         # Prefix completions with '-F'
-        COMPREPLY=( "${COMPREPLY[@]/#/-F}" )
-        cur=-F$cur  # Restore cur
-    elif [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=("${COMPREPLY[@]/#/-F}")
+        cur=-F$cur # Restore cur
+    elif [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
-        _known_hosts_real $ipvx -a -F "$configfile" -- "$cur"
+        _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} -- "$cur"
     fi
 } &&
-shopt -u hostcomplete && complete -F _sftp sftp
+    shopt -u hostcomplete && complete -F _sftp sftp
 
 # things we want to backslash escape in scp paths
-_scp_path_esc='[][(){}<>",:;^&!$=?`|\\'"'"'[:space:]]'
+# shellcheck disable=SC2089
+_scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
+# shellcheck disable=SC2120
 _scp_remote_files()
 {
     local IFS=$'\n'
@@ -409,6 +415,7 @@ _scp_remote_files()
     local path=${cur#*:}
 
     # unescape (3 backslashes to 1 for chars we escaped)
+    # shellcheck disable=SC2090
     path=$(command sed -e 's/\\\\\\\('$_scp_path_esc'\)/\\\1/g' <<<"$path")
 
     # default to home dir of specified user on remote host
@@ -419,18 +426,20 @@ _scp_remote_files()
     local files
     if [[ $1 == -d ]]; then
         # escape problematic characters; remove non-dirs
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e '/[^\/]$/d')
     else
         # escape problematic characters; remove executables, aliases, pipes
         # and sockets; add space at end of file names
+        # shellcheck disable=SC2090
         files=$(ssh -o 'Batchmode yes' $userhost \
-            command ls -aF1dL "$path*" 2>/dev/null | \
+            command ls -aF1dL "$path*" 2>/dev/null |
             command sed -e 's/'$_scp_path_esc'/\\\\\\&/g' -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g')
+                -e 's/[^\/]$/& /g')
     fi
-    COMPREPLY+=( $files )
+    COMPREPLY+=($files)
 }
 
 # This approach is used instead of _filedir to get a space appended
@@ -442,18 +451,18 @@ _scp_local_files()
     local IFS=$'\n'
 
     local dirsonly=false
-    if [[ $1 == -d ]]; then
+    if [[ ${1-} == -d ]]; then
         dirsonly=true
         shift
     fi
 
-    if $dirsonly ; then
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
-            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/$1/") )
+    if $dirsonly; then
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
+            command sed -e "s/$_scp_path_esc/\\\\&/g" -e '/[^\/]$/d' -e "s/^/${1-}/"))
     else
-        COMPREPLY+=( $(command ls -aF1dL $cur* 2>/dev/null | \
+        COMPREPLY+=($(command ls -aF1dL $cur* 2>/dev/null |
             command sed -e "s/$_scp_path_esc/\\\\&/g" -e 's/[*@|=]$//g' \
-            -e 's/[^\/]$/& /g' -e "s/^/$1/") )
+                -e 's/[^\/]$/& /g' -e "s/^/${1-}/"))
     fi
 }
 
@@ -468,22 +477,16 @@ _scp()
     _ssh_configfile
 
     _ssh_suboption_check && {
-        COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+        COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
 
     local ipvx
 
     case $prev in
-        -*4*)
-            ipvx=-4
-            ;;
-        -*6*)
-            ipvx=-6
-            ;;
         -*c)
             _ssh_ciphers
-            COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+            COMPREPLY=("${COMPREPLY[@]/%/ }")
             return
             ;;
         -*F)
@@ -497,7 +500,7 @@ _scp()
             return
             ;;
         -*J)
-            _known_hosts_real -a -F "$configfile" -- "$cur"
+            _known_hosts_real -a ${configfile:+-F "$configfile"} -- "$cur"
             return
             ;;
         -*[lP])
@@ -508,43 +511,53 @@ _scp()
             return
             ;;
         -*S)
-            _command
-            compopt +o nospace
+            compopt +o nospace -o filenames
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
+        -*4*)
+            ipvx=-4
+            ;;
+        -*6*)
+            ipvx=-6
+            ;;
     esac
 
     _expand || return
 
     case $cur in
-        !(*:*)/*|[.~]*) ;; # looks like a path
-        *:*) _scp_remote_files ; return ;;
+        !(*:*)/* | [.~]*) ;; # looks like a path
+        *:*)
+            _scp_remote_files
+            return
+            ;;
     esac
 
     local prefix
 
-    if [[ "$cur" == -F* ]]; then
+    if [[ $cur == -F* ]]; then
         cur=${cur#-F}
         prefix=-F
     else
         case $cur in
             -*)
-                COMPREPLY=( $(compgen -W '$(_parse_usage "${words[0]}")' \
-                    -- "$cur") )
-                COMPREPLY=( "${COMPREPLY[@]/%/ }" )
+                COMPREPLY=($(compgen -W '$(_parse_usage "${words[0]}")' \
+                    -- "$cur"))
+                COMPREPLY=("${COMPREPLY[@]/%/ }")
                 return
                 ;;
-            */*|[.~]*)
+            */* | [.~]*)
                 # not a known host, pass through
                 ;;
             *)
-                _known_hosts_real $ipvx -c -a -F "$configfile" -- "$cur"
+                _known_hosts_real ${ipvx-} -c -a \
+                    ${configfile:+-F "$configfile"} -- "$cur"
                 ;;
         esac
     fi
 
-    _scp_local_files "$prefix"
+    _scp_local_files "${prefix-}"
 } &&
-complete -F _scp -o nospace scp
+    complete -F _scp -o nospace scp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ssh-add b/msys2/usr/share/bash-completion/completions/ssh-add
index f35c7d00b..d8f749264 100644
--- a/msys2/usr/share/bash-completion/completions/ssh-add
+++ b/msys2/usr/share/bash-completion/completions/ssh-add
@@ -7,7 +7,7 @@ _ssh_add()
 
     case $prev in
         -*E)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             return
             ;;
         -*t)
@@ -24,12 +24,12 @@ _ssh_add()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" "-\?")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" "-\?")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _ssh_add ssh-add
+    complete -F _ssh_add ssh-add
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ssh-copy-id b/msys2/usr/share/bash-completion/completions/ssh-copy-id
index ebfc46e66..f62819477 100644
--- a/msys2/usr/share/bash-completion/completions/ssh-copy-id
+++ b/msys2/usr/share/bash-completion/completions/ssh-copy-id
@@ -21,12 +21,12 @@ _ssh_copy_id()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _known_hosts_real -a -- "$cur"
     fi
 } &&
-complete -F _ssh_copy_id ssh-copy-id
+    complete -F _ssh_copy_id ssh-copy-id
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ssh-keygen b/msys2/usr/share/bash-completion/completions/ssh-keygen
index 36fa2cad2..0e629a56d 100644
--- a/msys2/usr/share/bash-completion/completions/ssh-keygen
+++ b/msys2/usr/share/bash-completion/completions/ssh-keygen
@@ -3,14 +3,30 @@
 _ssh_keygen()
 {
     local cur prev words cword
-    _init_completion -n = || return
+    _init_completion -n := || return
 
     case $prev in
-        -*[abCIJjMNnrPSVWz])
+        -*[aCIJjMNPSVWz])
+            return
+            ;;
+        -*b)
+            local -a sizes
+            case "${words[*]}" in
+                *" -t dsa"?( *))
+                    sizes=(1024)
+                    ;;
+                *" -t ecdsa"?( *))
+                    sizes=(256 384 521)
+                    ;;
+                *" -t rsa"?( *))
+                    sizes=(1024 2048 3072 4096)
+                    ;;
+            esac
+            COMPREPLY=($(compgen -W '${sizes[@]}' -- "$cur"))
             return
             ;;
         -*E)
-            COMPREPLY=( $(compgen -W 'md5 sha256' -- "$cur") )
+            COMPREPLY=($(compgen -W 'md5 sha256' -- "$cur"))
             return
             ;;
         -*[FR])
@@ -18,7 +34,7 @@ _ssh_keygen()
             _known_hosts_real -- "$cur"
             return
             ;;
-        -*D)
+        -*[Dw])
             _filedir so
             return
             ;;
@@ -27,37 +43,81 @@ _ssh_keygen()
             return
             ;;
         -*m)
-            COMPREPLY=( $(compgen -W 'PEM PKCS8 RFC4716' -- "$cur") )
+            COMPREPLY=($(compgen -W 'PEM PKCS8 RFC4716' -- "$cur"))
+            return
+            ;;
+        -*n)
+            [[ ${words[*]} != *\ -*Y\ * ]] || return
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            if [[ ${words[*]} == *\ -*h\ * ]]; then
+                _known_hosts_real -- "${cur##*,}"
+            else
+                COMPREPLY=($(compgen -u -- "${cur##*,}"))
+            fi
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
         -*O)
             if [[ $cur != *=* ]]; then
-                COMPREPLY=( $(compgen -W 'clear force-command=
+                COMPREPLY=($(compgen -W '
+                    clear critical: extension: force-command=
                     no-agent-forwarding no-port-forwarding no-pty no-user-rc
                     no-x11-forwarding permit-agent-forwarding
                     permit-port-forwarding permit-pty permit-user-rc
-                    permit-x11-forwarding source-address=' -- "$cur") )
-                [[ $COMPREPLY == *= ]] && compopt -o nospace
+                    permit-X11-forwarding no-touch-required source-address=
+
+                    lines= start-line= checkpoint= memory= start= generator=
+
+                    application challenge= device resident user
+                    write-attestation-path
+                    ' -- "$cur"))
+                [[ ${COMPREPLY-} == *[:=] ]] && compopt -o nospace
+                __ltrim_colon_completions "$cur"
+            else
+                case $cur in
+                    force-command=*)
+                        compopt -o filenames
+                        COMPREPLY=($(compgen -c -- "${cur#*=}"))
+                        ;;
+                    checkpoint=* | challenge=*)
+                        cur=${cur#*=}
+                        _filedir
+                        ;;
+                esac
             fi
             return
             ;;
+        -*r)
+            [[ ${words[*]} != *\ -*Y\ * ]] || _filedir
+            return
+            ;;
         -*t)
             local protocols=$(_xfunc ssh _ssh_query "$1" protocol-version)
-            local types='dsa ecdsa ed25519 rsa'
+            local types='dsa ecdsa ecdsa-sk ed25519 ed25519-sk rsa'
             if [[ $protocols == *1* ]]; then
                 types+=' rsa1'
             fi
-            COMPREPLY=( $(compgen -W "$types" -- "$cur") )
+            COMPREPLY=($(compgen -W "$types" -- "$cur"))
+            return
+            ;;
+        -*Y)
+            COMPREPLY=($(compgen -W 'find-principals check-novalidate sign
+                verify' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_usage "$1" "-?")
-        [[ -z "$opts" ]] && opts=$(_parse_help "$1" "-?")  # OpenSSH < 7
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
+        [[ -z $opts ]] && opts=$(_parse_help "$1" "-?") # OpenSSH < 7
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
+    fi
+
+    if [[ ${words[*]} == *\ -*s\ * ]]; then
+        _filedir pub
     fi
 } &&
-complete -F _ssh_keygen ssh-keygen
+    complete -F _ssh_keygen ssh-keygen
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sshfs b/msys2/usr/share/bash-completion/completions/sshfs
index 4afcc9943..223d029ba 100644
--- a/msys2/usr/share/bash-completion/completions/sshfs
+++ b/msys2/usr/share/bash-completion/completions/sshfs
@@ -5,21 +5,19 @@ _sshfs()
     local cur prev words cword
     _init_completion -n : || return
 
-    local userhost path
-
     _expand || return
 
-    if [[ "$cur" == *:* ]]; then
+    if [[ $cur == *:* ]]; then
         _xfunc ssh _scp_remote_files -d
         # unlike scp and rsync, sshfs works with 1 backslash instead of 3
-        COMPREPLY=( "${COMPREPLY[@]//\\\\\\/\\}" )
+        COMPREPLY=("${COMPREPLY[@]//\\\\\\/\\}")
         return
     fi
 
-    [[ "$cur" == @(*/|[.~])* ]] || _known_hosts_real -c -a -- "$cur"
+    [[ $cur == @(*/|[.~])* ]] || _known_hosts_real -c -a -- "$cur"
 
     _xfunc ssh _scp_local_files -d
 } &&
-complete -F _sshfs -o nospace sshfs
+    complete -F _sshfs -o nospace sshfs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sshmitm b/msys2/usr/share/bash-completion/completions/sshmitm
index 8b320fa8d..ee893e59a 100644
--- a/msys2/usr/share/bash-completion/completions/sshmitm
+++ b/msys2/usr/share/bash-completion/completions/sshmitm
@@ -5,13 +5,13 @@ _sshmitm()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 
 } &&
-complete -F _sshmitm sshmitm
+    complete -F _sshmitm sshmitm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sshow b/msys2/usr/share/bash-completion/completions/sshow
index e9ea9c2d3..917444ea3 100644
--- a/msys2/usr/share/bash-completion/completions/sshow
+++ b/msys2/usr/share/bash-completion/completions/sshow
@@ -16,11 +16,11 @@ _sshow()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _sshow sshow
+    complete -F _sshow sshow
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/star b/msys2/usr/share/bash-completion/completions/star
index fda739c40..04b7fc078 100644
--- a/msys2/usr/share/bash-completion/completions/star
+++ b/msys2/usr/share/bash-completion/completions/star
@@ -47,10 +47,11 @@ __gtar_parse_help_opt()
     separator=" "
 
     case "$opt" in
-        --*)
-            ;;
+        --*) ;;
+
         -\?)
-            return ;;
+            return
+            ;;
         -*)
             opttype=short
             opt=${opt##-}
@@ -76,7 +77,6 @@ __gtar_parse_help_opt()
     eval "$optvar=\"\$$optvar$separator\"\"$opt\""
 }
 
-
 __gtar_parse_help_line()
 {
     local i
@@ -84,18 +84,18 @@ __gtar_parse_help_line()
     for i in $1; do
         case "$i" in
             # regular options
-            --*|-*)
+            --* | -*)
                 __gtar_parse_help_opt "$i" "$2"
                 ;;
 
             # end once there is single non-option word
             *)
                 break
+                ;;
         esac
     done
 }
 
-
 __gnu_tar_parse_help()
 {
     local str line arg
@@ -104,7 +104,7 @@ __gnu_tar_parse_help()
         # options on lines beginning with spaces.  After that, there is one
         # or more options separated by ', ' separator string.  We are matching
         # like this then:  ^<spaces>(<separator>?<option>)+<whatever>$
-        if [[ "$line" =~ \
+        if [[ $line =~ \
             ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
 
             line=${BASH_REMATCH[1]}
@@ -115,8 +115,8 @@ __gnu_tar_parse_help()
             # description in GNU help output mentions arguments.  So the $line
             # variable may contain e.g. '-X, --XXX[=NAME], -XXX2[=NAME]'.
             arg=none
-            if [[ "$line" =~ --[A-Za-z0-9-]+(\[?)= ]]; then
-                [[ -n "${BASH_REMATCH[1]}" ]] && arg=opt || arg=req
+            if [[ $line =~ --[A-Za-z0-9-]+(\[?)= ]]; then
+                [[ -n ${BASH_REMATCH[1]} ]] && arg=opt || arg=req
             fi
 
             __gtar_parse_help_line "$str" "$arg"
@@ -124,14 +124,11 @@ __gnu_tar_parse_help()
     done <<<"$(tar --help)"
 
     long_opts="\
-        $long_arg_none\
-        $long_arg_opt\
-        $long_arg_req"
+        $long_arg_none        $long_arg_opt        $long_arg_req"
 
     short_opts="$short_arg_none$short_arg_opt$short_arg_req"
 }
 
-
 # Hack: parse --warning keywords from tar's error output
 __gtar_parse_warnings()
 {
@@ -143,32 +140,30 @@ __gtar_parse_warnings()
     done
 }
 
-
 # Helper to obtain last character of string.
 __tar_last_char()
 {
-    echo "${1: $(( ${#1} - 1))}"
+    echo "${1:$((${#1} - 1))}"
 }
 
-
 __tar_parse_old_opt()
 {
     local first_word char
 
     # current word is the first word
-    [[ "$cword" -eq 1 && -n "$cur" && "${cur:0:1}" != '-' ]] \
-        && old_opt_progress=1
+    [[ $cword -eq 1 && -n $cur && ${cur:0:1} != '-' ]] &&
+        old_opt_progress=1
 
     # check that first argument does not begin with "-"
     first_word=${words[1]}
-    [[ -n "$first_word" && "${first_word:0:1}" != "-" ]] \
-        && old_opt_used=1
+    [[ -n $first_word && ${first_word:0:1} != "-" ]] &&
+        old_opt_used=1
 
     # parse the old option (if present) contents to allow later code expect
     # corresponding arguments
-    if [[ $old_opt_used -eq 1 ]]; then
+    if ((old_opt_used == 1)); then
         char=${first_word:0:1}
-        while [[ -n "$char" ]]; do
+        while [[ -n $char ]]; do
             if __tar_is_argreq "$char"; then
                 old_opt_parsed+=("$char")
             fi
@@ -178,11 +173,10 @@ __tar_parse_old_opt()
     fi
 }
 
-
 # Make the analysis of whole command line.
 __tar_preparse_cmdline()
 {
-    local first_arg my_args tmparg i modes="ctxurdA"
+    local first_arg i modes="ctxurdA"
 
     shift # progname
 
@@ -191,7 +185,7 @@ __tar_preparse_cmdline()
     first_arg=1
     for i in "$@"; do
         case "$i" in
-            --delete|--test-label)
+            --delete | --test-label)
                 tar_mode=${i:2:100}
                 tar_mode_arg=$i
                 break
@@ -207,7 +201,7 @@ __tar_preparse_cmdline()
                 ;;
             *[$modes]*)
                 # Only the first arg may be "MODE" without leading dash
-                if [[ $first_arg -eq 1 ]]; then
+                if ((first_arg == 1)); then
                     tar_mode=${i//[^$modes]/}
                     tar_mode=${tar_mode:0:1}
                     tar_mode_arg=$i
@@ -218,7 +212,6 @@ __tar_preparse_cmdline()
     done
 }
 
-
 # Generate completions for -f/--file.
 __tar_file_option()
 {
@@ -235,7 +228,6 @@ __tar_file_option()
     esac
 }
 
-
 # Returns truth if option requires argument.  No equal sign must be pasted.
 # Accepts option in format: 'c', '-c', '--create'
 __tar_is_argreq()
@@ -244,29 +236,28 @@ __tar_is_argreq()
     opt=$1
     case "$opt" in
         -[A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt##-} ]] && return 0
+            [[ $short_arg_req =~ ${opt##-} ]] && return 0
             ;;
         [A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt} ]] && return 0
+            [[ $short_arg_req =~ ${opt} ]] && return 0
             ;;
         --*)
-            [[ "$long_arg_req" =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
+            [[ $long_arg_req =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
             ;;
     esac
 
     return 1
 }
 
-
 # Called only for short parameter
 __tar_complete_mode()
 {
-    local short_modes has_mode rawopt generated \
-          allshort_raw_unused allshort_raw \
-          filler i
+    local short_modes rawopt generated \
+        allshort_raw_unused allshort_raw \
+        filler i
 
     short_modes="ctx"
-    [[ -z "$basic_tar" ]] && short_modes="ctxurdA"
+    [[ ! -v basic_tar ]] && short_modes="ctxurdA"
 
     # Remove prefix when needed
     rawopt=${cur#-}
@@ -275,95 +266,92 @@ __tar_complete_mode()
     allshort_raw=${short_opts//[- ]/}
 
     # init the 'mode' option if no option is in ${cur}
-    if [[ "$tar_mode" == none ]]; then
+    if [[ $tar_mode == none ]]; then
 
         # when user passed something like 'tar cf' do not put the '-' before
         filler=
-        if [[ -z "$cur" && -z "$basic_tar" ]]; then
+        if [[ -z $cur && ! -v basic_tar ]]; then
             filler=-
         fi
 
         generated=""
-        for (( i=0 ; 1; i++ )); do
-            local c="${short_modes:$i:1}"
-            [[ -z "$c" ]] && break
+        for ((i = 0; 1; i++)); do
+            local c="${short_modes:i:1}"
+            [[ -z $c ]] && break
             generated+=" $filler$cur$c"
         done
 
-        COMPREPLY=( $(compgen -W "$generated" ) )
+        COMPREPLY=($(compgen -W "$generated"))
         return 0
     fi
 
     # The last short option requires argument, like '-cf<TAB>'.  Cut the
     # completion here to enforce argument processing.
-    if [[ "$old_opt_progress" -eq 0 ]] \
-        && __tar_is_argreq "$(__tar_last_char "$cur")"; then
-        COMPREPLY=( "$cur" ) && return 0
+    if ((old_opt_progress == 0)) &&
+        __tar_is_argreq "$(__tar_last_char "$cur")"; then
+        COMPREPLY=("$cur") && return 0
     fi
 
     allshort_raw_unused=${allshort_raw//[$rawopt]/}
-    if [[ "$tar_mode" != none ]]; then
-        allshort_raw_unused=${allshort_raw_unused//[$short_modes]}
+    if [[ $tar_mode != none ]]; then
+        allshort_raw_unused=${allshort_raw_unused//[$short_modes]/}
     fi
 
     generated=
-    for (( i=0 ; 1; i++ )); do
-        local c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        local c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated") )
+    COMPREPLY=($(compgen -W "$generated"))
 
     return 0
 }
 
-
 __gtar_complete_lopts()
 {
     local rv
-    COMPREPLY=( $(compgen -W "$long_opts" -- "$cur") )
+    COMPREPLY=($(compgen -W "$long_opts" -- "$cur"))
     rv=$?
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     return $rv
 }
 
-
 __gtar_complete_sopts()
 {
     local generated short_mode_opts i c
     short_mode_opts="ctxurdA"
     generated=${short_opts//[$short_mode_opts]/}
 
-    for (( i=0 ; 1; i++ )); do
-        c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated" -- "$cur") )
+    COMPREPLY=($(compgen -W "$generated" -- "$cur"))
 }
 
-
 __tar_try_mode()
 {
     case "$cur" in
         --*)
             # posix tar does not support long opts
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
             __gtar_complete_lopts
             return $?
             ;;
 
         -*)
             # posix tar does not support short optios
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
 
             __tar_complete_mode && return 0
             ;;
 
         *)
-            if [[ "$cword" -eq 1 || "$tar_mode" == none ]]; then
+            if [[ $cword -eq 1 || $tar_mode == none ]]; then
                 __tar_complete_mode && return 0
             fi
             ;;
@@ -371,31 +359,27 @@ __tar_try_mode()
     return 1
 }
 
-
 __tar_adjust_PREV_from_old_option()
 {
     # deal with old style arguments here
     # $ tar cfTC # expects this sequence of arguments:
     # $ tar cfTC ARCHIVE_FILE PATTERNS_FILE CHANGE_DIR
-    if [[ "$old_opt_used" -eq 1 && "$cword" -gt 1 \
-        && "$cword" -lt $(( ${#old_opt_parsed[@]} + 2 )) ]];
-    then
+    if ((old_opt_used == 1 && cword > 1 && \
+        cword < ${#old_opt_parsed[@]} + 2)); then
         # make e.g. 'C' option from 'cffCT'
-        prev="-${old_opt_parsed[ $cword - 2 ]}"
+        prev="-${old_opt_parsed[cword - 2]}"
     fi
 }
 
-
 __tar_extract_like_mode()
 {
     local i
     for i in x d t delete; do
-        [[ "$tar_mode" == "$i" ]] && return 0
+        [[ $tar_mode == "$i" ]] && return 0
     done
     return 1
 }
 
-
 __tar_try_list_archive()
 {
     local tarball tarbin untar i
@@ -416,13 +400,13 @@ __tar_try_list_archive()
             break
         fi
     done
-    if [[ -n "$tarball" ]]; then
+    if [[ -n $tarball ]]; then
         local IFS=$'\n'
         COMPREPLY=($(compgen -o filenames -W "$(
             $tarbin $untar "$tarball" 2>/dev/null |
-            while read line; do
-                printf "%q\n" "$(printf %q"\n" "$line")"
-            done
+                while read line; do
+                    printf "%q\n" "$(printf %q"\n" "$line")"
+                done
         )" -- "$(printf "%q\n" "$cur")"))
         return 0
     fi
@@ -430,7 +414,7 @@ __tar_try_list_archive()
 
 __tar_cleanup_prev()
 {
-    if [[ "$prev" =~ ^-[a-zA-Z0-9?]*$ ]]; then
+    if [[ $prev =~ ^-[a-zA-Z0-9?]*$ ]]; then
         # transform '-caf' ~> '-f'
         prev="-$(__tar_last_char "$prev")"
     fi
@@ -448,11 +432,11 @@ __tar_detect_ext()
         ?(-)*[cr]*f)
             ext='@(tar|gem|spkg)'
             case ${words[1]} in
-                *a*)    ext="$tars"               ;;
-                *z*)    ext='t?(ar.)gz'           ;;
-                *Z*)    ext='ta@(r.Z|z)'          ;;
+                *a*) ext="$tars" ;;
+                *z*) ext='t?(ar.)gz' ;;
+                *Z*) ext='ta@(r.Z|z)' ;;
                 *[jy]*) ext='t@(?(ar.)bz?(2)|b2)' ;;
-                *J*)    ext='t?(ar.)xz'           ;;
+                *J*) ext='t?(ar.)xz' ;;
             esac
             ;;
         +([^ZzJjy])f)
@@ -470,14 +454,13 @@ __tar_detect_ext()
     esac
 }
 
-
 _gtar()
 {
-    local long_opts short_opts                          \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=0 old_opt_parsed=()
+    local long_opts short_opts \
+        long_arg_none="" long_arg_opt="" long_arg_req="" \
+        short_arg_none="" short_arg_opt="" short_arg_req="" \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=0 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -486,9 +469,9 @@ _gtar()
     # FIXME: handle long options
     local tar_mode_arg=
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set -x
-        PS4="\$BASH_SOURCE:\$LINENO: "
+        PS4='$BASH_SOURCE:$LINENO: '
     fi
 
     local cur prev words cword split
@@ -500,7 +483,7 @@ _gtar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -513,53 +496,53 @@ _gtar()
         # user (TODO: is there any sane way to deal with this?).  This case
         # statement successes only if there already is PREV.
         case $prev in
-            --directory|-!(-*)C)
+            --directory | -!(-*)C)
                 _filedir -d
                 break
                 ;;
             --atime-preserve)
-                COMPREPLY=( $(compgen -W 'replace system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'replace system' -- "$cur"))
                 break
                 ;;
             --group)
-                COMPREPLY=( $(compgen -g -- "$cur") )
+                COMPREPLY=($(compgen -g -- "$cur"))
                 break
                 ;;
             --owner)
-                COMPREPLY=( $(compgen -u -- "$cur") )
+                COMPREPLY=($(compgen -u -- "$cur"))
                 break
                 ;;
-            --info-script|--new-volume-script|--rmt-command|--rsh-command|\
-            --use-compress-program|-!(-*)[FI])
+            --info-script | --new-volume-script | --rmt-command | --rsh-command | \
+                --use-compress-program | -!(-*)[FI])
                 compopt -o filenames
-                COMPREPLY=( $(compgen -c -- "$cur") )
+                COMPREPLY=($(compgen -c -- "$cur"))
                 break
                 ;;
-            --volno-file|--add-file|--files-from|--exclude-from|\
-            --index-file|--listed-incremental|-!(-*)[TXg])
+            --volno-file | --add-file | --files-from | --exclude-from | \
+                --index-file | --listed-incremental | -!(-*)[TXg])
                 _filedir
                 break
                 ;;
-            --format|-!(-*)H)
-                COMPREPLY=( $(compgen -W 'gnu oldgnu pax posix ustar v7' \
-                    -- "$cur") )
+            --format | -!(-*)H)
+                COMPREPLY=($(compgen -W 'gnu oldgnu pax posix ustar v7' \
+                    -- "$cur"))
                 break
                 ;;
             --quoting-style)
-                COMPREPLY=( $(compgen -W 'literal shell shell-always c c-maybe
-                    escape locale clocale' -- "$cur") )
+                COMPREPLY=($(compgen -W 'literal shell shell-always c c-maybe
+                    escape locale clocale' -- "$cur"))
                 break
                 ;;
             --totals)
-                COMPREPLY=( $(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
+                    -- "$cur"))
                 break
                 ;;
             --warning)
-                COMPREPLY=( $(compgen -W "$(__gtar_parse_warnings)" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(__gtar_parse_warnings)" -- "$cur"))
                 break
                 ;;
-            --file|-!(-*)f)
+            --file | -!(-*)f)
                 __tar_file_option "$ext"
                 break
                 ;;
@@ -581,7 +564,7 @@ _gtar()
                 ;;
             -!(-*)[a-zA-Z0-9?])
                 # argument required but no completion yet
-                [[ "$short_arg_req" =~ ${prev##-} ]] && break
+                [[ $short_arg_req =~ ${prev##-} ]] && break
                 ;;
         esac
 
@@ -612,7 +595,7 @@ _gtar()
 
         # the first argument must be "mode" argument or --param, if any of those
         # was truth - the 'break' statement would have been already called
-        [[ "$cword" -eq 1 ]] && break
+        ((cword == 1)) && break
 
         __tar_try_list_archive && break
 
@@ -624,13 +607,12 @@ _gtar()
         break
     done # just-for-easy-break while
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set +x
         unset PS4
     fi
 }
 
-
 __tar_posix_prev_handle()
 {
     case "$prev" in
@@ -640,19 +622,19 @@ __tar_posix_prev_handle()
             ;;
         -b)
             return 0
+            ;;
     esac
 
     return 1
 }
 
-
 _posix_tar()
 {
-    local long_opts short_opts basic_tar                \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=1 old_opt_parsed=()
+    local long_opts short_opts basic_tar \
+        long_arg_none="" long_arg_opt long_arg_req="" \
+        short_arg_none short_arg_opt short_arg_req \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=1 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -675,7 +657,7 @@ _posix_tar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -691,23 +673,22 @@ _posix_tar()
     _filedir
 }
 
-
 _tar()
 {
     local cmd=${COMP_WORDS[0]} func line
     line="$($cmd --version 2>/dev/null)"
     case "$line" in
-    *GNU*)
-        func=_gtar
-        ;;
-    *)
-        func=_posix_tar
-        ;;
+        *GNU*)
+            func=_gtar
+            ;;
+        *)
+            func=_posix_tar
+            ;;
     esac
     $func "$@"
 
     # Install real completion for subsequent completions
-    if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
+    if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
         complete -F $func -o dirnames tar
     else
         complete -F $func tar
@@ -715,17 +696,16 @@ _tar()
     unset -f _tar
 }
 
-
-if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
-    complete -F _tar        -o dirnames tar
-    complete -F _gtar       -o dirnames gtar
-    complete -F _posix_tar  -o dirnames bsdtar
-    complete -F _posix_tar  -o dirnames star
+if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
+    complete -F _tar -o dirnames tar
+    complete -F _gtar -o dirnames gtar
+    complete -F _posix_tar -o dirnames bsdtar
+    complete -F _posix_tar -o dirnames star
 else
-    complete -F _tar        tar
-    complete -F _gtar       gtar
-    complete -F _posix_tar  bsdtar
-    complete -F _posix_tar  star
+    complete -F _tar tar
+    complete -F _gtar gtar
+    complete -F _posix_tar bsdtar
+    complete -F _posix_tar star
 fi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/strace b/msys2/usr/share/bash-completion/completions/strace
index 339780b67..2b46ce8e2 100644
--- a/msys2/usr/share/bash-completion/completions/strace
+++ b/msys2/usr/share/bash-completion/completions/strace
@@ -7,10 +7,10 @@ _strace()
 
     # check if we're still completing strace
     local offset=0 i
-    for (( i=1; i <= cword; i++ )); do
-        case ${words[$i]} in
-            -o|-e|-p)
-                (( i++ ))
+    for ((i = 1; i <= cword; i++)); do
+        case ${words[i]} in
+            -o | -e | -p)
+                ((i++))
                 continue
                 ;;
             -*)
@@ -21,13 +21,13 @@ _strace()
         break
     done
 
-    if [[ $offset -gt 0 ]]; then
+    if ((offset > 0)); then
         _command_offset $offset
     else
 
         case $prev in
             -*e)
-                if [[ "$cur" == *=* ]]; then
+                if [[ $cur == *=* ]]; then
                     prev=${cur/=*/}
                     cur=${cur/*=/}
 
@@ -39,33 +39,33 @@ _strace()
                             local -A syscalls
                             while read -r define syscall rest; do
                                 [[ $define == "#define" && \
-                                    $syscall =~ ^__NR_(.+) ]] && \
+                                $syscall =~ ^__NR_(.+) ]] &&
                                     syscalls[${BASH_REMATCH[1]}]=1
                             done 2>/dev/null </usr/include/asm/unistd.h
                             if [[ ! $syscalls ]]; then
                                 local unistd arch=$(command uname -m)
-                                if [[ "$arch" == *86 ]]; then
+                                if [[ $arch == *86 ]]; then
                                     unistd=/usr/include/asm/unistd_32.h
                                 else
                                     unistd=/usr/include/asm/unistd_64.h
                                 fi
                                 while read -r define syscall rest; do
                                     [[ $define == "#define" && \
-                                        $syscall =~ ^__NR_(.+) ]] && \
+                                    $syscall =~ ^__NR_(.+) ]] &&
                                         syscalls[${BASH_REMATCH[1]}]=1
                                 done 2>/dev/null <$unistd
                             fi
 
-                            COMPREPLY=( $(compgen -W '${!syscalls[@]} file
+                            COMPREPLY=($(compgen -W '${!syscalls[@]} file
                                 process network signal ipc desc all none' \
-                                    -- "$cur") )
+                                -- "$cur"))
                             return
                             ;;
                     esac
                 else
                     compopt -o nospace
-                    COMPREPLY=( $(compgen -S"=" -W 'trace abbrev verbose raw
-                        signal read write' -- "$cur") )
+                    COMPREPLY=($(compgen -S"=" -W 'trace abbrev verbose raw
+                        signal read write' -- "$cur"))
                 fi
                 return
                 ;;
@@ -78,7 +78,7 @@ _strace()
                 return
                 ;;
             -*S)
-                COMPREPLY=( $(compgen -W 'time calls name nothing' -- "$cur") )
+                COMPREPLY=($(compgen -W 'time calls name nothing' -- "$cur"))
                 return
                 ;;
             -*u)
@@ -87,13 +87,13 @@ _strace()
                 ;;
         esac
 
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
         fi
     fi
 } &&
-complete -F _strace -o default strace
+    complete -F _strace -o default strace
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/stream b/msys2/usr/share/bash-completion/completions/stream
index 3ebfc5e95..ef7baea96 100644
--- a/msys2/usr/share/bash-completion/completions/stream
+++ b/msys2/usr/share/bash-completion/completions/stream
@@ -4,122 +4,122 @@ _ImageMagick()
 {
     case $prev in
         -channel)
-            COMPREPLY=( $(compgen -W 'Red Green Blue Opacity Matte Cyan
-                Magenta Yellow Black' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Red Green Blue Opacity Matte Cyan
+                Magenta Yellow Black' -- "$cur"))
             return
             ;;
         -colormap)
-            COMPREPLY=( $(compgen -W 'shared private' -- "$cur") )
+            COMPREPLY=($(compgen -W 'shared private' -- "$cur"))
             return
             ;;
         -colorspace)
-            COMPREPLY=( $(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
-                YPbPr YUV CMYK' -- "$cur") )
+            COMPREPLY=($(compgen -W 'GRAY OHTA RGB Transparent XYZ YCbCr YIQ
+                YPbPr YUV CMYK' -- "$cur"))
             return
             ;;
         -compose)
-            COMPREPLY=( $(compgen -W 'Over In Out Atop Xor Plus Minus Add
+            COMPREPLY=($(compgen -W 'Over In Out Atop Xor Plus Minus Add
                 Subtract Difference Multiply Bumpmap Copy CopyRed CopyGreen
-                CopyBlue CopyOpacity' -- "$cur") )
+                CopyBlue CopyOpacity' -- "$cur"))
             return
             ;;
         -compress)
-            COMPREPLY=( $(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
-                RLE Zip' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None BZip Fax Group4 JPEG Lossless LZW
+                RLE Zip' -- "$cur"))
             return
             ;;
         -dispose)
-            COMPREPLY=( $(compgen -W 'Undefined None Background Previous' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined None Background Previous' \
+                -- "$cur"))
             return
             ;;
         -encoding)
-            COMPREPLY=( $(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
+            COMPREPLY=($(compgen -W 'AdobeCustom AdobeExpert AdobeStandard
                 AppleRoman BIG5 GB2312 Latin2 None SJIScode Symbol Unicode
-                Wansung' -- "$cur") )
+                Wansung' -- "$cur"))
             return
             ;;
         -endian)
-            COMPREPLY=( $(compgen -W 'MSB LSB' -- "$cur") )
+            COMPREPLY=($(compgen -W 'MSB LSB' -- "$cur"))
             return
             ;;
         -filter)
-            COMPREPLY=( $(compgen -W 'Point Box Triangle Hermite Hanning
+            COMPREPLY=($(compgen -W 'Point Box Triangle Hermite Hanning
                 Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell
-                Lanczos Bessel Sinc' -- "$cur") )
+                Lanczos Bessel Sinc' -- "$cur"))
             return
             ;;
         -format)
-            COMPREPLY=( $(compgen -W "$(convert -list format | awk \
+            COMPREPLY=($(compgen -W "$(convert -list format | awk \
                 '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -gravity)
-            COMPREPLY=( $(compgen -W 'Northwest North NorthEast West Center
-                East SouthWest South SouthEast' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Northwest North NorthEast West Center
+                East SouthWest South SouthEast' -- "$cur"))
             return
             ;;
         -intent)
-            COMPREPLY=( $(compgen -W 'Absolute Perceptual Relative
-                Saturation' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Absolute Perceptual Relative
+                Saturation' -- "$cur"))
             return
             ;;
         -interlace)
-            COMPREPLY=( $(compgen -W 'None Line Plane Partition' -- "$cur") )
+            COMPREPLY=($(compgen -W 'None Line Plane Partition' -- "$cur"))
             return
             ;;
         -limit)
-            COMPREPLY=( $(compgen -W 'Disk File Map Memory' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Disk File Map Memory' -- "$cur"))
             return
             ;;
         -list)
-            COMPREPLY=( $(compgen -W 'Delegate Format Magic Module Resource
-                Type' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Delegate Format Magic Module Resource
+                Type' -- "$cur"))
             return
             ;;
         -map)
-            COMPREPLY=( $(compgen -W 'best default gray red green blue' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'best default gray red green blue' \
+                -- "$cur"))
             _filedir
             return
             ;;
         -noise)
-            COMPREPLY=( $(compgen -W 'Uniform Gaussian Multiplicative
-                Impulse Laplacian Poisson' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Uniform Gaussian Multiplicative
+                Impulse Laplacian Poisson' -- "$cur"))
             return
             ;;
         -preview)
-            COMPREPLY=( $(compgen -W 'Rotate Shear Roll Hue Saturation
+            COMPREPLY=($(compgen -W 'Rotate Shear Roll Hue Saturation
                 Brightness Gamma Spiff Dull Grayscale Quantize Despeckle
                 ReduceNoise AddNoise Sharpen Blur Treshold EdgeDetect Spread
                 Shade Raise Segment Solarize Swirl Implode Wave OilPaint
-                CharcoalDrawing JPEG' -- "$cur") )
+                CharcoalDrawing JPEG' -- "$cur"))
             return
             ;;
-        -mask|-profile|-texture|-tile|-write)
+        -mask | -profile | -texture | -tile | -write)
             _filedir
             return
             ;;
         -type)
-            COMPREPLY=( $(compgen -W 'Bilevel Grayscale Palette PaletteMatte
+            COMPREPLY=($(compgen -W 'Bilevel Grayscale Palette PaletteMatte
                 TrueColor TrueColorMatte ColorSeparation ColorSeparationlMatte
-                Optimize' -- "$cur") )
+                Optimize' -- "$cur"))
             return
             ;;
         -units)
-            COMPREPLY=( $(compgen -W 'Undefined PixelsPerInch
-                PixelsPerCentimeter' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Undefined PixelsPerInch
+                PixelsPerCentimeter' -- "$cur"))
             return
             ;;
         -virtual-pixel)
-            COMPREPLY=( $(compgen -W 'Constant Edge mirror tile' -- "$cur") )
+            COMPREPLY=($(compgen -W 'Constant Edge mirror tile' -- "$cur"))
             return
             ;;
         -visual)
-            COMPREPLY=( $(compgen -W 'StaticGray GrayScale StaticColor
+            COMPREPLY=($(compgen -W 'StaticGray GrayScale StaticColor
                 PseudoColor TrueColor DirectColor defaut visualid' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
     esac
@@ -134,17 +134,17 @@ _convert()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +append +compress +contrast +debug
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +append +compress +contrast +debug
             +dither +endian +gamma +label +map +mask +matte +negate +noise
-            +page +raise +render +write' -- "$cur") )
+            +page +raise +render +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _convert convert
+    complete -F _convert convert
 
 _mogrify()
 {
@@ -153,16 +153,16 @@ _mogrify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +mask +matte +negate +page +raise' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _mogrify mogrify
+    complete -F _mogrify mogrify
 
 _display()
 {
@@ -171,16 +171,16 @@ _display()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +contrast +debug +dither +endian
-            +gamma +label +map +matte +negate +page +raise +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +contrast +debug +dither +endian
+            +gamma +label +map +matte +negate +page +raise +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _display display
+    complete -F _display display
 
 _animate()
 {
@@ -189,16 +189,16 @@ _animate()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug +dither +gamma +map +matte' \
-            -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug +dither +gamma +map +matte' \
+            -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _animate animate
+    complete -F _animate animate
 
 _identify()
 {
@@ -207,15 +207,15 @@ _identify()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _identify identify
+    complete -F _identify identify
 
 _montage()
 {
@@ -224,16 +224,16 @@ _montage()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+adjoin +compress +debug +dither +endian
-            +gamma +label +matte +page' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+adjoin +compress +debug +dither +endian
+            +gamma +label +matte +page' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _montage montage
+    complete -F _montage montage
 
 _composite()
 {
@@ -242,16 +242,16 @@ _composite()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+compress +debug +dither +endian +label
-            +matte +negate +page +write' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+compress +debug +dither +endian +label
+            +matte +negate +page +write' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _composite composite
+    complete -F _composite composite
 
 _compare()
 {
@@ -260,15 +260,15 @@ _compare()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _compare compare
+    complete -F _compare compare
 
 _conjure()
 {
@@ -277,15 +277,15 @@ _conjure()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _conjure conjure
+    complete -F _conjure conjure
 
 _import()
 {
@@ -294,15 +294,15 @@ _import()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _import import
+    complete -F _import import
 
 _stream()
 {
@@ -311,14 +311,14 @@ _stream()
 
     _ImageMagick && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-    elif [[ "$cur" == +* ]]; then
-        COMPREPLY=( $(compgen -W '+debug' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+    elif [[ $cur == +* ]]; then
+        COMPREPLY=($(compgen -W '+debug' -- "$cur"))
     else
         _filedir
     fi
 } &&
-complete -F _stream stream
+    complete -F _stream stream
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/strings b/msys2/usr/share/bash-completion/completions/strings
index b4e13ab6d..059f5571a 100644
--- a/msys2/usr/share/bash-completion/completions/strings
+++ b/msys2/usr/share/bash-completion/completions/strings
@@ -6,21 +6,21 @@ _strings()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|--bytes|-!(-*)[hvVn])
+        --help | --version | --bytes | -!(-*)[hvVn])
             return
             ;;
-        --radix|-!(-*)t)
-            COMPREPLY=( $(compgen -W 'o d x' -- "$cur") )
+        --radix | -!(-*)t)
+            COMPREPLY=($(compgen -W 'o d x' -- "$cur"))
             return
             ;;
-        --target|-!(-*)T)
-            COMPREPLY=( $(compgen -W '$(LC_ALL=C "$1" --help 2>/dev/null | \
+        --target | -!(-*)T)
+            COMPREPLY=($(compgen -W '$(LC_ALL=C "$1" --help 2>/dev/null | \
                 command sed -ne "s/: supported targets: \(.*\)/\1/p")' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
-        --encoding|-!(-*)e)
-            COMPREPLY=( $(compgen -W 's S b l B L' -- "$cur") )
+        --encoding | -!(-*)e)
+            COMPREPLY=($(compgen -W 's S b l B L' -- "$cur"))
             return
             ;;
     esac
@@ -28,18 +28,18 @@ _strings()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     elif [[ $cur == @* ]]; then
         cur=${cur:1}
         _filedir
-        COMPREPLY=( "${COMPREPLY[@]/#/@}" )
+        COMPREPLY=("${COMPREPLY[@]/#/@}")
         return
     fi
 
     _filedir
 } &&
-complete -F _strings strings
+    complete -F _strings strings
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sudo b/msys2/usr/share/bash-completion/completions/sudo
index 1b8e508fe..c9a806ba6 100644
--- a/msys2/usr/share/bash-completion/completions/sudo
+++ b/msys2/usr/share/bash-completion/completions/sudo
@@ -9,48 +9,48 @@ _sudo()
     [[ $1 == *sudoedit ]] && mode=edit
 
     [[ $mode == normal ]] &&
-    for (( i=1; i <= cword; i++ )); do
-        if [[ ${words[i]} != -* ]]; then
-            local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-            local root_command=${words[i]}
-            _command_offset $i
-            return
-        fi
-        if [[ ${words[i]} == -@(!(-*)e*|-edit) ]]; then
-            mode=edit
-            break
-        fi
-        [[ ${words[i]} == \
-            -@(user|other-user|group|close-from|prompt|!(-*)[uUgCp]) ]] \
-            && ((i++))
-    done
+        for ((i = 1; i <= cword; i++)); do
+            if [[ ${words[i]} != -* ]]; then
+                local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+                local root_command=${words[i]}
+                _command_offset $i
+                return
+            fi
+            if [[ ${words[i]} == -@(!(-*)e*|-edit) ]]; then
+                mode=edit
+                break
+            fi
+            [[ ${words[i]} == \
+            -@(user|other-user|group|close-from|prompt|!(-*)[uUgCp]) ]] &&
+                ((i++))
+        done
 
     case "$prev" in
-        --user|--other-user|-!(-*)[uU])
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | --other-user | -!(-*)[uU])
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        --group|-!(-*)g)
-            COMPREPLY=( $(compgen -g -- "$cur") )
+        --group | -!(-*)g)
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
             ;;
-        --close-from|--prompt|-!(-*)[Cp])
+        --close-from | --prompt | -!(-*)[Cp])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
     if [[ $mode == edit ]]; then
         _filedir
     fi
 } &&
-complete -F _sudo sudo sudoedit
+    complete -F _sudo sudo sudoedit
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sudoedit b/msys2/usr/share/bash-completion/completions/sudoedit
index 1b8e508fe..c9a806ba6 100644
--- a/msys2/usr/share/bash-completion/completions/sudoedit
+++ b/msys2/usr/share/bash-completion/completions/sudoedit
@@ -9,48 +9,48 @@ _sudo()
     [[ $1 == *sudoedit ]] && mode=edit
 
     [[ $mode == normal ]] &&
-    for (( i=1; i <= cword; i++ )); do
-        if [[ ${words[i]} != -* ]]; then
-            local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-            local root_command=${words[i]}
-            _command_offset $i
-            return
-        fi
-        if [[ ${words[i]} == -@(!(-*)e*|-edit) ]]; then
-            mode=edit
-            break
-        fi
-        [[ ${words[i]} == \
-            -@(user|other-user|group|close-from|prompt|!(-*)[uUgCp]) ]] \
-            && ((i++))
-    done
+        for ((i = 1; i <= cword; i++)); do
+            if [[ ${words[i]} != -* ]]; then
+                local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+                local root_command=${words[i]}
+                _command_offset $i
+                return
+            fi
+            if [[ ${words[i]} == -@(!(-*)e*|-edit) ]]; then
+                mode=edit
+                break
+            fi
+            [[ ${words[i]} == \
+            -@(user|other-user|group|close-from|prompt|!(-*)[uUgCp]) ]] &&
+                ((i++))
+        done
 
     case "$prev" in
-        --user|--other-user|-!(-*)[uU])
-            COMPREPLY=( $(compgen -u -- "$cur") )
+        --user | --other-user | -!(-*)[uU])
+            COMPREPLY=($(compgen -u -- "$cur"))
             return
             ;;
-        --group|-!(-*)g)
-            COMPREPLY=( $(compgen -g -- "$cur") )
+        --group | -!(-*)g)
+            COMPREPLY=($(compgen -g -- "$cur"))
             return
             ;;
-        --close-from|--prompt|-!(-*)[Cp])
+        --close-from | --prompt | -!(-*)[Cp])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
     if [[ $mode == edit ]]; then
         _filedir
     fi
 } &&
-complete -F _sudo sudo sudoedit
+    complete -F _sudo sudo sudoedit
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/svcadm b/msys2/usr/share/bash-completion/completions/svcadm
index f23af1ff2..5269c7bed 100644
--- a/msys2/usr/share/bash-completion/completions/svcadm
+++ b/msys2/usr/share/bash-completion/completions/svcadm
@@ -20,14 +20,14 @@
 # began to type svc:. In that case we will propose only the complete FMRI beginning with the
 # pattern
 #
-_smf_complete_fmri ()
+_smf_complete_fmri()
 {
     local cur="$1" prefix="$2"
     local cur_prefix fmri fmri_list=""
     local exact_mode pattern
 
-    if [[ "$cur" == $prefix* ]]; then
-        [[ "$cur" == $prefix ]] && cur+="/"
+    if [[ $cur == $prefix* ]]; then
+        [[ $cur == "$prefix" ]] && cur+="/"
         pattern="$cur*"
         exact_mode=1
     else
@@ -38,18 +38,21 @@ _smf_complete_fmri ()
 
     for fmri in $(svcs -H -o FMRI "$pattern" 2>/dev/null); do
         local fmri_part_list fmri_part
-        if [[ -z "$exact_mode" ]]; then
+        if [[ -z $exact_mode ]]; then
             fmri=${fmri#$prefix/}
 
             # we generate all possibles abbrevations for the FMRI
             # no need to have a generic loop as we will have a finite
             # number of components
-            local OIFS="$IFS"; IFS="/"; set -- $fmri; IFS="$OIFS"
+            local ifs="$IFS"
+            IFS="/"
+            set -- $fmri
+            IFS=$ifs
             case $# in
-                1) fmri_part_list=" $1";;
-                2) fmri_part_list=" $2 $1/$2";;
-                3) fmri_part_list=" $3 $2/$3 $1/$2/$3";;
-                4) fmri_part_list=" $4 $3/$4 $2/$3/$4 $1/$2/$3/$4";;
+                1) fmri_part_list=" $1" ;;
+                2) fmri_part_list=" $2 $1/$2" ;;
+                3) fmri_part_list=" $3 $2/$3 $1/$2/$3" ;;
+                4) fmri_part_list=" $4 $3/$4 $2/$3/$4 $1/$2/$3/$4" ;;
             esac
         else
             fmri_part_list="$fmri"
@@ -58,28 +61,28 @@ _smf_complete_fmri ()
         # Here we make sure the completions begins with the pattern and
         # we cut them at the first slash
         for fmri_part in $fmri_part_list; do
-            [[ "$fmri_part" == $cur* ]] || continue
+            [[ $fmri_part == $cur* ]] || continue
             local first_part=${fmri_part#$cur_prefix}
             first_part=$cur_prefix${first_part%%/*}
-            [[ "$first_part" != "$fmri_part" ]] && first_part+="/"
+            [[ $first_part != "$fmri_part" ]] && first_part+="/"
             fmri_list+=" $first_part"
         done
     done
 
-    COMPREPLY=( $fmri_list )
+    COMPREPLY=($fmri_list)
 
     # here we want to detect if there only one completion proposed and that
     # it ends with a slash. That means the users will still have to complete
     # after, so we gain him one tab keystroke by immediately proposing the
     # next completion alternatives
     local i=${#COMPREPLY[*]}
-    if [[ $i -gt 0 ]] && [[ "${COMPREPLY[$((--i))]}" == */ ]]; then
+    if [[ $i -gt 0 && ${COMPREPLY[--i]} == */ ]]; then
         # we have to iterate through the list as we may have duplicate
-        while [[ $i -ne 0 ]]; do
-            [[ "${COMPREPLY[$i]}" != "${COMPREPLY[$((i - 1))]}" ]] && break
+        while ((i != 0)); do
+            [[ ${COMPREPLY[i]} != "${COMPREPLY[i - 1]}" ]] && break
             ((i--))
         done
-        if [[ $i -eq 0 ]]; then
+        if ((i == 0)); then
             _smf_complete_fmri "${COMPREPLY[0]}" "$prefix"
             return
         fi
@@ -90,12 +93,12 @@ _smf_complete_fmri ()
     # it from darcs completion code :)
     local colonprefixes=${cur%"${cur##*:}"}
     local i=${#COMPREPLY[*]}
-    while [ $((--i)) -ge 0 ]; do
-        COMPREPLY[$i]=${COMPREPLY[$i]#"$colonprefixes"}
+    while ((i-- > 0)); do
+        COMPREPLY[i]=${COMPREPLY[i]#"$colonprefixes"}
     done
 }
 
-_svcadm ()
+_svcadm()
 {
     local cur prev words cword
     _init_completion -n : || return
@@ -103,34 +106,38 @@ _svcadm ()
     local command_list="enable disable restart refresh clear mark milestone"
     local command i
 
-    for (( i=1; i < $cword; i++ )); do
+    for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} == @(enable|disable|restart|refresh|clear|mark|milestone) ]]; then
             command=${words[i]}
         fi
     done
 
-    if [[ -z "$command" ]]; then
-        if [[ ${cur} == -* ]] ; then
-            COMPREPLY=( $(compgen -W "-v" -- ${cur}) )
+    if [[ ! -v command ]]; then
+        if [[ ${cur} == -* ]]; then
+            COMPREPLY=($(compgen -W "-v" -- ${cur}))
         else
-            COMPREPLY=( $(compgen -W "$command_list" -- ${cur}) )
+            COMPREPLY=($(compgen -W "$command_list" -- ${cur}))
         fi
     else
         if [[ ${cur} == -* ]]; then
             case "$command" in
                 enable)
-                    COMPREPLY=( $(compgen -W "-r -s -t" -- ${cur}) );;
+                    COMPREPLY=($(compgen -W "-r -s -t" -- ${cur}))
+                    ;;
                 disable)
-                    COMPREPLY=( $(compgen -W "-s -t" -- ${cur}) );;
+                    COMPREPLY=($(compgen -W "-s -t" -- ${cur}))
+                    ;;
                 mark)
-                    COMPREPLY=( $(compgen -W "-I -t" -- ${cur}) );;
+                    COMPREPLY=($(compgen -W "-I -t" -- ${cur}))
+                    ;;
                 milestone)
-                    COMPREPLY=( $(compgen -W "-d" -- ${cur}) );;
+                    COMPREPLY=($(compgen -W "-d" -- ${cur}))
+                    ;;
             esac
         else
-            if [[ "$command" == "mark" ]] && [[ "$prev" != @(degraded|maintenance) ]]; then
-                COMPREPLY=( $(compgen -W "degraded maintenance" -- ${cur}) )
-            elif [[ "$command" == "milestone" ]]; then
+            if [[ $command == "mark" ]] && [[ $prev != @(degraded|maintenance) ]]; then
+                COMPREPLY=($(compgen -W "degraded maintenance" -- ${cur}))
+            elif [[ $command == "milestone" ]]; then
                 _smf_complete_fmri "${cur}" "svc:/milestone"
             else
                 _smf_complete_fmri "${cur}" "svc:"
@@ -138,6 +145,6 @@ _svcadm ()
         fi
     fi
 } &&
-complete -F _svcadm svcadm
+    complete -F _svcadm svcadm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/svk b/msys2/usr/share/bash-completion/completions/svk
index f94356e1f..9079df1c1 100644
--- a/msys2/usr/share/bash-completion/completions/svk
+++ b/msys2/usr/share/bash-completion/completions/svk
@@ -14,15 +14,15 @@ _svk()
         propget pg pget proplist pl plist propset ps pset pull push resolved
         revert smerge sm status st stat switch sw sync sy update up verify'
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--version' -- "$cur") )
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--version' -- "$cur"))
         else
-            COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
+            COMPREPLY=($(compgen -W "$commands" -- "$cur"))
         fi
     else
         case $prev in
-            -F|--file|--targets)
+            -F | --file | --targets)
                 _filedir
                 return
                 ;;
@@ -34,50 +34,50 @@ _svk()
 
         command=${words[1]}
 
-        if [[ "$cur" == -* ]]; then
+        if [[ $cur == -* ]]; then
             # possible options for the command
             case $command in
                 add)
                     options=' --non-recursive -N -q --quiet'
                     ;;
-                blame|annotate|ann|praise)
+                blame | annotate | ann | praise)
                     options='-r --revisions -x --cross'
                     ;;
                 cat)
                     options='-r --revision'
                     ;;
-                checkout|co)
+                checkout | co)
                     options='-r --revision -q --quiet -N --non-recursive -l
                         --list -d --detach --export --relocate --purge'
                     ;;
                 cleanup)
                     options='-a --all'
                     ;;
-                cmerge|cm)
+                cmerge | cm)
                     options='-c --change -l --log -r --revision -a --auto
                         --verbatim --no-ticket -m --message -F --file
                         --template --encoding -P --patch -S --sign -C
                         --check-only --direct'
                     ;;
-                commit|ci)
+                commit | ci)
                     options='--import -m --message -F --file --encoding
                         --template -P --patch -S --sign -C --check-only -N
                         --non-recursive --direct'
                     ;;
-                copy|cp)
+                copy | cp)
                     options='-r --revision -p --parent -q --quiet -m --message
                         -F --file --template --encoding -P --patch -S --sign -C
                         --check-only --direct'
                     ;;
-                delete|del|remove|rm)
+                delete | del | remove | rm)
                     options='-k --keep-local -m --message -F --file --encoding
                         --template -P --patch -S --sign -C --check-only
                         --direct'
                     ;;
-                depotmap|depot)
+                depotmap | depot)
                     options='-i --init -l --list -d --detach --relocate'
                     ;;
-                diff|di)
+                diff | di)
                     options='-r --revision -s --summarize -b --verbose -N
                         --non-recursive'
                     ;;
@@ -86,7 +86,7 @@ _svk()
                         -F --file --template --encoding -P --patch -S --sign -C
                         --check-only -N --non-recursive --direct'
                     ;;
-                list|ls)
+                list | ls)
                     options='-r --revision -v --verbose -R --recursive -d
                         --depth -f --full-path'
                     ;;
@@ -101,7 +101,7 @@ _svk()
                         --template --encoding -P --patch -S --sign -C
                         --check-only --direct'
                     ;;
-                mirror|mi)
+                mirror | mi)
                     options='-l --list -d --detach --relocate --recover
                         --unlock --upgrade'
                     ;;
@@ -110,7 +110,7 @@ _svk()
                         --encoding -P --patch -S --sign -C --check-only
                         --direct'
                     ;;
-                move|mv|rename|ren)
+                move | mv | rename | ren)
                     options='-r --revision -p --parent -q --quiet -m --message
                         -F --file --encoding --template -P --patch -S --sign -C
                         --check-only --direct'
@@ -118,20 +118,20 @@ _svk()
                 patch)
                     options='--depot'
                     ;;
-                propdel|propset|pdel|pset|pd|ps)
+                propdel | propset | pdel | pset | pd | ps)
                     options='-R --recursive -r --revision --revprop -m
                         --message -F --file --template --encoding -P --patch -S
                         --sign -C --check-only -q --quiet --direct'
                     ;;
-                propedit|pedit|pe)
+                propedit | pedit | pe)
                     options='-R --recursive -r --revision --revprop -m
                         --message -F --file --template --encoding -P --patch
                         -S --sign -C --check-only --direct'
                     ;;
-                propget|pget|pg)
+                propget | pget | pg)
                     options='-R --recursive -r --revision --revprop --strict'
                     ;;
-                proplist|plist|pl)
+                proplist | plist | pl)
                     options='-R --recursive -v --verbose -r --revision
                         --revprop'
                     ;;
@@ -148,59 +148,59 @@ _svk()
                 revert)
                     options='-R --recursive -q --quiet'
                     ;;
-                smerge|sm)
+                smerge | sm)
                     options='-I --incremental -l --log -B --baseless -b --base
                         -s --sync -t --to -f --from --verbatim --no-ticket
                         --track-rename --host --remoterev -m --message -F
                         --file --template --encoding -P --patch -S --sign -C
                         --check-only --direct'
                     ;;
-                status|stat|st)
+                status | stat | st)
                     options='-q --quiet --no-ignore -N --non-recursive -v
                         --verbose'
                     ;;
-                switch|sw)
+                switch | sw)
                     options='-r --revision -d --detach -q --quiet'
                     ;;
-                sync|sy)
+                sync | sy)
                     options='-a --all -s --skipto -t --torev'
                     ;;
-                update|up)
+                update | up)
                     options='-r --revision -N --non-recursive -C --check-only
                         -s --sync -m --merge -q --quiet'
                     ;;
             esac
             options+=" --help -h"
 
-            COMPREPLY=( $(compgen -W "$options" -- "$cur") )
+            COMPREPLY=($(compgen -W "$options" -- "$cur"))
         else
             case $command in
-                help|h|\?)
-                    COMPREPLY=( $(compgen -W "$commands environment commands
-                        intro" -- "$cur") )
+                help | h | \?)
+                    COMPREPLY=($(compgen -W "$commands environment commands
+                        intro" -- "$cur"))
                     ;;
                 admin)
-                    COMPREPLY=( $(compgen -W 'help deltify dump hotcopy
+                    COMPREPLY=($(compgen -W 'help deltify dump hotcopy
                         list-dblogs list-unused-dblogs load lstxns recover
-                        rmtxns setlog verify rmcache' -- "$cur") )
+                        rmtxns setlog verify rmcache' -- "$cur"))
                     ;;
                 patch)
-                    COMPREPLY=( $(compgen -W '--ls --list --cat --view
+                    COMPREPLY=($(compgen -W '--ls --list --cat --view
                         --regen --regenerate --up --update --apply --rm
-                        --delete' -- "$cur") )
+                        --delete' -- "$cur"))
                     ;;
                 sync)
-                    COMPREPLY=( $(compgen -W "$($1 mirror --list \
-                        2>/dev/null | awk '/^\//{print $1}')" -- "$cur") )
+                    COMPREPLY=($(compgen -W "$($1 mirror --list \
+                        2>/dev/null | awk '/^\//{print $1}')" -- "$cur"))
                     ;;
-                co|checkout|push|pull)
-                    if [[ "$cur" == //*/* ]]; then
+                co | checkout | push | pull)
+                    if [[ $cur == //*/* ]]; then
                         path=${cur%/*}/
                     else
                         path=//
                     fi
-                    COMPREPLY=( $(compgen -W "$($1 list $path 2>/dev/null | \
-                        command sed -e 's|\(.*\)|'$path'\1|')" -- "$cur") )
+                    COMPREPLY=($(compgen -W "$($1 list $path 2>/dev/null |
+                        command sed -e 's|\(.*\)|'$path'\1|')" -- "$cur"))
                     ;;
                 *)
                     _filedir
@@ -209,6 +209,6 @@ _svk()
         fi
     fi
 } &&
-complete -F _svk svk
+    complete -F _svk svk
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sync_members b/msys2/usr/share/bash-completion/completions/sync_members
index 653c0ea9b..397f8b089 100644
--- a/msys2/usr/share/bash-completion/completions/sync_members
+++ b/msys2/usr/share/bash-completion/completions/sync_members
@@ -6,11 +6,11 @@ _sync_members()
     _init_completion -s || return
 
     case $prev in
-        -w|-g|-d|--welcome-msg|--goodbye-msg|--digest)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        -w | -g | -d | --welcome-msg | --goodbye-msg | --digest)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        -d|--file)
+        --file)
             _filedir
             return
             ;;
@@ -18,14 +18,14 @@ _sync_members()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--no-change --welcome-msg --goodbye-msg
-            --digest --notifyadmin --file --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--no-change --welcome-msg --goodbye-msg
+            --digest --notifyadmin --file --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _sync_members sync_members
+    complete -F _sync_members sync_members
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/synclient b/msys2/usr/share/bash-completion/completions/synclient
index e7371cb74..c4a0d42ff 100644
--- a/msys2/usr/share/bash-completion/completions/synclient
+++ b/msys2/usr/share/bash-completion/completions/synclient
@@ -6,19 +6,19 @@ _synclient()
     _init_completion -n = || return
 
     case $prev in
-        -\?|-h|-V)
+        -\? | -h | -V)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     elif [[ $cur != *=?* ]]; then
-        COMPREPLY=( $(compgen -S = -W '$($1 -l 2>/dev/null | \
-            awk "/^[ \t]/ { print \$1 }")' -- "$cur") )
+        COMPREPLY=($(compgen -S = -W '$($1 -l 2>/dev/null | \
+            awk "/^[ \t]/ { print \$1 }")' -- "$cur"))
         compopt -o nospace
     fi
 } &&
-complete -F _synclient synclient
+    complete -F _synclient synclient
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sysbench b/msys2/usr/share/bash-completion/completions/sysbench
index fc9420482..0af7cc33b 100644
--- a/msys2/usr/share/bash-completion/completions/sysbench
+++ b/msys2/usr/share/bash-completion/completions/sysbench
@@ -6,84 +6,84 @@ _sysbench()
     _init_completion -s || return
 
     case $prev in
-        --num-threads|--max-requests|--max-time|--thread-stack-size| \
-        --help|--version|help|version)
+        --num-threads | --max-requests | --max-time | --thread-stack-size | \
+            --help | --version | help | version)
             return
             ;;
-        --init-rng|--debug|--validate)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        --init-rng | --debug | --validate)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         --test)
-            COMPREPLY=( $(compgen -W 'fileio cpu memory threads mutex oltp' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'fileio cpu memory threads mutex oltp' \
+                -- "$cur"))
             return
             ;;
         --cpu-max-prime)
             return
             ;;
         --file-test-mode)
-            COMPREPLY=( $(compgen -W 'seqwr seqrewr seqrd rndrd rndwr rndrw' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'seqwr seqrewr seqrd rndrd rndwr rndrw' \
+                -- "$cur"))
             return
             ;;
         --file-io-mode)
-            COMPREPLY=( $(compgen -W 'sync async fastmmap slowmmap' -- "$cur") )
+            COMPREPLY=($(compgen -W 'sync async fastmmap slowmmap' -- "$cur"))
             return
             ;;
         --file-extra-flags)
-            COMPREPLY=( $(compgen -W 'sync dsync direct' -- "$cur") )
+            COMPREPLY=($(compgen -W 'sync dsync direct' -- "$cur"))
             return
             ;;
-        --file-fsync-all|--file-fsync-end)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        --file-fsync-all | --file-fsync-end)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         --file-fsync-mode)
-            COMPREPLY=( $(compgen -W 'fsync fdatasync' -- "$cur") )
+            COMPREPLY=($(compgen -W 'fsync fdatasync' -- "$cur"))
             return
             ;;
         --memory-scope)
-            COMPREPLY=( $(compgen -W 'global local' -- "$cur") )
+            COMPREPLY=($(compgen -W 'global local' -- "$cur"))
             return
             ;;
         --memory-hugetlb)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         --memory-oper)
-            COMPREPLY=( $(compgen -W 'read write none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'read write none' -- "$cur"))
             return
             ;;
         --memory-access-mode)
-            COMPREPLY=( $(compgen -W 'seq rnd' -- "$cur") )
+            COMPREPLY=($(compgen -W 'seq rnd' -- "$cur"))
             return
             ;;
         --oltp-test-mode)
-            COMPREPLY=( $(compgen -W 'simple complex nontrx sp' -- "$cur") )
+            COMPREPLY=($(compgen -W 'simple complex nontrx sp' -- "$cur"))
             return
             ;;
-        --oltp-read-only|--oltp-skip-trx|--oltp-quto-inc|--mysql-ssl)
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        --oltp-read-only | --oltp-skip-trx | --oltp-quto-inc | --mysql-ssl)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
         --oltp-nontrx-mode)
-            COMPREPLY=( $(compgen -W 'select update_key update_nokey insert
-                delete' -- "$cur") )
+            COMPREPLY=($(compgen -W 'select update_key update_nokey insert
+                delete' -- "$cur"))
             return
             ;;
         --oltp-dist-type)
-            COMPREPLY=( $(compgen -W 'uniform gaussian special' -- "$cur") )
+            COMPREPLY=($(compgen -W 'uniform gaussian special' -- "$cur"))
             return
             ;;
         --db-driver)
-            COMPREPLY=( $(compgen -W "$($1 --test=oltp help 2>/dev/null |
+            COMPREPLY=($(compgen -W "$($1 --test=oltp help 2>/dev/null |
                 command sed -e '/^.*database drivers:/,/^$/!d' \
-                    -ne 's/^  *\([^ ]*\) .*/\1/p')" -- "$cur") )
+                    -ne 's/^  *\([^ ]*\) .*/\1/p')" -- "$cur"))
             return
             ;;
         --db-ps-mode)
-            COMPREPLY=( $(compgen -W 'auto disable' -- "$cur") )
+            COMPREPLY=($(compgen -W 'auto disable' -- "$cur"))
             return
             ;;
         --mysql-socket)
@@ -91,12 +91,12 @@ _sysbench()
             return
             ;;
         --mysql-table-engine)
-            COMPREPLY=( $(compgen -W 'myisam innodb bdb heap ndbcluster
-                federated' -- "$cur") )
+            COMPREPLY=($(compgen -W 'myisam innodb bdb heap ndbcluster
+                federated' -- "$cur"))
             return
             ;;
         --mysql-engine-trx)
-            COMPREPLY=( $(compgen -W 'yes no auto' -- "$cur") )
+            COMPREPLY=($(compgen -W 'yes no auto' -- "$cur"))
             return
             ;;
         --*)
@@ -106,7 +106,8 @@ _sysbench()
 
     # find out which test we're running
     local i test
-    for (( i=1 ; $i < ${#words[@]}-1 ; i++ )); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
+        # TODO --test= is deprecated, bare test name preferred
         if [[ ${words[i]} == --test* ]]; then
             test=${words[i]#*=}
             break
@@ -114,18 +115,18 @@ _sysbench()
     done
 
     local opts=$(_parse_help "$1")
-    if [[ $test ]]; then
-        local help=( $(_parse_help "$1" "--test=$test help") )
-        opts="${opts[@]/--test=/} ${help[@]} prepare run cleanup help version"
+    if [[ -v test ]]; then
+        local help=($(_parse_help "$1" "--test=$test help"))
+        opts="${opts/--test=/} ${help[*]} prepare run cleanup help version"
     fi
 
-    if [[ "$cur" == -* || ! $test ]]; then
-        COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* || ! -v test ]]; then
+        COMPREPLY=($(compgen -W "$opts" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        COMPREPLY=( $(compgen -W "prepare run cleanup help version" -- "$cur") )
+        COMPREPLY=($(compgen -W "prepare run cleanup help version" -- "$cur"))
     fi
 } &&
-complete -F _sysbench sysbench
+    complete -F _sysbench sysbench
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/sysctl b/msys2/usr/share/bash-completion/completions/sysctl
index 6eb3f3915..005452da5 100644
--- a/msys2/usr/share/bash-completion/completions/sysctl
+++ b/msys2/usr/share/bash-completion/completions/sysctl
@@ -6,10 +6,10 @@ _sysctl()
     _init_completion || return
 
     case $prev in
-        --help|--version|--pattern|-!(-*)[hVr])
+        --help | --version | --pattern | -!(-*)[hVr])
             return
             ;;
-        --load|-!(-*)[pf])
+        --load | -!(-*)[pf])
             _filedir conf
             return
             ;;
@@ -17,15 +17,15 @@ _sysctl()
 
     if [[ $cur == -* ]]; then
         local opts="$(_parse_help "$1")"
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
     else
         local suffix=
         [[ $prev == -w ]] && suffix="="
-        COMPREPLY=( $(compgen -S "$suffix" -W \
-            "$(PATH="$PATH:/sbin" $1 -N -a 2>/dev/null)" -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -S "$suffix" -W \
+            "$(PATH="$PATH:/sbin" $1 -N -a 2>/dev/null)" -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _sysctl sysctl
+    complete -F _sysctl sysctl
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tar b/msys2/usr/share/bash-completion/completions/tar
index fda739c40..04b7fc078 100644
--- a/msys2/usr/share/bash-completion/completions/tar
+++ b/msys2/usr/share/bash-completion/completions/tar
@@ -47,10 +47,11 @@ __gtar_parse_help_opt()
     separator=" "
 
     case "$opt" in
-        --*)
-            ;;
+        --*) ;;
+
         -\?)
-            return ;;
+            return
+            ;;
         -*)
             opttype=short
             opt=${opt##-}
@@ -76,7 +77,6 @@ __gtar_parse_help_opt()
     eval "$optvar=\"\$$optvar$separator\"\"$opt\""
 }
 
-
 __gtar_parse_help_line()
 {
     local i
@@ -84,18 +84,18 @@ __gtar_parse_help_line()
     for i in $1; do
         case "$i" in
             # regular options
-            --*|-*)
+            --* | -*)
                 __gtar_parse_help_opt "$i" "$2"
                 ;;
 
             # end once there is single non-option word
             *)
                 break
+                ;;
         esac
     done
 }
 
-
 __gnu_tar_parse_help()
 {
     local str line arg
@@ -104,7 +104,7 @@ __gnu_tar_parse_help()
         # options on lines beginning with spaces.  After that, there is one
         # or more options separated by ', ' separator string.  We are matching
         # like this then:  ^<spaces>(<separator>?<option>)+<whatever>$
-        if [[ "$line" =~ \
+        if [[ $line =~ \
             ^[[:blank:]]{1,10}(((,[[:blank:]])?(--?([\]\[a-zA-Z0-9?=-]+))(,[[:space:]])?)+).*$ ]]; then
 
             line=${BASH_REMATCH[1]}
@@ -115,8 +115,8 @@ __gnu_tar_parse_help()
             # description in GNU help output mentions arguments.  So the $line
             # variable may contain e.g. '-X, --XXX[=NAME], -XXX2[=NAME]'.
             arg=none
-            if [[ "$line" =~ --[A-Za-z0-9-]+(\[?)= ]]; then
-                [[ -n "${BASH_REMATCH[1]}" ]] && arg=opt || arg=req
+            if [[ $line =~ --[A-Za-z0-9-]+(\[?)= ]]; then
+                [[ -n ${BASH_REMATCH[1]} ]] && arg=opt || arg=req
             fi
 
             __gtar_parse_help_line "$str" "$arg"
@@ -124,14 +124,11 @@ __gnu_tar_parse_help()
     done <<<"$(tar --help)"
 
     long_opts="\
-        $long_arg_none\
-        $long_arg_opt\
-        $long_arg_req"
+        $long_arg_none        $long_arg_opt        $long_arg_req"
 
     short_opts="$short_arg_none$short_arg_opt$short_arg_req"
 }
 
-
 # Hack: parse --warning keywords from tar's error output
 __gtar_parse_warnings()
 {
@@ -143,32 +140,30 @@ __gtar_parse_warnings()
     done
 }
 
-
 # Helper to obtain last character of string.
 __tar_last_char()
 {
-    echo "${1: $(( ${#1} - 1))}"
+    echo "${1:$((${#1} - 1))}"
 }
 
-
 __tar_parse_old_opt()
 {
     local first_word char
 
     # current word is the first word
-    [[ "$cword" -eq 1 && -n "$cur" && "${cur:0:1}" != '-' ]] \
-        && old_opt_progress=1
+    [[ $cword -eq 1 && -n $cur && ${cur:0:1} != '-' ]] &&
+        old_opt_progress=1
 
     # check that first argument does not begin with "-"
     first_word=${words[1]}
-    [[ -n "$first_word" && "${first_word:0:1}" != "-" ]] \
-        && old_opt_used=1
+    [[ -n $first_word && ${first_word:0:1} != "-" ]] &&
+        old_opt_used=1
 
     # parse the old option (if present) contents to allow later code expect
     # corresponding arguments
-    if [[ $old_opt_used -eq 1 ]]; then
+    if ((old_opt_used == 1)); then
         char=${first_word:0:1}
-        while [[ -n "$char" ]]; do
+        while [[ -n $char ]]; do
             if __tar_is_argreq "$char"; then
                 old_opt_parsed+=("$char")
             fi
@@ -178,11 +173,10 @@ __tar_parse_old_opt()
     fi
 }
 
-
 # Make the analysis of whole command line.
 __tar_preparse_cmdline()
 {
-    local first_arg my_args tmparg i modes="ctxurdA"
+    local first_arg i modes="ctxurdA"
 
     shift # progname
 
@@ -191,7 +185,7 @@ __tar_preparse_cmdline()
     first_arg=1
     for i in "$@"; do
         case "$i" in
-            --delete|--test-label)
+            --delete | --test-label)
                 tar_mode=${i:2:100}
                 tar_mode_arg=$i
                 break
@@ -207,7 +201,7 @@ __tar_preparse_cmdline()
                 ;;
             *[$modes]*)
                 # Only the first arg may be "MODE" without leading dash
-                if [[ $first_arg -eq 1 ]]; then
+                if ((first_arg == 1)); then
                     tar_mode=${i//[^$modes]/}
                     tar_mode=${tar_mode:0:1}
                     tar_mode_arg=$i
@@ -218,7 +212,6 @@ __tar_preparse_cmdline()
     done
 }
 
-
 # Generate completions for -f/--file.
 __tar_file_option()
 {
@@ -235,7 +228,6 @@ __tar_file_option()
     esac
 }
 
-
 # Returns truth if option requires argument.  No equal sign must be pasted.
 # Accepts option in format: 'c', '-c', '--create'
 __tar_is_argreq()
@@ -244,29 +236,28 @@ __tar_is_argreq()
     opt=$1
     case "$opt" in
         -[A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt##-} ]] && return 0
+            [[ $short_arg_req =~ ${opt##-} ]] && return 0
             ;;
         [A-Za-z0-9?])
-            [[ "$short_arg_req" =~ ${opt} ]] && return 0
+            [[ $short_arg_req =~ ${opt} ]] && return 0
             ;;
         --*)
-            [[ "$long_arg_req" =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
+            [[ $long_arg_req =~ [[:blank:]]$opt=[[:blank:]] ]] && return 0
             ;;
     esac
 
     return 1
 }
 
-
 # Called only for short parameter
 __tar_complete_mode()
 {
-    local short_modes has_mode rawopt generated \
-          allshort_raw_unused allshort_raw \
-          filler i
+    local short_modes rawopt generated \
+        allshort_raw_unused allshort_raw \
+        filler i
 
     short_modes="ctx"
-    [[ -z "$basic_tar" ]] && short_modes="ctxurdA"
+    [[ ! -v basic_tar ]] && short_modes="ctxurdA"
 
     # Remove prefix when needed
     rawopt=${cur#-}
@@ -275,95 +266,92 @@ __tar_complete_mode()
     allshort_raw=${short_opts//[- ]/}
 
     # init the 'mode' option if no option is in ${cur}
-    if [[ "$tar_mode" == none ]]; then
+    if [[ $tar_mode == none ]]; then
 
         # when user passed something like 'tar cf' do not put the '-' before
         filler=
-        if [[ -z "$cur" && -z "$basic_tar" ]]; then
+        if [[ -z $cur && ! -v basic_tar ]]; then
             filler=-
         fi
 
         generated=""
-        for (( i=0 ; 1; i++ )); do
-            local c="${short_modes:$i:1}"
-            [[ -z "$c" ]] && break
+        for ((i = 0; 1; i++)); do
+            local c="${short_modes:i:1}"
+            [[ -z $c ]] && break
             generated+=" $filler$cur$c"
         done
 
-        COMPREPLY=( $(compgen -W "$generated" ) )
+        COMPREPLY=($(compgen -W "$generated"))
         return 0
     fi
 
     # The last short option requires argument, like '-cf<TAB>'.  Cut the
     # completion here to enforce argument processing.
-    if [[ "$old_opt_progress" -eq 0 ]] \
-        && __tar_is_argreq "$(__tar_last_char "$cur")"; then
-        COMPREPLY=( "$cur" ) && return 0
+    if ((old_opt_progress == 0)) &&
+        __tar_is_argreq "$(__tar_last_char "$cur")"; then
+        COMPREPLY=("$cur") && return 0
     fi
 
     allshort_raw_unused=${allshort_raw//[$rawopt]/}
-    if [[ "$tar_mode" != none ]]; then
-        allshort_raw_unused=${allshort_raw_unused//[$short_modes]}
+    if [[ $tar_mode != none ]]; then
+        allshort_raw_unused=${allshort_raw_unused//[$short_modes]/}
     fi
 
     generated=
-    for (( i=0 ; 1; i++ )); do
-        local c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        local c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated") )
+    COMPREPLY=($(compgen -W "$generated"))
 
     return 0
 }
 
-
 __gtar_complete_lopts()
 {
     local rv
-    COMPREPLY=( $(compgen -W "$long_opts" -- "$cur") )
+    COMPREPLY=($(compgen -W "$long_opts" -- "$cur"))
     rv=$?
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     return $rv
 }
 
-
 __gtar_complete_sopts()
 {
     local generated short_mode_opts i c
     short_mode_opts="ctxurdA"
     generated=${short_opts//[$short_mode_opts]/}
 
-    for (( i=0 ; 1; i++ )); do
-        c="${allshort_raw_unused:$i:1}"
-        [[ -z "$c" ]] && break
+    for ((i = 0; 1; i++)); do
+        c="${allshort_raw_unused:i:1}"
+        [[ -z $c ]] && break
         generated+=" $cur$c"
     done
 
-    COMPREPLY=( $(compgen -W "$generated" -- "$cur") )
+    COMPREPLY=($(compgen -W "$generated" -- "$cur"))
 }
 
-
 __tar_try_mode()
 {
     case "$cur" in
         --*)
             # posix tar does not support long opts
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
             __gtar_complete_lopts
             return $?
             ;;
 
         -*)
             # posix tar does not support short optios
-            [[ -n "$basic_tar" ]] && return 0
+            [[ -v basic_tar ]] && return 0
 
             __tar_complete_mode && return 0
             ;;
 
         *)
-            if [[ "$cword" -eq 1 || "$tar_mode" == none ]]; then
+            if [[ $cword -eq 1 || $tar_mode == none ]]; then
                 __tar_complete_mode && return 0
             fi
             ;;
@@ -371,31 +359,27 @@ __tar_try_mode()
     return 1
 }
 
-
 __tar_adjust_PREV_from_old_option()
 {
     # deal with old style arguments here
     # $ tar cfTC # expects this sequence of arguments:
     # $ tar cfTC ARCHIVE_FILE PATTERNS_FILE CHANGE_DIR
-    if [[ "$old_opt_used" -eq 1 && "$cword" -gt 1 \
-        && "$cword" -lt $(( ${#old_opt_parsed[@]} + 2 )) ]];
-    then
+    if ((old_opt_used == 1 && cword > 1 && \
+        cword < ${#old_opt_parsed[@]} + 2)); then
         # make e.g. 'C' option from 'cffCT'
-        prev="-${old_opt_parsed[ $cword - 2 ]}"
+        prev="-${old_opt_parsed[cword - 2]}"
     fi
 }
 
-
 __tar_extract_like_mode()
 {
     local i
     for i in x d t delete; do
-        [[ "$tar_mode" == "$i" ]] && return 0
+        [[ $tar_mode == "$i" ]] && return 0
     done
     return 1
 }
 
-
 __tar_try_list_archive()
 {
     local tarball tarbin untar i
@@ -416,13 +400,13 @@ __tar_try_list_archive()
             break
         fi
     done
-    if [[ -n "$tarball" ]]; then
+    if [[ -n $tarball ]]; then
         local IFS=$'\n'
         COMPREPLY=($(compgen -o filenames -W "$(
             $tarbin $untar "$tarball" 2>/dev/null |
-            while read line; do
-                printf "%q\n" "$(printf %q"\n" "$line")"
-            done
+                while read line; do
+                    printf "%q\n" "$(printf %q"\n" "$line")"
+                done
         )" -- "$(printf "%q\n" "$cur")"))
         return 0
     fi
@@ -430,7 +414,7 @@ __tar_try_list_archive()
 
 __tar_cleanup_prev()
 {
-    if [[ "$prev" =~ ^-[a-zA-Z0-9?]*$ ]]; then
+    if [[ $prev =~ ^-[a-zA-Z0-9?]*$ ]]; then
         # transform '-caf' ~> '-f'
         prev="-$(__tar_last_char "$prev")"
     fi
@@ -448,11 +432,11 @@ __tar_detect_ext()
         ?(-)*[cr]*f)
             ext='@(tar|gem|spkg)'
             case ${words[1]} in
-                *a*)    ext="$tars"               ;;
-                *z*)    ext='t?(ar.)gz'           ;;
-                *Z*)    ext='ta@(r.Z|z)'          ;;
+                *a*) ext="$tars" ;;
+                *z*) ext='t?(ar.)gz' ;;
+                *Z*) ext='ta@(r.Z|z)' ;;
                 *[jy]*) ext='t@(?(ar.)bz?(2)|b2)' ;;
-                *J*)    ext='t?(ar.)xz'           ;;
+                *J*) ext='t?(ar.)xz' ;;
             esac
             ;;
         +([^ZzJjy])f)
@@ -470,14 +454,13 @@ __tar_detect_ext()
     esac
 }
 
-
 _gtar()
 {
-    local long_opts short_opts                          \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=0 old_opt_parsed=()
+    local long_opts short_opts \
+        long_arg_none="" long_arg_opt="" long_arg_req="" \
+        short_arg_none="" short_arg_opt="" short_arg_req="" \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=0 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -486,9 +469,9 @@ _gtar()
     # FIXME: handle long options
     local tar_mode_arg=
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set -x
-        PS4="\$BASH_SOURCE:\$LINENO: "
+        PS4='$BASH_SOURCE:$LINENO: '
     fi
 
     local cur prev words cword split
@@ -500,7 +483,7 @@ _gtar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -513,53 +496,53 @@ _gtar()
         # user (TODO: is there any sane way to deal with this?).  This case
         # statement successes only if there already is PREV.
         case $prev in
-            --directory|-!(-*)C)
+            --directory | -!(-*)C)
                 _filedir -d
                 break
                 ;;
             --atime-preserve)
-                COMPREPLY=( $(compgen -W 'replace system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'replace system' -- "$cur"))
                 break
                 ;;
             --group)
-                COMPREPLY=( $(compgen -g -- "$cur") )
+                COMPREPLY=($(compgen -g -- "$cur"))
                 break
                 ;;
             --owner)
-                COMPREPLY=( $(compgen -u -- "$cur") )
+                COMPREPLY=($(compgen -u -- "$cur"))
                 break
                 ;;
-            --info-script|--new-volume-script|--rmt-command|--rsh-command|\
-            --use-compress-program|-!(-*)[FI])
+            --info-script | --new-volume-script | --rmt-command | --rsh-command | \
+                --use-compress-program | -!(-*)[FI])
                 compopt -o filenames
-                COMPREPLY=( $(compgen -c -- "$cur") )
+                COMPREPLY=($(compgen -c -- "$cur"))
                 break
                 ;;
-            --volno-file|--add-file|--files-from|--exclude-from|\
-            --index-file|--listed-incremental|-!(-*)[TXg])
+            --volno-file | --add-file | --files-from | --exclude-from | \
+                --index-file | --listed-incremental | -!(-*)[TXg])
                 _filedir
                 break
                 ;;
-            --format|-!(-*)H)
-                COMPREPLY=( $(compgen -W 'gnu oldgnu pax posix ustar v7' \
-                    -- "$cur") )
+            --format | -!(-*)H)
+                COMPREPLY=($(compgen -W 'gnu oldgnu pax posix ustar v7' \
+                    -- "$cur"))
                 break
                 ;;
             --quoting-style)
-                COMPREPLY=( $(compgen -W 'literal shell shell-always c c-maybe
-                    escape locale clocale' -- "$cur") )
+                COMPREPLY=($(compgen -W 'literal shell shell-always c c-maybe
+                    escape locale clocale' -- "$cur"))
                 break
                 ;;
             --totals)
-                COMPREPLY=( $(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
-                    -- "$cur") )
+                COMPREPLY=($(compgen -W 'SIGHUP SIGQUIT SIGINT SIGUSR1 SIGUSR2' \
+                    -- "$cur"))
                 break
                 ;;
             --warning)
-                COMPREPLY=( $(compgen -W "$(__gtar_parse_warnings)" -- "$cur") )
+                COMPREPLY=($(compgen -W "$(__gtar_parse_warnings)" -- "$cur"))
                 break
                 ;;
-            --file|-!(-*)f)
+            --file | -!(-*)f)
                 __tar_file_option "$ext"
                 break
                 ;;
@@ -581,7 +564,7 @@ _gtar()
                 ;;
             -!(-*)[a-zA-Z0-9?])
                 # argument required but no completion yet
-                [[ "$short_arg_req" =~ ${prev##-} ]] && break
+                [[ $short_arg_req =~ ${prev##-} ]] && break
                 ;;
         esac
 
@@ -612,7 +595,7 @@ _gtar()
 
         # the first argument must be "mode" argument or --param, if any of those
         # was truth - the 'break' statement would have been already called
-        [[ "$cword" -eq 1 ]] && break
+        ((cword == 1)) && break
 
         __tar_try_list_archive && break
 
@@ -624,13 +607,12 @@ _gtar()
         break
     done # just-for-easy-break while
 
-    if [[ "$_TAR_OPT_DEBUG" == 1 ]]; then
+    if [[ -v BASHCOMP_TAR_OPT_DEBUG ]]; then
         set +x
         unset PS4
     fi
 }
 
-
 __tar_posix_prev_handle()
 {
     case "$prev" in
@@ -640,19 +622,19 @@ __tar_posix_prev_handle()
             ;;
         -b)
             return 0
+            ;;
     esac
 
     return 1
 }
 
-
 _posix_tar()
 {
-    local long_opts short_opts basic_tar                \
-          long_arg_none  long_arg_opt  long_arg_req     \
-          short_arg_none short_arg_opt short_arg_req    \
-          tar_mode tar_mode_arg old_opt_progress=0      \
-          old_opt_used=1 old_opt_parsed=()
+    local long_opts short_opts basic_tar \
+        long_arg_none="" long_arg_opt long_arg_req="" \
+        short_arg_none short_arg_opt short_arg_req \
+        tar_mode tar_mode_arg old_opt_progress=0 \
+        old_opt_used=1 old_opt_parsed=()
 
     # Main mode, e.g. -x or -c (extract/creation)
     local tar_mode=none
@@ -675,7 +657,7 @@ _posix_tar()
 
     __tar_preparse_cmdline "${words[@]}"
 
-    local ext tar untar
+    local ext
 
     __tar_detect_ext
 
@@ -691,23 +673,22 @@ _posix_tar()
     _filedir
 }
 
-
 _tar()
 {
     local cmd=${COMP_WORDS[0]} func line
     line="$($cmd --version 2>/dev/null)"
     case "$line" in
-    *GNU*)
-        func=_gtar
-        ;;
-    *)
-        func=_posix_tar
-        ;;
+        *GNU*)
+            func=_gtar
+            ;;
+        *)
+            func=_posix_tar
+            ;;
     esac
     $func "$@"
 
     # Install real completion for subsequent completions
-    if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
+    if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
         complete -F $func -o dirnames tar
     else
         complete -F $func tar
@@ -715,17 +696,16 @@ _tar()
     unset -f _tar
 }
 
-
-if [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ]; then
-    complete -F _tar        -o dirnames tar
-    complete -F _gtar       -o dirnames gtar
-    complete -F _posix_tar  -o dirnames bsdtar
-    complete -F _posix_tar  -o dirnames star
+if [[ ${COMP_TAR_INTERNAL_PATHS-} ]]; then
+    complete -F _tar -o dirnames tar
+    complete -F _gtar -o dirnames gtar
+    complete -F _posix_tar -o dirnames bsdtar
+    complete -F _posix_tar -o dirnames star
 else
-    complete -F _tar        tar
-    complete -F _gtar       gtar
-    complete -F _posix_tar  bsdtar
-    complete -F _posix_tar  star
+    complete -F _tar tar
+    complete -F _gtar gtar
+    complete -F _posix_tar bsdtar
+    complete -F _posix_tar star
 fi
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tcpdump b/msys2/usr/share/bash-completion/completions/tcpdump
index d93c8795a..9a7c2e9cc 100644
--- a/msys2/usr/share/bash-completion/completions/tcpdump
+++ b/msys2/usr/share/bash-completion/completions/tcpdump
@@ -10,7 +10,7 @@ _tcpdump()
             _filedir
             return
             ;;
-        --interface|-!(-*)i)
+        --interface | -!(-*)i)
             _available_interfaces -a
             return
             ;;
@@ -19,46 +19,46 @@ _tcpdump()
             return
             ;;
         -!(-*)T)
-            COMPREPLY=( $(compgen -W 'aodv carp cnfp lmp pgm pgm_zmtp1 radius
+            COMPREPLY=($(compgen -W 'aodv carp cnfp lmp pgm pgm_zmtp1 radius
                 resp rpc rtcp rtp rtcp snmp tftp vat vxlan wb zmtp1' \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
         -!(-*)z)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
-        --relinquish-privileges|-!(-*)Z)
+        --relinquish-privileges | -!(-*)Z)
             _allowed_users
             return
             ;;
         -!(-*)[BcCDEGMsWy])
             return
             ;;
-        --time-stamp-type|-!(-*)j)
-            COMPREPLY=( $(compgen -W 'host host_lowprec host_hiprec adapter
-                adapter_unsynced' -- "$cur") )
+        --time-stamp-type | -!(-*)j)
+            COMPREPLY=($(compgen -W 'host host_lowprec host_hiprec adapter
+                adapter_unsynced' -- "$cur"))
             return
             ;;
-        --direction|-!(-*)Q)
-            COMPREPLY=( $(compgen -W 'in out inout' -- "$cur") )
+        --direction | -!(-*)Q)
+            COMPREPLY=($(compgen -W 'in out inout' -- "$cur"))
             return
             ;;
         --time-stamp-precision)
-            COMPREPLY=( $(compgen -W 'micro nano' -- "$cur") )
+            COMPREPLY=($(compgen -W 'micro nano' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
 } &&
-complete -F _tcpdump tcpdump
+    complete -F _tcpdump tcpdump
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tcpkill b/msys2/usr/share/bash-completion/completions/tcpkill
index 200cfc38b..189d928e2 100644
--- a/msys2/usr/share/bash-completion/completions/tcpkill
+++ b/msys2/usr/share/bash-completion/completions/tcpkill
@@ -12,11 +12,11 @@ _tcpkill()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-i -1 -2 -3 -4 -5 -6 -7 -8 -9' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-i -1 -2 -3 -4 -5 -6 -7 -8 -9' -- "$cur"))
     fi
 
 } &&
-complete -F _tcpkill tcpkill
+    complete -F _tcpkill tcpkill
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tcpnice b/msys2/usr/share/bash-completion/completions/tcpnice
index 0302d46d9..c6a94d6b5 100644
--- a/msys2/usr/share/bash-completion/completions/tcpnice
+++ b/msys2/usr/share/bash-completion/completions/tcpnice
@@ -12,11 +12,11 @@ _tcpnice()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _tcpnice tcpnice
+    complete -F _tcpnice tcpnice
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tightvncviewer b/msys2/usr/share/bash-completion/completions/tightvncviewer
index 000ba1a8f..ba5522689 100644
--- a/msys2/usr/share/bash-completion/completions/tightvncviewer
+++ b/msys2/usr/share/bash-completion/completions/tightvncviewer
@@ -4,17 +4,17 @@ _vncviewer_bootstrap()
 {
     local fname
     case $(_realcommand vncviewer) in
-        *xvnc4viewer)      fname=_xvnc4viewer    ;;
-        *tightvncviewer)   fname=_tightvncviewer ;;
-        *)                 fname=_known_hosts    ;;
+        *xvnc4viewer) fname=_xvnc4viewer ;;
+        *tightvncviewer) fname=_tightvncviewer ;;
+        *) fname=_known_hosts ;;
     esac
 
     # Install real completion for subsequent completions
     complete -F $fname vncviewer
-    $fname  # Generate completions once for now
+    $fname # Generate completions once for now
     unset -f _vncviewer_bootstrap
 } &&
-complete -F _vncviewer_bootstrap vncviewer
+    complete -F _vncviewer_bootstrap vncviewer
 
 _tightvncviewer()
 {
@@ -27,8 +27,8 @@ _tightvncviewer()
             return
             ;;
         -encodings)
-            COMPREPLY=( $(compgen -W 'copyrect tight hextile zlib corre rre
-                raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'copyrect tight hextile zlib corre rre
+                raw' -- "$cur"))
             return
             ;;
         -via)
@@ -37,18 +37,16 @@ _tightvncviewer()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-help -listen -via -shared -noshared
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-help -listen -via -shared -noshared
             -viewonly -fullscreen -noraiseonbeep -passwd -encodings -bgr233
             -owncmap -truecolour -truecolor -depth -compresslevel -quality
-            -nojpeg -nocursorshape -x11cursor' -- "$cur") )
+            -nojpeg -nocursorshape -x11cursor' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _tightvncviewer tightvncviewer
-
+    complete -F _tightvncviewer tightvncviewer
 
 # NOTE: - VNC Viewer options are case insensitive.
 #         Preferred case is taken from -help.
@@ -61,12 +59,12 @@ _xvnc4viewer()
     local opt=${prev/#--/-}
     case ${opt,,} in
         # -passwd, -PasswordFile
-        -passwd|-passwordfile)
+        -passwd | -passwordfile)
             _filedir
             return
             ;;
         -preferredencoding)
-            COMPREPLY=( $(compgen -W 'zrle hextile raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'zrle hextile raw' -- "$cur"))
             return
             ;;
         -via)
@@ -75,26 +73,27 @@ _xvnc4viewer()
             ;;
     esac
 
-    if [[ "$cur" == -* || "$cur" == --* ]]; then
+    if [[ $cur == -* || $cur == --* ]]; then
         # Default to vncviewer camelcase options, see `vncviewer -help'
-        local dash options=( AcceptClipboard AutoSelect DebugDelay display
+        local dash options=(AcceptClipboard AutoSelect DebugDelay display
             DotWhenNoCursor FullColor FullColour FullScreen geometry help
             listen Log LowColourLevel MenuKey name Parent passwd PasswordFile
             PointerEventInterval PreferredEncoding SendClipboard SendPrimary
             Shared UseLocalCursor via ViewOnly WMDecorationHeight
-            WMDecorationWidth ZlibLevel )
-        [[ "$cur" == --* ]] && dash=-- || dash=-
+            WMDecorationWidth ZlibLevel)
+        [[ $cur == --* ]] && dash=-- || dash=-
 
-        local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+        local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+        shopt -s nocasematch
         local option
-        COMPREPLY=( $(for option in "${options[@]}"; do
-                [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
-            done) )
+        COMPREPLY=($(for option in "${options[@]}"; do
+            [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
+        done))
         $reset
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _xvnc4viewer xvnc4viewer
+    complete -F _xvnc4viewer xvnc4viewer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/timeout b/msys2/usr/share/bash-completion/completions/timeout
index bcc9a8659..32ff2e361 100644
--- a/msys2/usr/share/bash-completion/completions/timeout
+++ b/msys2/usr/share/bash-completion/completions/timeout
@@ -5,8 +5,8 @@ _timeout()
     local cur prev words cword split i found=false
     _init_completion -s || return
 
-    for (( i=1; i <= COMP_CWORD; i++ )); do
-        if [[ ${COMP_WORDS[i]} != -* && ${COMP_WORDS[i-1]} != = ]]; then
+    for ((i = 1; i <= COMP_CWORD; i++)); do
+        if [[ ${COMP_WORDS[i]} != -* && ${COMP_WORDS[i - 1]} != = ]]; then
             if $found; then
                 _command_offset $i
                 return
@@ -17,10 +17,10 @@ _timeout()
     done
 
     case $prev in
-        --help|--version|--kill-after|-!(-*)k)
+        --help | --version | --kill-after | -!(-*)k)
             return
             ;;
-        --signal|-!(-*)s)
+        --signal | -!(-*)s)
             _signals
             return
             ;;
@@ -30,10 +30,10 @@ _timeout()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _timeout timeout
+    complete -F _timeout timeout
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tipc b/msys2/usr/share/bash-completion/completions/tipc
index 830040d9d..44ade360e 100644
--- a/msys2/usr/share/bash-completion/completions/tipc
+++ b/msys2/usr/share/bash-completion/completions/tipc
@@ -1,20 +1,22 @@
 # tipc(8) completion                                       -*- shell-script -*-
 
-_tipc_media() {
+_tipc_media()
+{
     local optind=$1
 
-    if [[ $cword -eq $optind ]]; then
-        COMPREPLY=( $(compgen -W 'media' -- $cur) )
+    if ((cword == optind)); then
+        COMPREPLY=($(compgen -W 'media' -- $cur))
         return 0
-    elif [[ $cword -eq $optind+1 ]]; then
-        COMPREPLY=( $(compgen -W 'udp eth ib' -- $cur) )
+    elif ((cword == optind + 1)); then
+        COMPREPLY=($(compgen -W 'udp eth ib' -- $cur))
         return 0
     fi
 
     return 1
 }
 
-_tipc_bearer() {
+_tipc_bearer()
+{
     local optind=$1
     local media i
 
@@ -22,52 +24,54 @@ _tipc_bearer() {
         return
     fi
 
-    for ((i = 0; i < $cword; i++)); do
-        if [[ ${words[$i]} == 'media' ]]; then
-            media=${words[$(($i + 1))]}
+    for ((i = 0; i < cword; i++)); do
+        if [[ ${words[i]} == 'media' ]]; then
+            media=${words[i + 1]}
         fi
     done
 
-    if [[ $cword -eq $optind+2 ]]; then
+    if ((cword == optind + 2)); then
         case "$media" in
-        "udp")
-            COMPREPLY=( $(compgen -W 'name' -- $cur) )
-            ;;
-        "eth" | "ib")
-            COMPREPLY=( $(compgen -W 'device' -- $cur) )
-            ;;
+            "udp")
+                COMPREPLY=($(compgen -W 'name' -- $cur))
+                ;;
+            "eth" | "ib")
+                COMPREPLY=($(compgen -W 'device' -- $cur))
+                ;;
         esac
-    elif [[ $cword -eq $optind+3 ]]; then
+    elif ((cword == optind + 3)); then
         case "$media" in
-        "udp")
-            local names=$(tipc bearer list 2>/dev/null | awk -F: '/^udp:/ {print $2}')
-            COMPREPLY=( $(compgen -W '$names' -- $cur) )
-            ;;
-        "eth")
-            local interfaces=$(command ls /sys/class/net/)
-            COMPREPLY=( $(compgen -W '$interfaces' -- $cur) )
-            ;;
+            "udp")
+                local names=$(tipc bearer list 2>/dev/null | awk -F: '/^udp:/ {print $2}')
+                COMPREPLY=($(compgen -W '$names' -- $cur))
+                ;;
+            "eth")
+                local interfaces=$(command ls /sys/class/net/)
+                COMPREPLY=($(compgen -W '$interfaces' -- $cur))
+                ;;
         esac
     fi
 }
 
-_tipc_link_opts() {
-    COMPREPLY=( $(compgen -W 'priority tolerance window' -- $cur) )
+_tipc_link_opts()
+{
+    COMPREPLY=($(compgen -W 'priority tolerance window' -- $cur))
 }
 
-_tipc_link() {
+_tipc_link()
+{
     local optind=$1
     local filter=$2
 
-    if [[ $cword -eq $optind ]]; then
-        COMPREPLY=( $(compgen -W 'link' -- $cur) )
-    elif [[ $cword -eq $optind+1 ]]; then
+    if ((cword == optind)); then
+        COMPREPLY=($(compgen -W 'link' -- $cur))
+    elif ((cword == optind + 1)); then
         # awk drops link state and last trailing :
-        local links=$(tipc link list 2>/dev/null | \
+        local links=$(tipc link list 2>/dev/null |
             awk '{print substr($1, 0, length($1))}')
         local -a exclude
-        [[ $filter == peers ]] && exclude=( -X broadcast-link )
-        COMPREPLY=( $(compgen "${exclude[@]}" -W '$links' -- $cur) )
+        [[ $filter == peers ]] && exclude=(-X broadcast-link)
+        COMPREPLY=($(compgen "${exclude[@]}" -W '$links' -- $cur))
     fi
 }
 
@@ -82,203 +86,204 @@ _tipc()
     # Flags can be placed anywhere in the commandline
     case "$cur" in
         -*)
-            COMPREPLY=( $(compgen -W '-h --help' -- $cur) )
+            COMPREPLY=($(compgen -W '-h --help' -- $cur))
             return
             ;;
     esac
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'bearer link media nametable node socket' -- $cur) )
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'bearer link media nametable node socket' -- $cur))
         return
     fi
 
-    case "${words[$optind]}" in
-    bearer)
-        (( optind++ ))
+    case "${words[optind]}" in
+        bearer)
+            ((optind++))
 
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'enable disable set get list' -- $cur) )
-            return
-        fi
-
-        case "${words[$optind]}" in
-        enable)
-            local media params
-            (( optind++ ))
-
-            if [[ $cword -lt $optind+4 ]]; then
-                _tipc_bearer $optind
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'enable disable set get list' -- $cur))
                 return
             fi
 
-            for ((i = 0; i < $cword; i++)); do
-                if [[ ${words[$i]} == 'media' ]]; then
-                    media=${words[$(($i + 1))]}
-                fi
-            done
-            case "$media" in
-                "udp")
-                    declare -a  params=("localip" "localport" "remoteip"
-                    "remoteport" "domain" "priority")
-                    ;;
-                "eth" | "ib")
-                    declare -a params=("domain" "priority")
-                    ;;
-                *)
-                    return
-                    ;;
-            esac
+            case "${words[optind]}" in
+                enable)
+                    local media params
+                    ((optind++))
 
-            # If the previous word was a known paramater we assume a value for
-            # that key Note that this would break if the user attempts to use a
-            # kown key as value
-            for i in "${params[@]}"; do
-                if [[ $prev == $i ]]; then
-                    return
-                fi
-            done
-
-            # In order not to print already used options we remove them
-            for p in "${words[@]}"; do
-                for i in "${params[@]}"; do
-                    if [[ $p == $i ]]; then
-                        params=( "${params[@]/$i}" )
+                    if ((cword < optind + 4)); then
+                        _tipc_bearer $optind
+                        return
                     fi
-                done
-            done
 
-            COMPREPLY=( $(compgen -W '${params[@]}' -- $cur) )
+                    for ((i = 0; i < cword; i++)); do
+                        if [[ ${words[i]} == 'media' ]]; then
+                            media=${words[i + 1]}
+                        fi
+                    done
+                    case "$media" in
+                        "udp")
+                            declare -a params=("localip" "localport" "remoteip"
+                                "remoteport" "domain" "priority")
+                            ;;
+                        "eth" | "ib")
+                            declare -a params=("domain" "priority")
+                            ;;
+                        *)
+                            return
+                            ;;
+                    esac
+
+                    # If the previous word was a known parameter, we assume a value for
+                    # that key. Note that this would break if the user attempts to use
+                    # a known key as value.
+                    for i in "${params[@]}"; do
+                        if [[ $prev == "$i" ]]; then
+                            return
+                        fi
+                    done
+
+                    # In order not to print already used options, we remove them
+                    for p in "${words[@]}"; do
+                        for i in "${params[@]}"; do
+                            if [[ $p == "$i" ]]; then
+                                params=("${params[@]/$i/}")
+                            fi
+                        done
+                    done
+
+                    COMPREPLY=($(compgen -W '${params[@]}' -- $cur))
+                    ;;
+                disable)
+                    ((optind++))
+
+                    _tipc_bearer $optind
+                    ;;
+                get)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 1)); then
+                        _tipc_bearer $((optind + 1))
+                    fi
+                    ;;
+                set)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 2)); then
+                        _tipc_bearer $((optind + 2))
+                    fi
+                    ;;
+            esac
             ;;
-        disable)
-            (( optind++ ))
+        link)
+            ((optind++))
 
-            _tipc_bearer $optind
-            ;;
-        get)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+1 ]]; then
-                _tipc_bearer $(($optind + 1))
-            fi
-            ;;
-        set)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+2 ]]; then
-                _tipc_bearer $(($optind + 2))
-            fi
-            ;;
-        esac
-        ;;
-    link)
-        (( optind++ ))
-
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'get set list statistics'  -- $cur) )
-            return
-        fi
-
-        case "${words[$optind]}" in
-        get)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+1 ]]; then
-                _tipc_link $(($optind + 1)) "peers"
-            fi
-            ;;
-        set)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+2 ]]; then
-                _tipc_link $(($optind + 2)) "peers"
-            fi
-            ;;
-        statistics)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                COMPREPLY=( $(compgen -W 'show reset' -- $cur) )
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'get set list statistics' -- $cur))
                 return
             fi
 
-            case "${words[$optind]}" in
-            show|reset)
-                _tipc_link $(($optind + 1))
-                ;;
+            case "${words[optind]}" in
+                get)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 1)); then
+                        _tipc_link $((optind + 1)) "peers"
+                    fi
+                    ;;
+                set)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 2)); then
+                        _tipc_link $((optind + 2)) "peers"
+                    fi
+                    ;;
+                statistics)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        COMPREPLY=($(compgen -W 'show reset' -- $cur))
+                        return
+                    fi
+
+                    case "${words[optind]}" in
+                        show | reset)
+                            _tipc_link $((optind + 1))
+                            ;;
+                    esac
+                    ;;
             esac
             ;;
-        esac
-        ;;
-    media)
-        (( optind++ ))
+        media)
+            ((optind++))
 
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'get set list'  -- $cur) )
-            return
-        fi
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'get set list' -- $cur))
+                return
+            fi
 
-        case "${words[$optind]}" in
-        get)
-            (( optind++ ))
+            case "${words[optind]}" in
+                get)
+                    ((optind++))
 
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+1 ]]; then
-                _tipc_media $(($optind + 1))
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 1)); then
+                        _tipc_media $((optind + 1))
+                    fi
+                    ;;
+                set)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        _tipc_link_opts
+                    elif ((cword >= optind + 2)); then
+                        _tipc_media $((optind + 2))
+                    fi
+                    ;;
+            esac
+            ;;
+        nametable)
+            ((optind++))
+
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'show' -- $cur))
             fi
             ;;
-        set)
-            (( optind++ ))
+        node)
+            ((optind++))
 
-            if [[ $cword -eq $optind ]]; then
-                _tipc_link_opts
-            elif [[ $cword -ge $optind+2 ]]; then
-                _tipc_media $(($optind + 2))
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'list get set' -- $cur))
+                return
+            fi
+
+            case "${words[optind]}" in
+                get | set)
+                    ((optind++))
+
+                    if ((cword == optind)); then
+                        COMPREPLY=($(compgen -W 'address netid' -- $cur))
+                    fi
+                    ;;
+            esac
+            ;;
+        socket)
+            ((optind++))
+
+            if ((cword == optind)); then
+                COMPREPLY=($(compgen -W 'list' -- $cur))
             fi
             ;;
-        esac
-        ;;
-    nametable)
-        (( optind++ ))
-
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'show'  -- $cur) )
-        fi
-        ;;
-    node)
-        (( optind++ ))
-
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'list get set'  -- $cur) )
-            return
-        fi
-
-        case "${words[$optind]}" in
-        get|set)
-            (( optind++ ))
-
-            if [[ $cword -eq $optind ]]; then
-                COMPREPLY=( $(compgen -W 'address netid'  -- $cur) )
-            fi
-        esac
-        ;;
-    socket)
-        (( optind++ ))
-
-        if [[ $cword -eq $optind ]]; then
-            COMPREPLY=( $(compgen -W 'list'  -- $cur) )
-        fi
-        ;;
     esac
 } &&
-complete -F _tipc tipc
+    complete -F _tipc tipc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tox b/msys2/usr/share/bash-completion/completions/tox
index 7dcddc54a..0ea656e93 100644
--- a/msys2/usr/share/bash-completion/completions/tox
+++ b/msys2/usr/share/bash-completion/completions/tox
@@ -12,35 +12,40 @@ _tox()
     fi
 
     case $prev in
-        --help|--version|--num|--index-url|--hashseed|--force-dep|-!(-*)[hni])
+        --help | --version | --num | --index-url | --hashseed | --force-dep | -!(-*)[hni])
             return
             ;;
         -!(-*)c)
             _filedir ini
             return
             ;;
-        --installpkg|--result-json|--workdir)
+        --installpkg | --result-json | --workdir)
             _filedir
             return
             ;;
         -!(-*)e)
             local envs=$(
-                { "$1" --listenvs-all || "$1" --listenvs; } 2>/dev/null )
+                {
+                    "$1" --listenvs-all || "$1" --listenvs
+                } 2>/dev/null
+            )
             [[ $envs ]] || envs=$(
-                    command sed -e 's/,/ /g' -ne 's/^envlist[[:space:]]*=//p' \
-                            tox.ini 2>/dev/null)
-            local prefix=""; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -X '*[{}]*' -W "$envs ALL" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+                command sed -e 's/,/ /g' -ne 's/^envlist[[:space:]]*=//p' \
+                    tox.ini 2>/dev/null
+            )
+            local prefix=""
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -X '*[{}]*' -W "$envs ALL" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1") --' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1") --' -- "$cur"))
         return
     fi
 } &&
-complete -F _tox tox
+    complete -F _tox tox
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tracepath b/msys2/usr/share/bash-completion/completions/tracepath
index 29dec3e80..176534f12 100644
--- a/msys2/usr/share/bash-completion/completions/tracepath
+++ b/msys2/usr/share/bash-completion/completions/tracepath
@@ -13,14 +13,14 @@ _tracepath()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     local ipvx
     [[ $1 == *6 ]] && ipvx=-6
-    _known_hosts_real $ipvx -- "$cur"
+    _known_hosts_real ${ipvx-} -- "$cur"
 } &&
-complete -F _tracepath tracepath tracepath6
+    complete -F _tracepath tracepath tracepath6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tracepath6 b/msys2/usr/share/bash-completion/completions/tracepath6
index 29dec3e80..176534f12 100644
--- a/msys2/usr/share/bash-completion/completions/tracepath6
+++ b/msys2/usr/share/bash-completion/completions/tracepath6
@@ -13,14 +13,14 @@ _tracepath()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1")
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
         return
     fi
 
     local ipvx
     [[ $1 == *6 ]] && ipvx=-6
-    _known_hosts_real $ipvx -- "$cur"
+    _known_hosts_real ${ipvx-} -- "$cur"
 } &&
-complete -F _tracepath tracepath tracepath6
+    complete -F _tracepath tracepath tracepath6
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tshark b/msys2/usr/share/bash-completion/completions/tshark
index 2f18d0a37..396fbcbd8 100644
--- a/msys2/usr/share/bash-completion/completions/tshark
+++ b/msys2/usr/share/bash-completion/completions/tshark
@@ -23,13 +23,13 @@ _tshark()
                 cur=${cur#*:}
                 _filedir
             else
-                [ -n "$_tshark_prefs" ] ||
-                    _tshark_prefs="$("$1" -G defaultprefs 2>/dev/null | command\
-                        sed -ne 's/^#\{0,1\}\([a-z0-9_.-]\{1,\}:\).*/\1/p' |
+                [[ -v _tshark_prefs ]] ||
+                    _tshark_prefs="$("$1" -G defaultprefs 2>/dev/null | command sed -ne 's/^#\{0,1\}\([a-z0-9_.-]\{1,\}:\).*/\1/p' |
                         tr '\n' ' ')"
-                COMPREPLY=( $(compgen -P "$prefix" -W "$_tshark_prefs" \
-                    -- "${cur:${#prefix}}") )
-                [[ $COMPREPLY == *: ]] && compopt -o nospace
+                : ${prefix:=}
+                COMPREPLY=($(compgen -P "$prefix" -W "$_tshark_prefs" \
+                    -- "${cur:${#prefix}}"))
+                [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             fi
             return
             ;;
@@ -37,73 +37,71 @@ _tshark()
             return
             ;;
         -*i)
-            COMPREPLY=( $(compgen -W \
-                "$("$1" -D 2>/dev/null | awk '{print $2}')" -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                "$("$1" -D 2>/dev/null | awk '{print $2}')" -- "$cur"))
             return
             ;;
         -*y)
             local opts i
-            for (( i=${#words[@]}-1; i > 0; i-- )); do
+            for ((i = ${#words[@]} - 1; i > 0; i--)); do
                 if [[ ${words[i]} == -i ]]; then
-                    opts+="-i ${words[i+1]}"
+                    opts+="-i ${words[i + 1]}"
                     break
                 fi
             done
-            COMPREPLY=( $(compgen -W "$("$1" $opts -L 2>/dev/null | \
-                awk '/^  / { print $1 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$("$1" $opts -L 2>/dev/null |
+                awk '/^  / { print $1 }')" -- "$cur"))
             return
             ;;
         -*[ab])
-            COMPREPLY=( $(compgen -W 'duration: filesize: files:' -- "$cur") )
-            [[ $COMPREPLY == *: ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W 'duration: filesize: files:' -- "$cur"))
+            [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             return
             ;;
-        -*r)
-            _filedir '@(pcap?(ng)|cap)?(.gz)'
-            return
-            ;;
-        -*H)
+        -*[rH])
+            # -r accepts a lot of different file types
             _filedir
             return
             ;;
         -*w)
             _filedir
-            [[ $cur == @(|-) ]] && COMPREPLY+=( - )
+            [[ $cur == @(|-) ]] && COMPREPLY+=(-)
             return
             ;;
         -*F)
-            COMPREPLY=( $(compgen -W "$("$1" -F 2>&1 | \
-                awk '/^  / { print $1 }')" -- "$cur") )
+            COMPREPLY=($(compgen -W "$("$1" -F 2>&1 |
+                awk '/^  / { print $1 }')" -- "$cur"))
             return
             ;;
         -*O)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            [ -n "$_tshark_protocols" ] ||
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            [[ -v _tshark_protocols ]] ||
                 _tshark_protocols="$("$1" -G protocols 2>/dev/null |
                     cut -f 3 | tr '\n' ' ')"
-            COMPREPLY=( $(compgen -W "$_tshark_protocols" -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+            COMPREPLY=($(compgen -W "$_tshark_protocols" -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
         -*T)
             # Parse from: tshark -T . 2>&1 | awk -F \" '/^\t*"/ { print $2 }'
-            COMPREPLY=( $(compgen -W \
-                'pdml ps psml json jsonraw ek tabs text fields' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                'pdml ps psml json jsonraw ek tabs text fields' -- "$cur"))
             return
             ;;
         -*t)
             # Parse from: tshark -t . 2>&1 | awk -F \" '/^\t*"/ { print $2 }'
-            COMPREPLY=( $(compgen -W \
-                'a ad adoy d dd e r u ud udoy' -- "$cur") )
+            COMPREPLY=($(compgen -W \
+                'a ad adoy d dd e r u ud udoy' -- "$cur"))
             return
             ;;
         -*u)
             # TODO: could be parsed from "-u ." output
-            COMPREPLY=( $(compgen -W 's hms' -- "$cur") )
+            COMPREPLY=($(compgen -W 's hms' -- "$cur"))
             return
             ;;
         -*W)
-            COMPREPLY=( $(compgen -W 'n' -- "$cur") )
+            COMPREPLY=($(compgen -W 'n' -- "$cur"))
             return
             ;;
         -*X)
@@ -111,28 +109,28 @@ _tshark()
                 cur=${cur#*:}
                 _filedir lua
             else
-                COMPREPLY=( $(compgen -P "$prefix" -W 'lua_script:' -- \
-                    "${cur:${#prefix}}") )
-                [[ $COMPREPLY == *: ]] && compopt -o nospace
+                COMPREPLY=($(compgen -P "$prefix" -W 'lua_script:' -- \
+                    "${cur:${#prefix}}"))
+                [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             fi
             return
             ;;
         -*G)
-            COMPREPLY=( $(compgen -W "$("$1" -G \? 2>/dev/null | \
+            COMPREPLY=($(compgen -W "$("$1" -G \? 2>/dev/null |
                 awk '/^[ \t]*-G / \
                     { sub("^[[]","",$2); sub("[]]$","",$2); print $2 }')" \
-                -- "$cur") )
+                -- "$cur"))
             return
             ;;
 
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h 2>/dev/null)' \
-                              -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h 2>/dev/null)' \
+            -- "$cur"))
         return
     fi
 } &&
-complete -F _tshark tshark
+    complete -F _tshark tshark
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tsig-keygen b/msys2/usr/share/bash-completion/completions/tsig-keygen
new file mode 100644
index 000000000..017e9d818
--- /dev/null
+++ b/msys2/usr/share/bash-completion/completions/tsig-keygen
@@ -0,0 +1,28 @@
+# tsig-keygen(8) completion                                -*- shell-script -*-
+
+_tsig_keygen()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -h)
+            return
+            ;;
+        -a)
+            COMPREPLY=($(compgen -W 'hmac-{md5,sha{1,224,256,384,512}}' -- "$cur"))
+            return
+            ;;
+        -r)
+            COMPREPLY=($(compgen -W keyboard -- "$cur"))
+            _filedir
+            return
+            ;;
+    esac
+
+    [[ $cur != -* ]] ||
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+} &&
+    complete -F _tsig_keygen tsig-keygen
+
+# ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/tune2fs b/msys2/usr/share/bash-completion/completions/tune2fs
index ab79cd512..66d629c48 100644
--- a/msys2/usr/share/bash-completion/completions/tune2fs
+++ b/msys2/usr/share/bash-completion/completions/tune2fs
@@ -10,12 +10,12 @@ _tune2fs()
             return
             ;;
         -*e)
-            COMPREPLY=( $(compgen -W 'continue remount-ro panic' -- "$cur") )
+            COMPREPLY=($(compgen -W 'continue remount-ro panic' -- "$cur"))
             return
             ;;
         -*g)
             _gids
-            COMPREPLY=( $(compgen -g -W '${COMPREPLY[@]}' -- "$cur") )
+            COMPREPLY=($(compgen -g -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
         -*M)
@@ -26,7 +26,7 @@ _tune2fs()
             local -a opts=(^debug ^bsdgroups ^user_xattr ^acl ^uid16
                 ^journal_data ^journal_data_ordered ^journal_data_writeback
                 ^nobarrier ^block_validity ^discard ^nodelalloc)
-            COMPREPLY=( $(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur") )
+            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur"))
             return
             ;;
         -*O)
@@ -34,28 +34,28 @@ _tune2fs()
                 ^filetype ^flex_bg ^has_journal ^huge_file ^large_file
                 ^metadata_csum ^mmp ^project ^quota ^read-only ^resize_inode
                 ^sparse_super ^uninit_bg)
-            COMPREPLY=( $(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur") )
+            COMPREPLY=($(compgen -W '${opts[@]} ${opts[@]#^}' -- "$cur"))
             return
             ;;
         -*u)
             _uids
-            COMPREPLY=( $(compgen -u -W '${COMPREPLY[@]}' -- "$cur") )
+            COMPREPLY=($(compgen -u -W '${COMPREPLY[@]}' -- "$cur"))
             return
             ;;
         -*U)
-            COMPREPLY=( $(compgen -W 'clear random time' -- "$cur") )
+            COMPREPLY=($(compgen -W 'clear random time' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     cur=${cur:=/dev/}
     _filedir
 } &&
-complete -F _tune2fs tune2fs
+    complete -F _tune2fs tune2fs
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/typeset b/msys2/usr/share/bash-completion/completions/typeset
index a97b5255c..6ae52718f 100644
--- a/msys2/usr/share/bash-completion/completions/typeset
+++ b/msys2/usr/share/bash-completion/completions/typeset
@@ -8,30 +8,30 @@ _function()
     if [[ $1 == @(declare|typeset) ]]; then
         if [[ $cur == [-+]* ]]; then
             local opts
-            opts=( $(_parse_usage "$1") )
+            opts=($(_parse_usage "$1"))
             # Most options also have a '+' form.  We'll exclude the ones that don't with compgen.
-            opts+=( ${opts[*]/-/+} )
-            COMPREPLY=( $(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur") )
+            opts+=(${opts[*]/-/+})
+            COMPREPLY=($(compgen -W "${opts[*]}" -X '+[Ffgp]' -- "$cur"))
         else
             local i=1
             while [[ ${words[i]} == [-+]* ]]; do
                 if [[ ${words[i]} == -*[fF]* ]]; then
-                    COMPREPLY=( $(compgen -A function -- "$cur") )
+                    COMPREPLY=($(compgen -A function -- "$cur"))
                     return
                 fi
                 ((i++))
             done
-            if [[ $i -gt 1 ]]; then
+            if ((i > 1)); then
                 # There was at least one option and it was not one that limited operations to functions
-                COMPREPLY=( $(compgen -A variable -- "$cur") )
+                COMPREPLY=($(compgen -A variable -- "$cur"))
             fi
         fi
-    elif [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -A function -- "$cur") )
+    elif ((cword == 1)); then
+        COMPREPLY=($(compgen -A function -- "$cur"))
     else
-        COMPREPLY=( "() $(type -- ${words[1]} | command sed -e 1,2d)" )
+        COMPREPLY=("() $(type -- ${words[1]} | command sed -e 1,2d)")
     fi
 } &&
-complete -F _function function declare typeset
+    complete -F _function function declare typeset
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ulimit b/msys2/usr/share/bash-completion/completions/ulimit
index 3887cdf57..e596bf72c 100644
--- a/msys2/usr/share/bash-completion/completions/ulimit
+++ b/msys2/usr/share/bash-completion/completions/ulimit
@@ -10,33 +10,33 @@ _ulimit()
     local mode
     case $prev in
         -a)
-            COMPREPLY=( $(compgen -W "-S -H" -- "$cur") )
+            COMPREPLY=($(compgen -W "-S -H" -- "$cur"))
             return
             ;;
-        -[SH])
-            ;;
+        -[SH]) ;;
+
         -*)
             mode=$prev
             ;;
     esac
 
-    if [[ -z "$mode" ]]; then
+    if [[ ! -v mode ]]; then
         local word
         for word in "${words[@]}"; do
             [[ $word == -*a* ]] && return
         done
 
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
             return
         fi
     fi
 
     local args
     _count_args
-    [[ $args -eq 1 ]] && \
-        COMPREPLY=( $(compgen -W "soft hard unlimited" -- "$cur") )
+    ((args == 1)) &&
+        COMPREPLY=($(compgen -W "soft hard unlimited" -- "$cur"))
 } &&
-complete -F _ulimit ulimit
+    complete -F _ulimit ulimit
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/unace b/msys2/usr/share/bash-completion/completions/unace
index a58bd6f0a..7d6bd424d 100644
--- a/msys2/usr/share/bash-completion/completions/unace
+++ b/msys2/usr/share/bash-completion/completions/unace
@@ -6,15 +6,15 @@ _unace()
     _init_completion || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-c -c- -f -f- -o -o- -p -y -y-' -- "$cur") )
+        COMPREPLY=($(compgen -W '-c -c- -f -f- -o -o- -p -y -y-' -- "$cur"))
     else
-        if [[ $cword -eq 1 ]]; then
-            COMPREPLY=( $(compgen -W 'e l t v x' -- "$cur") )
+        if ((cword == 1)); then
+            COMPREPLY=($(compgen -W 'e l t v x' -- "$cur"))
         else
             _filedir ace
         fi
     fi
 } &&
-complete -F _unace unace
+    complete -F _unace unace
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/unpack200 b/msys2/usr/share/bash-completion/completions/unpack200
index 393df04d5..8814259ba 100644
--- a/msys2/usr/share/bash-completion/completions/unpack200
+++ b/msys2/usr/share/bash-completion/completions/unpack200
@@ -6,15 +6,15 @@ _unpack200()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[?hVJ])
+        --help | --version | -!(-*)[?hVJ])
             return
             ;;
-        --deflate-hint|-!(-*)H)
-            COMPREPLY=( $(compgen -W 'true false keep' -- "$cur") )
+        --deflate-hint | -!(-*)H)
+            COMPREPLY=($(compgen -W 'true false keep' -- "$cur"))
             return
             ;;
-        --log-file|-!(-*)l)
-            COMPREPLY=( $(compgen -W '-' -- "$cur") )
+        --log-file | -!(-*)l)
+            COMPREPLY=($(compgen -W '-' -- "$cur"))
             _filedir log
             return
             ;;
@@ -23,26 +23,26 @@ _unpack200()
     $split && return
 
     # Check if a pack or a jar was already given.
-    local i pack=false jar=false
-    for (( i=0; i < ${#words[@]}-1; i++ )) ; do
-        case ${words[i]} in
-            *.pack|*.pack.gz) pack=true ;;
+    local word pack=false jar=false
+    for word in "${words[@]:1}"; do
+        case $word in
+            *.pack | *.pack.gz) pack=true ;;
             *.jar) jar=true ;;
         esac
     done
 
-    if ! $pack ; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--deflate-hint= --remove-pack-file
-                --verbose --quiet --log-file= --help --version' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if ! $pack; then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--deflate-hint= --remove-pack-file
+                --verbose --quiet --log-file= --help --version' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         else
             _filedir 'pack?(.gz)'
         fi
-    elif ! $jar ; then
+    elif ! $jar; then
         _filedir jar
     fi
 } &&
-complete -F _unpack200 unpack200
+    complete -F _unpack200 unpack200
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/unrar b/msys2/usr/share/bash-completion/completions/unrar
index 959a5c9c2..4cbac8fe6 100644
--- a/msys2/usr/share/bash-completion/completions/unrar
+++ b/msys2/usr/share/bash-completion/completions/unrar
@@ -6,18 +6,18 @@ _unrar()
     _init_completion || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '-ad -ap -av- -c- -cfg- -cl -cu -dh -ep -f
+        COMPREPLY=($(compgen -W '-ad -ap -av- -c- -cfg- -cl -cu -dh -ep -f
             -idp -ierr -inul -kb -o+ -o- -ow -p -p- -r -ta -tb -tn -to -u -v
-            -ver -vp -x -x@ -y' -- "$cur") )
+            -ver -vp -x -x@ -y' -- "$cur"))
     else
-        if [[ $cword -eq 1 ]]; then
-            COMPREPLY=( $(compgen -W 'e l lb lt p t v vb vt x' -- "$cur") )
+        if ((cword == 1)); then
+            COMPREPLY=($(compgen -W 'e l lb lt p t v vb vt x' -- "$cur"))
         else
             _filedir '@(rar|exe)'
         fi
     fi
 
 } &&
-complete -F _unrar unrar
+    complete -F _unrar unrar
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/unshunt b/msys2/usr/share/bash-completion/completions/unshunt
index 214fa4239..95a16015b 100644
--- a/msys2/usr/share/bash-completion/completions/unshunt
+++ b/msys2/usr/share/bash-completion/completions/unshunt
@@ -5,13 +5,13 @@ _unshunt()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _filedir -d
     fi
 
 } &&
-complete -F _unshunt unshunt
+    complete -F _unshunt unshunt
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/update-alternatives b/msys2/usr/share/bash-completion/completions/update-alternatives
index 17b687a77..25d2ce6b4 100644
--- a/msys2/usr/share/bash-completion/completions/update-alternatives
+++ b/msys2/usr/share/bash-completion/completions/update-alternatives
@@ -7,13 +7,13 @@ _installed_alternatives()
     for i in alternatives dpkg/alternatives rpm/alternatives; do
         [[ -d /var/lib/$i ]] && admindir=/var/lib/$i && break
     done
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --admindir ]]; then
-            admindir=${words[i+1]}
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --admindir ]]; then
+            admindir=${words[i + 1]}
             break
         fi
     done
-    COMPREPLY=( $(compgen -W '$(command ls $admindir)' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(command ls $admindir)' -- "$cur"))
 }
 
 _update_alternatives()
@@ -22,11 +22,11 @@ _update_alternatives()
     _init_completion || return
 
     case $prev in
-        --altdir|--admindir)
+        --altdir | --admindir)
             _filedir -d
             return
             ;;
-        --help|--usage|--version)
+        --help | --usage | --version)
             return
             ;;
     esac
@@ -34,18 +34,18 @@ _update_alternatives()
     local mode args i
 
     # find which mode to use and how many real args used so far
-    for (( i=1; i < cword; i++ )); do
-        if [[ "${words[i]}" == --@(install|remove|auto|display|config|remove-all|set) ]]; then
+    for ((i = 1; i < cword; i++)); do
+        if [[ ${words[i]} == --@(install|remove|auto|display|config|remove-all|set) ]]; then
             mode=${words[i]}
-            args=$(($cword - i))
+            args=$((cword - i))
             break
         fi
     done
 
-    case $mode in
+    case ${mode-} in
         --install)
             case $args in
-                1|3)
+                1 | 3)
                     _filedir
                     ;;
                 2)
@@ -56,19 +56,20 @@ _update_alternatives()
                     ;;
                 *)
                     case $((args % 4)) in
-                        0|2)
+                        0 | 2)
                             _filedir
                             ;;
                         1)
-                            COMPREPLY=( $(compgen -W '--slave' -- "$cur") )
+                            COMPREPLY=($(compgen -W '--slave' -- "$cur"))
                             ;;
                         3)
                             _installed_alternatives
                             ;;
                     esac
+                    ;;
             esac
             ;;
-        --remove|--set)
+        --remove | --set)
             case $args in
                 1)
                     _installed_alternatives
@@ -78,13 +79,14 @@ _update_alternatives()
                     ;;
             esac
             ;;
-        --auto|--remove-all|--display|--config)
+        --auto | --remove-all | --display | --config)
             _installed_alternatives
             ;;
         *)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            ;;
     esac
 } &&
-complete -F _update_alternatives update-alternatives alternatives
+    complete -F _update_alternatives update-alternatives alternatives
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/update-rc.d b/msys2/usr/share/bash-completion/completions/update-rc.d
index 31cd820b8..9b281d5fb 100644
--- a/msys2/usr/share/bash-completion/completions/update-rc.d
+++ b/msys2/usr/share/bash-completion/completions/update-rc.d
@@ -9,50 +9,50 @@ _update_rc_d()
 
     local sysvdir services options
 
-    [[ -d /etc/rc.d/init.d ]] && sysvdir=/etc/rc.d/init.d \
-        || sysvdir=/etc/init.d
+    [[ -d /etc/rc.d/init.d ]] && sysvdir=/etc/rc.d/init.d ||
+        sysvdir=/etc/init.d
 
-    services=( $(printf '%s ' $sysvdir/!(README*|*.sh|$_backup_glob)) )
-    services=( ${services[@]#$sysvdir/} )
-    options=( -f -n )
+    services=($(printf '%s ' $sysvdir/!(README*|*.sh|$_backup_glob)))
+    services=(${services[@]#$sysvdir/})
+    options=(-f -n)
 
-    if [[ $cword -eq 1 || "$prev" == -* ]]; then
-        COMPREPLY=( $(compgen -W '${options[@]} ${services[@]}' \
-            -X '$(tr " " "|" <<<${words[@]})' -- "$cur") )
-    elif [[ "$prev" == ?($(tr " " "|" <<<"${services[*]}")) ]]; then
-        COMPREPLY=( $(compgen -W 'remove defaults start stop' -- "$cur") )
-    elif [[ "$prev" == defaults && "$cur" == [0-9] ]]; then
-        COMPREPLY=( 0 1 2 3 4 5 6 7 8 9 )
-    elif [[ "$prev" == defaults && "$cur" == [sk]?([0-9]) ]]; then
-        COMPREPLY=( 0 1 2 3 4 5 6 7 8 9 )
-    elif [[ "$prev" == defaults && -z "$cur" ]]; then
-        COMPREPLY=( 0 1 2 3 4 5 6 7 8 9 s k )
-    elif [[ "$prev" == ?(start|stop) ]]; then
-        if [[ "$cur" == [0-9] || -z "$cur" ]]; then
-            COMPREPLY=( 0 1 2 3 4 5 6 7 8 9 )
-        elif [[ "$cur" == [0-9][0-9] ]]; then
-            COMPREPLY=( $cur )
+    if [[ $cword -eq 1 || $prev == -* ]]; then
+        COMPREPLY=($(compgen -W '${options[@]} ${services[@]}' \
+            -X '$(tr " " "|" <<<${words[@]})' -- "$cur"))
+    elif [[ $prev == ?($(tr " " "|" <<<"${services[*]}")) ]]; then
+        COMPREPLY=($(compgen -W 'remove defaults start stop' -- "$cur"))
+    elif [[ $prev == defaults && $cur == [0-9] ]]; then
+        COMPREPLY=(0 1 2 3 4 5 6 7 8 9)
+    elif [[ $prev == defaults && $cur == [sk]?([0-9]) ]]; then
+        COMPREPLY=(0 1 2 3 4 5 6 7 8 9)
+    elif [[ $prev == defaults && -z $cur ]]; then
+        COMPREPLY=(0 1 2 3 4 5 6 7 8 9 s k)
+    elif [[ $prev == ?(start|stop) ]]; then
+        if [[ $cur == [0-9] || -z $cur ]]; then
+            COMPREPLY=(0 1 2 3 4 5 6 7 8 9)
+        elif [[ $cur == [0-9][0-9] ]]; then
+            COMPREPLY=($cur)
         else
             COMPREPLY=()
         fi
-    elif [[ "$prev" == ?([0-9][0-9]|[0-6S]) ]]; then
-        if [[ -z "$cur" ]]; then
+    elif [[ $prev == ?([0-9][0-9]|[0-6S]) ]]; then
+        if [[ -z $cur ]]; then
             if [[ $prev == [0-9][0-9] ]]; then
-                COMPREPLY=( 0 1 2 3 4 5 6 S )
+                COMPREPLY=(0 1 2 3 4 5 6 S)
             else
-                COMPREPLY=( 0 1 2 3 4 5 6 S . )
+                COMPREPLY=(0 1 2 3 4 5 6 S .)
             fi
-        elif [[ "$cur" == [0-6S.] ]]; then
-            COMPREPLY=( $cur )
+        elif [[ $cur == [0-6S.] ]]; then
+            COMPREPLY=($cur)
         else
             COMPREPLY=()
         fi
-    elif [[ "$prev" == "." ]]; then
-        COMPREPLY=( $(compgen -W "start stop" -- "$cur") )
+    elif [[ $prev == "." ]]; then
+        COMPREPLY=($(compgen -W "start stop" -- "$cur"))
     else
         COMPREPLY=()
     fi
 } &&
-complete -F _update_rc_d update-rc.d
+    complete -F _update_rc_d update-rc.d
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/upgradepkg b/msys2/usr/share/bash-completion/completions/upgradepkg
index 7b7757691..d3ce6084c 100644
--- a/msys2/usr/share/bash-completion/completions/upgradepkg
+++ b/msys2/usr/share/bash-completion/completions/upgradepkg
@@ -5,26 +5,26 @@ _upgradepkg()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--dry-run --install-new --reinstall
-            --verbose' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--dry-run --install-new --reinstall
+            --verbose' -- "$cur"))
         return
     fi
 
-    if [[ "$cur" == ?*%* ]]; then
+    if [[ $cur == ?*%* ]]; then
         prev="${cur%%?(\\)%*}"
         cur="${cur#*%}"
         local nofiles IFS=$'\n'
         compopt -o filenames
-        COMPREPLY=( $(compgen -P "$prev%" -f -X "!*.@(t[bgxl]z)" -- "$cur") )
-        [[ $COMPREPLY ]] || nofiles=1
-        COMPREPLY+=( $(compgen -P "$prev%" -S '/' -d  -- "$cur") )
-        [[ $nofiles ]] && compopt -o nospace
+        COMPREPLY=($(compgen -P "$prev%" -f -X "!*.@(t[bgxl]z)" -- "$cur"))
+        [[ ${COMPREPLY-} ]] || nofiles=1
+        COMPREPLY+=($(compgen -P "$prev%" -S '/' -d -- "$cur"))
+        [[ -v nofiles ]] && compopt -o nospace
         return
     fi
 
     _filedir 't[bglx]z'
 } &&
-complete -F _upgradepkg upgradepkg
+    complete -F _upgradepkg upgradepkg
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/urlsnarf b/msys2/usr/share/bash-completion/completions/urlsnarf
index d3581c5f6..e32707622 100644
--- a/msys2/usr/share/bash-completion/completions/urlsnarf
+++ b/msys2/usr/share/bash-completion/completions/urlsnarf
@@ -16,11 +16,11 @@ _urlsnarf()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 
 } &&
-complete -F _urlsnarf urlsnarf
+    complete -F _urlsnarf urlsnarf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/useradd b/msys2/usr/share/bash-completion/completions/useradd
index 8e095441e..ceeca9144 100644
--- a/msys2/usr/share/bash-completion/completions/useradd
+++ b/msys2/usr/share/bash-completion/completions/useradd
@@ -9,27 +9,28 @@ _useradd()
     #       with -u/--uid
 
     case $prev in
-        --comment|--help|--expiredate|--inactive|--key|--password|--uid|\
-        --selinux-user|-!(-*)[chefKpuZ])
+        --comment | --help | --expiredate | --inactive | --key | --password | --uid | \
+            --selinux-user | -!(-*)[chefKpuZ])
             return
             ;;
-        --base-dir|--home-dir|--skel|--root|-!(-*)[bdkR])
+        --base-dir | --home-dir | --skel | --root | -!(-*)[bdkR])
             _filedir -d
             return
             ;;
-        --gid|-!(-*)g)
+        --gid | -!(-*)g)
             _gids
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]} $(compgen -g)' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]} $(compgen -g)' \
+                -- "$cur"))
             return
             ;;
-        --groups|-!(-*)G)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -g -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+        --groups | -!(-*)G)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -g -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --shell|-!(-*)s)
+        --shell | -!(-*)s)
             _shells
             return
             ;;
@@ -37,9 +38,9 @@ _useradd()
 
     $split && return
 
-    [[ "$cur" == -* ]] && \
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    [[ $cur == -* ]] &&
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _useradd useradd
+    complete -F _useradd useradd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/userdel b/msys2/usr/share/bash-completion/completions/userdel
index 7d637d2ea..ed98447b1 100644
--- a/msys2/usr/share/bash-completion/completions/userdel
+++ b/msys2/usr/share/bash-completion/completions/userdel
@@ -6,22 +6,22 @@ _userdel()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)h)
+        --help | -!(-*)h)
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _userdel userdel
+    complete -F _userdel userdel
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/usermod b/msys2/usr/share/bash-completion/completions/usermod
index 3d0efdbdd..77ab33c80 100644
--- a/msys2/usr/share/bash-completion/completions/usermod
+++ b/msys2/usr/share/bash-completion/completions/usermod
@@ -9,27 +9,28 @@ _usermod()
     #       with -u/--uid
 
     case $prev in
-        --comment|--home|--expiredate|--inactive|--help|--login|--password|\
-        --uid|--selinux-user|-!(-*)[cdefhlpuZ])
+        --comment | --home | --expiredate | --inactive | --help | --login | --password | \
+            --uid | --selinux-user | -!(-*)[cdefhlpuZ])
             return
             ;;
-        --gid|-!(-*)g)
+        --gid | -!(-*)g)
             _gids
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]} $(compgen -g)' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]} $(compgen -g)' \
+                -- "$cur"))
             return
             ;;
-        --groups|-!(-*)G)
-            local prefix=; [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=( $(compgen -g -- "${cur##*,}") )
-            [[ ${#COMPREPLY[@]} -eq 1 ]] && COMPREPLY=( ${COMPREPLY/#/$prefix} )
+        --groups | -!(-*)G)
+            local prefix=
+            [[ $cur == *,* ]] && prefix="${cur%,*},"
+            COMPREPLY=($(compgen -g -- "${cur##*,}"))
+            ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
-        --shell|-!(-*)s)
+        --shell | -!(-*)s)
             _shells
             return
             ;;
@@ -37,14 +38,14 @@ _usermod()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
+    if [[ $cur == -* ]]; then
         # TODO: -U/--unlock, -p/--password, -L/--lock mutually exclusive
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
-    COMPREPLY=( $(compgen -u -- "$cur") )
+    COMPREPLY=($(compgen -u -- "$cur"))
 } &&
-complete -F _usermod usermod
+    complete -F _usermod usermod
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/valgrind b/msys2/usr/share/bash-completion/completions/valgrind
index 01ca62c5a..f54116152 100644
--- a/msys2/usr/share/bash-completion/completions/valgrind
+++ b/msys2/usr/share/bash-completion/completions/valgrind
@@ -9,47 +9,47 @@ _valgrind()
     # Note: intentionally using COMP_WORDS and COMP_CWORD instead of
     # words and cword here due to splitting on = causing index differences
     # (_command_offset assumes the former).
-    for (( i=1; i <= COMP_CWORD; i++ )); do
-        if [[ ${COMP_WORDS[i]} != @([-=])* && ${COMP_WORDS[i-1]} != = ]]; then
+    for ((i = 1; i <= COMP_CWORD; i++)); do
+        if [[ ${COMP_WORDS[i]} != @([-=])* && ${COMP_WORDS[i - 1]} != = ]]; then
             _command_offset $i
             return
         fi
     done
 
-    local tool
-    for (( i=1; i < ${#words[@]}; i++ )); do
-        if [[ ${words[i]} == --tool=?* ]]; then
-            tool=${words[i]}
+    local word tool
+    for word in "${words[@]:1}"; do
+        if [[ $word == --tool=?* ]]; then
+            tool=$word
             break
         fi
     done
 
     case $prev in
-        -h|--help|--help-debug|--version)
+        -h | --help | --help-debug | --version)
             return
             ;;
         --tool)
             # Tools seem to be named e.g. like memcheck-amd64-linux from which
             # we want to grab memcheck.
-            COMPREPLY=( $(compgen -W '$(
+            COMPREPLY=($(compgen -W '$(
                 for f in /usr{,/local}/lib{,64,exec}{/*-linux-gnu,}/valgrind/*
                 do
                     [[ $f != *.so && -x $f && $f =~ ^.*/(.*)-[^-]+-[^-]+ ]] &&
                         printf "%s\n" "${BASH_REMATCH[1]}"
-                done)' -- "$cur") )
+                done)' -- "$cur"))
             return
             ;;
         --sim-hints)
-            COMPREPLY=( $(compgen -W 'lax-ioctls enable-outer' -- "$cur") )
+            COMPREPLY=($(compgen -W 'lax-ioctls enable-outer' -- "$cur"))
             return
             ;;
         --soname-synonyms)
-            COMPREPLY=( $(compgen -W 'somalloc' -S = -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W 'somalloc' -S = -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;
         --kernel-variant)
-            COMPREPLY=( $(compgen -W 'bproc' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bproc' -- "$cur"))
             return
             ;;
         # callgrind:
@@ -59,18 +59,18 @@ _valgrind()
             ;;
         # exp-dhat:
         --sort-by)
-            COMPREPLY=( $(compgen -W 'max-bytes-live tot-bytes-allocd
-                max-blocks-live' -- "$cur") )
+            COMPREPLY=($(compgen -W 'max-bytes-live tot-bytes-allocd
+                max-blocks-live' -- "$cur"))
             return
             ;;
         # massif:
         --time-unit)
-            COMPREPLY=( $(compgen -W 'i ms B' -- "$cur") )
+            COMPREPLY=($(compgen -W 'i ms B' -- "$cur"))
             return
             ;;
-        # generic cases parsed from --help output
+            # generic cases parsed from --help output
         --+([-A-Za-z0-9_]))
-            local value=$($1 --help-debug $tool 2>/dev/null | \
+            local value=$($1 --help-debug ${tool-} 2>/dev/null |
                 command sed -ne "s|^[[:blank:]]*$prev=\([^[:blank:]]\{1,\}\).*|\1|p")
             case $value in
                 \<file*\>)
@@ -79,18 +79,18 @@ _valgrind()
                     ;;
                 \<command\>)
                     compopt -o filenames
-                    COMPREPLY=( $(compgen -c -- "$cur") )
+                    COMPREPLY=($(compgen -c -- "$cur"))
                     return
                     ;;
                 \<+([0-9])..+([0-9])\>)
-                    COMPREPLY=( $(compgen -W "{${value:1:((${#value}-2))}}" \
-                        -- "$cur") )
+                    COMPREPLY=($(compgen -W "{${value:1:${#value}-2}}" \
+                        -- "$cur"))
                     return
                     ;;
                 # "yes", "yes|no", etc (but not "string", "STR",
                 # "hint1,hint2,...")
-                yes|+([-a-z0-9])\|+([-a-z0-9\|]))
-                    COMPREPLY=( $(IFS='|' compgen -W '$value' -- "$cur") )
+                yes | +([-a-z0-9])\|+([-a-z0-9\|]))
+                    COMPREPLY=($(IFS='|' compgen -W '$value' -- "$cur"))
                     return
                     ;;
             esac
@@ -100,12 +100,12 @@ _valgrind()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" "--help $tool")' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help ${tool-}")' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _valgrind valgrind
+    complete -F _valgrind valgrind
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgcfgbackup b/msys2/usr/share/bash-completion/completions/vgcfgbackup
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgcfgbackup
+++ b/msys2/usr/share/bash-completion/completions/vgcfgbackup
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgcfgrestore b/msys2/usr/share/bash-completion/completions/vgcfgrestore
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgcfgrestore
+++ b/msys2/usr/share/bash-completion/completions/vgcfgrestore
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgchange b/msys2/usr/share/bash-completion/completions/vgchange
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgchange
+++ b/msys2/usr/share/bash-completion/completions/vgchange
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgck b/msys2/usr/share/bash-completion/completions/vgck
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgck
+++ b/msys2/usr/share/bash-completion/completions/vgck
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgconvert b/msys2/usr/share/bash-completion/completions/vgconvert
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgconvert
+++ b/msys2/usr/share/bash-completion/completions/vgconvert
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgcreate b/msys2/usr/share/bash-completion/completions/vgcreate
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgcreate
+++ b/msys2/usr/share/bash-completion/completions/vgcreate
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgdisplay b/msys2/usr/share/bash-completion/completions/vgdisplay
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgdisplay
+++ b/msys2/usr/share/bash-completion/completions/vgdisplay
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgexport b/msys2/usr/share/bash-completion/completions/vgexport
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgexport
+++ b/msys2/usr/share/bash-completion/completions/vgexport
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgextend b/msys2/usr/share/bash-completion/completions/vgextend
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgextend
+++ b/msys2/usr/share/bash-completion/completions/vgextend
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgimport b/msys2/usr/share/bash-completion/completions/vgimport
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgimport
+++ b/msys2/usr/share/bash-completion/completions/vgimport
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgmerge b/msys2/usr/share/bash-completion/completions/vgmerge
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgmerge
+++ b/msys2/usr/share/bash-completion/completions/vgmerge
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgmknodes b/msys2/usr/share/bash-completion/completions/vgmknodes
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgmknodes
+++ b/msys2/usr/share/bash-completion/completions/vgmknodes
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgreduce b/msys2/usr/share/bash-completion/completions/vgreduce
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgreduce
+++ b/msys2/usr/share/bash-completion/completions/vgreduce
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgremove b/msys2/usr/share/bash-completion/completions/vgremove
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgremove
+++ b/msys2/usr/share/bash-completion/completions/vgremove
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgrename b/msys2/usr/share/bash-completion/completions/vgrename
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgrename
+++ b/msys2/usr/share/bash-completion/completions/vgrename
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgs b/msys2/usr/share/bash-completion/completions/vgs
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgs
+++ b/msys2/usr/share/bash-completion/completions/vgs
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgscan b/msys2/usr/share/bash-completion/completions/vgscan
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgscan
+++ b/msys2/usr/share/bash-completion/completions/vgscan
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vgsplit b/msys2/usr/share/bash-completion/completions/vgsplit
index 712838c8e..e70ecc3a5 100644
--- a/msys2/usr/share/bash-completion/completions/vgsplit
+++ b/msys2/usr/share/bash-completion/completions/vgsplit
@@ -8,26 +8,26 @@ _lvm_filedir()
 
 _lvm_volumegroups()
 {
-    COMPREPLY=( $(compgen -W "$(vgscan 2>/dev/null | \
-        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(vgscan 2>/dev/null |
+        command sed -n -e 's|.*Found.*"\(.*\)".*$|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes_all()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \([^ ]*\) .*|\1|p')" -- "$cur"))
 }
 
 _lvm_physicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(pvscan 2>/dev/null | \
-        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p' )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(pvscan 2>/dev/null |
+        command sed -n -e 's|^.*PV \(.*\) VG.*$|\1|p')" -- "$cur"))
 }
 
 _lvm_logicalvolumes()
 {
-    COMPREPLY=( $(compgen -W "$(lvscan 2>/dev/null | \
-        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p" )" -- "$cur") )
+    COMPREPLY=($(compgen -W "$(lvscan 2>/dev/null |
+        command sed -n -e "s|^.*'\(.*\)'.*$|\1|p")" -- "$cur"))
     if [[ $cur == /dev/mapper/* ]]; then
         _filedir
         local i
@@ -39,12 +39,12 @@ _lvm_logicalvolumes()
 
 _lvm_units()
 {
-    COMPREPLY=( $(compgen -W 'h s b k m g t H K M G T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'h s b k m g t H K M G T' -- "$cur"))
 }
 
 _lvm_sizes()
 {
-    COMPREPLY=( $(compgen -W 'k K m M g G t T' -- "$cur") )
+    COMPREPLY=($(compgen -W 'k K m M g G t T' -- "$cur"))
 }
 
 # @param $1 glob matching args known to take an argument
@@ -52,13 +52,14 @@ _lvm_count_args()
 {
     args=0
     local offset=1
-    if [[ "${words[0]}" == lvm ]]; then
+    if [[ ${words[0]} == lvm ]]; then
         offset=2
     fi
-    local i prev=${words[$offset-1]}
-    for (( i=$offset; i < cword; i++ )); do
-        if [[ "${words[i]}" != -* && $prev != $1 ]]; then
-            (( args++ ))
+    local i prev=${words[offset - 1]}
+    for ((i = offset; i < cword; i++)); do
+        # shellcheck disable=SC2053
+        if [[ ${words[i]} != -* && $prev != $1 ]]; then
+            ((args++))
         fi
         prev=${words[i]}
     done
@@ -69,22 +70,22 @@ _lvmdiskscan()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvmdiskscan lvmdiskscan
+    complete -F _lvmdiskscan lvmdiskscan
 
 _pvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _pvscan pvscan
+    complete -F _pvscan pvscan
 
 _pvs()
 {
@@ -92,9 +93,9 @@ _pvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
-                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur") )
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'pv_fmt pv_uuid pv_size pv_free pv_used
+                pv_name pv_attr pv_pe_count pv_pe_alloc_count' -- "$cur"))
             return
             ;;
         --units)
@@ -103,13 +104,13 @@ _pvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvs pvs
+    complete -F _pvs pvs
 
 _pvdisplay()
 {
@@ -123,13 +124,13 @@ _pvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvdisplay pvdisplay
+    complete -F _pvdisplay pvdisplay
 
 _pvchange()
 {
@@ -137,19 +138,19 @@ _pvchange()
     _init_completion || return
 
     case $prev in
-        --autobackup|--allocatable|-!(-*)[Ax])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --allocatable | -!(-*)[Ax])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvchange pvchange
+    complete -F _pvchange pvchange
 
 _pvcreate()
 {
@@ -161,27 +162,27 @@ _pvcreate()
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
-        --metadatasize|--setphysicalvolumesize)
+        --metadatasize | --setphysicalvolumesize)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_filedir
     fi
 } &&
-complete -F _pvcreate pvcreate
+    complete -F _pvcreate pvcreate
 
 _pvmove()
 {
@@ -189,46 +190,47 @@ _pvmove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
+            ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes
     fi
 } &&
-complete -F _pvmove pvmove
+    complete -F _pvmove pvmove
 
 _pvremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_physicalvolumes_all
     fi
 } &&
-complete -F _pvremove pvremove
+    complete -F _pvremove pvremove
 
 _vgscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _vgscan vgscan
+    complete -F _vgscan vgscan
 
 _vgs()
 {
@@ -236,11 +238,11 @@ _vgs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'vg_fmt vg_uuid vg_name vg_attr vg_size
                 vg_free vg_sysid vg_extent_size vg_extent_count vg_free_count
                 max_lv max_pv pv_count lv_count snap_count vg_seqno' \
-                    -- "$cur") )
+                -- "$cur"))
             return
             ;;
         --units)
@@ -249,13 +251,13 @@ _vgs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgs vgs
+    complete -F _vgs vgs
 
 _vgdisplay()
 {
@@ -269,13 +271,13 @@ _vgdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgdisplay vgdisplay
+    complete -F _vgdisplay vgdisplay
 
 _vgchange()
 {
@@ -283,19 +285,19 @@ _vgchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--resizeable|-!(-*)[aAx])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --resizeable | -!(-*)[aAx])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgchange vgchange
+    complete -F _vgchange vgchange
 
 _vgcreate()
 {
@@ -303,46 +305,46 @@ _vgcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --physicalextentsize|-!(-*)s)
+        --physicalextentsize | -!(-*)s)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype|-s|--physicalextentsize)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgcreate vgcreate
+    complete -F _vgcreate vgcreate
 
 _vgremove()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgremove vgremove
+    complete -F _vgremove vgremove
 
 _vgrename()
 {
@@ -350,19 +352,19 @@ _vgrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgrename vgrename
+    complete -F _vgrename vgrename
 
 _vgreduce()
 {
@@ -370,26 +372,26 @@ _vgreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
 
     else
         local args
         _lvm_count_args '@(-A|--autobackup)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgreduce vgreduce
+    complete -F _vgreduce vgreduce
 
 _vgextend()
 {
@@ -397,55 +399,55 @@ _vgextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes_all
         fi
     fi
 } &&
-complete -F _vgextend vgextend
+    complete -F _vgextend vgextend
 
 _vgport()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgport vgimport vgexport
+    complete -F _vgport vgimport vgexport
 
 _vgck()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgck vgck
+    complete -F _vgck vgck
 
 _vgconvert()
 {
@@ -453,12 +455,12 @@ _vgconvert()
     _init_completion || return
 
     case $prev in
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
         --metadatacopies)
-            COMPREPLY=( $(compgen -W '0 1 2' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2' -- "$cur"))
             return
             ;;
         --metadatasize)
@@ -467,13 +469,13 @@ _vgconvert()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgconvert vgconvert
+    complete -F _vgconvert vgconvert
 
 _vgcfgbackup()
 {
@@ -481,19 +483,19 @@ _vgcfgbackup()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgbackup vgcfgbackup
+    complete -F _vgcfgbackup vgcfgbackup
 
 _vgcfgrestore()
 {
@@ -501,27 +503,27 @@ _vgcfgrestore()
     _init_completion || return
 
     case $prev in
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_volumegroups
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgcfgrestore vgcfgrestore
+    complete -F _vgcfgrestore vgcfgrestore
 
 _vgmerge()
 {
@@ -529,19 +531,19 @@ _vgmerge()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmerge vgmerge
+    complete -F _vgmerge vgmerge
 
 _vgsplit()
 {
@@ -549,53 +551,53 @@ _vgsplit()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --metadatatype|-!(-*)M)
-            COMPREPLY=( $(compgen -W '1 2' -- "$cur") )
+        --metadatatype | -!(-*)M)
+            COMPREPLY=($(compgen -W '1 2' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-M|--metadatatype)'
-        if [[ $args -eq 0 || $args -eq 1 ]]; then
+        if ((args == 0 || args == 1)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _vgsplit vgsplit
+    complete -F _vgsplit vgsplit
 
 _vgmknodes()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_volumegroups
     fi
 } &&
-complete -F _vgmknodes vgmknodes
+    complete -F _vgmknodes vgmknodes
 
 _lvscan()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     fi
 } &&
-complete -F _lvscan lvscan
+    complete -F _lvscan lvscan
 
 _lvs()
 {
@@ -603,10 +605,10 @@ _lvs()
     _init_completion || return
 
     case $prev in
-        --options|--sort|-!(-*)[oO])
-            COMPREPLY=( $(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
+        --options | --sort | -!(-*)[oO])
+            COMPREPLY=($(compgen -W 'lv_uuid lv_name lv_attr lv_minor lv_size
                 seg_count origin snap_percent segtype stripes stripesize
-                chunksize seg_start seg_size' -- "$cur") )
+                chunksize seg_start seg_size' -- "$cur"))
             return
             ;;
         --units)
@@ -615,13 +617,13 @@ _lvs()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvs lvs
+    complete -F _lvs lvs
 
 _lvdisplay()
 {
@@ -635,13 +637,13 @@ _lvdisplay()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvdisplay lvdisplay
+    complete -F _lvdisplay lvdisplay
 
 _lvchange()
 {
@@ -649,23 +651,23 @@ _lvchange()
     _init_completion || return
 
     case $prev in
-        --available|--autobackup|--contiguous|--persistent|-!(-*)[aACM])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --available | --autobackup | --contiguous | --persistent | -!(-*)[aACM])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvchange lvchange
+    complete -F _lvchange lvchange
 
 _lvcreate()
 {
@@ -673,37 +675,37 @@ _lvcreate()
     _init_completion || return
 
     case $prev in
-        --autobackup|--contiguous|--persistent|--zero|-!(-*)[ACMZ])
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | --contiguous | --persistent | --zero | -!(-*)[ACMZ])
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
-        --permission|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'r rw' -- "$cur") )
+        --permission | -!(-*)p)
+            COMPREPLY=($(compgen -W 'r rw' -- "$cur"))
             return
             ;;
-        --name|-!(-*)n)
+        --name | -!(-*)n)
             _lvm_logicalvolumes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|-C|-M|-Z|--autobackup|--contiguous|--persistent|--zero|-L|--size|-p|--permission|-n|--name)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_volumegroups
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvcreate lvcreate
+    complete -F _lvcreate lvcreate
 
 _lvremove()
 {
@@ -711,19 +713,19 @@ _lvremove()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvremove lvremove
+    complete -F _lvremove lvremove
 
 _lvrename()
 {
@@ -731,19 +733,19 @@ _lvrename()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvrename lvrename
+    complete -F _lvrename lvrename
 
 _lvreduce()
 {
@@ -751,23 +753,23 @@ _lvreduce()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         _lvm_logicalvolumes
     fi
 } &&
-complete -F _lvreduce lvreduce
+    complete -F _lvreduce lvreduce
 
 _lvresize()
 {
@@ -775,29 +777,29 @@ _lvresize()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvresize lvresize
+    complete -F _lvresize lvresize
 
 _lvextend()
 {
@@ -805,55 +807,55 @@ _lvextend()
     _init_completion || return
 
     case $prev in
-        --autobackup|-!(-*)A)
-            COMPREPLY=( $(compgen -W 'y n' -- "$cur") )
+        --autobackup | -!(-*)A)
+            COMPREPLY=($(compgen -W 'y n' -- "$cur"))
             return
             ;;
-        --size|-!(-*)L)
+        --size | -!(-*)L)
             _lvm_sizes
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1" --help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur"))
     else
         local args
         _lvm_count_args '@(-A|--autobackup|-L|--size)'
-        if [[ $args -eq 0 ]]; then
+        if ((args == 0)); then
             _lvm_logicalvolumes
         else
             _lvm_physicalvolumes
         fi
     fi
 } &&
-complete -F _lvextend lvextend
+    complete -F _lvextend lvextend
 
 _lvm()
 {
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
+    if ((cword == 1)); then
+        COMPREPLY=($(compgen -W 'dumpconfig help lvchange lvcreate lvdisplay
             lvextend lvmchange lvmdiskscan lvmsadc lvmsar lvreduce lvremove
             lvrename lvresize lvs lvscan pvchange pvcreate pvdata pvdisplay
             pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore
             vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend
             vgimport vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan
-            vgsplit version' -- "$cur") )
+            vgsplit version' -- "$cur"))
     else
         case "${words[1]}" in
-            pvchange|pvcreate|pvdisplay|pvmove|pvremove|pvresize|pvs|pvscan|\
-            vgcfgbackup|vgcfgrestore|vgchange|vgck|vgconvert|vgcreate|\
-            vgdisplay|vgexport|vgextend|vgimport|vgmerge|vgmknodes|vgreduce|\
-            vgremove|vgrename|vgs|vgscan|vgsplit|lvchange|lvcreate|lvdisplay|\
-            lvextend|lvreduce|lvremove|lvrename|lvresize|lvscan)
+            pvchange | pvcreate | pvdisplay | pvmove | pvremove | pvresize | pvs | pvscan | \
+                vgcfgbackup | vgcfgrestore | vgchange | vgck | vgconvert | vgcreate | \
+                vgdisplay | vgexport | vgextend | vgimport | vgmerge | vgmknodes | vgreduce | \
+                vgremove | vgrename | vgs | vgscan | vgsplit | lvchange | lvcreate | lvdisplay | \
+                lvextend | lvreduce | lvremove | lvrename | lvresize | lvscan)
                 _${words[1]}
                 ;;
         esac
     fi
 } &&
-complete -F _lvm lvm
+    complete -F _lvm lvm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vigr b/msys2/usr/share/bash-completion/completions/vigr
index 46771a0ac..b3a741564 100644
--- a/msys2/usr/share/bash-completion/completions/vigr
+++ b/msys2/usr/share/bash-completion/completions/vigr
@@ -6,17 +6,17 @@ _vipw()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)h)
+        --help | -!(-*)h)
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _vipw vipw vigr
+    complete -F _vipw vipw vigr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vipw b/msys2/usr/share/bash-completion/completions/vipw
index 46771a0ac..b3a741564 100644
--- a/msys2/usr/share/bash-completion/completions/vipw
+++ b/msys2/usr/share/bash-completion/completions/vipw
@@ -6,17 +6,17 @@ _vipw()
     _init_completion || return
 
     case $prev in
-        --help|-!(-*)h)
+        --help | -!(-*)h)
             return
             ;;
-        --root|-!(-*)R)
+        --root | -!(-*)R)
             _filedir -d
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-complete -F _vipw vipw vigr
+    complete -F _vipw vipw vigr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vmstat b/msys2/usr/share/bash-completion/completions/vmstat
index f15d40898..e36934a55 100644
--- a/msys2/usr/share/bash-completion/completions/vmstat
+++ b/msys2/usr/share/bash-completion/completions/vmstat
@@ -6,22 +6,22 @@ _vmstat()
     _init_completion || return
 
     case $prev in
-        --help|--version|--partition|-!(-*)[hVcMNnwp])
+        --help | --version | --partition | -!(-*)[hVcMNnwp])
             return
             ;;
-        --unit|-!(-*)S)
-            [[ $OSTYPE == *linux* ]] && \
-                COMPREPLY=( $(compgen -W 'k K m M' -- "$cur") )
+        --unit | -!(-*)S)
+            [[ $OSTYPE == *linux* ]] &&
+                COMPREPLY=($(compgen -W 'k K m M' -- "$cur"))
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY ]] || \
-            COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} ]] ||
+            COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     fi
 } &&
-complete -F _vmstat vmstat
+    complete -F _vmstat vmstat
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vncviewer b/msys2/usr/share/bash-completion/completions/vncviewer
index 000ba1a8f..ba5522689 100644
--- a/msys2/usr/share/bash-completion/completions/vncviewer
+++ b/msys2/usr/share/bash-completion/completions/vncviewer
@@ -4,17 +4,17 @@ _vncviewer_bootstrap()
 {
     local fname
     case $(_realcommand vncviewer) in
-        *xvnc4viewer)      fname=_xvnc4viewer    ;;
-        *tightvncviewer)   fname=_tightvncviewer ;;
-        *)                 fname=_known_hosts    ;;
+        *xvnc4viewer) fname=_xvnc4viewer ;;
+        *tightvncviewer) fname=_tightvncviewer ;;
+        *) fname=_known_hosts ;;
     esac
 
     # Install real completion for subsequent completions
     complete -F $fname vncviewer
-    $fname  # Generate completions once for now
+    $fname # Generate completions once for now
     unset -f _vncviewer_bootstrap
 } &&
-complete -F _vncviewer_bootstrap vncviewer
+    complete -F _vncviewer_bootstrap vncviewer
 
 _tightvncviewer()
 {
@@ -27,8 +27,8 @@ _tightvncviewer()
             return
             ;;
         -encodings)
-            COMPREPLY=( $(compgen -W 'copyrect tight hextile zlib corre rre
-                raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'copyrect tight hextile zlib corre rre
+                raw' -- "$cur"))
             return
             ;;
         -via)
@@ -37,18 +37,16 @@ _tightvncviewer()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-help -listen -via -shared -noshared
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-help -listen -via -shared -noshared
             -viewonly -fullscreen -noraiseonbeep -passwd -encodings -bgr233
             -owncmap -truecolour -truecolor -depth -compresslevel -quality
-            -nojpeg -nocursorshape -x11cursor' -- "$cur") )
+            -nojpeg -nocursorshape -x11cursor' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _tightvncviewer tightvncviewer
-
+    complete -F _tightvncviewer tightvncviewer
 
 # NOTE: - VNC Viewer options are case insensitive.
 #         Preferred case is taken from -help.
@@ -61,12 +59,12 @@ _xvnc4viewer()
     local opt=${prev/#--/-}
     case ${opt,,} in
         # -passwd, -PasswordFile
-        -passwd|-passwordfile)
+        -passwd | -passwordfile)
             _filedir
             return
             ;;
         -preferredencoding)
-            COMPREPLY=( $(compgen -W 'zrle hextile raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'zrle hextile raw' -- "$cur"))
             return
             ;;
         -via)
@@ -75,26 +73,27 @@ _xvnc4viewer()
             ;;
     esac
 
-    if [[ "$cur" == -* || "$cur" == --* ]]; then
+    if [[ $cur == -* || $cur == --* ]]; then
         # Default to vncviewer camelcase options, see `vncviewer -help'
-        local dash options=( AcceptClipboard AutoSelect DebugDelay display
+        local dash options=(AcceptClipboard AutoSelect DebugDelay display
             DotWhenNoCursor FullColor FullColour FullScreen geometry help
             listen Log LowColourLevel MenuKey name Parent passwd PasswordFile
             PointerEventInterval PreferredEncoding SendClipboard SendPrimary
             Shared UseLocalCursor via ViewOnly WMDecorationHeight
-            WMDecorationWidth ZlibLevel )
-        [[ "$cur" == --* ]] && dash=-- || dash=-
+            WMDecorationWidth ZlibLevel)
+        [[ $cur == --* ]] && dash=-- || dash=-
 
-        local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+        local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+        shopt -s nocasematch
         local option
-        COMPREPLY=( $(for option in "${options[@]}"; do
-                [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
-            done) )
+        COMPREPLY=($(for option in "${options[@]}"; do
+            [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
+        done))
         $reset
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _xvnc4viewer xvnc4viewer
+    complete -F _xvnc4viewer xvnc4viewer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/vpnc b/msys2/usr/share/bash-completion/completions/vpnc
index 5eb5be717..bbdb8ee75 100644
--- a/msys2/usr/share/bash-completion/completions/vpnc
+++ b/msys2/usr/share/bash-completion/completions/vpnc
@@ -6,9 +6,9 @@ _vpnc()
     _init_completion || return
 
     case $prev in
-        --help|--long-help|--version|--id|--username|--domain|--ifname|\
-        --application-version|--local-addr|--local-port|--udp-port|--dpd-idle|\
-        --target-network|--ifmtu)
+        --help | --long-help | --version | --id | --username | --domain | --ifname | \
+            --application-version | --local-addr | --local-port | --udp-port | --dpd-idle | \
+            --target-network | --ifmtu)
             return
             ;;
         --gateway)
@@ -16,36 +16,36 @@ _vpnc()
             return
             ;;
         --vendor)
-            COMPREPLY=( $(compgen -W 'cisco netscreen' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cisco netscreen' -- "$cur"))
             return
             ;;
         --natt-mode)
-            COMPREPLY=( $(compgen -W 'natt none force-natt cisco-udp' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'natt none force-natt cisco-udp' \
+                -- "$cur"))
             return
             ;;
-        --script|--pid-file|--ca-file)
+        --script | --pid-file | --ca-file)
             _filedir
             return
             ;;
         --dh)
-            COMPREPLY=( $(compgen -W 'dh1 dh2 dh5' -- "$cur") )
+            COMPREPLY=($(compgen -W 'dh1 dh2 dh5' -- "$cur"))
             return
             ;;
         --pfs)
-            COMPREPLY=( $(compgen -W 'nopfs dh1 dh2 dh5 server' -- "$cur") )
+            COMPREPLY=($(compgen -W 'nopfs dh1 dh2 dh5 server' -- "$cur"))
             return
             ;;
         --ifmode)
-            COMPREPLY=( $(compgen -W 'tun tap' -- "$cur") )
+            COMPREPLY=($(compgen -W 'tun tap' -- "$cur"))
             return
             ;;
         --debug)
-            COMPREPLY=( $(compgen -W '0 1 2 3 99' -- "$cur") )
+            COMPREPLY=($(compgen -W '0 1 2 3 99' -- "$cur"))
             return
             ;;
         --auth-mode)
-            COMPREPLY=( $(compgen -W 'psk cert hybrid' -- "$cur") )
+            COMPREPLY=($(compgen -W 'psk cert hybrid' -- "$cur"))
             return
             ;;
         --ca-dir)
@@ -54,28 +54,29 @@ _vpnc()
             ;;
         --password-helper)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --long-help)' -- "$cur") )
-    elif [[ "$cur" == */* ]]; then
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --long-help)' -- "$cur"))
+    elif [[ $cur == */* ]]; then
         # explicit filename
         _filedir conf
     else
         # config name, /etc/vpnc/<name>.conf
-        local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
-        local -a configs=( /etc/vpnc/*.conf )
-        configs=( "${configs[@]##*/}" )
-        configs=( "${configs[@]%.conf}" )
+        local IFS=$' \t\n' reset=$(shopt -p nullglob)
+        shopt -s nullglob
+        local -a configs=(/etc/vpnc/*.conf)
+        configs=("${configs[@]##*/}")
+        configs=("${configs[@]%.conf}")
         $reset
         IFS=$'\n'
         compopt -o filenames
-        COMPREPLY=( $(compgen -W '${configs[@]}' -- "$cur") )
+        COMPREPLY=($(compgen -W '${configs[@]}' -- "$cur"))
     fi
 } &&
-complete -F _vpnc vpnc
+    complete -F _vpnc vpnc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/watch b/msys2/usr/share/bash-completion/completions/watch
index eb04df893..efc0a98fb 100644
--- a/msys2/usr/share/bash-completion/completions/watch
+++ b/msys2/usr/share/bash-completion/completions/watch
@@ -8,13 +8,13 @@ _watch()
     _init_completion -s || return
 
     local offset=0 i
-    for (( i=1; i <= cword; i++ )); do
+    for ((i = 1; i <= cword; i++)); do
         case ${words[i]} in
-            --help|--version|-!(-*)h)
+            --help | --version | -!(-*)h)
                 return
                 ;;
-            --interval|-!(-*)n)
-                (( i++ ))
+            --interval | -!(-*)n)
+                ((i++))
                 continue
                 ;;
             -*)
@@ -25,18 +25,18 @@ _watch()
         break
     done
 
-    if [[ $offset -gt 0 ]]; then
+    if ((offset > 0)); then
         _command_offset $offset
         return
     fi
 
     case $prev in
-        --differences|-!(-*)d)
-            [[ $cur != -* ]] && \
-                COMPREPLY=( $(compgen -W 'cumulative' -- "$cur") )
+        --differences | -!(-*)d)
+            [[ $cur != -* ]] &&
+                COMPREPLY=($(compgen -W 'cumulative' -- "$cur"))
             return
             ;;
-        --interval|-!(-*)n)
+        --interval | -!(-*)n)
             return
             ;;
     esac
@@ -44,11 +44,11 @@ _watch()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 } &&
-complete -F _watch watch
+    complete -F _watch watch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/webmitm b/msys2/usr/share/bash-completion/completions/webmitm
index d50bc3e3f..549c5ef5d 100644
--- a/msys2/usr/share/bash-completion/completions/webmitm
+++ b/msys2/usr/share/bash-completion/completions/webmitm
@@ -5,13 +5,13 @@ _webmitm()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 
 } &&
-complete -F _webmitm webmitm
+    complete -F _webmitm webmitm
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wget b/msys2/usr/share/bash-completion/completions/wget
index b27d860db..d6a2fe932 100644
--- a/msys2/usr/share/bash-completion/completions/wget
+++ b/msys2/usr/share/bash-completion/completions/wget
@@ -6,84 +6,87 @@ _wget()
     _init_completion -s || return
 
     case $prev in
-        --version|--help|-!(-*)[hV])
+        --version | --help | -!(-*)[hV])
             return
             ;;
         --progress)
-            COMPREPLY=( $(compgen -W 'bar dot' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bar dot' -- "$cur"))
             return
             ;;
         --bind-address)
             _ip_addresses
             return
             ;;
-        --domains|--exclude-domains|-!(-*)D)
+        --domains | --exclude-domains | -!(-*)D)
             _known_hosts_real -- "$cur"
             return
             ;;
         --restrict-file-names)
             local excludes=()
             case $cur in
-                *unix*|*windows*)
-                    excludes=( windows unix )
+                *unix* | *windows*)
+                    excludes=(windows unix)
                     ;;&
-                *lowercase*|*uppercase*)
-                    excludes+=( lowercase uppercase )
+                *lowercase* | *uppercase*)
+                    excludes+=(lowercase uppercase)
                     ;;&
                 *nocontrol*)
-                    excludes+=( nocontrol )
+                    excludes+=(nocontrol)
                     ;;&
                 *ascii*)
-                    excludes+=( ascii )
+                    excludes+=(ascii)
                     ;;
             esac
-            local excludes_str=$(export IFS='|'; echo "${excludes[*]}";)
+            local excludes_str=$(
+                export IFS='|'
+                echo "${excludes[*]}"
+            )
 
             # prevopt is the previous options string used as a prefix
             # to avoid COMPREPLY replacing them with the $lastopt completion
-            local lastopt=${cur/*,} prevopt=
+            local lastopt=${cur/*,/} prevopt=
             [[ $cur == *,* ]] && prevopt=${cur%,*},
 
-            COMPREPLY=( $(compgen -P "$prevopt" -X "@($excludes_str)" \
+            COMPREPLY=($(compgen -P "$prevopt" -X "@($excludes_str)" \
                 -W 'unix windows nocontrol ascii lowercase uppercase' \
-                -- "$lastopt") )
+                -- "$lastopt"))
 
             # +o nospace when no more valid option is possible (= append a space)
-            local opt_as_arr=( $(echo ${COMPREPLY[0]//,/ }) )
-            [[ ${#opt_as_arr[@]} -lt 4 ]] && compopt -o nospace
+            local opt_as_arr=(${COMPREPLY[0]//,/ })
+            ((${#opt_as_arr[@]} < 4)) && compopt -o nospace
             return
             ;;
         --prefer-family)
-            COMPREPLY=( $(compgen -W 'IPv4 IPv6 none' -- "$cur") )
+            COMPREPLY=($(compgen -W 'IPv4 IPv6 none' -- "$cur"))
             return
             ;;
-        --directory-prefix|--ca-directory|--warc-tempdir|-!(-*)P)
+        --directory-prefix | --ca-directory | --warc-tempdir | -!(-*)P)
             _filedir -d
             return
             ;;
-        --output-file|--append-output|--config|--load-cookies|--save-cookies|\
-        --post-file|--certificate|--ca-certificate|--private-key|\
-        --random-file|--egd-file|--warc-file|--warc-dedup|-!(-*)[oa])
+        --output-file | --append-output | --config | --load-cookies | --save-cookies | \
+            --post-file | --certificate | --ca-certificate | --private-key | \
+            --random-file | --egd-file | --warc-file | --warc-dedup | -!(-*)[oa])
             _filedir
             return
             ;;
-        --output-document|--input-file|-!(-*)[Oi])
-            _filedir && [[ $cur == - || -z $cur ]] && COMPREPLY+=( - )
+        --output-document | --input-file | -!(-*)[Oi])
+            _filedir && [[ $cur == - || -z $cur ]] && COMPREPLY+=(-)
             return
             ;;
         --secure-protocol)
-            COMPREPLY=( $(compgen -W 'auto SSLv2 SSLv3 TLSv1' -- "$cur") )
+            COMPREPLY=($(compgen -W 'auto SSLv2 SSLv3 TLSv1' -- "$cur"))
             return
             ;;
-        --certificate-type|--private-key-type)
-            COMPREPLY=( $(compgen -W 'PEM DER' -- "$cur") )
+        --certificate-type | --private-key-type)
+            COMPREPLY=($(compgen -W 'PEM DER' -- "$cur"))
             return
             ;;
-        --follow-tags|--ignore-tags)
-            local lastopt=${cur/*,} prevopt=
+        --follow-tags | --ignore-tags)
+            local lastopt=${cur/*,/} prevopt=
             [[ $cur == *,* ]] && prevopt=${cur%,*},
 
-            COMPREPLY=( $(compgen -P "$prevopt" -W 'a abbr acronym address
+            COMPREPLY=($(compgen -P "$prevopt" -W 'a abbr acronym address
                 applet area b base basefont bdo big blockquote body br button
                 caption center cite code col colgroup dd del dir div dfn dl dt
                 em fieldset font form frame frameset h6 head hr html i iframe
@@ -91,37 +94,37 @@ _wget()
                 noframes noscript object ol optgroup option p param pre q s
                 samp script select small span strike strong style sub sup table
                 tbody td textarea tfoot th thead title tr tt u ul var xmp' \
-                -- "$lastopt") )
+                -- "$lastopt"))
             return
             ;;
-        --tries|--timeout|--dns-timeout|--connect-timeout|--read-timeout|\
-        --wait|--waitretry|--cut-dirs|--max-redirect|--level|-!(-*)[tTwl])
+        --tries | --timeout | --dns-timeout | --connect-timeout | --read-timeout | \
+            --wait | --waitretry | --cut-dirs | --max-redirect | --level | -!(-*)[tTwl])
             # expect integer number
-            COMPREPLY+=( $(compgen -P "$cur" -W "{0..9}") )
+            COMPREPLY+=($(compgen -P "$cur" -W "{0..9}"))
             compopt -o nospace
             return
             ;;
-        --quota|--limit-rate|--warc-max-size|-!(-*)Q)
+        --quota | --limit-rate | --warc-max-size | -!(-*)Q)
             # expect size
             if [[ $cur == *[km] ]]; then
-                COMPREPLY=( $(compgen -W "$cur") )
+                COMPREPLY=($(compgen -W "$cur"))
             elif [[ $cur ]]; then
-                COMPREPLY=( $(compgen -P "$cur" -W "{0..9} k m") )
+                COMPREPLY=($(compgen -P "$cur" -W "{0..9} k m"))
                 compopt -o nospace
             else
-                COMPREPLY=( $(compgen -W "{0..9}") )
+                COMPREPLY=($(compgen -W "{0..9}"))
                 compopt -o nospace
             fi
             return
             ;;
-        --user|--http-user|--proxy-user|--ftp-user)
-            COMPREPLY=( $(compgen -W "$(command sed -n \
+        --user | --http-user | --proxy-user | --ftp-user)
+            COMPREPLY=($(compgen -W "$(command sed -n \
                 '/^login/s/^[[:blank:]]*login[[:blank:]]//p' ~/.netrc \
-                2>/dev/null)" -- "$cur") )
+                2>/dev/null)" -- "$cur"))
             return
             ;;
         --header)
-            COMPREPLY=( $(compgen -W 'Accept Accept-Charset Accept-Encoding
+            COMPREPLY=($(compgen -W 'Accept Accept-Charset Accept-Encoding
                 Accept-Language Accept-Ranges Age Allow Authorization
                 Cache-Control Connection Content-Encoding Content-Language
                 Content-Length Content-Location Content-MD5 Content-Range
@@ -130,29 +133,29 @@ _wget()
                 Last-Modified Location Max-Forwards Pragma Proxy-Authenticate
                 Proxy-Authorization Range Referer Retry-After Server TE Trailer
                 Transfer-Encoding Upgrade User-Agent Vary Via Warning
-                WWW-Authenticate' -- "$cur") )
+                WWW-Authenticate' -- "$cur"))
             compopt -o nospace
             return
             ;;
-        --local-encoding|--remote-encoding)
+        --local-encoding | --remote-encoding)
             type -P xauth &>/dev/null && _xfunc iconv _iconv_charsets
             return
             ;;
-        --execute|-!(-*)e)
+        --execute | -!(-*)e)
             return # TODO base=STR
             ;;
         --report-speed)
-            COMPREPLY=( $(compgen -W 'bits' -- "$cur") )
+            COMPREPLY=($(compgen -W 'bits' -- "$cur"))
             return
             ;;
         --regex-type)
-            COMPREPLY=( $(compgen -W 'posix' -- "$cur") )
+            COMPREPLY=($(compgen -W 'posix' -- "$cur"))
             return
             ;;
-        --base|--password|--ftp-password|--http-password|--proxy-password|\
-        --default-page|--referer|--user-agent|--post-data|--warc-header|\
-        --accept|--reject|--accept-regex|--reject-regex|--include-directories|\
-        --exclude-directories|-!(-*)[BUARIX])
+        --base | --password | --ftp-password | --http-password | --proxy-password | \
+            --default-page | --referer | --user-agent | --post-data | --warc-header | \
+            --accept | --reject | --accept-regex | --reject-regex | --include-directories | \
+            --exclude-directories | -!(-*)[BUARIX])
             # argument required but no completions available
             return
             ;;
@@ -161,11 +164,11 @@ _wget()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 
 } &&
-complete -F _wget wget
+    complete -F _wget wget
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/whatis b/msys2/usr/share/bash-completion/completions/whatis
index e5a473617..81d06f513 100644
--- a/msys2/usr/share/bash-completion/completions/whatis
+++ b/msys2/usr/share/bash-completion/completions/whatis
@@ -10,29 +10,29 @@ _man()
     local mansect="@([0-9lnp]|[0-9][px]|3?(gl|pm))"
 
     case $prev in
-        --config-file|-!(-*)C)
+        --config-file | -!(-*)C)
             _filedir conf
             return
             ;;
-        --local-file|-!(-*)l)
+        --local-file | -!(-*)l)
             _filedir "$manext"
             return
             ;;
-        --manpath|-!(-*)M)
+        --manpath | -!(-*)M)
             _filedir -d
             return
             ;;
-        --pager|-!(-*)P)
+        --pager | -!(-*)P)
             compopt -o filenames
-            COMPREPLY=( $(compgen -c -- "$cur") )
+            COMPREPLY=($(compgen -c -- "$cur"))
             return
             ;;
-        --preprocessor|-!(-*)p)
-            COMPREPLY=( $(compgen -W 'e p t g r v' -- "$cur") )
+        --preprocessor | -!(-*)p)
+            COMPREPLY=($(compgen -W 'e p t g r v' -- "$cur"))
             return
             ;;
-        --locale|--systems|--extension|--prompt|--recode|--encoding|\
-        -!(-*)[LmerRE])
+        --locale | --systems | --extension | --prompt | --recode | --encoding | \
+            -!(-*)[LmerRE])
             return
             ;;
     esac
@@ -41,13 +41,13 @@ _man()
 
     if [[ $cur == -* ]]; then
         local opts=$(_parse_help "$1" -h)
-        COMPREPLY=( $(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     # file based completion if parameter looks like a path
-    if [[ "$cur" == @(*/|[.~])* ]]; then
+    if [[ $cur == @(*/|[.~])* ]]; then
         _filedir "$manext"
         return
     fi
@@ -57,7 +57,8 @@ _man()
 
     # determine manual section to search
     local sect
-    [[ "$prev" == $mansect ]] && sect=$prev || sect='*'
+    # shellcheck disable=SC2053
+    [[ $prev == $mansect ]] && sect=$prev || sect='*'
 
     _expand || return
 
@@ -68,29 +69,33 @@ _man()
         manpath="${manpath//://*man$sect/ } ${manpath//://*cat$sect/ }"
     fi
 
-    local IFS=$' \t\n' reset=$(shopt -p failglob); shopt -u failglob
+    local IFS=$' \t\n' reset=$(shopt -p failglob)
+    shopt -u failglob
     # redirect stderr for when path doesn't exist
-    COMPREPLY=( $(eval command ls "$manpath" 2>/dev/null) )
+    COMPREPLY=($(eval command ls "$manpath" 2>/dev/null))
     $reset
 
-    # weed out directory path names and paths to man pages
-    COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
-    # strip suffix from man pages
-    COMPREPLY=( ${COMPREPLY[@]%$comprsuffix} )
-    COMPREPLY=( $(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}") )
+    if ((${#COMPREPLY[@]} != 0)); then
+        # weed out directory path names and paths to man pages
+        COMPREPLY=(${COMPREPLY[@]##*/?(:)})
+        # strip suffix from man pages
+        COMPREPLY=(${COMPREPLY[@]%$comprsuffix})
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}"))
+    fi
 
-    if [[ "$prev" != $mansect ]]; then
+    # shellcheck disable=SC2053
+    if [[ $prev != $mansect ]]; then
         # File based completion for the rest, prepending ./ if needed
         # (man 1.6f needs that for man pages in current dir)
         local i start=${#COMPREPLY[@]}
         _filedir "$manext"
-        for (( i=$start; i < ${#COMPREPLY[@]}; i++ )); do
+        for ((i = start; i < ${#COMPREPLY[@]}; i++)); do
             [[ ${COMPREPLY[i]} == */* ]] || COMPREPLY[i]=./${COMPREPLY[i]}
         done
     fi
 
     __ltrim_colon_completions "$cur"
 } &&
-complete -F _man man apropos whatis
+    complete -F _man man apropos whatis
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wine b/msys2/usr/share/bash-completion/completions/wine
index dab45ae4c..429fede44 100644
--- a/msys2/usr/share/bash-completion/completions/wine
+++ b/msys2/usr/share/bash-completion/completions/wine
@@ -5,16 +5,16 @@ _wine()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
-            [[ $COMPREPLY ]] && return
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
+            [[ ${COMPREPLY-} ]] && return
         fi
         _filedir '@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR]|[mM][sS][iI])'
     else
         _filedir
     fi
 } &&
-complete -F _wine wine wine-development wine-stable
+    complete -F _wine wine wine-development wine-stable
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wine-development b/msys2/usr/share/bash-completion/completions/wine-development
index dab45ae4c..429fede44 100644
--- a/msys2/usr/share/bash-completion/completions/wine-development
+++ b/msys2/usr/share/bash-completion/completions/wine-development
@@ -5,16 +5,16 @@ _wine()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
-            [[ $COMPREPLY ]] && return
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
+            [[ ${COMPREPLY-} ]] && return
         fi
         _filedir '@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR]|[mM][sS][iI])'
     else
         _filedir
     fi
 } &&
-complete -F _wine wine wine-development wine-stable
+    complete -F _wine wine wine-development wine-stable
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wine-stable b/msys2/usr/share/bash-completion/completions/wine-stable
index dab45ae4c..429fede44 100644
--- a/msys2/usr/share/bash-completion/completions/wine-stable
+++ b/msys2/usr/share/bash-completion/completions/wine-stable
@@ -5,16 +5,16 @@ _wine()
     local cur prev words cword
     _init_completion || return
 
-    if [[ $cword -eq 1 ]]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --version' -- "$cur") )
-            [[ $COMPREPLY ]] && return
+    if ((cword == 1)); then
+        if [[ $cur == -* ]]; then
+            COMPREPLY=($(compgen -W '--help --version' -- "$cur"))
+            [[ ${COMPREPLY-} ]] && return
         fi
         _filedir '@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR]|[mM][sS][iI])'
     else
         _filedir
     fi
 } &&
-complete -F _wine wine wine-development wine-stable
+    complete -F _wine wine wine-development wine-stable
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/withlist b/msys2/usr/share/bash-completion/completions/withlist
index cd030a276..4142471ec 100644
--- a/msys2/usr/share/bash-completion/completions/withlist
+++ b/msys2/usr/share/bash-completion/completions/withlist
@@ -5,14 +5,14 @@ _withlist()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '--lock --interactive --run --all --quiet
-            --help' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '--lock --interactive --run --all --quiet
+            --help' -- "$cur"))
     else
         _xfunc list_lists _mailman_lists
     fi
 
 } &&
-complete -F _withlist withlist
+    complete -F _withlist withlist
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wodim b/msys2/usr/share/bash-completion/completions/wodim
index ac1dc5a9b..b308291d3 100644
--- a/msys2/usr/share/bash-completion/completions/wodim
+++ b/msys2/usr/share/bash-completion/completions/wodim
@@ -5,19 +5,19 @@ _cdrecord()
     local cur prev words cword
     _init_completion -n = || return
 
-    local i generic_options track_options track_mode
+    local generic_options track_options track_mode
 
     # foo=bar style option
-    if [[ "$cur" == *=* ]]; then
+    if [[ $cur == *=* ]]; then
         prev=${cur%%=*}
         cur=${cur#*=}
         case $prev in
-            textfile|cuefile|msifile)
+            textfile | cuefile | msifile)
                 _filedir
                 ;;
             blank)
-                COMPREPLY=( $(compgen -W 'help all fast track unreserve trtail
-                    unclose session' -- "$cur") )
+                COMPREPLY=($(compgen -W 'help all fast track unreserve trtail
+                    unclose session' -- "$cur"))
                 ;;
             driveropts)
                 if [[ $cur == *=* ]]; then
@@ -25,53 +25,55 @@ _cdrecord()
                     cur=${cur#*=}
                     case $prev in
                         varirec)
-                            COMPREPLY=( $(compgen -W "-2 -1 0 1 2" -- "$cur") )
+                            COMPREPLY=($(compgen -W "-2 -1 0 1 2" -- "$cur"))
                             ;;
                         gigarec)
-                            COMPREPLY=( $(compgen -W "0.6 0.7 0.8 1.0 1.2 1.3
-                                1.4" -- "$cur") )
+                            COMPREPLY=($(compgen -W "0.6 0.7 0.8 1.0 1.2 1.3
+                                1.4" -- "$cur"))
                             ;;
                         tattoofile)
                             _filedir
                             ;;
                     esac
                 else
-                    COMPREPLY=( $(compgen -W 'burnfree noburnfree varirec=
+                    COMPREPLY=($(compgen -W 'burnfree noburnfree varirec=
                         gigarec= audiomaster forcespeed noforcespeed speedread
                         nospeedread singlesession nosinglesession hidecdr
-                        nohidecdr tattooinfo tattoofile=' -- "$cur") )
-                    [[ $COMPREPLY == *= ]] && compopt -o nospace
+                        nohidecdr tattooinfo tattoofile=' -- "$cur"))
+                    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
                 fi
                 ;;
             driver)
-                COMPREPLY=( $(compgen -W "$($1 driver=help 2>&1 | \
-                    awk 'NR > 1 { print $1 }') help" -- "$cur") )
+                COMPREPLY=($(compgen -W "$($1 driver=help 2>&1 |
+                    awk 'NR > 1 { print $1 }') help" -- "$cur"))
                 ;;
             minbuf)
-                COMPREPLY=( $(compgen -W '{25..95}' -- "$cur") )
+                COMPREPLY=($(compgen -W '{25..95}' -- "$cur"))
                 ;;
         esac
         return
     fi
 
-    generic_options=( -version -v -V -d -silent -force -immed -dummy -clone \
-        -dao -sao -tao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip \
-        -fix -nofix -waiti -load -lock -eject -format -setdropts -checkdrive \
-        -prcap -inq -scanbus --devices -reset -abort -overburn -ignsize \
-        -useinfo -packet -noclose -text debug= kdebug= minbuf= msifile= \
-        speed= blank= fs= ts= dev= gracetime= timeout= driver= driveropts= \
-        defpregap= pktsize= mcn= textfile= cuefile= )
-    track_options=( -audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi \
-        -isosize -pad -nopad -shorttrack -noshorttrack -preemp -nopreemp \
-        -copy -nocopy -scms isrc= index= padsize= pregap= tsize= )
+    generic_options=(-version -v -V -d -silent -force -immed -dummy -clone
+        -dao -sao -tao -raw -raw96r -raw96p -raw16 -multi -msinfo -toc -atip
+        -fix -nofix -waiti -load -lock -eject -format -setdropts -checkdrive
+        -prcap -inq -scanbus --devices -reset -abort -overburn -ignsize
+        -useinfo -packet -noclose -text "debug=" "kdebug=" "minbuf="
+        "msifile=" "speed=" "blank=" "fs=" "ts=" "dev=" "gracetime="
+        "timeout=" "driver=" "driveropts=" "defpregap=" "pktsize=" "mcn="
+        "textfile=" "cuefile=")
+    track_options=(-audio -swab -data -mode2 -xa -xa1 -xa2 -xamix -cdi
+        -isosize -pad -nopad -shorttrack -noshorttrack -preemp -nopreemp
+        -copy -nocopy -scms "isrc=" "index=" "padsize=" "pregap=" "tsize=")
     # look if previous was either a file or a track option
     track_mode=0
-    if [[ $cword -gt 1 ]]; then
+    if ((cword > 1)); then
         if [[ -f $prev ]]; then
             track_mode=1
         else
-            for (( i=0; i < ${#track_options[@]}; i++ )); do
-                if [[ "${track_options[i]}" == "$prev" ]]; then
+            local opt
+            for opt in "${track_options[@]}"; do
+                if [[ $opt == "$prev" ]]; then
                     track_mode=1
                     break
                 fi
@@ -82,13 +84,13 @@ _cdrecord()
     # files are always eligible completion
     _filedir
     # track options are always available
-    COMPREPLY+=( $(compgen -W '${track_options[@]}' -- "$cur") )
+    COMPREPLY+=($(compgen -W '${track_options[@]}' -- "$cur"))
     # general options are no more available after file or track option
-    if [[ $track_mode -eq 0 ]]; then
-        COMPREPLY+=( $(compgen -W '${generic_options[@]}' -- "$cur") )
+    if ((track_mode == 0)); then
+        COMPREPLY+=($(compgen -W '${generic_options[@]}' -- "$cur"))
     fi
-    [[ $COMPREPLY == *= ]] && compopt -o nospace
+    [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
-complete -F _cdrecord cdrecord wodim
+    complete -F _cdrecord cdrecord wodim
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wol b/msys2/usr/share/bash-completion/completions/wol
index 0222b24d8..eada070b5 100644
--- a/msys2/usr/share/bash-completion/completions/wol
+++ b/msys2/usr/share/bash-completion/completions/wol
@@ -6,20 +6,22 @@ _wol()
     _init_completion -s -n : || return
 
     case $prev in
-        --version|--help|--port|--passwd|--wait|-!(-*)[Vpw])
+        --version | --help | --port | --passwd | --wait | -!(-*)[Vpw])
             return
             ;;
-        --host|--ipaddr|-!(-*)[hi])
+        --host | --ipaddr | -!(-*)[hi])
             # Broadcast addresses
             local PATH=$PATH:/sbin
-            COMPREPLY=( $({ ip addr show || ifconfig -a; } 2>/dev/null | \
+            COMPREPLY=($({
+                ip addr show || ifconfig -a
+            } 2>/dev/null |
                 command sed -ne 's/.*[[:space:]]Bcast:\([^[:space:]]*\).*/\1/p' -ne \
-                's/.*inet.*[[:space:]]brd[[:space:]]\([^[:space:]]*\).*/\1/p' -ne \
-                's/.*[[:space:]]broadcast[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p') )
+                    's/.*inet.*[[:space:]]brd[[:space:]]\([^[:space:]]*\).*/\1/p' -ne \
+                    's/.*[[:space:]]broadcast[[:space:]]\{1,\}\([^[:space:]]*\).*/\1/p'))
             _known_hosts_real -- "$cur"
             return
             ;;
-        --file|-!(-*)f)
+        --file | -!(-*)f)
             _filedir
             return
             ;;
@@ -27,14 +29,14 @@ _wol()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _mac_addresses
 } &&
-complete -F _wol wol
+    complete -F _wol wol
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wsimport b/msys2/usr/share/bash-completion/completions/wsimport
index 406a47d7d..d5bec9fe0 100644
--- a/msys2/usr/share/bash-completion/completions/wsimport
+++ b/msys2/usr/share/bash-completion/completions/wsimport
@@ -6,7 +6,7 @@ _wsimport()
     _init_completion -n : || return
 
     case $prev in
-        -help|-version|-B|-p|-wsdllocation)
+        -help | -version | -B | -p | -wsdllocation)
             return
             ;;
         -b)
@@ -17,12 +17,12 @@ _wsimport()
             _filedir '@(xml|soc|catalog)'
             return
             ;;
-        -d|–s)
+        -d | –s)
             _filedir -d
             return
             ;;
         -target)
-            COMPREPLY=( $(compgen -W '2.0 2.1 2.2' -- "$cur") )
+            COMPREPLY=($(compgen -W '2.0 2.1 2.2' -- "$cur"))
             return
             ;;
         -clientjar)
@@ -35,14 +35,14 @@ _wsimport()
         _known_hosts_real -- "${cur#-httpproxy:}"
         return
     elif [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $COMPREPLY == *: ]] && compopt -o nospace
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
         __ltrim_colon_completions "$cur"
         return
     fi
 
     _filedir wsdl
 } &&
-complete -F _wsimport wsimport
+    complete -F _wsimport wsimport
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wtf b/msys2/usr/share/bash-completion/completions/wtf
index 6a596a3be..27fc10a74 100644
--- a/msys2/usr/share/bash-completion/completions/wtf
+++ b/msys2/usr/share/bash-completion/completions/wtf
@@ -7,34 +7,36 @@ _wtf()
     _init_completion || return
 
     [[ $prev == -f ]] && _filedir && return
-    [[ "${words[*]}" == *\ -f* ]] && addf= || addf=-f
+    [[ ${words[*]} == *\ -f* ]] && addf= || addf=-f
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $addf )
+        COMPREPLY=($addf)
         return
     fi
 
     local db
 
     set -- "${words[@]}"
-    while [[ $# -gt 0 ]]; do
+    while (($# > 0)); do
         if [[ $1 == -f ]]; then
-            shift ; db=$1 ; break
+            shift
+            db=$1
+            break
         fi
         shift
     done
 
-    if [[ -z "$db" ]]; then
+    if [[ ! -v db ]]; then
         local f
-        for f in "$ACRONYMDB" /usr/share/misc/acronyms \
+        for f in "${ACRONYMDB-}" /usr/share/misc/acronyms \
             /usr/share/games/bsdgames/acronyms; do
-            [[ -f "$f" ]] && db="$f" && break
+            [[ -f $f ]] && db="$f" && break
         done
-        [[ -z "$db" ]] && return
+        [[ -v db ]] || return
     fi
 
-    COMPREPLY=( $(compgen -W "$(cut -f 1 -s $db* 2>/dev/null) $addf" \
-        -- "${cur^^}") )
+    COMPREPLY=($(compgen -W "$(cut -f 1 -s $db* 2>/dev/null) $addf" \
+        -- "${cur^^}"))
 } &&
-complete -F _wtf wtf
+    complete -F _wtf wtf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/wvdial b/msys2/usr/share/bash-completion/completions/wvdial
index e03166172..86674002e 100644
--- a/msys2/usr/share/bash-completion/completions/wvdial
+++ b/msys2/usr/share/bash-completion/completions/wvdial
@@ -18,29 +18,29 @@ _wvdial()
 
     case $cur in
         -*)
-            COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+            [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             ;;
         *)
             # start with global and personal config files
             config="/etc/wvdial.conf"$'\n'"$HOME/.wvdialrc"
             # replace with command line config file if present
-            for (( i=1; i < cword; i++ )); do
-                if [[ "${words[i]}" == "--config" ]]; then
-                    config=${words[i+1]}
+            for ((i = 1; i < cword; i++)); do
+                if [[ ${words[i]} == "--config" ]]; then
+                    config=${words[i + 1]}
                     break
                 fi
             done
             # parse config files for sections and
             # remove default section
-            COMPREPLY=( $(command sed -ne "s|^\[Dialer \($cur.*\)\]$|\1|p" $config \
+            COMPREPLY=($(command sed -ne "s|^\[Dialer \($cur.*\)\]$|\1|p" $config \
                 2>/dev/null | command grep -v '^Defaults$'))
             # escape spaces
-            COMPREPLY=${COMPREPLY// /\\ }
+            COMPREPLY=(${COMPREPLY[@]// /\\ })
             ;;
     esac
 
 } &&
-complete -F _wvdial wvdial
+    complete -F _wvdial wvdial
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xdg-mime b/msys2/usr/share/bash-completion/completions/xdg-mime
index 72e92c667..74c26c43a 100644
--- a/msys2/usr/share/bash-completion/completions/xdg-mime
+++ b/msys2/usr/share/bash-completion/completions/xdg-mime
@@ -2,9 +2,9 @@
 
 _xdg_mime_mimetype()
 {
-    COMPREPLY+=( $(compgen -S / -W 'application audio font image message model
-                                    multipart text video' -- "$cur") )
-    [[ $COMPREPLY == */ ]] && compopt -o nospace
+    COMPREPLY+=($(compgen -S / -W 'application audio font image message model
+                                    multipart text video' -- "$cur"))
+    [[ ${COMPREPLY-} == */ ]] && compopt -o nospace
 }
 
 _xdg_mime()
@@ -15,59 +15,60 @@ _xdg_mime()
     local args
     _count_args
 
-    if [[ $args -eq 1 ]]; then
+    if ((args == 1)); then
         if [[ $cur == -* ]]; then
-            COMPREPLY=( $(compgen -W '--help --manual --version' -- "$cur") )
+            COMPREPLY=($(compgen -W '--help --manual --version' -- "$cur"))
             return
         fi
-        COMPREPLY=( $(compgen -W \
-                               'query default install uninstall' -- "$cur") )
+        COMPREPLY=($(compgen -W \
+            'query default install uninstall' -- "$cur"))
         return
     fi
 
     case ${words[1]} in
         query)
-            if [[ $args -eq 2 ]]; then
-                COMPREPLY=( $(compgen -W 'filetype default' -- "$cur") )
+            if ((args == 2)); then
+                COMPREPLY=($(compgen -W 'filetype default' -- "$cur"))
                 return
             fi
-            case ${words[2]} in  # TODO and $args -eq 3 (takes only one arg!)
+            case ${words[2]} in # TODO and args == 3 (takes only one arg!)
                 filetype) _filedir ;;
                 default) _xdg_mime_mimetype ;;
             esac
             ;;
         default)
-            if [[ $args -eq 2 ]]; then
-                local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
-                local -a desktops=( /usr/share/applications/*.desktop )
-                desktops=( "${desktops[@]##*/}" )
+            if ((args == 2)); then
+                local IFS=$' \t\n' reset=$(shopt -p nullglob)
+                shopt -s nullglob
+                local -a desktops=(/usr/share/applications/*.desktop)
+                desktops=("${desktops[@]##*/}")
                 $reset
                 IFS=$'\n'
-                COMPREPLY=( $(compgen -W '${desktops[@]}' -- "$cur") )
+                COMPREPLY=($(compgen -W '${desktops[@]}' -- "$cur"))
             else
                 _xdg_mime_mimetype
             fi
             ;;
         install)
             if [[ $cur == -* ]]; then
-                COMPREPLY=( $(compgen -W '--mode --novendor' -- "$cur") )
+                COMPREPLY=($(compgen -W '--mode --novendor' -- "$cur"))
             elif [[ $prev == --mode ]]; then
-                COMPREPLY=( $(compgen -W 'user system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'user system' -- "$cur"))
             else
                 _filedir xml
             fi
             ;;
         uninstall)
             if [[ $cur == -* ]]; then
-                COMPREPLY=( $(compgen -W '--mode' -- "$cur") )
+                COMPREPLY=($(compgen -W '--mode' -- "$cur"))
             elif [[ $prev == --mode ]]; then
-                COMPREPLY=( $(compgen -W 'user system' -- "$cur") )
+                COMPREPLY=($(compgen -W 'user system' -- "$cur"))
             else
                 _filedir xml
             fi
             ;;
     esac
 } &&
-complete -F _xdg_mime xdg-mime
+    complete -F _xdg_mime xdg-mime
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xdg-settings b/msys2/usr/share/bash-completion/completions/xdg-settings
index c14d37baf..abd924648 100644
--- a/msys2/usr/share/bash-completion/completions/xdg-settings
+++ b/msys2/usr/share/bash-completion/completions/xdg-settings
@@ -6,26 +6,26 @@ _xdg_settings()
     _init_completion || return
 
     case $prev in
-        --help|--list|--manual|--version)
+        --help | --list | --manual | --version)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help |
-            tr "{|" "\n" | _parse_help -)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$("$1" --help |
+            tr "{|" "\n" | _parse_help -)' -- "$cur"))
         return
     fi
 
     local args
     _count_args
-    if [[ $args -eq 1 ]]; then
-        COMPREPLY=( $(compgen -W "get check set" -- "$cur") )
-    elif [[ $args -eq 2 ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$("$1" --list | awk "!/^Known/ { print \$1 }")' -- "$cur") )
+    if ((args == 1)); then
+        COMPREPLY=($(compgen -W "get check set" -- "$cur"))
+    elif ((args == 2)); then
+        COMPREPLY=($(compgen -W \
+            '$("$1" --list | awk "!/^Known/ { print \$1 }")' -- "$cur"))
     fi
 } &&
-complete -F _xdg_settings xdg-settings
+    complete -F _xdg_settings xdg-settings
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xfreerdp b/msys2/usr/share/bash-completion/completions/xfreerdp
index f025cfcef..f17414f22 100644
--- a/msys2/usr/share/bash-completion/completions/xfreerdp
+++ b/msys2/usr/share/bash-completion/completions/xfreerdp
@@ -5,63 +5,63 @@ _xfreerdp()
     local cur prev words cword
     _init_completion -n : || return
 
-    case $prev in  # old/dash syntax
+    case $prev in # old/dash syntax
         -k)
-            COMPREPLY=( $(compgen -W '$("$1" --kbd-list |
-                awk "/^0x/ { print \$1 }")' -- "$cur") )
+            COMPREPLY=($(compgen -W '$("$1" --kbd-list |
+                awk "/^0x/ { print \$1 }")' -- "$cur"))
             return
             ;;
         -a)
-            COMPREPLY=( $(compgen -W '8 15 16 24 32' -- "$cur") )
+            COMPREPLY=($(compgen -W '8 15 16 24 32' -- "$cur"))
             return
             ;;
         -x)
-            COMPREPLY=( $(compgen -W 'broadband modem lan' -- "$cur") )
+            COMPREPLY=($(compgen -W 'broadband modem lan' -- "$cur"))
             return
             ;;
         --plugin)
-            COMPREPLY=( $(compgen -W 'cliprdr rdpsnd rdpdr' -- "$cur") )
+            COMPREPLY=($(compgen -W 'cliprdr rdpsnd rdpdr' -- "$cur"))
             return
             ;;
     esac
 
-    case $cur in  # new/slash syntax
+    case $cur in # new/slash syntax
         /kbd:*)
-            COMPREPLY=( $(compgen -W '$("$1" /kbd-list |
-                awk "/^0x/ { print \$1 }")' -- "${cur#/kbd:}") )
+            COMPREPLY=($(compgen -W '$("$1" /kbd-list |
+                awk "/^0x/ { print \$1 }")' -- "${cur#/kbd:}"))
             return
             ;;
         /bpp:*)
-            COMPREPLY=( $(compgen -W '8 15 16 24 32' -- "${cur#/bpp:}") )
+            COMPREPLY=($(compgen -W '8 15 16 24 32' -- "${cur#/bpp:}"))
             return
             ;;
-        /*:*|/help|/version|-h|--help|--version)
+        /*:* | /help | /version | -h | --help | --version)
             return
             ;;
     esac
 
-    if [[ "$cur" == /* ]]; then
-        COMPREPLY=( $(compgen -W '$("$1" --help |
+    if [[ $cur == /* ]]; then
+        COMPREPLY=($(compgen -W '$("$1" --help |
             awk "\$1 ~ /^\\// && \$1 !~ /^.(flag\$|option:)/ { sub(\":.*\",\":\",\$1); print \$1 }")' \
-            -- "$cur") )
-        [[ $COMPREPLY == *: ]] && compopt -o nospace
-    elif [[ "$cur" == [+-]* ]]; then
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
+    elif [[ $cur == [+-]* ]]; then
         local char=${cur:0:1}
         local help="$($1 --help)"
-        if [[ "$help" == */help* ]]; then  # new/slash syntax
-            COMPREPLY=( $(compgen -W '$(awk "
+        if [[ $help == */help* ]]; then # new/slash syntax
+            COMPREPLY=($(compgen -W '$(awk "
                 \$1 ~ /^[+-]/ && \$1 !~ /^.toggle\$/ { sub(\"^.\",\"$char\",\$1); print \$1 }
-            " <<<"$help")' -- "$cur") )
-        else  # old/dash syntax
-            COMPREPLY=( $(_parse_help - <<<"$help") )
-            COMPREPLY=( $(compgen -W '${COMPREPLY[@]%:}' -- "$cur") )
+            " <<<"$help")' -- "$cur"))
+        else # old/dash syntax
+            COMPREPLY=($(_parse_help - <<<"$help"))
+            COMPREPLY=($(compgen -W '${COMPREPLY[@]%:}' -- "$cur"))
         fi
     else
-        COMPREPLY=( $(compgen -W "$(awk '{print $1}' ~/.freerdp/known_hosts \
-            2>/dev/null)" -- "$cur") )
+        COMPREPLY=($(compgen -W "$(awk '{print $1}' ~/.freerdp/known_hosts \
+            2>/dev/null)" -- "$cur"))
     fi
 
 } &&
-complete -F _xfreerdp xfreerdp
+    complete -F _xfreerdp xfreerdp
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xgamma b/msys2/usr/share/bash-completion/completions/xgamma
index 005928d22..8d77ba3b3 100644
--- a/msys2/usr/share/bash-completion/completions/xgamma
+++ b/msys2/usr/share/bash-completion/completions/xgamma
@@ -9,37 +9,37 @@ _xgamma()
         -screen)
             local screens=$(xrandr --query 2>/dev/null | command sed -n \
                 '/^Screen /s|^Screen \{1,\}\(.*\):.*$|\1|p' 2>/dev/null)
-            COMPREPLY=( $(compgen -W "$screens" -- "$cur") )
+            COMPREPLY=($(compgen -W "$screens" -- "$cur"))
             return
             ;;
-        -gamma|-rgamma|-ggamma|-bgamma)
+        -gamma | -rgamma | -ggamma | -bgamma)
             # expect f.f
-            if [[ $cur && "$cur" != *.* ]]; then
-                COMPREPLY=( . )
+            if [[ $cur && $cur != *.* ]]; then
+                COMPREPLY=(.)
             fi
-            COMPREPLY+=( $(compgen -W "{0..9}") )
+            COMPREPLY+=($(compgen -W "{0..9}"))
             compopt -o nospace
             return
             ;;
         -display)
             # expect hostname:displaynumber.screennumber
-            if [[ "$cur" == :* && "$cur" != :*.* ]]; then
+            if [[ $cur == :* && $cur != :*.* ]]; then
                 # FIXME: where to get local display numbers?
                 local display=${cur#:}
-                COMPREPLY=( $(compgen -W "${display:-0}.") )
+                COMPREPLY=($(compgen -W "${display:-0}."))
                 compopt -o nospace
-            elif [[ "$cur" == :*.* ]]; then
+            elif [[ $cur == :*.* ]]; then
                 # local screen numbers
                 local t screens=$(xrandr --query 2>/dev/null | command sed -ne \
                     '/^Screen /s|^Screen \{1,\}\(.*\):.*$|\1|p' 2>/dev/null)
                 t="${cur#:}"
-                COMPREPLY=( $(compgen -P "${t%.*}." -W "$screens" -- \
-                    "${cur##*.}") )
-            elif [[ "$cur" != *:* ]]; then
+                COMPREPLY=($(compgen -P "${t%.*}." -W "$screens" -- \
+                    "${cur##*.}"))
+            elif [[ $cur != *:* ]]; then
                 # complete hostnames
                 _known_hosts_real -c -- "$cur"
                 if [[ ! $cur ]]; then
-                    COMPREPLY+=( : )
+                    COMPREPLY+=(:)
                 fi
                 compopt -o nospace
             fi
@@ -48,12 +48,14 @@ _xgamma()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
-        [[ $COMPREPLY ]] && return
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
+        if [[ ${COMPREPLY-} ]]; then
+            [[ $COMPREPLY == *= ]] && compopt -o nospace
+            return
+        fi
     fi
 } &&
-complete -F _xgamma xgamma
+    complete -F _xgamma xgamma
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xhost b/msys2/usr/share/bash-completion/completions/xhost
index 53b3695b7..648ae4f12 100644
--- a/msys2/usr/share/bash-completion/completions/xhost
+++ b/msys2/usr/share/bash-completion/completions/xhost
@@ -1,6 +1,6 @@
 # xhost(1) completion                                      -*- shell-script -*-
 
-_xhost ()
+_xhost()
 {
     local cur prev words cword
     _init_completion || return
@@ -8,9 +8,9 @@ _xhost ()
     case $cur in
         +*) _known_hosts_real -p+ -- "${cur:1}" ;;
         -*) _known_hosts_real -p- -- "${cur:1}" ;;
-        *)  _known_hosts_real -- "$cur" ;;
+        *) _known_hosts_real -- "$cur" ;;
     esac
 } &&
-complete -F _xhost xhost
+    complete -F _xhost xhost
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xmllint b/msys2/usr/share/bash-completion/completions/xmllint
index f5865b398..a6ef38f42 100644
--- a/msys2/usr/share/bash-completion/completions/xmllint
+++ b/msys2/usr/share/bash-completion/completions/xmllint
@@ -6,11 +6,11 @@ _xmllint()
     _init_completion || return
 
     case $prev in
-        -o|--output)
+        -o | --output)
             _filedir
             return
             ;;
-        --path|--dtdvalidfpi|--maxmem|--pattern|--xpath)
+        --path | --dtdvalidfpi | --maxmem | --pattern | --xpath)
             # argument required but no completions available
             return
             ;;
@@ -35,19 +35,19 @@ _xmllint()
             return
             ;;
         --pretty)
-            COMPREPLY=( $(compgen -W '{0..2}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..2}' -- "$cur"))
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        COMPREPLY=( "${COMPREPLY[@]%:}" )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        COMPREPLY=("${COMPREPLY[@]%:}")
         return
     fi
 
     _filedir '@(*ml|htm|svg?(z)|xs[dl]|rng|wsdl|jnlp|tld|dbk|docbook|page)?(.gz)'
 } &&
-complete -F _xmllint xmllint
+    complete -F _xmllint xmllint
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xmlwf b/msys2/usr/share/bash-completion/completions/xmlwf
index 9cd0e195f..b397af941 100644
--- a/msys2/usr/share/bash-completion/completions/xmlwf
+++ b/msys2/usr/share/bash-completion/completions/xmlwf
@@ -11,8 +11,8 @@ _xmlwf()
             return
             ;;
         -*e)
-            COMPREPLY=( $(compgen -W 'US-ASCII UTF-8 UTF-16 ISO-8859-1' \
-                -- "$cur") )
+            COMPREPLY=($(compgen -W 'US-ASCII UTF-8 UTF-16 ISO-8859-1' \
+                -- "$cur"))
             return
             ;;
         -*v)
@@ -20,13 +20,13 @@ _xmlwf()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_usage "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
         return
     fi
 
     _filedir '@(*ml|htm|svg|xs[dl]|rng|wsdl|jnlp|tld|dbk|docbook|page)'
 } &&
-complete -F _xmlwf xmlwf
+    complete -F _xmlwf xmlwf
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xmms b/msys2/usr/share/bash-completion/completions/xmms
index 9f084c38d..af4aefe98 100644
--- a/msys2/usr/share/bash-completion/completions/xmms
+++ b/msys2/usr/share/bash-completion/completions/xmms
@@ -6,24 +6,24 @@ _xmms()
     _init_completion -s || return
 
     case $prev in
-        --help|--version|-!(-*)[hv])
+        --help | --version | -!(-*)[hv])
             return
             ;;
-        --toggle-shuffle|--toggle-repeat|--toggle-advance|-!(-*)[SRA])
-            COMPREPLY=( $(compgen -W 'on off' -- "$cur") )
+        --toggle-shuffle | --toggle-repeat | --toggle-advance | -!(-*)[SRA])
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     else
         _filedir '@(mp[23]|ogg|wav|pls|m3u|xm|mod|s[3t]m|it|mtm|ult|flac)'
     fi
 
 } &&
-complete -F _xmms xmms
+    complete -F _xmms xmms
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xmodmap b/msys2/usr/share/bash-completion/completions/xmodmap
index 38bc63916..7cfa230bd 100644
--- a/msys2/usr/share/bash-completion/completions/xmodmap
+++ b/msys2/usr/share/bash-completion/completions/xmodmap
@@ -6,18 +6,18 @@ _xmodmap()
     _init_completion || return
 
     case $prev in
-        -display|-e)
+        -display | -e)
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -help)' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -help)' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _xmodmap xmodmap
+    complete -F _xmodmap xmodmap
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xpovray b/msys2/usr/share/bash-completion/completions/xpovray
index c5af018aa..56dfd94d2 100644
--- a/msys2/usr/share/bash-completion/completions/xpovray
+++ b/msys2/usr/share/bash-completion/completions/xpovray
@@ -16,35 +16,41 @@ _povray()
             cur="${povcur#[-+]I}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir pov
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
         [-+]O*)
             # guess what output file type user may want
-            case $(IFS=$'\n'; command grep '^[-+]F' <<<"${words[*]}") in
+            case $(
+                IFS=$'\n'
+                command grep '^[-+]F' <<<"${words[*]}"
+            ) in
                 [-+]FN) oext=png ;;
                 [-+]FP) oext=ppm ;;
                 [-+]F[CT]) oext=tga ;;
                 *) oext=$defoext ;;
             esac
             # complete filename corresponding to previously specified +I
-            COMPREPLY=( $(IFS=$'\n'; command grep '^[-+]I' <<<"${words[*]}") )
-            COMPREPLY=( ${COMPREPLY[@]#[-+]I} )
-            COMPREPLY=( ${COMPREPLY[@]/%.pov/.$oext} )
+            COMPREPLY=($(
+                IFS=$'\n'
+                command grep '^[-+]I' <<<"${words[*]}"
+            ))
+            COMPREPLY=(${COMPREPLY[@]#[-+]I})
+            COMPREPLY=(${COMPREPLY[@]/%.pov/.$oext})
             cur="${povcur#[-+]O}" # to confuse _filedir
             pfx="${povcur%"$cur"}"
             _filedir $oext
-            COMPREPLY=( ${COMPREPLY[@]/#/$pfx} )
+            COMPREPLY=(${COMPREPLY[@]/#/$pfx})
             return
             ;;
-        *.ini\[|*.ini\[*[^]]) # sections in .ini files
+        *.ini\[ | *.ini\[*[^]]) # sections in .ini files
             cur="${povcur#*\[}"
             pfx="${povcur%\["$cur"}" # prefix == filename
             [[ -r $pfx ]] || return
-            COMPREPLY=( $(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
-                -e 't' -e 'd' -- "$pfx") )
+            COMPREPLY=($(command sed -e 's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/' \
+                -e 't' -e 'd' -- "$pfx"))
             # to prevent [bar] expand to nothing.  can be done more easily?
-            COMPREPLY=( "${COMPREPLY[@]/#/${pfx}[}" )
+            COMPREPLY=("${COMPREPLY[@]/#/${pfx}[}")
             return
             ;;
         *)
@@ -53,6 +59,6 @@ _povray()
             ;;
     esac
 } &&
-complete -F _povray povray xpovray spovray
+    complete -F _povray povray xpovray spovray
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xrandr b/msys2/usr/share/bash-completion/completions/xrandr
index 9b5b6a59f..16704e313 100644
--- a/msys2/usr/share/bash-completion/completions/xrandr
+++ b/msys2/usr/share/bash-completion/completions/xrandr
@@ -6,58 +6,58 @@ _xrandr()
     _init_completion || return
 
     case "$prev" in
-        -display|-d|-help|-s|--size|-r|--rate|--refresh|--screen|--fb|--fbmm|\
-        --dpi|--pos|--set|--scale|--transform|--crtc|--panning|--gamma|\
-        --newmode|--rmmode|--addmode|--delmode)
+        -display | -d | -help | -s | --size | -r | --rate | --refresh | --screen | --fb | --fbmm | \
+            --dpi | --pos | --set | --scale | --transform | --crtc | --panning | --gamma | \
+            --newmode | --rmmode | --addmode | --delmode)
             return
             ;;
-        --output|--left-of|--right-of|--above|--below|--same-as)
+        --output | --left-of | --right-of | --above | --below | --same-as)
             local outputs=$("$1" | awk '/connected/ {print $1}')
-            COMPREPLY=( $(compgen -W "$outputs" -- "$cur") )
+            COMPREPLY=($(compgen -W "$outputs" -- "$cur"))
             return
             ;;
         --mode)
             local i output
-            for (( i=1; i < cword; i++ )); do
-                if [[ "${words[i]}" == --output ]]; then
-                    output=${words[i+1]}
+            for ((i = 1; i < cword; i++)); do
+                if [[ ${words[i]} == --output ]]; then
+                    output=${words[i + 1]}
                     break
                 fi
             done
-            if [[ $output ]]; then
+            if [[ -v output ]]; then
                 local modes=$("$1" | command sed -e "1,/^$output / d" \
                     -e "/connected/,$ d" \
                     -e "s/\([^[:space:]]\)[[:space:]].*/\1/")
-                COMPREPLY=( $(compgen -W "$modes" -- "$cur") )
+                COMPREPLY=($(compgen -W "$modes" -- "$cur"))
             fi
             return
             ;;
-        -o|--orientation)
-            COMPREPLY=( $(compgen -W 'normal inverted left right 0 1 2 3' -- \
-                "$cur") )
+        -o | --orientation)
+            COMPREPLY=($(compgen -W 'normal inverted left right 0 1 2 3' -- \
+                "$cur"))
             return
             ;;
         --reflect)
-            COMPREPLY=( $(compgen -W 'normal x y xy' -- "$cur") )
+            COMPREPLY=($(compgen -W 'normal x y xy' -- "$cur"))
             return
             ;;
         --rotate)
-            COMPREPLY=( $(compgen -W 'normal inverted left right' -- "$cur") )
+            COMPREPLY=($(compgen -W 'normal inverted left right' -- "$cur"))
             return
             ;;
-        --setprovideroutputsource|--setprovideroffloadsink)
+        --setprovideroutputsource | --setprovideroffloadsink)
             local providers=$("$1" --listproviders 2>/dev/null |
                 command sed -ne 's/.* name:\([^ ]*\).*/\1/p')
-            COMPREPLY=( $(compgen -W "$providers" -- "$cur") )
+            COMPREPLY=($(compgen -W "$providers" -- "$cur"))
             # TODO 2nd arg needed, is that a provider as well?
             return
             ;;
     esac
 
-    COMPREPLY=( $(compgen -W '$("$1" -help 2>&1 |
+    COMPREPLY=($(compgen -W '$("$1" -help 2>&1 |
         command sed -e "s/ or / /g" -e "s/<[^>]*>]//g" | _parse_help -)' \
-        -- "$cur") )
+        -- "$cur"))
 } &&
-complete -F _xrandr xrandr
+    complete -F _xrandr xrandr
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xrdb b/msys2/usr/share/bash-completion/completions/xrdb
index d9f114395..f46f90b9e 100644
--- a/msys2/usr/share/bash-completion/completions/xrdb
+++ b/msys2/usr/share/bash-completion/completions/xrdb
@@ -6,22 +6,22 @@ _xrdb()
     _init_completion || return
 
     case $prev in
-        -backup|-display|-help)
+        -backup | -display | -help)
             return
             ;;
-        -cpp|-edit)
+        -cpp | -edit)
             _filedir
             return
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _xrdb xrdb
+    complete -F _xrdb xrdb
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xsltproc b/msys2/usr/share/bash-completion/completions/xsltproc
index dbe68c45f..4cb707195 100644
--- a/msys2/usr/share/bash-completion/completions/xsltproc
+++ b/msys2/usr/share/bash-completion/completions/xsltproc
@@ -6,7 +6,7 @@ _xsltproc()
     _init_completion || return
 
     case $prev in
-        --output|-o)
+        --output | -o)
             _filedir
             return
             ;;
@@ -16,11 +16,11 @@ _xsltproc()
             ;;
         --encoding)
             # some aliases removed
-            COMPREPLY=( $(compgen -X '@(UTF[1378]|8859|ISO[0-9_])*' \
-                -W "$(iconv -l | command sed -e 's/\/.*//')" -- "$cur") )
+            COMPREPLY=($(compgen -X '@(UTF[1378]|8859|ISO[0-9_])*' \
+                -W "$(iconv -l | command sed -e 's/\/.*//')" -- "$cur"))
             return
             ;;
-        --param|--stringparam)
+        --param | --stringparam)
             return
             ;;
         # not really like --writesubtree
@@ -34,16 +34,16 @@ _xsltproc()
             ;;
     esac
 
-    [[ $cword -gt 2 && `_get_cword '' 2` == --?(string)param ]] && return
+    [[ $cword -gt 2 && $(_get_cword '' 2) == --?(string)param ]] && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        COMPREPLY=( "${COMPREPLY[@]%:}" )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        COMPREPLY=("${COMPREPLY[@]%:}")
     else
         # TODO: 1st file xsl|xslt, 2nd XML
         _filedir '@(xsl|xslt|xml|dbk|docbook|page)'
     fi
 } &&
-complete -F _xsltproc xsltproc
+    complete -F _xsltproc xsltproc
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xvfb-run b/msys2/usr/share/bash-completion/completions/xvfb-run
index 162c66ed4..ed2788a9a 100644
--- a/msys2/usr/share/bash-completion/completions/xvfb-run
+++ b/msys2/usr/share/bash-completion/completions/xvfb-run
@@ -6,7 +6,7 @@ _xvfb_run()
     _init_completion -s || return
 
     local i
-    for (( i=1; i <= COMP_CWORD; i++ )); do
+    for ((i = 1; i <= COMP_CWORD; i++)); do
         if [[ ${COMP_WORDS[i]} != -* ]]; then
             _command_offset $i
             return
@@ -15,10 +15,10 @@ _xvfb_run()
     done
 
     case $prev in
-        --help|--server-num|--xauth-protocol|--server-args|-!(-*)[hnps])
+        --help | --server-num | --xauth-protocol | --server-args | -!(-*)[hnps])
             return
             ;;
-        --error-file|--auth-file|-!(-*)[ef])
+        --error-file | --auth-file | -!(-*)[ef])
             _filedir
             return
             ;;
@@ -26,11 +26,11 @@ _xvfb_run()
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&
-complete -F _xvfb_run xvfb-run
+    complete -F _xvfb_run xvfb-run
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xvnc4viewer b/msys2/usr/share/bash-completion/completions/xvnc4viewer
index 000ba1a8f..ba5522689 100644
--- a/msys2/usr/share/bash-completion/completions/xvnc4viewer
+++ b/msys2/usr/share/bash-completion/completions/xvnc4viewer
@@ -4,17 +4,17 @@ _vncviewer_bootstrap()
 {
     local fname
     case $(_realcommand vncviewer) in
-        *xvnc4viewer)      fname=_xvnc4viewer    ;;
-        *tightvncviewer)   fname=_tightvncviewer ;;
-        *)                 fname=_known_hosts    ;;
+        *xvnc4viewer) fname=_xvnc4viewer ;;
+        *tightvncviewer) fname=_tightvncviewer ;;
+        *) fname=_known_hosts ;;
     esac
 
     # Install real completion for subsequent completions
     complete -F $fname vncviewer
-    $fname  # Generate completions once for now
+    $fname # Generate completions once for now
     unset -f _vncviewer_bootstrap
 } &&
-complete -F _vncviewer_bootstrap vncviewer
+    complete -F _vncviewer_bootstrap vncviewer
 
 _tightvncviewer()
 {
@@ -27,8 +27,8 @@ _tightvncviewer()
             return
             ;;
         -encodings)
-            COMPREPLY=( $(compgen -W 'copyrect tight hextile zlib corre rre
-                raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'copyrect tight hextile zlib corre rre
+                raw' -- "$cur"))
             return
             ;;
         -via)
@@ -37,18 +37,16 @@ _tightvncviewer()
             ;;
     esac
 
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-help -listen -via -shared -noshared
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-help -listen -via -shared -noshared
             -viewonly -fullscreen -noraiseonbeep -passwd -encodings -bgr233
             -owncmap -truecolour -truecolor -depth -compresslevel -quality
-            -nojpeg -nocursorshape -x11cursor' -- "$cur") )
+            -nojpeg -nocursorshape -x11cursor' -- "$cur"))
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _tightvncviewer tightvncviewer
-
+    complete -F _tightvncviewer tightvncviewer
 
 # NOTE: - VNC Viewer options are case insensitive.
 #         Preferred case is taken from -help.
@@ -61,12 +59,12 @@ _xvnc4viewer()
     local opt=${prev/#--/-}
     case ${opt,,} in
         # -passwd, -PasswordFile
-        -passwd|-passwordfile)
+        -passwd | -passwordfile)
             _filedir
             return
             ;;
         -preferredencoding)
-            COMPREPLY=( $(compgen -W 'zrle hextile raw' -- "$cur") )
+            COMPREPLY=($(compgen -W 'zrle hextile raw' -- "$cur"))
             return
             ;;
         -via)
@@ -75,26 +73,27 @@ _xvnc4viewer()
             ;;
     esac
 
-    if [[ "$cur" == -* || "$cur" == --* ]]; then
+    if [[ $cur == -* || $cur == --* ]]; then
         # Default to vncviewer camelcase options, see `vncviewer -help'
-        local dash options=( AcceptClipboard AutoSelect DebugDelay display
+        local dash options=(AcceptClipboard AutoSelect DebugDelay display
             DotWhenNoCursor FullColor FullColour FullScreen geometry help
             listen Log LowColourLevel MenuKey name Parent passwd PasswordFile
             PointerEventInterval PreferredEncoding SendClipboard SendPrimary
             Shared UseLocalCursor via ViewOnly WMDecorationHeight
-            WMDecorationWidth ZlibLevel )
-        [[ "$cur" == --* ]] && dash=-- || dash=-
+            WMDecorationWidth ZlibLevel)
+        [[ $cur == --* ]] && dash=-- || dash=-
 
-        local IFS=$' \t\n' reset=$(shopt -p nocasematch); shopt -s nocasematch
+        local IFS=$' \t\n' reset=$(shopt -p nocasematch)
+        shopt -s nocasematch
         local option
-        COMPREPLY=( $(for option in "${options[@]}"; do
-                [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
-            done) )
+        COMPREPLY=($(for option in "${options[@]}"; do
+            [[ $dash$option == "$cur"* ]] && printf '%s\n' $dash$option
+        done))
         $reset
     else
         _known_hosts_real -- "$cur"
     fi
 } &&
-complete -F _xvnc4viewer xvnc4viewer
+    complete -F _xvnc4viewer xvnc4viewer
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xxd b/msys2/usr/share/bash-completion/completions/xxd
index f6bcb4a28..a470bb0de 100644
--- a/msys2/usr/share/bash-completion/completions/xxd
+++ b/msys2/usr/share/bash-completion/completions/xxd
@@ -6,18 +6,18 @@ _xxd()
     _init_completion || return
 
     case $prev in
-        -h|-help|-c|-cols|-g|-groupsize|-l|-len|-s|-seek|-v|-version)
+        -h | -help | -c | -cols | -g | -groupsize | -l | -len | -s | -seek | -v | -version)
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" -h)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" -h)' -- "$cur"))
         return
     fi
 
     _filedir
 } &&
-complete -F _xxd xxd
+    complete -F _xxd xxd
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xz b/msys2/usr/share/bash-completion/completions/xz
index b64921f15..73958c50d 100644
--- a/msys2/usr/share/bash-completion/completions/xz
+++ b/msys2/usr/share/bash-completion/completions/xz
@@ -8,40 +8,40 @@ _xz()
     local xspec="*.@(xz|lzma|txz|tlz)"
 
     case $prev in
-        --decompress|--list|--test|-!(-*)[dlt]*)
+        --decompress | --list | --test | -!(-*)[dlt]*)
             xspec="!"$xspec
             ;;
-        --files|--files0)
+        --files | --files0)
             _filedir
             return
             ;;
-        --check|-!(-*)C)
-            COMPREPLY=( $(compgen -W 'crc32 crc64 sha256 none' -- "$cur") )
+        --check | -!(-*)C)
+            COMPREPLY=($(compgen -W 'crc32 crc64 sha256 none' -- "$cur"))
             return
             ;;
-        --format|-!(-*)F)
-            COMPREPLY=( $(compgen -W 'auto xz lzma raw' -- "$cur") )
+        --format | -!(-*)F)
+            COMPREPLY=($(compgen -W 'auto xz lzma raw' -- "$cur"))
             return
             ;;
-        --threads|-!(-*)T)
-            COMPREPLY=( $(compgen -W "{0..$(_ncpus)}" -- "$cur") )
+        --threads | -!(-*)T)
+            COMPREPLY=($(compgen -W "{0..$(_ncpus)}" -- "$cur"))
             return
             ;;
-        --memlimit|--memlimit-compress|--memlimit-decompress|--memory|\
-        --suffix|--delta|--lzma1|--lzma2|-!(-*)[MS])
+        --memlimit | --memlimit-compress | --memlimit-decompress | --memory | \
+            --suffix | --delta | --lzma1 | --lzma2 | -!(-*)[MS])
             return
             ;;
-        --help|--long-help|--version|--info-memory|-!(-*)[hHV])
+        --help | --long-help | --version | --info-memory | -!(-*)[hHV])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1" --long-help) {-1..-9}' \
-            -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" --long-help) {-1..-9}' \
+            -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
@@ -49,8 +49,8 @@ _xz()
 
     local IFS=$'\n'
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _xz xz pxz
+    complete -F _xz xz pxz
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/xzdec b/msys2/usr/share/bash-completion/completions/xzdec
index 6b402eb33..993bd2b21 100644
--- a/msys2/usr/share/bash-completion/completions/xzdec
+++ b/msys2/usr/share/bash-completion/completions/xzdec
@@ -6,24 +6,24 @@ _xzdec()
     _init_completion -s || return
 
     case $prev in
-        --memory|-!(-*)M)
+        --memory | -!(-*)M)
             return
             ;;
-        --help|--version|-!(-*)[hV])
+        --help | --version | -!(-*)[hV])
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '$(_parse_help "$1")' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
     _filedir xz # no lzma support here as of xz 4.999.9beta
 } &&
-complete -F _xzdec xzdec
+    complete -F _xzdec xzdec
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ypcat b/msys2/usr/share/bash-completion/completions/ypcat
index 655390f24..13249f063 100644
--- a/msys2/usr/share/bash-completion/completions/ypcat
+++ b/msys2/usr/share/bash-completion/completions/ypcat
@@ -12,15 +12,15 @@ _ypmatch()
 
     if [[ $cmd == ypmatch && $cword -eq 1 && ${#words[@]} -eq 3 ]]; then
         map=${words[2]}
-        COMPREPLY=( $(compgen -W '$(ypcat $map 2>/dev/null | \
-            cut -d':' -f 1)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(ypcat $map 2>/dev/null | \
+            cut -d':' -f 1)' -- "$cur"))
     else
         [[ $cmd == ypmatch && $cword -ne 2 ]] && return
-        COMPREPLY=( $(compgen -W \
+        COMPREPLY=($(compgen -W \
             '$(printf "%s\n" $(ypcat -x 2>/dev/null | \
-               cut -d"\"" -f 2))' -- "$cur") )
+               cut -d"\"" -f 2))' -- "$cur"))
     fi
 } &&
-complete -F _ypmatch ypmatch ypcat
+    complete -F _ypmatch ypmatch ypcat
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/ypmatch b/msys2/usr/share/bash-completion/completions/ypmatch
index 655390f24..13249f063 100644
--- a/msys2/usr/share/bash-completion/completions/ypmatch
+++ b/msys2/usr/share/bash-completion/completions/ypmatch
@@ -12,15 +12,15 @@ _ypmatch()
 
     if [[ $cmd == ypmatch && $cword -eq 1 && ${#words[@]} -eq 3 ]]; then
         map=${words[2]}
-        COMPREPLY=( $(compgen -W '$(ypcat $map 2>/dev/null | \
-            cut -d':' -f 1)' -- "$cur") )
+        COMPREPLY=($(compgen -W '$(ypcat $map 2>/dev/null | \
+            cut -d':' -f 1)' -- "$cur"))
     else
         [[ $cmd == ypmatch && $cword -ne 2 ]] && return
-        COMPREPLY=( $(compgen -W \
+        COMPREPLY=($(compgen -W \
             '$(printf "%s\n" $(ypcat -x 2>/dev/null | \
-               cut -d"\"" -f 2))' -- "$cur") )
+               cut -d"\"" -f 2))' -- "$cur"))
     fi
 } &&
-complete -F _ypmatch ypmatch ypcat
+    complete -F _ypmatch ypmatch ypcat
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/yum-arch b/msys2/usr/share/bash-completion/completions/yum-arch
index f2b902a3f..883c77e14 100644
--- a/msys2/usr/share/bash-completion/completions/yum-arch
+++ b/msys2/usr/share/bash-completion/completions/yum-arch
@@ -5,12 +5,12 @@ _yum_arch()
     local cur prev words cword
     _init_completion || return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W '-d -v -vv -n -c -z -s -l -q' -- "$cur") )
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W '-d -v -vv -n -c -z -s -l -q' -- "$cur"))
     else
         _filedir -d
     fi
 } &&
-complete -F _yum_arch yum-arch
+    complete -F _yum_arch yum-arch
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/zopfli b/msys2/usr/share/bash-completion/completions/zopfli
index 3c7ea4034..8c02885e5 100644
--- a/msys2/usr/share/bash-completion/completions/zopfli
+++ b/msys2/usr/share/bash-completion/completions/zopfli
@@ -11,10 +11,10 @@ _zopfli()
             ;;
     esac
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W \
-            '$(_parse_help "$1" -h | command sed -e "s/#$//")' -- "$cur") )
-        [[ $COMPREPLY == --i ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(compgen -W \
+            '$(_parse_help "$1" -h | command sed -e "s/#$//")' -- "$cur"))
+        [[ ${COMPREPLY-} == --i ]] && compopt -o nospace
         return
     fi
 
@@ -22,8 +22,8 @@ _zopfli()
 
     local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
     compopt -o filenames
-    COMPREPLY=( $(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur") )
+    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
 } &&
-complete -F _zopfli zopfli
+    complete -F _zopfli zopfli
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/completions/zopflipng b/msys2/usr/share/bash-completion/completions/zopflipng
index 3d815404c..4526cd92c 100644
--- a/msys2/usr/share/bash-completion/completions/zopflipng
+++ b/msys2/usr/share/bash-completion/completions/zopflipng
@@ -6,34 +6,34 @@ _zopflipng()
     _init_completion -s || return
 
     case $prev in
-        -h|--help)
+        -h | --help)
             return
             ;;
         --splitting)
-            COMPREPLY=( $(compgen -W '{0..3}' -- "$cur") )
+            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
             return
             ;;
     esac
 
     $split && return
 
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(_parse_help "$1" -h) )
-        COMPREPLY=( $(compgen -W '${COMPREPLY[@]%:}' -- "$cur") )
-        [[ $COMPREPLY == *= ]] && compopt -o nospace
+    if [[ $cur == -* ]]; then
+        COMPREPLY=($(_parse_help "$1" -h))
+        COMPREPLY=($(compgen -W '${COMPREPLY[@]%:}' -- "$cur"))
+        [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    if [[ "${words[*]}" != *\ --prefix=* ]]; then
+    if [[ ${words[*]} != *\ --prefix=* ]]; then
         # 2 png args only if --prefix not given
         local args
         _count_args
-        [[ $args -lt 3 ]] && _filedir png
+        ((args < 3)) && _filedir png
     else
         # otherwise arbitrary number of png args
         _filedir png
     fi
 } &&
-complete -F _zopflipng zopflipng
+    complete -F _zopflipng zopflipng
 
 # ex: filetype=sh
diff --git a/msys2/usr/share/bash-completion/helpers/python b/msys2/usr/share/bash-completion/helpers/python
index 9e2682523..a74387f30 100644
--- a/msys2/usr/share/bash-completion/helpers/python
+++ b/msys2/usr/share/bash-completion/helpers/python
@@ -11,4 +11,4 @@ else:
     walker = pkgutil.iter_modules
 
 for mod in walker():
-    print (mod[1])  # noqa: E211
+    print(mod[1])  # noqa: E211
diff --git a/msys2/usr/share/cmake/bash-completion/bash-completion-config-version.cmake b/msys2/usr/share/cmake/bash-completion/bash-completion-config-version.cmake
index 593d53aee..1258e6462 100644
--- a/msys2/usr/share/cmake/bash-completion/bash-completion-config-version.cmake
+++ b/msys2/usr/share/cmake/bash-completion/bash-completion-config-version.cmake
@@ -1,4 +1,4 @@
-set (PACKAGE_VERSION "2.10")
+set (PACKAGE_VERSION "2.11")
 if (NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
   set (PACKAGE_VERSION_COMPATIBLE 1)
   if (${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
diff --git a/msys2/usr/share/cmake/bash-completion/bash-completion-config.cmake b/msys2/usr/share/cmake/bash-completion/bash-completion-config.cmake
index b2bb1d9f8..9e2f209ab 100644
--- a/msys2/usr/share/cmake/bash-completion/bash-completion-config.cmake
+++ b/msys2/usr/share/cmake/bash-completion/bash-completion-config.cmake
@@ -1,7 +1,7 @@
 # config file for bash-completion
 # https://github.com/scop/bash-completion
 
-set (BASH_COMPLETION_VERSION "2.10")
+set (BASH_COMPLETION_VERSION "2.11")
 
 set (BASH_COMPLETION_PREFIX "/usr")
 
diff --git a/msys2/usr/share/doc/bash/CHANGES b/msys2/usr/share/doc/bash/CHANGES
index 43cb1341a..7a47c7c57 100644
--- a/msys2/usr/share/doc/bash/CHANGES
+++ b/msys2/usr/share/doc/bash/CHANGES
@@ -1,3 +1,1454 @@
+This document details the changes between this version, bash-5.1-rc3, and
+the previous version, bash-5.1-rc2.
+
+1. Changes to Bash
+
+a. The `assoc_expand_once' option now affects the evaluation of the -v primary
+   to test and the [[ compound command.
+
+2. Changes to Readline
+
+a. Fixed a bug that could cause point to be set beyond the end of the line
+   buffer when aborting an incremental search.
+
+3. New Features in Bash
+
+4. New Features in Readline
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.1-rc2, and
+the previous version, bash-5.1-rc1.
+
+1. Changes to Bash
+
+a. Process substitutions started from an interactive shell no longer have their
+   standard input implicitly redirected from /dev/null.
+
+b. Fixed an issue with setting the SIGINT trap handler in an interactive shell
+   when temporarily running $PROMPT_COMMAND non-interactively.
+
+2. Changes to Readline
+
+a. Terminals that are named "dumb" or unknown do not enable bracketed paste
+   by default.
+
+b. Ensure that disabling bracketed paste turns off highlighting the incremental
+   search string when the search is successful.
+
+3. New Features in Bash
+
+4. New Features in Readline
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.1-rc1, and
+the previous version, bash-5.1-beta.
+
+1. Changes to Bash
+
+a. Fixed an inconsistency in the way HISTCMD is calculated when it's expanded
+   during a multi-line command.
+
+b. Modified the change to here-document expansion containing backslash-quoted
+   double quotes.
+
+c. Fixed a case where the shells's exit status could be greater than 255.
+
+d. Modified changed to process substitution so the executed command has its
+   stdin redirected from /dev/null if it was previously interactive and
+   reading commands from the terminal.
+
+2. New Features in Bash
+
+a. There is a new contributed loadable builtin: asort.
+
+3. Changes to Readline
+
+a. Fixed a bug that could cause an application with an application-specific
+   redisplay function to crash if the line data structures had not been
+   initialized.
+
+4. New Features in Readline
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.1-beta, and
+the previous version, bash-5.1-alpha.
+
+1. Changes to Bash
+
+a. Fixed a bug that caused name references to variables to not update the
+   referenced variable's assignment side effects.
+
+b. Tightened up the parameter transformation error checking for invalid
+   transformation operators.
+
+c. System-specific changes for: FreeBSD
+
+d. A few minor changes to move potential uses of stdio functions out of signal
+   handling paths.
+
+e. Make sure SIGCHLD is blocked in all cases where waitchld() is not called
+   from a signal handler.
+
+f. Changed `command' builtin processing so it no longer starts an extra process
+   when run asynchronously (command x &).
+
+g. Avoid performing tilde expansion after `:' in words that look like assignment
+   statements when in posix mode.
+
+h. Slight changes to how the `complete' builtin prints out options and actions
+   for completion specifications.
+
+i. Several changes to how `local -' restores the values of options and
+   $SHELLOPTS.
+
+j. Don't treat a word in a compound assignment as an assignment statement
+   unless it has a valid subscript before the `='.
+
+k. Fixed a bug with the DEBUG trap and process substitution that caused the
+   terminal's process group to be set incorrectly.
+
+l. Fixed a bug that left readline's signal handlers installed while running a
+   shell command from a bindable readline command.
+
+m. Fixed the `fc' builtin to clamp out of range history specifications at the
+   boundaries of the history list for POSIX conformance.
+
+n. Fixed a bug that caused ${foo@a} to treat foo as an unset variable if it
+   was an array without a value for subscript 0/"0" but had other set
+   elements.
+
+o. Fixed a bug that caused the history code to attempt to parse command
+   substitutions looking for shell comments before adding them to the history,
+   even while parsing here-documents.
+
+p. Fixed a bug that could cause a syntax error in a command read by `eval' to
+   exit an interactive shell.
+
+2. New Features in Bash
+
+a. If the hash builtin is listing hashed filenames portably, don't print
+   anything if the table is empty.
+
+b. GLOBIGNORE now ignores `.' and `..' as a terminal pathname component.
+
+c. Bash attempts to optimize away forks in the last command in a function body
+   under appropriate circumstances.
+
+d. The globbing code now uses fnmatch(3) to check collation elements (if
+   available) even in cases without multibyte characters.
+
+e. The `fg' and `bg' builtins now return an error in a command substitution
+   when asked to restart a job inherited from the parent shell.
+
+f. The shell now attempts to unlink all FIFOs on exit, whether a consuming
+   process has finished with them or not.
+
+3. Changes to Readline
+
+a. Make sure that all undo groups are closed when leaving vi insertion mode.
+
+b. Make sure that the vi-mode `C' and `c' commands enter insert mode even if
+   the motion command doesn't have any effect.
+
+c. Fixed several potential memory leaks in the callback mode context handling.
+
+d. If readline is handling a SIGTTOU, make sure SIGTTOU is blocked while
+   executing the terminal cleanup code, since it's no longer run in a signal
+   handling context.
+
+4. New Features in Readline
+
+a. The signal cleanup code now blocks SIGINT while processing after a SIGINT.
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.1-alpha, and
+the previous version, bash-5.0-release.
+
+1. Changes to Bash
+
+a. Fixed a bug that caused a posix-mode shell to not exit if the return builtin
+   was executed outside a function or dot script.
+
+b. Fixed a bug where `declare +f' could potentially turn off the function
+   attribute.
+
+c. Restored bash-4.4 pathname expansion behavior when a word to be expanded had
+   only backslashes, not any of the other globbing characters. This came after
+   an extensive POSIX group discussion (interp #1234).
+
+d. There are more changes to avoid performing word expansions multiple times on
+   arithmetic expressions.
+
+e. Fixed a bug with alias expansion when the alias ends with a TAB.
+
+f. Fixed a bug that caused programmable completion to return an error if the
+   shell function name supplied as an argument to `complete -F' was invalid.
+
+g. There are several fixes to buffer overflows found as the result of fuzzing
+   with random input.
+
+h. Fixed a bug that caused the edit-and-execute-command editing command to
+   start with the previous history line if invoked on an empty line.
+
+i. Fixed a bug that potentially caused `bind --help' to change readline's
+   output stream.
+
+j. Turning off posix mode now restores the vi-insertion mode binding for TAB
+   that was in effect when posix mode was enabled.
+
+k. Restore the previous state of job control being enabled if `exec' fails in
+   an interactive shell.
+
+l. Fixed a bug that caused the terminal's process group to be set incorrectly
+   if job control was turned off before starting an interactive shell.
+
+m. Fixed a bug that caused a crash when HISTSIZE=0.
+
+n. Fixed a word expansion bug that caused null strings on the rhs of expansions
+   to be discarded incorrectly.
+
+o. History list management does a better job of handling the situation where
+   the number of history entries from the current shell session is greater than
+   the number of entries in the history list.
+
+p. Fixed a bug that caused the `fc' builtin to attempt to dereference a newly-
+   freed history entry.
+
+q. Fixed a bug that made the `Q' variable transformation not work well with
+   `set -u'.
+
+r. There are several word expansion fixes for expanding $* and $@ in contexts
+   where word splitting is not going to be performed, since each positional
+   parameter must expand to a separate word.
+
+s. Fixed a bug that could cause ^D to exit bash immediately even if there were
+   stopped jobs.
+
+t. Fixed a bug with double-quoting and backslash-quoting strings containing
+   multibyte characters for reuse.
+
+u. Fixed a bug that caused the line number to be reported incorrectly if the
+   shell executed a (command) subshell.
+
+v. Fixed a bug that caused the shell to fail to reap process substitutions
+   when they went out of scope, which had unpredictable results.
+
+w. Fixed a bug that caused null strings in arguments to [[ conditional command
+   operators to compare incorrectly.
+
+x. Changed the behavior of `wait' without arguments to only wait for background
+   processes the current shell instance started, not background children it may
+   have inherited.
+
+y. Fixed a bug that could cause command substitution to leave file descriptors
+   open if the shell received many SIGINTs.
+
+z. Bash now behaves better if the `**' filename expansion operator encounters a
+   symbolic link to a directory, avoiding more cases where it might return
+   duplicate pathnames.
+
+aa. Programmable completion now canonicalizes directory names in the same way
+    as bash word completion, so `..' is handled consistently.
+
+bb. Fixed a bug when using RETURN as the delimiter to the read builtin; it
+    caused readline to set the binding for RETURN incorrectly.
+
+cc. Fixed a bug that caused `history -d' to delay printing an out-of-range
+    error message.
+
+dd. Fixed a bug with `bash -c command' where `command' ends with an expanded
+    alias.
+
+ee. Fixed a bug that could result in `history -n' adding spurious line feeds to
+    commands in the history list.
+
+ff. The $RANDOM random number generator now XORs the top and bottom halves of
+    the internal 32-bit value to introduce more randomness. Setting the shell
+    compatibility level to 50 or lower undoes this.
+
+gg. Fixed several problems caused by running the DEBUG trap on simple commands
+    executed as part of a pipeline.
+
+ii. Fixed a bug that didn't allow `bind -r' to remove the binding for \C-@.
+
+jj. Several fixes to the bash-backward-shellword bindable readline command to
+    behave better when at the last character on the line.
+
+kk. If `set -x' is enabled, bash doesn't print a command twice if it's run by
+    the `command' builtin.
+
+ll. Fixed a bug with printing function definitions containing here documents.
+
+mm. Fixed a bug that could cause the `bind' builtin to set $? to -1.
+
+nn. Fixed a bug that didn't reset the timezone information correctly when the
+    TZ variable was unset.
+
+oo. Fixed several issues with assigning an associative array variable using a
+    compound assignment that expands the value of the same variable.
+
+pp. Fixed several places where the shell set $? without setting PIPESTATUS.
+
+qq. Fixed a problem with glob bracket expressions containing invalid character
+    classes, collating symbols, or equivalence classes -- they should not
+    require a closing right bracket.
+
+rr. Fixed a bug where running a builtin in a subshell did not run the EXIT trap.
+
+ss. Fixed several problems with posix-mode variable assignments preceding
+    shell function calls and posix special builtins, so that they create and
+    modify variables at the current scope.
+
+tt. Fix history initialization so `bash +o history' works as expected.
+
+uu. Fixed a bug in the bindable edit-and-execute-command command that could
+    interfere with the shell's parsing state.
+
+vv. Fixed an issue with nested traps running command substitutions in command
+    lines with command substitutions.
+
+ww. Fixed a bug with globbing pathnames that contain invalid multibyte
+    characters (sequences that don't correspond to a character in the current
+    locale).
+
+xx. Fixed a bug that caused the shell not to exit if a function definition
+    failed while errexit was enabled.
+
+yy. Process substitution processes now get their input from /dev/null, since
+    they are asynchronous, not interactive, and not jobs.
+
+zz. Setting nocaseglob no longer turns on case-insensitive regexp matching.
+
+aaa. Fixed a bug that resulted in extra blank lines being added to some history
+     entries containing here-documents.
+
+bbb. Fixed a bug that resulted in incorrect matching of some patterns in word
+     expansion if they expanded to the empty string.
+
+ccc. Fixed here-string expansion so it behaves the same as expansion of the
+     rhs of an assignment statement.
+
+ddd. Changed here-document parsing to no longer allow the end of the here
+     document to delimit a command substitution.
+
+eee. Several fixes to history expansion: multiple :p modifiers work, a ^ word
+     designator works as part of a range, and a `-' is treated as part of a
+     search string if it immediately follows a `!'.
+
+fff. Fixed a bug in pattern substitution with null matches in a string
+     containing multibyte characters.
+
+ggg. Unbinding a key sequence bound with `bind -x' now removes the key sequence
+     from the additional keymap `bind -x' uses.
+
+hhh. Fixed a bug with command start detection for completion so that it doesn't
+     mistake brace expansion for the start of a command.
+
+iii. Fixed a bug that caused local variables with the same name as variables
+     appearing in a function's temporary environment to not be marked as local.
+
+jjj. Fixed a bug that could cause SIGCHLD to be blocked when executing return
+     or exec in the rightmost pipeline element with lastpipe enabled.
+
+kkk. Fixed a bug that could result in commands without the execute bit set
+     being added to the command hash table.
+
+lll. Fixed a bug that allowed non-digits to follow the `#' in a `base#number'
+     integer constant.
+
+mmm. Fixed a bug that made `time -- command' attempt to execute `--'.
+
+nnn. Fixed a couple of bugs with variable transformation using arrays
+     subscripted with `*' or `@'.
+
+ooo. A failure to create a variable using `declare' in a function no longer
+     causes the function to return immediately.
+
+ppp. Fixed a bug that could cause the := word expansion to add a non-null
+     value if attempting to assign a null string when double-quoted.
+
+qqq. Fixed a bug that could cause backslashes quoting double quotes in here
+     document bodies to not be removed when expanding the body.
+
+rrr. Fixed a bug that caused commands following a subshell while the shell is
+     reading input from stdin but not interactive, while job control is
+     enabled, to be executed twice.
+
+sss. Fixed a bug where receiving SIGTERM from a different process while
+     readline was active could cause the shell to terminate.
+
+ttt. In posix mode, running a trap after the read builtin now sees the exit
+     status of the read builtin (e.g., 130 after a SIGINT) in $?.
+
+uuu. Fixed a bug with nameref variables referencing array subscripts used in
+     arithmetic expressions.
+
+vvv. Fixed a bug that caused the pipeline process group id to be reset in the
+     middle of a command list run by a shell started to run a command
+     substitution.
+
+www. Restricted shells can no longer read and write history files with pathnames
+     containing slashes.
+
+xxx. Fixed a couple of problems with 0 and -0 used as arguments to `fc' when
+     not listing commands from the history.
+
+yyy. When `test' is supplied four or more arguments, treat an argument that
+     looks like an operator (e.g., -e), but is in a place where only a string
+     is valid, as a string, as it would be when using the POSIX rules, instead
+     of an operator with a missing argument.
+
+zzz. There is no `compat50' shopt option. Changes to the shell compatibility
+     level should use the BASH_COMPAT variable.
+
+aaaa. Redirection failures with compound commands are now treated as errors
+      that cause the shell to exit if `errexit' is enabled.
+
+bbbb. Redirection failure error messages no longer expand the word in the
+      redirection again.
+
+cccc. History expansion is no longer performed while parsing a here-document
+      inside a command substitution.
+
+2. Changes to Readline
+
+a. There are a number of fixes that were found as the result of fuzzing with
+   random input.
+
+b. Changed the revert-all-at-newline behavior to make sure to start at the end
+   of the history list when doing it, instead of the line where the user hit
+   return.
+
+c. When parsing `set' commands from the inputrc file or an application, readline
+   now allows trailing whitespace.
+
+d. Fixed a bug that left a file descriptor open to the history file if the
+   file size was 0.
+
+e. Fixed a problem with binding key sequences containing meta characters.
+
+f. Fixed a bug that caused the wrong line to be displayed if the user tried to
+   move back beyond the beginning of the history list, or forward past the end
+   of the history list.
+
+g. If readline catches SIGTSTP, it now sets a hook that allows the calling
+   application to handle it if it desires.
+
+h. Fixed a redisplay problem with a prompt string containing embedded newlines.
+
+i. Fixed a problem with completing filenames containing invalid multibyte
+   sequences when case-insensitive comparisons are enabled.
+
+j. Fixed a redisplay problem with prompt strings containing invisible multibyte
+   characters.
+
+k. Fixed a problem with multibyte characters mapped to editing commands that
+   modify the search string in incremental search.
+
+l. Fixed a bug with maintaining the key sequence while resolving a bound
+   command in the presence of ambiguous sequences (sequences with a common
+   prefix), in most cases while attempting to unbind it.
+
+m. Fixed several buffer overflows found as the result of fuzzing.
+
+n. Reworked backslash handling when translating key sequences for key binding
+   to be more uniform and consistent, which introduces a slight backwards
+   incompatibility.
+
+o. Fixed a bug with saving the history that resulted in errors not being
+   propagated to the calling application when the history file is not writable.
+
+p. Readline only calls chown(2) on a newly-written history file if it really
+   needs to, instead of having it be a no-op.
+
+q. Readline now behaves better when operate-and-get-next is used when the
+   history list is `full': when there are already $HISTSIZE entries.
+
+r. Fixed a bug that could cause vi redo (`.') of a replace command not to work
+   correctly in the C or POSIX locale.
+
+s. Fixed a bug with vi-mode digit arguments that caused the last command to be
+   set incorrectly. This prevents yank-last-arg from working as intended, for
+   example.
+
+3. New Features in Bash
+
+a. `bind -x' now supports different bindings for different editing modes and
+   keymaps.
+
+b. Bash attempts to optimize the number of times it forks when executing
+   commands in subshells and from `bash -c'.
+
+c. Here documents and here strings now use pipes for the expanded document if
+   it's smaller than the pipe buffer size, reverting to temporary files if it's
+   larger.
+
+d. There are new loadable builtins: mktemp, accept, mkfifo, csv, cut/lcut
+
+e. In posix mode, `trap -p' now displays signals whose disposition is SIG_DFL
+   and those that were SIG_IGN when the shell starts.
+
+f. The shell now expands the history number (e.g., in PS1) even if it is not
+   currently saving commands to the history list.
+
+g. `read -e' may now be used with arbitrary file descriptors (`read -u N').
+
+h. The `select' builtin now runs traps if its internal call to the read builtin
+   is interrupted by a signal.
+
+i. SRANDOM: a new variable that expands to a 32-bit random number that is not
+   produced by an LCRNG, and uses getrandom/getentropy, falling back to
+   /dev/urandom or arc4random if available. There is a fallback generator if
+   none of these are available.
+
+j. shell-transpose-words: a new bindable readline command that uses the same
+   definition of word as shell-forward-word, etc.
+
+k. The shell now adds default bindings for shell-forward-word,
+   shell-backward-word, shell-transpose-words, and shell-kill-word.
+
+l. Bash now allows ARGV0 appearing in the initial shell environment to set $0.
+
+m. If `unset' is executed without option arguments, bash tries to unset a shell
+   function if a name argument cannot be a shell variable name because it's not
+   an identifier.
+
+n. The `test -N' operator uses nanosecond timestamp granularity if it's
+   available.
+
+o. Bash posix mode now treats assignment statements preceding shell function
+   definitions the same as in its default mode, since POSIX has changed and
+   no longer requires those assignments to persist after the function returns
+   (POSIX interp 654).
+
+p. BASH_REMATCH is no longer readonly.
+
+q. wait: has a new -p VARNAME option, which stores the PID returned by `wait -n'
+   or `wait' without arguments.
+
+r. Sorting the results of pathname expansion now uses byte-by-byte comparisons
+   if two strings collate equally to impose a total order; the result of a
+   POSIX interpretation (#963 and #1070).
+
+s. Bash now allows SIGINT trap handlers to execute recursively.
+
+t. Bash now saves and restores state around setting and unsetting posix mode,
+   instead of having unsetting posix mode set a known state.
+
+u. Process substitution is now available in posix mode.
+
+v. READLINE_MARK: a new variable available while executing commands bound with
+   `bind -x', contains the value of the mark.
+
+w. Bash removes SIGCHLD from the set of blocked signals if it's blocked at shell
+   startup.
+
+x. `test -v N' can now test whether or not positional parameter N is set.
+
+y. `local' now honors the `-p' option to display all local variables at the
+    current context.
+
+z. The `@a' variable transformation now prints attributes for unset array
+   variables.
+
+aa. The `@A' variable transformation now prints a declare command that sets a
+    variable's attributes if the variable has attributes but is unset.
+
+bb. `declare' and `local' now have a -I option that inherits attributes and
+    value from a variable with the same name at a previous scope.
+
+cc. When run from a -c command, `jobs' now reports the status of completed jobs.
+
+dd. New `U', `u', and `L' parameter transformations to convert to uppercase,
+    convert first character to uppercase, and convert to lowercase,
+    respectively.
+
+ee. PROMPT_COMMAND: can now be an  array variable, each element of which can
+    contain a command to be executed like a string PROMPT_COMMAND variable.
+
+ff. `ulimit' has a -R option to report and set the RLIMIT_RTTIME resource.
+
+gg. Associative arrays may be assigned using a list of key-value pairs within
+    a compound assignment. Compound assignments where the words are not of
+    the form [key]=value are assumed to be key-value assignments. A missing or
+    empty key is an error; a missing value is treated as NULL. Assignments may
+    not mix the two forms.
+
+hh. New `K' parameter transformation to display associative arrays as key-
+    value pairs.
+
+ii. Writing history to syslog now handles messages longer than the syslog max
+    length by writing multiple messages with a sequence number.
+
+jj. SECONDS and RANDOM may now be assigned using arithmetic expressions, since
+    they are nominally integer variables. LINENO is not an integer variable.
+
+kk. Bash temporarily suppresses the verbose option when running the DEBUG trap
+    while running a command from the `fc' builtin.
+
+ll. `wait -n' now accepts a list of job specifications as arguments and will
+    wait for the first one in the list to change state.
+
+mm. The associative array implementation can now dynamically increase the
+    size of the hash table based on insertion patterns.
+
+nn. HISTFILE is now readonly in a restricted shell.
+
+oo. The bash malloc now returns memory that is 16-byte aligned on 64-bit
+    systems.
+
+4. New Features in Readline
+
+a. If a second consecutive completion attempt produces matches where the first
+   did not, treat it as a new completion attempt and insert a match as
+   appropriate.
+
+b. Bracketed paste mode works in more places: incremental search strings, vi
+   overstrike mode, character search, and reading numeric arguments.
+
+c. Readline automatically switches to horizontal scrolling if the terminal has
+   only one line.
+
+d. Unbinding all key sequences bound to a particular readline function now
+   descends into keymaps for multi-key sequences.
+
+e. rl-clear-display: new bindable command that clears the screen and, if
+   possible, the scrollback buffer (bound to emacs mode M-C-l by default).
+
+f. New active mark and face feature: when enabled, it will highlight the text
+   inserted by a bracketed paste (the `active region') and the text found by
+   incremental and non-incremental history searches. This is tied to bracketed
+   paste and can be disabled by turning off bracketed paste.
+
+g. Readline sets the mark in several additional commands.
+
+h. Bracketed paste mode is enabled by default.
+
+i. Readline tries to take advantage of the more regular structure of UTF-8
+   characters to identify the beginning and end of characters when moving
+   through the line buffer.
+
+j. The bindable operate-and-get-next command (and its default bindings) are
+   now part of readline instead of a bash-specific addition.
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.0-release, and
+the previous version, bash-5.0-rc1.
+
+1. Changes to Bash
+
+a. Tilde expansion isn't performed on indexed array subscripts, even for
+   backwards compatibility.
+
+b. The shell doesn't exit in posix mode if the eval builtin gets a parse
+   error when run by the command builtin.
+
+c. Fixed a bug that caused a shell comment in an alias to not find the end
+   of the alias properly.
+
+d. Reverted a change from April, 2018 that caused strings containing
+   backslashes to be flagged as glob patterns.
+
+2. Changes to Readline
+
+3. New Features in Bash
+
+4. New Features in Readline
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.0-rc1, and
+the previous version, bash-5.0-beta2.
+
+1. Changes to Bash
+
+a. Fix to initial word completion detection code.
+
+b. Fixed a bug that caused issues with assignment statements containing ^A in
+   the value assigned when IFS contains ^A.
+
+c. Added a fallback to fnmatch() when strcoll can't correctly deal with
+   bracket expression character equivalence classes.
+
+d. Fixed a bug that caused $BASH_COMMAND to contain the trap handler command
+   when running a trap handler containing [[ or (( commands.
+
+e. Fixed a bug that caused nameref assignments in the temporary environment
+   to potentially create variables with invalid names.
+
+f. Fixed a bug that caused `local -' to turn off alias expansion in scripts.
+
+g. Fixed a parser issue with a command string containing EOF after an invalid
+   command as an argument to a special builtin not causing a posix-mode shell
+   to exit.
+
+h. Made a slight change to the FNV-1 string hash algorithm used for associative
+   arrays (corrected the initial seed).
+
+2. Changes to Readline
+
+3. New Features in Bash
+
+a. The `select' command now supports command forms without a word list
+   following `in'.
+
+4. New Features in Readline
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.0-beta2, and
+the previous version, bash-5.0-beta.
+
+1. Changes to Bash
+
+a. Fixed a bug that could cause a seg fault while parsing a subshell command
+   inside a command substitution.
+
+b. Fixed several small memory leaks uncovered by coverity.
+
+c. Fixed a problem with command substitution inside an interactive shell that
+   could cause the parent to receive a SIGHUP.
+
+d. Fixed a problem with using `*' and `@' as subscripts when assigning values
+   to an associative array with assoc_expand_once enabled.
+
+e. Fixed a bug that could cause a huge memory allocation when completing a
+   word beginning with an invalid tilde expansion.
+
+f. Cleaned up some incompatibilities with bash-4.4 when expanding indexed array
+   subscripts used in arithmetic expansions when assoc_expand_once is enabled.
+
+g. The ${parameter@a} expansion will display attributes even if `parameter' is
+   unset.
+
+h. Fixed a bug that caused the output of `set' to cut off some variables before
+   printing the value.
+
+i. Treat a failure to assign a variable when using the ${x:=value} expansion
+   as an expansion error, so non-interactive posix-mode shells exit
+
+j. Fixed a problem when expanding $* in a context where word splitting is not
+   performed when IFS is NULL.
+
+k. Temp files used to store here documents are forced readable, no matter what
+   the user's umask says.
+
+l. Fixed a problem where an interrupted brace expansion could cause the shell
+   to attempt to free an invalid memory location.
+
+m. Make sure to check for any terminating signals after running a trap
+   handler; don't wait until the next time we process traps.
+
+n. Fixed a bug that caused "return" to act like a special builtin with respect
+   to variable assignments even when preceded by "command".
+
+o. POSIX-mode shells now return failure if the cd builtin fails due to the
+   absolute directory name being longer than PATH_MAX, instead of trying
+   again with a relative pathname.
+
+p. Fixed a problem with FUNCNAME occasionally being visible when not executing
+   a shell function.
+
+q. Fixed a problem with the expansions performed on the WORD in the case
+   command.
+
+r. Fixed a slight POSIX compatibility when removing "IFS whitespace" during
+   word splitting and the read builtin.
+
+s. Fixed a problem with expanding an array with subscript `*' when all the
+   elements expand to the empty string, and making sure the expansion honors
+   the `:' specifier.
+
+2. Changes to Readline
+
+a. Fixed a bug with adding multibyte characters to an incremental search string.
+
+b. Fixed a bug with redoing text insertions in vi mode.
+
+c. Fixed a bug with pasting text into an incremental search string if bracketed
+   paste mode is enabled. ESC cannot be one of the incremental search
+   terminator characters for this to work.
+
+d. Fixed a bug with anchored search patterns when performing searches in vi
+   mode.
+
+3. New Features in Bash
+
+a. Associative and indexed arrays now allow subscripts consisting solely of
+   whitespace.
+
+b. `checkwinsize' is now enabled by default.
+
+c. The `localvar_unset' shopt option is now visible and documented.
+
+d. The `progcomp_alias' shopt option is now visible and documented.
+
+e. The signal name processing code now understands `SIGRTMIN+n' all the way
+   up to SIGRTMAX.
+
+f. There is a new `seq' loadable builtin.
+
+g. Trap execution now honors the (internal) max invocations of `eval', since
+   traps are supposed to be executed as if using `eval'.
+
+h. The $_ variable doesn't change when the shell executes a command that forks.
+
+i. The `kill' builtin now supports -sSIGNAME and -nSIGNUM, even though
+   conforming applications aren't supposed to use them.
+
+j. POSIX mode now enables the `shift_verbose' option.
+
+4. New Features in Readline
+
+a. Readline now allows application-defined keymap names; there is a new public
+   function, rl_set_keymap_name(), to do that.
+
+b. The "Insert" keypad key, if available, now puts readline into overwrite
+   mode.
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.0-beta, and
+the previous version, bash-5.0-alpha.
+
+1.  Changes to Bash
+
+a. Fixed a bug that allowed subshells to "inherit" enclosing loops -- this
+   is where POSIX says the subshell is not "enclosed" by the loop.
+
+b. Added more UTF-8-specific versions of multibyte functions, and optimized
+   existing functions if the current locale uses UTF-8 encoding.
+
+c. In POSIX mode, assignments preceding regular builtins should not persist
+   when the builtin completes.
+
+d. Added additional checks to special array assignment (e.g., BASH_ALIASES)
+   so it can't be used to bypass validity checks performed in other places.
+
+e. The `!!' history expansion now refers to the previous history entry as
+   expected, even if used on the second or subsequent line of a multi-line
+   history entry.
+
+f. Fixed a bug that could cause the shell to dereference a NULL pointer if
+   the environment (`environ') is set to NULL.
+
+g. Bash uses slightly better integer overflow handling for brace sequence
+   expansion on systems where ints are 32 bits and intmax_t is 64 bits.
+
+h. Fixed a bug setting attributes for a variable named as an argument to
+   `declare' that also appears as a nameref in the temporary environment.
+
+i. Fixed several bugs that could cause assignments to namerefs to create
+   variables with invalid names.
+
+j. Fixed a bug that could result in the SIGINT handler being set incorrectly
+   in asynchronous subshells.
+
+k. Fixed a bug that could cause `bash -t' to not execute the specified command.
+
+l. Fixed several bugs that caused the shell to operate on the wrong variable
+   when using namerefs with the same name as a global variable in shell
+   functions.
+
+m. Internal changes to how the shell handles variables with invalid names in
+   the initial environment and to prevent variables with invalid names from
+   being added to the environment instead of passing them on to children.
+
+n. Changes to make sure that an expansion that results in a quoted null string
+   is reflected in the expansion, even if the word expands to nothing.
+
+o. Changes to make sure that $* and ${array[*]} (and $@/${array[@]}) expand
+   the same way after the recent changes for POSIX interpretation 888.
+
+p. Saving and restoring the positional parameters at function entry and exit
+   is considerably more efficient; noticeably so when there are large numbers
+   of positional parameters.
+
+q. Fixed a bug that caused `lastpipe' and `pipefail' to return an incorrect
+   status for the pipeline if there was more than one external command in a
+   loop body appearing in the last pipeline element.
+
+r. Fixed a bug that caused value conversion errors with the printf builtin's
+   %u and %f conversion specifications and invalid constants.
+
+2.  Changes to Readline
+
+a. Added more UTF-8-specific versions of multibyte functions, and optimized
+   existing functions if the current locale uses UTF-8 encoding.
+
+b. Fixed a problem with bracketed-paste inserting more than one character and
+   interacting with other readline functions.
+
+c. Fixed a bug that caused the history library to attempt to append a history
+   line to a non-existent history entry.
+
+d. If using bracketed paste mode, output a newline after the \r that is the
+   last character of the mode disable string to avoid overwriting output.
+
+e. Fixes to the vi-mode `b', `B', `w', `W', `e', and `E' commands to better
+   handle multibyte characters.
+
+f. Fixed a redisplay problem that caused an extra newline to be generated on
+   accept-line when the line length is exactly the screenwidth.
+
+3.  New Features in Bash
+
+a. Bash no longer allows variable assignments preceding a special builtin that
+   changes variable attributes to propagate back to the calling environment
+   unless the compatibility level is 44 or lower.
+
+b. You can set the default value for $HISTSIZE at build time in config-top.h.
+
+c. The `complete' builtin now accepts a -I option that applies the completion
+   to the initial word on the line.
+
+d. The internal bash malloc now uses mmap (if available) to satisfy requests
+   greater than 128K bytes, so free can use mfree to return the pages to the
+   kernel.
+
+e. The shell doesn't automatically set BASH_ARGC and BASH_ARGV at startup
+   unless it's in debugging mode, as the documentation has always said, but
+   will dynamically create them if a script references them at the top level
+   without having enabled debugging mode.
+
+f. The localvar_inherit option will not attempt to inherit a value from a
+   variable of an incompatible type (indexed vs. associative arrays, for
+   example).
+
+g. The `globasciiranges' option is now enabled by default; it can be set to
+   off by default at configuration time.
+
+4.  New Features in Readline
+
+a. The history expansion library now understands command and process
+   substitution and extended globbing and allows them to appear anywhere in a
+   word.
+
+b. The history library has a new variable that allows applications to set the
+   initial quoting state, so quoting state can be inherited from a previous
+   line.
+
+------------------------------------------------------------------------------
+This document details the changes between this version, bash-5.0-alpha, and
+the previous version, bash-4.4-release.
+
+1.  Changes to Bash
+
+a. Fixed a bug that could cause traps in background jobs to give the terminal
+   to the wrong process group.
+
+b. Fixed a bug that caused `kill -l 0' to print an out-of-range error.
+
+c. Fixed a problem that could result in here-documents being displayed in
+   the wrong order.
+
+d. Fixed a number of out-of-bounds and free memory read errors found via
+   fuzzing.
+
+e. Fixed a subshell inheritance problem that could cause a subshell to wait for
+   the wrong process.
+
+f. Fixed a bug that caused SHLVL to be incremented one too many times when
+   creating subshells.
+
+g. A job dying due to SIGINT can now interrupt sourcing a file in a shell with
+   job control enabled.
+
+h. Fixed a spurious warning about unterminated ${ or $( constructs during
+   word completion.
+
+i. The shell no longer runs traps if a signal arrives while reading command
+   substitution output.
+
+j. Fixed an arithmetic expansion error that could allow ++var++ as valid
+   syntax.
+
+k. Fixed an error that allowed out-of-bounds references to the directory stack.
+
+l. The shell does a better job of saving multi-line history entries with
+   embedded comments.
+
+m. Fixed a bug that could cause quoted bracket expressions in regular expression
+   arguments to `[[' to not match correctly.
+
+n. Fixed a bug that could cause an IFS character in a word to result in an
+   extra '\001' character in the expansion.
+
+o. A trailing backslash in a glob pattern can match a trailing backslash in the
+   string.
+
+p. Fixed a memory leak in the process creation code path when job control is
+   enabled.
+
+q. Fixed a bug that caused `printf' to output broken surrogate pairs for
+   Japanese locales.
+
+r. Fixed a bug that caused a SIGINT generated from `kill' in a dot script to
+   kill an interactive shell.
+
+s. Fixed a bug that could cause the `read' builtin to not fully read a
+   multibyte character.
+
+t. Fixed a bug that could cause identifiers to be evaluated in conditional
+   arithmetic expressions even when evaluation is suppressed.
+
+u. Fixed a bug that could result in command substitution, when executed in a
+   context where word splitting is not performed, to leave a stray '\001'
+   character in the string.
+
+v. Fixed a bug that could cause history expansion to be disabled in a non-
+   interactive shell even if `-o histexpand' is supplied at startup.
+
+w. Fixed a bug that caused `read -N' to strip leading whitespace IFS characters.
+
+x. Fixed a bug that caused spurious tilde expansion in arithmetic expressions.
+
+y. If indirect expansion attempts to indirectly reference through an unset
+   variable, report an error.
+
+z. Added a guard to prevent the shell from looping while receiving an endless
+   stream of SIGTTIN at shell startup.
+
+aa. Fixed a bug with parsing here documents inside a command substitution when
+    looking for the closing delimiter.
+
+bb. Fixed a bug that caused printf to not quote all <blank> characters in the
+    current locale when using the `%q' format specifier.
+
+cc. Fixed a bug with bash's internal buffered I/O system that caused the input
+    pointer to not be reset when read(2) returned an EOF.
+
+dd. Bash now installs its SIGWINCH signal handler with SA_RESTART, so it will
+    not interrupt open/read/write system calls.
+
+ee. The ERR trap now reports line numbers more reliably.
+
+ff. The shell no longer tries to manipulate the terminal process group if a
+    command or process substitution is killed by SIGTERM when job control is
+    enabled.
+
+gg. Fixed a bug that caused extglob patterns to match filenames beginning with
+    a period.
+
+hh. File descriptors open for writing to here documents are no longer available
+    to subshells.
+
+ii. Make sure word completion doesn't perform command or process substitution.
+
+jj. Fixed a bug with parsing $$'...' inside a command substitution.
+
+kk. Fixed a bug that caused bash to remove backslash-newline pairs from the
+    body of a here-document with a quoted delimiter inside a command
+    substitution.
+
+ll. Fixed a bug that could cause the shell to hang when adding a pid to the
+    table of background process exit statuses.
+
+mm. Fixed a bug that could cause 0x01 characters to be doubled in the output
+    of process substitution.
+
+nn. Restricted shells now clear the hash table before making the PATH variable
+    read-only.
+
+oo. There are a number of changes to the expansion of $* and $@ in contexts
+    where word splitting does not occur (quoted and unquoted), with IFS set
+    to NULL or a non-standard value, mostly to deal with the consequences of
+    the behavior defined in Posix interpretation 888.
+
+pp. There are a number of changes to nameref variable handling to avoid
+    creating variables with invalid names.
+
+qq. A non-interactive posix mode shell no longer exits when an assignment
+    statement fails if the assignment is utimately being performed by the
+    `command' builtin.
+
+rr. When using character class names for globbing, don't allow case
+    insensitivity, even if nocaseglob is enabled.
+
+ss. Fixed a bug that allowed some redirections to stay in place if a later
+    redirection failed.
+
+tt. Fixed a bug in how command and process substitutions are recognized within
+    other parameter expansions.
+
+uu. Fixed a bug that caused bash to loop under certain circumstances when
+    performing arithmetic expansion on a variable whose value is an invalid
+    expression.
+
+vv. Fixed a bug that could cause bash to expand aliases inappropriately while
+    parsing compound commands like `case'.
+
+ww. Fixed a bug that could cause `read -N' to fail to read complete multibyte
+    characters, even when the sequences are incomplete or invalid, with or
+    without readline.
+
+xx. Fixed a bug that could cause `case' to fail to match patterns containing
+    0x01 characters.
+
+yy. Fixed a bug that caused exported functions to contain stray 0x01 characters.
+
+zz. Fixed some inconsistencies with how the history number is handled in the
+    various prompt strings.
+
+aaa. Fixed a bug that could cause a core dump if READLINE_LINE was unset
+     inside a shell function bound to a key sequence with `bind -x'.
+
+bbb. Fixed a bug that could cause bash to not read a token terminator correctly
+     if a command substitution was used inside an arithmetic `for' command.
+
+ccc. Fixed problems that could occur with a fatal arithmetic expansion error
+     in a context (like prompt expansion) where you can't jump back to the
+     top level.
+
+ddd. Expression errors in arithmetic `for' commands are treated more like
+     shell syntax errors.
+
+eee. Fixed a parser synchronization error resulting from a syntax error
+     followed immediately by an EOF.
+
+fff. When executing a shell function, the first line in the function ($LINENO)
+     is line 1 instead of line 0, as Posix requires.
+
+ggg. In Posix mode, bash will canonicalize the value of PWD it inherits from
+     the environment and use that to set its idea of the current directory.
+
+hhh. If LINENO is exported, bash needs to regenerate its value each time it
+     constructs the environment.
+
+iii. Fixed a bug with restoring the SIGINT handler when using `wait -n'.
+
+jjj. Make sure the `coproc' command returns an appropriate status if the NAME
+     argument is invalid.
+
+kkk. Fixed a problem with arithmetic expressions containing array references
+     that contain arithmetic expressions with syntax errors.
+
+lll. The `select' command and help builtin will use $COLUMNS before the window
+     size returned from the kernel as the terminal width.
+
+mmm. `read -n 0' and `read -N 0' now try a zero-length read in an attempt to
+     detect file descriptor errors.
+
+nnn. The `read' builtin now does a better job of acting on signals that don't
+     interrupt read(2).
+
+ooo. Fixed some cases where `printf -v' did not return failure status on a
+     variable assignment error.
+
+ppp. Fixed temporary environment propagation back to the current environment
+     so that it doesn't happen for special builtins run by the `command'
+     builtin.
+
+qqq. Fixed a bug when searching for the end of a here-document delimiter in a
+     command substitution.
+
+rrr. Fixed a bug that could cause `cd ${DIRSTACK[0]}' to fail.
+
+sss. Fixed a bug that could cause reserved words to not be recognized in a
+     for statement without the `in' inside a command substitution.
+
+ttt. Fixed a bug that could cause a double-free in a timed command with an
+     expansion error.
+
+uuu. Fixed a bug that could cause a core dump if a script switches from a UTF-8
+     locale to a different locale after displaying a lone surrogate character.
+
+vvv. Fixed cases where bash prematurely removed FIFOs attached to process
+     substitutions.
+
+www. Fixed a problem with calculating the size of the table that stores exit
+     statuses from background processes when the child process resource limit
+     is very large.
+
+xxx. Fixed a memory leak with functions using `return' when using FIFOs for
+     standard input.
+
+yyy. `wait' without arguments attempts to wait for all active process
+     substitution processes.
+
+zzz. Fixed a bug where an indirect parameter was subjected to word splitting
+     when trying to find the indirected variable name.
+
+aaaa. Fixed a bug that could allow restricted shell users to add commands to
+      the hash table.
+
+bbbb. When using the `!(patlist)' extended globbing operator, a filename
+      beginning with a `.' that doesn't match any of the patterns is not
+      returned as a match if leading dots must be matched explicitly.
+
+cccc. Fixed a bug that could cause line number and source file information for
+      a function definition to be incorrect if there are multiple definitions.
+
+dddd. Fixed a bug that could cause builtins like `readonly' to behave
+      differently when applied to arrays and scalar variables within functions.
+
+eeee. Fixed a bug that could cause alias expansion to add an extra space to
+      a quoted string that begins outside the alias expansion.
+
+ffff. Fixed a bug that could result in unwanted alias expansion after timing
+      the null command.
+
+gggg. Fixed a bug that could cause a core dump if a timestamp in a history
+      file overflowed a time_t.
+
+hhhh. Restricted shells can no longer redirect from /dev/tcp or /dev/udp, since
+      the kernel calls make those file descriptors read-write.
+
+iiii. Fixed a problem with splitting double-quoted words for programmable
+      completion when the double quote immediately follows another word
+      delimiter.
+
+jjjj. Fixed a bug resulting in a use-after-free if two file descriptors share
+      the same input buffer.
+
+kkkk. The error message resulting from ${x:?} and ${x?} now differs depending
+      on whether the variable is null or unset.
+
+llll. In Posix mode, the shell exits if a variable assignment fails and precedes
+      an empty simple command (after expansion).
+
+mmmm. Fixed a timing problem with SIGALRM that could cause the read builtin to
+      drop characters.
+
+nnnn. Added code to deal with kill(2) failing to send the shell a fatal signal
+      due to Linux pid namespace peculiarities.
+
+oooo. Fixed a bug that made \C-@ (NUL) unusable in key sequences used for
+      `bind -x' commands.
+
+pppp. Fixed a bug that could cause SIGINT recursion when running an external
+      command in a trap the shell takes after a command exits due to SIGINT.
+
+qqqq. Make sure the shell turns off job control before running the command-
+      not-found handle, so the command doesn't try to manipulate process
+      groups.
+
+rrrr. Fixed a problem with timing process substitutions that caused the shell
+      to print timing information for the calling command.
+
+ssss. Fixed a bug that caused backquotes in a here-document delimiter to mark
+      the delimiter as quoted (inhibiting expansion of the here-document
+      contents).
+
+tttt. Fixed several problems with 0x01 and 0x177 in case pattern lists and
+      conditional command pattern matches.
+
+uuuu. Fixed a bug that could cause the pattern matching engine to not recognize
+      locale-specific character classes.
+
+vvvv. The auto-configuration now tests for /dev/stdin and /dev/fd independently.
+
+wwww. The `globstar' code now skips over symbolic links to directories,
+      preventing them from being scanned twice.
+
+xxxx. When running `bind -x' commands, bash now sets READLINE_POINT based on
+      the number of characters in the readline line buffer, not the number of
+      bytes.
+
+yyyy. Fixed a problem that could cause recursive trap evaluation of the RETURN
+      trap when using `eval return'.
+
+zzzz. Fixed a bug with expanding 0x01 in an unquoted here-document.
+
+aaaaa. The process substitution code now closes and unlinks FIFOs when the
+       process on the other side exits, in order to prevent SIGPIPE or
+       waiting until a FIFO opened for read has a writer.
+
+bbbbb. Fixed a bug with recursive calls to the parser overwriting the token in
+       an {id}>foo construct.
+
+ccccc. After a Posix discussion, the pattern matching engine just skips over
+       invalid character classes in bracket expressions, instead of matching
+       them like individual characters in the expression.
+
+ddddd. Fixed a posix-mode problem with variable scoping when creating variables
+       from assignment statements preceding special builtins.
+
+eeeee. Fixed a bug that could cause patterns containing backslashes to not be
+       run through the pattern matching engine.
+
+fffff. Fixed a bug that could cause redirections to compound commands to not
+       be `undone' if the file descriptor in the redirection was closed when
+       the redirection was initially processed.
+
+ggggg. Fixed a bug that could cause buffer corruption when using `bind -x' in
+       a command execute as a result of a key binding installed by `bind -x'.
+
+2.  Changes to Readline
+
+a. Added a guard to prevent nested macros from causing an infinite expansion
+   loop.
+
+b. Instead of allocating enough history list entries to hold the maximum list
+   size, cap the number allocated initially.
+
+c. Added a strategy to avoid allocating huge amounts of memory if a block of
+   history entries without timestamps occurs after a block with timestamps.
+
+d. Added support for keyboard timeouts when an ESC character is the last
+   character in a macro.
+
+e. There are several performance improvements when in a UTF-8 locale.
+
+f. Readline does a better job of preserving the original set of blocked
+   signals when using pselect() to wait for input.
+
+g. Fixed a bug that caused multibyte characters in macros to be mishandled.
+
+h. Fixed several bugs in the code that calculates line breaks when expanding
+   prompts that span several lines, contain multibyte characters, and contain
+   invisible character seqeuences.
+
+i. Fixed several bugs in cursor positioning when displaying lines with prompts
+   containing invisible characters and multibyte characters.
+
+j. When performing case-insensitive completion, Readline no longer sorts the
+   list of matches unless directed to do so.
+
+k. Fixed a problem with key sequences ending with a backslash.
+
+l. Fixed out-of-bounds and free memory read errors found via fuzzing.
+
+m. Fixed several cases where the mark was set to an invalid value.
+
+n. Fixed a problem with the case-changing operators in the case where the
+   lower and upper case versions of a character do not have the same number
+   of bytes.
+
+o. Handle incremental and non-incremental search character reads returning EOF.
+
+p. Handle the case where a failing readline command at the end of a multi-key
+   sequence could be misinterpreted.
+
+q. The history library now prints a meaningful error message if the history
+   file isn't a regular file.
+
+r. Fixed a problem with vi-mode redo (`.') on a command when trying to replace
+   a multibyte character.
+
+s. The key binding code now attempts to remove a keymap if a key unbinding
+   leaves it empty.
+
+t. Fixed a line-wrapping issue that caused problems for some terminal
+   emulators.
+
+u. If there is a key bound to the tty's VDISCARD special character, readline
+   disables VDISCARD while it is active.
+
+v. Fixed a problem with exiting bracketed paste mode on terminals that assume
+   the bracketed paste mode character sequence contains visible characters.
+
+w. Fixed a bug that could cause a key binding command to refer to an
+   uninitialized variable.
+
+3.  New Features in Bash
+
+a. The `wait' builtin can now wait for the last process substitution created.
+
+b. There is an EPOCHSECONDS variable, which expands to the time in seconds
+   since the Unix epoch.
+
+c. There is an EPOCHREALTIME variable, which expands to the time in seconds
+   since the Unix epoch with microsecond granularity.
+
+d. New loadable builtins: rm, stat, fdflags.
+
+e. BASH_ARGV0: a new variable that expands to $0 and sets $0 on assignment.
+
+f. When supplied a numeric argument, the shell-expand-line bindable readline
+   command does not perform quote removal and suppresses command and process
+   substitution.
+
+g. `history -d' understands negative arguments: negative arguments offset from
+   the end of the history list.
+
+h. The `name' argument to the `coproc' reserved word now undergoes word
+   expansion, so unique coprocs can be created in loops.
+
+i. A nameref name resolution loop in a function now resolves to a variable by
+   that name in the global scope.
+
+j. The `wait' builtin now has a `-f' option, which signifies to wait until the
+   specified job or process terminates, instead of waiting until it changes
+   state.
+
+k. There is a define in config-top.h that allows the shell to use a static
+   value for $PATH, overriding whatever is in the environment at startup, for
+   use by the restricted shell.
+
+l. Process substitution does not inherit the `v' option, like command
+   substitution.
+
+m. If a non-interactive shell with job control enabled detects that a foreground
+   job died due to SIGINT, it acts as if it received the SIGINT.
+
+n. The SIGCHLD trap is run once for each exiting child process even if job
+   control is not enabled when the shell is in Posix mode.
+
+o. A new shopt option: localvar_inherit; if set, a local variable inherits the
+   value of a variable with the same name at the nearest preceding scope.
+
+p. `bind -r' now checks whether a key sequence is bound before binding it to
+   NULL, to avoid creating keymaps for a multi-key sequence.
+
+q. A numeric argument to the line editing `operate-and-get-next' command
+   specifies which history entry to use.
+
+r. The positional parameters are now assigned before running the shell startup
+   files, so startup files can use $@.
+
+s. There is a compile-time option that forces the shell to disable the check
+   for an inherited OLDPWD being a directory.
+
+t. The `history' builtin can now delete ranges of history entries using
+   `-d start-end'.
+
+u. The `vi-edit-and-execute-command' bindable readline command now puts readline
+   back in vi insertion mode after executing commands from the edited file.
+
+v. The command completion code now matches aliases and shell function names
+   case-insensitively if the readline completion-ignore-case variable is set.
+
+w. There is a new `assoc_expand_once' shell option that attempts to expand
+   associative array subscripts only once.
+
+x. The shell only sets up BASH_ARGV and BASH_ARGC at startup if extended
+   debugging mode is active. The old behavior of unconditionally setting them
+   is available as part of the shell compatibility options.
+
+y. The `umask' builtin now allows modes and masks greater than octal 777.
+
+z. The `times' builtin now honors the current locale when printing a decimal
+   point.
+
+aa. There is a new (disabled by default, undocumented) shell option to enable
+    and disable sending history to syslog at runtime.
+
+4.  New Features in Readline
+
+a. Non-incremental vi-mode search (`N', `n') can search for a shell pattern, as
+   Posix specifies (uses fnmatch(3) if available).
+
+b. There are new `next-screen-line' and `previous-screen-line' bindable
+   commands, which move the cursor to the same column in the next, or previous,
+   physical line, respectively.
+
+c. There are default key bindings for control-arrow-key key combinations.
+
+d. A negative argument (-N) to `quoted-insert' means to insert the next N
+   characters using quoted-insert.
+
+e. New public function: rl_check_signals(), which allows applications to
+   respond to signals that readline catches while waiting for input using
+   a custom read function.
+
+f. There is new support for conditionally testing the readline version in an
+   inputrc file, with a full set of arithmetic comparison operators available.
+
+g. There is a simple variable comparison facility available for use within an
+   inputrc file. Allowable operators are equality and inequality; string
+   variables may be compared to a value; boolean variables must be compared to
+   either `on' or `off'; variable names are separated from the operator by
+   whitespace.
+
+------------------------------------------------------------------------------
 This document details the changes between this version, bash-4.4-release, and
 the previous version, bash-4.4-rc2.
 
@@ -21,7 +1472,6 @@ e.  Fixed several potential buffer overflow issues in the word expansion code.
 3.  New Features in Bash
 
 4.  New Features in Readline
-
 ------------------------------------------------------------------------------
 This document details the changes between this version, bash-4.4-rc2, and
 the previous version, bash-4.4-beta2.
@@ -558,7 +2008,7 @@ j.  Fixed a bug involving sign extension when reallocating the input line
 k.  Bash now does a better job at identifying syntax errors during word
     completion and tailoring completion appropriately.
 
-l.  Bash now uses the current locale's decimal point in comamnd timing output.
+l.  Bash now uses the current locale's decimal point in command timing output.
 
 m.  Fixed a bug that caused segmentation faults while reading here documents if
     PS2 contains a command substitution.
@@ -601,7 +2051,7 @@ x.  Fixed a bug that caused the shell to exit with the wrong (but non-zero)
 y.  Fixed a bug that caused the `time' reserved word to not be recognized as
     such in all contexts where it should have been.
 
-z.  Fixed a bug that caused the shell to close process subsitution file
+z.  Fixed a bug that caused the shell to close process substitution file
     descriptors when executing a script without the `#!' leading line.
 
 aa. Fixed a typo that caused the `compat42' shell option to set the wrong
@@ -998,7 +2448,7 @@ bb. Aliases whose value ends in a shell metacharacter now expand in a way to
 
 4.  New Features in Readline
 
-a.  The history truncation code now uses the same error recovery mechansim as
+a.  The history truncation code now uses the same error recovery mechanism as
     the history writing code, and restores the old version of the history file
     on error.  The error recovery mechanism handles symlinked history files.
 
@@ -1335,7 +2785,7 @@ c.  Fixed a bug that caused the pattern removal and pattern substitution word
     expansions and case statement word expansion to not match the empty string.
 
 d.  Fixed a bug that caused the tzset() function to not work after changing
-    the TZ enviroment variable.
+    the TZ environment variable.
 
 e.  Fixed a bug that caused the RHS of an assignment statement to undergo
     word splitting when it contained an unquoted $@.
@@ -1386,7 +2836,7 @@ t.  Fixed a problem with the bash malloc's internal idea of the top of the
     memory heap that resulted in incorrect decisions to try to reduce the
     break and give memory back to the kernel.
 
-u.  There are changes to the expansions peformed on compound array assignments,
+u.  There are changes to the expansions performed on compound array assignments,
     in an effort to make foo=( [ind1]=bar [ind2]=baz ) identical to
     foo[ind1]=bar foo[ind2]=baz.
 
@@ -2388,7 +3838,7 @@ j.  Fixed a bug in brace expansion that caused unwanted zero padding of the
 k.  Fixed a bug that prevented the |& construct from working as intended when
     used with a simple command with additional redirections.
 
-l.  Fixed a bug with the case statment ;& terminator that caused the shell to
+l.  Fixed a bug with the case statement ;& terminator that caused the shell to
     dereference a NULL pointer.
 
 m.  Fixed a bug that caused assignment statements or redirections preceding
@@ -3121,7 +4571,7 @@ l.  Fixed a bug in the code that buffers characters received very quickly in
     succession which caused characters to be dropped.
 
 m.  Fixed a bug that caused readline to reference uninitialized data structures
-    if it received a SIGWINCH before completing initialzation.
+    if it received a SIGWINCH before completing initialization.
 
 n.  Fixed a bug that caused the vi-mode `last command' to be set incorrectly
     and therefore unrepeatable.
@@ -3453,7 +4903,7 @@ x.  Fixed a bug that caused the shell to dump core when performing filename
 y.  Returned to the original Bourne shell rules for parsing ``:  no recursive
     parsing of embedded quoted strings or ${...} constructs.
 
-z.  The inheritence of the DEBUG, RETURN, and ERR traps is now dependent only
+z.  The inheritance of the DEBUG, RETURN, and ERR traps is now dependent only
     on the settings of the `functrace' and `errtrace' shell options, rather
     than whether or not the shell is in debugging mode.
 
@@ -3688,7 +5138,7 @@ and the previous version, bash-3.1-alpha1.
 a.  Added some system-specific signal names.
 
 b.  Fixed a typo in the ulimit builtin to make `x' the right option to
-    maniuplate the limit on file locks.
+    manipulate the limit on file locks.
 
 c.  Fixed a problem with using += to append to index 0 of an array variable
     when not using subscript syntax.
@@ -4389,7 +5839,7 @@ y.  Fixed a problem that could cause here documents to not be created correctly
 2.  Changes to Readline
 
 a.  Change to history expansion functions to treat `^' as equivalent to word
-    one, as the documention states.
+    one, as the documentation states.
 
 b.  Some changes to the display code to improve display and redisplay of
     multibyte characters.
@@ -5006,7 +6456,7 @@ c.  Fixed a problem which caused the display to be messed up when the last
     line of a multi-line prompt (possibly containing invisible characters)
     was longer than the screen width.
 
-d.  Fixed a problem with the vi-mode `r' command that ocurred on systems with
+d.  Fixed a problem with the vi-mode `r' command that occurred on systems with
     support for multibyte characters when running in a locale without any
     multibyte characters.
 
@@ -5419,7 +6869,7 @@ l.  The `printf' builtin now handles the `ll' and `j' length modifiers
     passed to printf(3).
 
 m.  Renamed a number of the bash-specific autoconf macros in aclocal.m4 to
-    have more sytematic naming, with accompanying changes to configure.in.
+    have more systematic naming, with accompanying changes to configure.in.
 
 n.  Fixed snprintf to handle long doubles and the %a/%A conversions by
     falling back to sprintf, as long as sprintf supports them.
@@ -5532,7 +6982,7 @@ and the previous version, bash-2.05a-alpha1.
 
 1.  Changes to Bash
 
-a.  Fixed a bug in the evalution of arithmetic `for' statements when the
+a.  Fixed a bug in the evaluation of arithmetic `for' statements when the
     expanded expression is NULL.
 
 b.  Fixed an unassigned variable problem in the redirection printing code.
@@ -5588,7 +7038,7 @@ o.  `umask' now prints four digits when printing in octal mode, for
 
 p.  Lots of changes to the `printf' builtin from Paul Eggert:  it handles `L'
     formats and long doubles better, and internal functions have been
-    simpified where appropriate.
+    simplified where appropriate.
 
 q.  Some `time_t' fixes for machines were a time_t is bigger than a long.
 
@@ -5661,7 +7111,7 @@ c.  `ulimit' prints `hard' or `soft' when a value is not `unlimited' but is
 
 a.  New bindable variable `history-preserve-point'.  If set, the history
     code attempts to place the user at the same location on each history
-    line retrived with previous-history or next-history.
+    line retrieved with previous-history or next-history.
 
 ------------------------------------------------------------------------------
 This document details the changes between this version, bash-2.05a-alpha1,
@@ -5728,9 +7178,9 @@ v.  Fixes, mostly from Paul Eggert, for a few possible buffer overflows in
 w.  Fixes from Paul Eggert to avoid most of the type casts in the shell code,
     and use more appropriate types for a number of variables.
 
-x.  Command substition no longer inherits the DEBUG trap.
+x.  Command substitution no longer inherits the DEBUG trap.
 
-y.  Some fixes to the process substition code on machines without /dev/fd so
+y.  Some fixes to the process substitution code on machines without /dev/fd so
     that named pipes are not removed inappropriately.
 
 z.  The loadable `getconf' builtin is now much more complete, and will become
@@ -6127,7 +7577,7 @@ g.  Renamed rltty_set_default_bindings to rl_tty_set_default_bindings and
 a.  A new loadable builtin, realpath, which canonicalizes and expands symlinks
     in pathname arguments.
 
-b.  When `set' is called without options, it prints function defintions in a
+b.  When `set' is called without options, it prints function definitions in a
     way that allows them to be reused as input.  This affects `declare' and
     `declare -p' as well.
 
@@ -6886,7 +8336,7 @@ m.  Improvements were made to the `read' builtin so that it makes many
 n.  The expansion of $- will include `c' and `s' when those options are
     supplied at shell invocation.
 
-o.  Several improvments were made to the completion code:  variable completion
+o.  Several improvements were made to the completion code:  variable completion
     now works better when there are unterminated expansions, command
     completion understands quotes better, and completion now works in certain
     unclosed $(... constructs.
@@ -6974,7 +8424,7 @@ d.  There is a new shell option, no_empty_command_completion, which, when
     enabled, disables command completion when TAB is typed on an empty line.
 
 e.  The `help' builtin has a `-s' option to just print a builtin's usage
-    synopsys.
+    synopsis.
 
 f.  There are several new arithmetic operators:  id++, id-- (variable
     post-increment/decrement), ++id, --id (variabl pre-increment/decrement),
@@ -8858,5 +10308,5 @@ b. A bug encountered when expand-tilde was enabled and file completion was
 c. A slight change was made to the incremental search termination behavior.
    ESC still terminates the search, but if input is pending or arrives
    within 0.1 seconds (on systems with select(2)), it is used as a prefix
-   character.  This is intented to allow users to terminate searches with
+   character.  This is intended to allow users to terminate searches with
    the arrow keys and get the behavior they expect.
diff --git a/msys2/usr/share/doc/bash/COMPAT b/msys2/usr/share/doc/bash/COMPAT
index 9959b962f..5cfb83600 100644
--- a/msys2/usr/share/doc/bash/COMPAT
+++ b/msys2/usr/share/doc/bash/COMPAT
@@ -2,11 +2,11 @@ Compatibility with previous versions
 ====================================
 
 This document details the incompatibilities between this version of bash,
-bash-4.4, and the previous widely-available versions, bash-3.x (which is
-still the `standard' version for Mac OS X), 4.1/4.2 (which are still
-standard on a few Linux distributions), and bash-4.3, the current
-widely-available version.  These were discovered by users of bash-2.x
-through 4.x, so this list is not comprehensive.  Some of these
+bash-5.1, and the previous widely-available versions, bash-3.2 (which is
+still the `standard' version for Mac OS X), 4.2/4.3 (which are still
+standard on a few Linux distributions), and bash-4.4/bash-5.0, the current
+widely-available versions.  These were discovered by users of bash-2.x
+through 5.x, so this list is not comprehensive.  Some of these
 incompatibilities occur between the current version and versions 2.0 and
 above. 
 
@@ -292,7 +292,7 @@ above.
 
 36. Bash-4.0 now allows process substitution constructs to pass unchanged
     through brace expansion, so any expansion of the contents will have to be
-    separately specified, and each process subsitution will have to be
+    separately specified, and each process substitution will have to be
     separately entered.
 
 37. Bash-4.0 now allows SIGCHLD to interrupt the wait builtin, as Posix
@@ -391,65 +391,158 @@ above.
     argument to `declare' or a similar builtin expands to a word that looks
     like a compound array assignment (e.g. declare w=$x where x='(foo)').
 
+60. Bash-5.0 only sets up BASH_ARGV and BASH_ARGC at startup if extended
+    debugging mode is active. The old behavior of unconditionally setting
+    BASH_ARGC and BASH_ARGV is available at compatibility levels less than
+    or equal to 44.
+
+61. Bash-5.0 doesn't allow a `break' or `continue' in a subshell to attempt
+    to break or continue loop execution inherited from the calling context.
+
+62. Bash-5.0 doesn't allow variable assignments preceding builtins like
+    export and readonly to modify variables with the same name in preceding
+    contexts (including the global context) unless the shell is in posix
+    mode, since export and readonly are special builtins.
+
+63. Bash-5.1 changes the way posix-mode shells handle assignment statements
+    preceding shell function calls. Previous versions of POSIX specified that
+    such assignments would persist after the function returned; subsequent
+    versions of the standard removed that requirement (interpretation #654).
+    Bash-5.1 posix mode assignment statements preceding shell function calls
+    do not persist after the function returns.
+
+64. Bash-5.1 reverts to the bash-4.4 treatment of pathname expansion of words
+    containing backslashes but no other special globbing characters. This comes
+    after a protracted discussion and a POSIX interpretation (#1234).
+
+65. In bash-5.1, disabling posix mode attempts to restore the state of several
+    options that posix mode modifies to the state they had before enabling
+    posix mode. Previous versions restored these options to default values.
+
+
 Shell Compatibility Level
 =========================
 
 Bash-4.0 introduced the concept of a `shell compatibility level', specified
-as a set of options to the shopt builtin (compat31, compat32, compat40, 
-compat41, and compat42 at this writing).  There is only one current
-compatibility level -- each option is mutually exclusive.  This list does not
-mention behavior that is standard for a particular version (e.g., setting
-compat32 means that quoting the rhs of the regexp matching operator quotes
-special regexp characters in the word, which is default behavior in bash-3.2
-and above).
+as a set of options to the shopt builtin (compat31, compat32, compat40,
+compat41, and so on).  There is only one current compatibility level --
+each option is mutually exclusive.  The compatibility level is intended to
+allow users to select behavior from previous versions that is incompatible
+with newer versions while they migrate scripts to use current features and
+behavior.  It's intended to be a temporary solution. 
 
-Bash-4.3 introduces a new shell variable: BASH_COMPAT.  The value assigned
+This section does not mention behavior that is standard for a particular
+version (e.g., setting compat32 means that quoting the rhs of the regexp
+matching operator quotes special regexp characters in the word, which is
+default behavior in bash-3.2 and above). 
+
+If a user enables, say, compat32, it may affect the behavior of other
+compatibility levels up to and including the current compatibility level. 
+The idea is that each compatibility level controls behavior that changed in
+that version of bash, but that behavior may have been present in earlier
+versions.  For instance, the change to use locale-based comparisons with
+the `[[' command came in bash-4.1, and earlier versions used ASCII-based
+comparisons, so enabling compat32 will enable ASCII-based comparisons as
+well.  That granularity may not be sufficient for all uses, and as a result
+users should employ compatibility levels carefully.  Read the documentation
+for a particular feature to find out the current behavior. 
+
+Bash-4.3 introduced a new shell variable: BASH_COMPAT. The value assigned
 to this variable (a decimal version number like 4.2, or an integer
 corresponding to the compatNN option, like 42) determines the compatibility
 level.
 
-Bash-4.4 has begun deprecating older compatibility levels.  Eventually, the
-options will be removed in favor of the BASH_COMPAT variable.
+Starting with bash-4.4, bash has begun deprecating older compatibility
+levels.  Eventually, the options will be removed in favor of the
+BASH_COMPAT variable. 
 
-compat31 set
+Bash-5.0 is the final version for which there will be an individual shopt
+option for the previous version.  Users should use the BASH_COMPAT variable
+on bash-5.0 and later versions. 
+
+The following table describes the behavior changes controlled by each
+compatibility level setting.  The `compatNN' tag is used as shorthand for
+setting the compatibility level to NN using one of the following
+mechanisms.  For versions prior to bash-5.0, the compatibility level may be
+set using the corresponding compatNN shopt option.  For bash-4.3 and later
+versions, the BASH_COMPAT variable is preferred, and it is required for
+bash-5.1 and later versions. 
+
+compat31
 	- the < and > operators to the [[ command do not consider the current
 	  locale when comparing strings; they use ASCII ordering
-	- quoting the rhs of the regexp matching operator (=~) has no
-	  special effect
+	- quoting the rhs of the [[ command's regexp matching operator (=~)
+	  has no special effect
 
-compat32 set
-	- the < and > operators to the [[ command do not consider the current
-	  locale when comparing strings; they use ASCII ordering
-
-compat40 set
+compat32
 	- the < and > operators to the [[ command do not consider the current
 	  locale when comparing strings; they use ASCII ordering
 	- interrupting a command list such as "a ; b ; c" causes the execution
-	  of the entire list to be aborted (in versions before bash-4.0,
-	  interrupting one command in a list caused the next to be executed)
+	  of the next command in the list (in bash-4.0 and later versions,
+	  the shell acts as if it received the interrupt, so interrupting
+	  one command in a list aborts the execution of the entire list)
 
-compat41 set
-	- interrupting a command list such as "a ; b ; c" causes the execution
-	  of the entire list to be aborted (in versions before bash-4.0,
-	  interrupting one command in a list caused the next to be executed)
-	- when in posix mode, single quotes in the `word' portion of a
-	  double-quoted parameter expansion define a new quoting context and
-	  are treated specially
+compat40
+	- the < and > operators to the [[ command do not consider the current
+	  locale when comparing strings; they use ASCII ordering.
+	  Bash versions prior to bash-4.1 use ASCII collation and strcmp(3);
+	  bash-4.1 and later use the current locale's collation sequence and
+	  strcoll(3).
 
-compat42 set
+compat41
+	- in posix mode, `time' may be followed by options and still be
+	  recognized as a reserved word (this is POSIX interpretation 267)
+	- in posix mode, the parser requires that an even number of single
+	  quotes occur in the `word' portion of a double-quoted ${...}
+	  parameter expansion and treats them specially, so that characters
+	  within the single quotes are considered quoted (this is POSIX
+	  interpretation 221)
+
+compat42
 	- the replacement string in double-quoted pattern substitution is not
-	  run through quote removal, as in previous versions
+	  run through quote removal, as it is in versions after bash-4.2
+	- in posix mode, single quotes are considered special when expanding
+	  the `word' portion of a double-quoted ${...} parameter expansion
+	  and can be used to quote a closing brace or other special character
+	  (this is part of POSIX interpretation 221); in later versions,
+	  single quotes are not special within double-quoted word expansions
 
-compat43 set
+compat43
 	- the shell does not print a warning message if an attempt is made to
 	  use a quoted compound assignment as an argument to declare
-	  (declare -a foo='(1 2)')
+	  (declare -a foo='(1 2)'). Later versions warn that this usage is
+	  deprecated.
 	- word expansion errors are considered non-fatal errors that cause the
-	  current command to fail, even in Posix mode
-	- when executing a shell function, the loop state (while/until/etc.) is
-	  not reset, so `break' or `continue' in a shell function will break or
-	  continue loops in the calling context.  Bash-4.4 and later reset the
-	  loop state to prevent this.
+	  current command to fail, even in posix mode (the default behavior is
+	  to make them fatal errors that cause the shell to exit)
+	- when executing a shell function, the loop state (while/until/etc.)
+	  is not reset, so `break' or `continue' in that function will break
+	  or continue loops in the calling context. Bash-4.4 and later reset
+	  the loop state to prevent this
+
+compat44
+	- the shell sets up the values used by BASH_ARGV and BASH_ARGC so
+	  they can expand to the shell's positional parameters even if extended
+	  debug mode is not enabled
+	- a subshell inherits loops from its parent context, so `break'
+	  or `continue' will cause the subshell to exit. Bash-5.0 and later
+	  reset the loop state to prevent the exit
+	- variable assignments preceding builtins like export and readonly
+	  that set attributes continue to affect variables with the same
+	  name in the calling environment even if the shell is not in posix
+	  mode
+
+compat50 (set using BASH_COMPAT)
+	- Bash-5.1 changed the way $RANDOM is generated to introduce slightly
+	  more randomness. If the shell compatibility level is set to 50 or
+	  lower, it reverts to the method from bash-5.0 and previous versions,
+	  so seeding the random number generator by assigning a value to
+	  RANDOM will produce the same sequence as in bash-5.0
+	- If the command hash table is empty, bash versions prior to bash-5.1
+	  printed an informational message to that effect even when writing
+	  output in a format that can be reused as input (-l). Bash-5.1
+	  suppresses that message if -l is supplied
+
 
 -------------------------------------------------------------------------------
 
diff --git a/msys2/usr/share/doc/bash/FAQ b/msys2/usr/share/doc/bash/FAQ
index 87dbb2d02..104d0bc1c 100644
--- a/msys2/usr/share/doc/bash/FAQ
+++ b/msys2/usr/share/doc/bash/FAQ
@@ -1,6 +1,4 @@
-This is the Bash FAQ, version 4.14, for Bash version 4.4.
-
-[THIS FAQ IS NO LONGER MAINTAINED]
+This is the Bash FAQ, version 4.15, for Bash version 5.0.
 
 This document contains a set of frequently-asked questions concerning
 Bash, the GNU Bourne-Again Shell.  Bash is a freely-available command
@@ -962,7 +960,7 @@ o `complete' and `compgen' now take a `-o value' option, which controls some
                     directory names and suppress trailing spaces
 o A new loadable builtin, realpath, which canonicalizes and expands symlinks
   in pathname arguments.
-o When `set' is called without options, it prints function defintions in a
+o When `set' is called without options, it prints function definitions in a
   way that allows them to be reused as input.  This affects `declare' and 
   `declare -p' as well.  This only happens when the shell is not in POSIX
    mode, since POSIX.2 forbids this behavior.
@@ -2171,17 +2169,11 @@ You may also need
 
 Finally, you need to tell readline that you will be inputting and
 displaying eight-bit characters.  You use readline variables to do
-this.  convert-meta says what to do if you read a character with its
-eighth bit set.  input-meta says whether to permit characters with the
-eighth bit at all.  output-meta determines how to display characters
-with the eighth bit set: if on, they are output directly; if it is off,
-such characters are displayed as a meta-prefixed escape sequence.
-
-These variables can be set in your .inputrc or using the bash
+this.  These variables can be set in your .inputrc or using the bash
 `bind' builtin.  Here's an example using `bind':
 
 	bash$ bind 'set convert-meta off'
-	bash$ bind 'set input-meta on'
+	bash$ bind 'set meta-flag on'
 	bash$ bind 'set output-meta on'
 
 The `set' commands between the single quotes may also be placed
@@ -2287,7 +2279,7 @@ The \w expansion gives the full pathname of the current directory, with
 a tilde (`~') substituted for the current value of $HOME.  The \W
 expansion gives the basename of the current directory.  To put the full
 pathname of the current directory into the path without any tilde
-subsitution, use $PWD.  Here are some examples:
+substitution, use $PWD.  Here are some examples:
 
 	PS1='\w$ '	# current directory with tilde
 	PS1='\W$ '	# basename of current directory
@@ -2404,7 +2396,7 @@ a bash programmer's guide with a chapter on creating loadable builtins
 a better loadable interface to perl with access to the shell builtins and
 	variables (contributions gratefully accepted)
 ksh93-like `xx.yy' variables (including some of the .sh.* variables) and
-	associated disipline functions
+	associated discipline functions
 Some of the new ksh93 pattern matching operators, like backreferencing
 
 H5) When will the next release appear?
diff --git a/msys2/usr/share/doc/bash/NEWS b/msys2/usr/share/doc/bash/NEWS
index 931dc846b..a6170be85 100644
--- a/msys2/usr/share/doc/bash/NEWS
+++ b/msys2/usr/share/doc/bash/NEWS
@@ -1,3 +1,367 @@
+This is a terse description of the new features added to bash-5.1 since
+the release of bash-5.0.  As always, the manual page (doc/bash.1) is
+the place to look for complete descriptions.
+
+1. New Features in Bash
+
+a. `bind -x' now supports different bindings for different editing modes and
+   keymaps.
+
+b. Bash attempts to optimize the number of times it forks when executing
+   commands in subshells and from `bash -c'.
+
+c. Here documents and here strings now use pipes for the expanded document if
+   it's smaller than the pipe buffer size, reverting to temporary files if it's
+   larger.
+
+d. There are new loadable builtins: mktemp, accept, mkfifo, csv, cut/lcut
+
+e. In posix mode, `trap -p' now displays signals whose disposition is SIG_DFL
+   and those that were SIG_IGN when the shell starts.
+
+f. The shell now expands the history number (e.g., in PS1) even if it is not
+   currently saving commands to the history list.
+
+g. `read -e' may now be used with arbitrary file descriptors (`read -u N').
+
+h. The `select' builtin now runs traps if its internal call to the read builtin
+   is interrupted by a signal.
+
+i. SRANDOM: a new variable that expands to a 32-bit random number that is not
+   produced by an LCRNG, and uses getrandom/getentropy, falling back to
+   /dev/urandom or arc4random if available. There is a fallback generator if
+   none of these are available.
+
+j. shell-transpose-words: a new bindable readline command that uses the same
+   definition of word as shell-forward-word, etc.
+
+k. The shell now adds default bindings for shell-forward-word,
+   shell-backward-word, shell-transpose-words, and shell-kill-word.
+
+l. Bash now allows ARGV0 appearing in the initial shell environment to set $0.
+
+m. If `unset' is executed without option arguments, bash tries to unset a shell
+   function if a name argument cannot be a shell variable name because it's not
+   an identifier.
+
+n. The `test -N' operator uses nanosecond timestamp granularity if it's
+   available.
+
+o. Bash posix mode now treats assignment statements preceding shell function
+   definitions the same as in its default mode, since POSIX has changed and
+   no longer requires those assignments to persist after the function returns
+   (POSIX interp 654).
+
+p. BASH_REMATCH is no longer readonly.
+
+q. wait: has a new -p VARNAME option, which stores the PID returned by `wait -n'
+   or `wait' without arguments.
+
+r. Sorting the results of pathname expansion now uses byte-by-byte comparisons
+   if two strings collate equally to impose a total order; the result of a
+   POSIX interpretation.
+
+s. Bash now allows SIGINT trap handlers to execute recursively.
+
+t. Bash now saves and restores state around setting and unsetting posix mode,
+   instead of having unsetting posix mode set a known state.
+
+u. Process substitution is now available in posix mode.
+
+v. READLINE_MARK: a new variable available while executing commands bound with
+   `bind -x', contains the value of the mark.
+
+w. Bash removes SIGCHLD from the set of blocked signals if it's blocked at shell
+   startup.
+
+x. `test -v N' can now test whether or not positional parameter N is set.
+
+y. `local' now honors the `-p' option to display all local variables at the
+    current context.
+
+z. The `@a' variable transformation now prints attributes for unset array
+   variables.
+
+aa. The `@A' variable transformation now prints a declare command that sets a
+    variable's attributes if the variable has attributes but is unset.
+
+bb. `declare' and `local' now have a -I option that inherits attributes and
+    value from a variable with the same name at a previous scope.
+
+cc. When run from a -c command, `jobs' now reports the status of completed jobs.
+
+dd. New `U', `u', and `L' parameter transformations to convert to uppercase,
+    convert first character to uppercase, and convert to lowercase,
+    respectively.
+
+ee. PROMPT_COMMAND: can now be an  array variable, each element of which can
+    contain a command to be executed like a string PROMPT_COMMAND variable.
+
+ff. `ulimit' has a -R option to report and set the RLIMIT_RTTIME resource.
+
+gg. Associative arrays may be assigned using a list of key-value pairs within
+    a compound assignment. Compound assignments where the words are not of
+    the form [key]=value are assumed to be key-value assignments. A missing or
+    empty key is an error; a missing value is treated as NULL. Assignments may
+    not mix the two forms.
+
+hh. New `K' parameter transformation to display associative arrays as key-
+    value pairs.
+
+ii. Writing history to syslog now handles messages longer than the syslog max
+    length by writing multiple messages with a sequence number.
+
+jj. SECONDS and RANDOM may now be assigned using arithmetic expressions, since
+    they are nominally integer variables. LINENO is not an integer variable.
+
+kk. Bash temporarily suppresses the verbose option when running the DEBUG trap
+    while running a command from the `fc' builtin.
+
+ll. `wait -n' now accepts a list of job specifications as arguments and will
+    wait for the first one in the list to change state.
+
+mm. The associative array implementation can now dynamically increase the
+    size of the hash table based on insertion patterns.
+
+nn. HISTFILE is now readonly in a restricted shell.
+
+oo. The bash malloc now returns memory that is 16-byte aligned on 64-bit
+    systems.
+
+pp. If the hash builtin is listing hashed filenames portably, don't print
+   anything if the table is empty.
+
+qq. GLOBIGNORE now ignores `.' and `..' as a terminal pathname component.
+
+rr. Bash attempts to optimize away forks in the last command in a function body
+    under appropriate circumstances.
+
+ss. The globbing code now uses fnmatch(3) to check collation elements (if
+    available) even in cases without multibyte characters.
+
+tt. The `fg' and `bg' builtins now return an error in a command substitution
+    when asked to restart a job inherited from the parent shell.
+
+uu. The shell now attempts to unlink all FIFOs on exit, whether a consuming
+    process has finished with them or not.
+
+vv. There is a new contributed loadable builtin: asort.
+
+2. New Features in Readline
+
+a. If a second consecutive completion attempt produces matches where the first
+   did not, treat it as a new completion attempt and insert a match as
+   appropriate.
+
+b. Bracketed paste mode works in more places: incremental search strings, vi
+   overstrike mode, character search, and reading numeric arguments.
+
+c. Readline automatically switches to horizontal scrolling if the terminal has
+   only one line.
+
+d. Unbinding all key sequences bound to a particular readline function now
+   descends into keymaps for multi-key sequences.
+
+e. rl-clear-display: new bindable command that clears the screen and, if
+   possible, the scrollback buffer (bound to emacs mode M-C-l by default).
+
+f. New active mark and face feature: when enabled, it will highlight the text
+   inserted by a bracketed paste (the `active region') and the text found by
+   incremental and non-incremental history searches. This is tied to bracketed
+   paste and can be disabled by turning off bracketed paste.
+
+g. Readline sets the mark in several additional commands.
+
+h. Bracketed paste mode is enabled by default.
+
+i. Readline tries to take advantage of the more regular structure of UTF-8
+   characters to identify the beginning and end of characters when moving
+   through the line buffer.
+
+j. The bindable operate-and-get-next command (and its default bindings) are
+   now part of readline instead of a bash-specific addition.
+
+k. The signal cleanup code now blocks SIGINT while processing after a SIGINT.
+
+-------------------------------------------------------------------------------
+This is a terse description of the new features added to bash-5.0 since
+the release of bash-4.4.  As always, the manual page (doc/bash.1) is
+the place to look for complete descriptions.
+
+1.  New Features in Bash
+
+a. The `wait' builtin can now wait for the last process substitution created.
+
+b. There is an EPOCHSECONDS variable, which expands to the time in seconds
+   since the Unix epoch.
+
+c. There is an EPOCHREALTIME variable, which expands to the time in seconds
+   since the Unix epoch with microsecond granularity.
+
+d. New loadable builtins: rm, stat, fdflags.
+
+e. BASH_ARGV0: a new variable that expands to $0 and sets $0 on assignment.
+
+f. When supplied a numeric argument, the shell-expand-line bindable readline
+   command does not perform quote removal and suppresses command and process
+   substitution.
+
+g. `history -d' understands negative arguments: negative arguments offset from
+   the end of the history list.
+
+h. The `name' argument to the `coproc' reserved word now undergoes word
+   expansion, so unique coprocs can be created in loops.
+
+i. A nameref name resolution loop in a function now resolves to a variable by
+   that name in the global scope.
+
+j. The `wait' builtin now has a `-f' option, which signifies to wait until the
+   specified job or process terminates, instead of waiting until it changes
+   state.
+
+k. There is a define in config-top.h that allows the shell to use a static
+   value for $PATH, overriding whatever is in the environment at startup, for
+   use by the restricted shell.
+
+l. Process substitution does not inherit the `v' option, like command
+   substitution.
+
+m. If a non-interactive shell with job control enabled detects that a foreground
+   job died due to SIGINT, it acts as if it received the SIGINT.
+
+n. The SIGCHLD trap is run once for each exiting child process even if job
+   control is not enabled when the shell is in Posix mode.
+
+o. A new shopt option: localvar_inherit; if set, a local variable inherits the
+   value of a variable with the same name at the nearest preceding scope.
+
+p. `bind -r' now checks whether a key sequence is bound before binding it to
+   NULL, to avoid creating keymaps for a multi-key sequence.
+
+q. A numeric argument to the line editing `operate-and-get-next' command
+   specifies which history entry to use.
+
+r. The positional parameters are now assigned before running the shell startup
+   files, so startup files can use $@.
+
+s. There is a compile-time option that forces the shell to disable the check
+   for an inherited OLDPWD being a directory.
+
+t. The `history' builtin can now delete ranges of history entries using
+   `-d start-end'.
+
+u. The `vi-edit-and-execute-command' bindable readline command now puts readline
+   back in vi insertion mode after executing commands from the edited file.
+
+v. The command completion code now matches aliases and shell function names
+   case-insensitively if the readline completion-ignore-case variable is set.
+
+w. There is a new `assoc_expand_once' shell option that attempts to expand
+   associative array subscripts only once.
+
+x. The shell only sets up BASH_ARGV and BASH_ARGC at startup if extended
+   debugging mode is active. The old behavior of unconditionally setting them
+   is available as part of the shell compatibility options.
+
+y. The `umask' builtin now allows modes and masks greater than octal 777.
+
+z. The `times' builtin now honors the current locale when printing a decimal
+   point.
+
+aa. There is a new (disabled by default, undocumented) shell option to enable
+    and disable sending history to syslog at runtime.
+
+bb. Bash no longer allows variable assignments preceding a special builtin that
+    changes variable attributes to propagate back to the calling environment
+    unless the compatibility level is 44 or lower.
+
+cc. You can set the default value for $HISTSIZE at build time in config-top.h.
+
+dd. The `complete' builtin now accepts a -I option that applies the completion
+    to the initial word on the line.
+
+ee.  The internal bash malloc now uses mmap (if available) to satisfy requests
+    greater than 128K bytes, so free can use mfree to return the pages to the
+    kernel.
+
+ff. The shell doesn't automatically set BASH_ARGC and BASH_ARGV at startup
+    unless it's in debugging mode, as the documentation has always said, but
+    will dynamically create them if a script references them at the top level
+    without having enabled debugging mode.
+
+gg. The localvar_inherit option will not attempt to inherit a value from a
+    variable of an incompatible type (indexed vs. associative arrays, for
+    example).
+
+hh. The `globasciiranges' option is now enabled by default; it can be set to
+    off by default at configuration time.
+
+ii. Associative and indexed arrays now allow subscripts consisting solely of
+    whitespace.
+
+jj. `checkwinsize' is now enabled by default.
+
+kk. The `localvar_unset' shopt option is now visible and documented.
+
+ll. The `progcomp_alias' shopt option is now visible and documented.
+
+mm. The signal name processing code now understands `SIGRTMIN+n' all the way
+    up to SIGRTMAX.
+
+nn. There is a new `seq' loadable builtin.
+
+oo. Trap execution now honors the (internal) max invocations of `eval', since
+    traps are supposed to be executed as if using `eval'.
+
+pp. The $_ variable doesn't change when the shell executes a command that forks.
+
+qq. The `kill' builtin now supports -sSIGNAME and -nSIGNUM, even though
+    conforming applications aren't supposed to use them.
+
+rr. POSIX mode now enables the `shift_verbose' option.
+
+2.  New Features in Readline
+
+a. Non-incremental vi-mode search (`N', `n') can search for a shell pattern, as
+   Posix specifies (uses fnmatch(3) if available).
+
+b. There are new `next-screen-line' and `previous-screen-line' bindable
+   commands, which move the cursor to the same column in the next, or previous,
+   physical line, respectively.
+
+c. There are default key bindings for control-arrow-key key combinations.
+
+d. A negative argument (-N) to `quoted-insert' means to insert the next N
+   characters using quoted-insert.
+
+e. New public function: rl_check_signals(), which allows applications to
+   respond to signals that readline catches while waiting for input using
+   a custom read function.
+
+f. There is new support for conditionally testing the readline version in an
+   inputrc file, with a full set of arithmetic comparison operators available.
+
+g. There is a simple variable comparison facility available for use within an
+   inputrc file. Allowable operators are equality and inequality; string
+   variables may be compared to a value; boolean variables must be compared to
+   either `on' or `off'; variable names are separated from the operator by
+   whitespace.
+
+h. The history expansion library now understands command and process
+   substitution and extended globbing and allows them to appear anywhere in a
+   word.
+
+i. The history library has a new variable that allows applications to set the
+   initial quoting state, so quoting state can be inherited from a previous
+   line.
+
+j. Readline now allows application-defined keymap names; there is a new public
+   function, rl_set_keymap_name(), to do that.
+
+k. The "Insert" keypad key, if available, now puts readline into overwrite
+   mode.
+
+-------------------------------------------------------------------------------
 This is a terse description of the new features added to bash-4.4 since
 the release of bash-4.3.  As always, the manual page (doc/bash.1) is
 the place to look for complete descriptions.
@@ -150,7 +514,7 @@ rr. Bash now uses mktemp() when creating internal temporary files; it produces
 
 2.  New Features in Readline
 
-a.  The history truncation code now uses the same error recovery mechansim as
+a.  The history truncation code now uses the same error recovery mechanism as
     the history writing code, and restores the old version of the history file
     on error.  The error recovery mechanism handles symlinked history files.
 
@@ -1371,7 +1735,7 @@ e.  The history expansion code now allows any character to terminate a
 
 f.  New bindable variable `history-preserve-point'.  If set, the history
     code attempts to place the user at the same location on each history
-    line retrived with previous-history or next-history.
+    line retrieved with previous-history or next-history.
 
 -------------------------------------------------------------------------------
 This is a terse description of the new features added to bash-2.05 since
@@ -1400,7 +1764,7 @@ c.  `complete' and `compgen' now take a `-o value' option, which controls some
 d.  A new loadable builtin, realpath, which canonicalizes and expands symlinks
     in pathname arguments.
     
-e.  When `set' is called without options, it prints function defintions in a
+e.  When `set' is called without options, it prints function definitions in a
     way that allows them to be reused as input.  This affects `declare' and 
     `declare -p' as well.  This only happens when the shell is not in POSIX
     mode, since POSIX.2 forbids this behavior.
@@ -1811,7 +2175,7 @@ p.  The shell now supports integer-indexed arrays of unlimited length,
 
 q.  ${!var}: indirect variable expansion, equivalent to eval \${$var}.
 
-r.  ${paramter:offset[:length]}: variable substring extraction.
+r.  ${parameter:offset[:length]}: variable substring extraction.
 
 s.  ${parameter/pattern[/[/]string]}: variable pattern substitution.
 
@@ -1935,7 +2299,7 @@ iii. Changes to Posix mode:
 	  any symbolic links.
 	o A non-interactive shell exits if a variable assignment error
 	  occurs when no command name follows the assignment statements.
-	o A non-interactive shell exits if the interation variable in a
+	o A non-interactive shell exits if the iteration variable in a
 	  `for' statement or the selection variable in a `select' statement
 	  is read-only or another variable assignment error occurs.
 	o The `<>' redirection operator now opens a file for both stdin and
diff --git a/msys2/usr/share/doc/bash/POSIX b/msys2/usr/share/doc/bash/POSIX
index 84ab6bea6..24114af14 100644
--- a/msys2/usr/share/doc/bash/POSIX
+++ b/msys2/usr/share/doc/bash/POSIX
@@ -11,205 +11,225 @@ files.
 
 The following list is what's changed when 'POSIX mode' is in effect:
 
-  1. When a command in the hash table no longer exists, Bash will
+  1. Bash ensures that the 'POSIXLY_CORRECT' variable is set.
+
+  2. When a command in the hash table no longer exists, Bash will
      re-search '$PATH' to find the new location.  This is also available
      with 'shopt -s checkhash'.
 
-  2. The message printed by the job control code and builtins when a job
+  3. Bash will not insert a command without the execute bit set into the
+     command hash table, even if it returns it as a (last-ditch) result
+     from a '$PATH' search.
+
+  4. The message printed by the job control code and builtins when a job
      exits with a non-zero status is 'Done(status)'.
 
-  3. The message printed by the job control code and builtins when a job
+  5. The message printed by the job control code and builtins when a job
      is stopped is 'Stopped(SIGNAME)', where SIGNAME is, for example,
      'SIGTSTP'.
 
-  4. Alias expansion is always enabled, even in non-interactive shells.
+  6. Alias expansion is always enabled, even in non-interactive shells.
 
-  5. Reserved words appearing in a context where reserved words are
+  7. Reserved words appearing in a context where reserved words are
      recognized do not undergo alias expansion.
 
-  6. The POSIX 'PS1' and 'PS2' expansions of '!' to the history number
+  8. The POSIX 'PS1' and 'PS2' expansions of '!' to the history number
      and '!!' to '!' are enabled, and parameter expansion is performed
      on the values of 'PS1' and 'PS2' regardless of the setting of the
      'promptvars' option.
 
-  7. The POSIX startup files are executed ('$ENV') rather than the
+  9. The POSIX startup files are executed ('$ENV') rather than the
      normal Bash files.
 
-  8. Tilde expansion is only performed on assignments preceding a
+  10. Tilde expansion is only performed on assignments preceding a
      command name, rather than on all assignment statements on the line.
 
-  9. The default history file is '~/.sh_history' (this is the default
+  11. The default history file is '~/.sh_history' (this is the default
      value of '$HISTFILE').
 
-  10. Redirection operators do not perform filename expansion on the
+  12. Redirection operators do not perform filename expansion on the
      word in the redirection unless the shell is interactive.
 
-  11. Redirection operators do not perform word splitting on the word in
+  13. Redirection operators do not perform word splitting on the word in
      the redirection.
 
-  12. Function names must be valid shell 'name's.  That is, they may not
+  14. Function names must be valid shell 'name's.  That is, they may not
      contain characters other than letters, digits, and underscores, and
      may not start with a digit.  Declaring a function with an invalid
      name causes a fatal syntax error in non-interactive shells.
 
-  13. Function names may not be the same as one of the POSIX special
+  15. Function names may not be the same as one of the POSIX special
      builtins.
 
-  14. POSIX special builtins are found before shell functions during
+  16. POSIX special builtins are found before shell functions during
      command lookup.
 
-  15. Literal tildes that appear as the first character in elements of
+  17. When printing shell function definitions (e.g., by 'type'), Bash
+     does not print the 'function' keyword.
+
+  18. Literal tildes that appear as the first character in elements of
      the 'PATH' variable are not expanded as described above under *note
      Tilde Expansion::.
 
-  16. The 'time' reserved word may be used by itself as a command.  When
+  19. The 'time' reserved word may be used by itself as a command.  When
      used in this way, it displays timing statistics for the shell and
      its completed children.  The 'TIMEFORMAT' variable controls the
      format of the timing information.
 
-  17. When parsing and expanding a ${...} expansion that appears within
+  20. When parsing and expanding a ${...} expansion that appears within
      double quotes, single quotes are no longer special and cannot be
      used to quote a closing brace or other special character, unless
      the operator is one of those defined to perform pattern removal.
      In this case, they do not have to appear as matched pairs.
 
-  18. The parser does not recognize 'time' as a reserved word if the
+  21. The parser does not recognize 'time' as a reserved word if the
      next token begins with a '-'.
 
-  19. The '!' character does not introduce history expansion within a
+  22. The '!' character does not introduce history expansion within a
      double-quoted string, even if the 'histexpand' option is enabled.
 
-  20. If a POSIX special builtin returns an error status, a
+  23. If a POSIX special builtin returns an error status, a
      non-interactive shell exits.  The fatal errors are those listed in
      the POSIX standard, and include things like passing incorrect
      options, redirection errors, variable assignment errors for
      assignments preceding the command name, and so on.
 
-  21. A non-interactive shell exits with an error status if a variable
+  24. A non-interactive shell exits with an error status if a variable
      assignment error occurs when no command name follows the assignment
      statements.  A variable assignment error occurs, for example, when
      trying to assign a value to a readonly variable.
 
-  22. A non-interactive shell exits with an error status if a variable
+  25. A non-interactive shell exits with an error status if a variable
      assignment error occurs in an assignment statement preceding a
      special builtin, but not with any other simple command.
 
-  23. A non-interactive shell exits with an error status if the
+  26. A non-interactive shell exits with an error status if the
      iteration variable in a 'for' statement or the selection variable
      in a 'select' statement is a readonly variable.
 
-  24. Non-interactive shells exit if FILENAME in '.'  FILENAME is not
+  27. Non-interactive shells exit if FILENAME in '.'  FILENAME is not
      found.
 
-  25. Non-interactive shells exit if a syntax error in an arithmetic
+  28. Non-interactive shells exit if a syntax error in an arithmetic
      expansion results in an invalid expression.
 
-  26. Non-interactive shells exit on word expansion errors.
+  29. Non-interactive shells exit if a parameter expansion error occurs.
 
-  27. Non-interactive shells exit if there is a syntax error in a script
+  30. Non-interactive shells exit if there is a syntax error in a script
      read with the '.' or 'source' builtins, or in a string processed by
      the 'eval' builtin.
 
-  28. Process substitution is not available.
-
-  29. While variable indirection is available, it may not be applied to
+  31. While variable indirection is available, it may not be applied to
      the '#' and '?' special parameters.
 
-  30. Assignment statements preceding POSIX special builtins persist in
+  32. When expanding the '*' special parameter in a pattern context
+     where the expansion is double-quoted does not treat the '$*' as if
+     it were double-quoted.
+
+  33. Assignment statements preceding POSIX special builtins persist in
      the shell environment after the builtin completes.
 
-  31. Assignment statements preceding shell function calls persist in
-     the shell environment after the function returns, as if a POSIX
-     special builtin command had been executed.
-
-  32. The 'command' builtin does not prevent builtins that take
+  34. The 'command' builtin does not prevent builtins that take
      assignment statements as arguments from expanding them as
      assignment statements; when not in POSIX mode, assignment builtins
      lose their assignment statement expansion properties when preceded
      by 'command'.
 
-  33. The 'bg' builtin uses the required format to describe each job
+  35. The 'bg' builtin uses the required format to describe each job
      placed in the background, which does not include an indication of
      whether the job is the current or previous job.
 
-  34. The output of 'kill -l' prints all the signal names on a single
+  36. The output of 'kill -l' prints all the signal names on a single
      line, separated by spaces, without the 'SIG' prefix.
 
-  35. The 'kill' builtin does not accept signal names with a 'SIG'
+  37. The 'kill' builtin does not accept signal names with a 'SIG'
      prefix.
 
-  36. The 'export' and 'readonly' builtin commands display their output
+  38. The 'export' and 'readonly' builtin commands display their output
      in the format required by POSIX.
 
-  37. The 'trap' builtin displays signal names without the leading
+  39. The 'trap' builtin displays signal names without the leading
      'SIG'.
 
-  38. The 'trap' builtin doesn't check the first argument for a possible
+  40. The 'trap' builtin doesn't check the first argument for a possible
      signal specification and revert the signal handling to the original
      disposition if it is, unless that argument consists solely of
      digits and is a valid signal number.  If users want to reset the
      handler for a given signal to the original disposition, they should
      use '-' as the first argument.
 
-  39. The '.' and 'source' builtins do not search the current directory
+  41. 'trap -p' displays signals whose dispositions are set to SIG_DFL
+     and those that were ignored when the shell started.
+
+  42. The '.' and 'source' builtins do not search the current directory
      for the filename argument if it is not found by searching 'PATH'.
 
-  40. Enabling POSIX mode has the effect of setting the
+  43. Enabling POSIX mode has the effect of setting the
      'inherit_errexit' option, so subshells spawned to execute command
      substitutions inherit the value of the '-e' option from the parent
      shell.  When the 'inherit_errexit' option is not enabled, Bash
      clears the '-e' option in such subshells.
 
-  41. When the 'alias' builtin displays alias definitions, it does not
+  44. Enabling POSIX mode has the effect of setting the 'shift_verbose'
+     option, so numeric arguments to 'shift' that exceed the number of
+     positional parameters will result in an error message.
+
+  45. When the 'alias' builtin displays alias definitions, it does not
      display them with a leading 'alias ' unless the '-p' option is
      supplied.
 
-  42. When the 'set' builtin is invoked without options, it does not
+  46. When the 'set' builtin is invoked without options, it does not
      display shell function names and definitions.
 
-  43. When the 'set' builtin is invoked without options, it displays
+  47. When the 'set' builtin is invoked without options, it displays
      variable values without quotes, unless they contain shell
      metacharacters, even if the result contains nonprinting characters.
 
-  44. When the 'cd' builtin is invoked in LOGICAL mode, and the pathname
+  48. When the 'cd' builtin is invoked in LOGICAL mode, and the pathname
      constructed from '$PWD' and the directory name supplied as an
      argument does not refer to an existing directory, 'cd' will fail
      instead of falling back to PHYSICAL mode.
 
-  45. The 'pwd' builtin verifies that the value it prints is the same as
+  49. When the 'cd' builtin cannot change a directory because the length
+     of the pathname constructed from '$PWD' and the directory name
+     supplied as an argument exceeds PATH_MAX when all symbolic links
+     are expanded, 'cd' will fail instead of attempting to use only the
+     supplied directory name.
+
+  50. The 'pwd' builtin verifies that the value it prints is the same as
      the current directory, even if it is not asked to check the file
      system with the '-P' option.
 
-  46. When listing the history, the 'fc' builtin does not include an
+  51. When listing the history, the 'fc' builtin does not include an
      indication of whether or not a history entry has been modified.
 
-  47. The default editor used by 'fc' is 'ed'.
+  52. The default editor used by 'fc' is 'ed'.
 
-  48. The 'type' and 'command' builtins will not report a non-executable
+  53. The 'type' and 'command' builtins will not report a non-executable
      file as having been found, though the shell will attempt to execute
      such a file if it is the only so-named file found in '$PATH'.
 
-  49. The 'vi' editing mode will invoke the 'vi' editor directly when
+  54. The 'vi' editing mode will invoke the 'vi' editor directly when
      the 'v' command is run, instead of checking '$VISUAL' and
      '$EDITOR'.
 
-  50. When the 'xpg_echo' option is enabled, Bash does not attempt to
+  55. When the 'xpg_echo' option is enabled, Bash does not attempt to
      interpret any arguments to 'echo' as options.  Each argument is
      displayed, after escape characters are converted.
 
-  51. The 'ulimit' builtin uses a block size of 512 bytes for the '-c'
+  56. The 'ulimit' builtin uses a block size of 512 bytes for the '-c'
      and '-f' options.
 
-  52. The arrival of 'SIGCHLD' when a trap is set on 'SIGCHLD' does not
+  57. The arrival of 'SIGCHLD' when a trap is set on 'SIGCHLD' does not
      interrupt the 'wait' builtin and cause it to return immediately.
      The trap command is run once for each child that exits.
 
-  53. The 'read' builtin may be interrupted by a signal for which a trap
+  58. The 'read' builtin may be interrupted by a signal for which a trap
      has been set.  If Bash receives a trapped signal while executing
      'read', the trap handler executes and 'read' returns an exit status
      greater than 128.
 
-  54. Bash removes an exited background process's status from the list
+  59. Bash removes an exited background process's status from the list
      of such statuses after the 'wait' builtin is used to obtain it.
 
 There is other POSIX behavior that Bash does not implement by default
diff --git a/msys2/usr/share/doc/bash/RBASH b/msys2/usr/share/doc/bash/RBASH
index 9478fc64f..9732c769c 100644
--- a/msys2/usr/share/doc/bash/RBASH
+++ b/msys2/usr/share/doc/bash/RBASH
@@ -8,11 +8,13 @@ the standard shell.  A restricted shell behaves identically to 'bash'
 with the exception that the following are disallowed or not performed:
 
    * Changing directories with the 'cd' builtin.
-   * Setting or unsetting the values of the 'SHELL', 'PATH', 'ENV', or
-     'BASH_ENV' variables.
+   * Setting or unsetting the values of the 'SHELL', 'PATH', 'HISTFILE',
+     'ENV', or 'BASH_ENV' variables.
    * Specifying command names containing slashes.
    * Specifying a filename containing a slash as an argument to the '.'
      builtin command.
+   * Specifying a filename containing a slash as an argument to the
+     'history' builtin command.
    * Specifying a filename containing a slash as an argument to the '-p'
      option to the 'hash' builtin command.
    * Importing function definitions from the shell environment at
@@ -35,3 +37,15 @@ When a command that is found to be a shell script is executed (*note
 Shell Scripts::), 'rbash' turns off any restrictions in the shell
 spawned to execute the script.
 
+The restricted shell mode is only one component of a useful restricted
+environment.  It should be accompanied by setting 'PATH' to a value that
+allows execution of only a few verified commands (commands that allow
+shell escapes are particularly vulnerable), leaving the user in a
+non-writable directory other than his home directory after login, not
+allowing the restricted shell to execute shell scripts, and cleaning the
+environment of variables that cause some commands to modify their
+behavior (e.g., 'VISUAL' or 'PAGER').
+
+Modern systems provide more secure ways to implement a restricted
+environment, such as 'jails', 'zones', or 'containers'.
+
diff --git a/msys2/usr/share/doc/bash/README b/msys2/usr/share/doc/bash/README
index ad87aa8a6..70b7a8517 100644
--- a/msys2/usr/share/doc/bash/README
+++ b/msys2/usr/share/doc/bash/README
@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This is GNU Bash, version 4.4.  Bash is the GNU Project's Bourne
+This is GNU Bash, version 5.1.  Bash is the GNU Project's Bourne
 Again SHell, a complete implementation of the POSIX shell spec,
 but also with interactive command line editing, job control on
 architectures that support it, csh-like features such as history
@@ -15,8 +15,8 @@ See the file POSIX for a discussion of how the Bash defaults differ
 from the POSIX spec and a description of the Bash `posix mode'.
 
 There are some user-visible incompatibilities between this version
-of Bash and previous widely-distributed versions, bash-4.2 and
-bash-4.3.  For details, see the file COMPAT.  The NEWS file tersely
+of Bash and previous widely-distributed versions, bash-4.4 and
+bash-5.0.  For details, see the file COMPAT.  The NEWS file tersely
 lists features that are new in this release. 
 
 Bash is free software, distributed under the terms of the [GNU] General
@@ -88,6 +88,18 @@ to bash-maintainers@gnu.org.
 While the Bash maintainers do not promise to fix all bugs, we would
 like this shell to be the best that we can make it.
 
+Other Packages
+==============
+
+This distribution includes, in examples/bash-completion, a recent version
+of the `bash-completion' package, which provides programmable completions
+for a number of commands. It's available as a package in many distributions,
+and that is the first place from which to obtain it. If it's not a package
+from your vendor, you may install the included version.
+
+The latest version of bash-completion is always available from
+https://github.com/scop/bash-completion.
+
 Enjoy!
 
 Chet Ramey
diff --git a/msys2/usr/share/doc/bash/bash.html b/msys2/usr/share/doc/bash/bash.html
index 983284e84..adb9e7607 100644
--- a/msys2/usr/share/doc/bash/bash.html
+++ b/msys2/usr/share/doc/bash/bash.html
@@ -3,7 +3,7 @@
 </HEAD>
 <BODY><TABLE WIDTH=100%>
 <TR>
-<TH ALIGN=LEFT width=33%>BASH(1)<TH ALIGN=CENTER width=33%>2016 August 26<TH ALIGN=RIGHT width=33%>BASH(1)
+<TH ALIGN=LEFT width=33%>BASH(1)<TH ALIGN=CENTER width=33%>2020 October 29<TH ALIGN=RIGHT width=33%>BASH(1)
 </TR>
 </TABLE>
 <BR><A HREF="#index">Index</A>
@@ -18,6 +18,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -42,7 +54,7 @@ bash - GNU Bourne-Again SHell
 <H3>COPYRIGHT</H3>
 
 
-Bash is Copyright &#169; 1989-2016 by the Free Software Foundation, Inc.
+Bash is Copyright &#169; 1989-2020 by the Free Software Foundation, Inc.
 <A NAME="lbAE">&nbsp;</A>
 <H3>DESCRIPTION</H3>
 
@@ -68,8 +80,8 @@ can be configured to be POSIX-conformant by default.
 <H3>OPTIONS</H3>
 
 All of the single-character shell options documented in the
-description of the <B>set</B> builtin command can be used as options
-when the shell is invoked.
+description of the <B>set</B> builtin command, including <B>-o</B>,
+can be used as options when the shell is invoked.
 In addition, <B>bash</B>
 interprets the following options when it is invoked:
 <P>
@@ -139,7 +151,8 @@ If the
 option is present, or if no arguments remain after option
 processing, then commands are read from the standard input.
 This option allows the positional parameters to be set
-when invoking an interactive shell.
+when invoking an interactive shell or when reading input
+through a pipe.
 <DT><B>-D</B>
 
 <DD>
@@ -509,7 +522,7 @@ option has no effect.
 A non-interactive shell invoked with the name
 <B>sh</B>
 
-does not attempt to read any other startup files. 
+does not attempt to read any other startup files.
 When invoked as
 <B>sh</B>,
 
@@ -585,8 +598,6 @@ the same, but the effective user id is not reset.
 <A NAME="lbAI">&nbsp;</A>
 <H3>DEFINITIONS</H3>
 
-<P>
-
 The following definitions are used throughout the rest of this
 document.
 
@@ -626,10 +637,6 @@ A character that, when unquoted, separates words.  One of the following:
 
 </DL>
 
-</DL>
-<P>
-
-<DL COMPACT>
 <DT><B>control operator</B>
 
 <DD>
@@ -649,17 +656,21 @@ symbols:
 
 <I>Reserved words</I> are words that have a special meaning to the shell.
 The following words are recognized as reserved when unquoted and either
-the first word of a simple command (see
+the first word of a command (see
 <FONT SIZE=-1><B>SHELL GRAMMAR</B>
 
 </FONT>
-below) or the third word of a
+below), the third word of a
 <B>case</B>
 
 or
+<B>select</B>
+
+command
+(only <B>in</B> is valid), or the third word of a
 <B>for</B>
 
-command:
+command (only <B>in</B> and <B>do</B> are valid):
 <DL COMPACT><DT><DD>
 
 <P>
@@ -677,8 +688,6 @@ command:
 <A NAME="lbAL">&nbsp;</A>
 <H4>Simple Commands</H4>
 
-<P>
-
 A <I>simple command</I> is a sequence of optional variable assignments
 followed by <B>blank</B>-separated words and redirections, and
 terminated by a <I>control operator</I>.  The first word
@@ -693,8 +702,6 @@ The return value of a <I>simple command</I> is its exit status, or
 <A NAME="lbAM">&nbsp;</A>
 <H4>Pipelines</H4>
 
-<P>
-
 A <I>pipeline</I> is a sequence of one or more commands separated by
 one of the control operators
 <B>|</B>
@@ -780,11 +787,15 @@ the time information.
 
 Each command in a pipeline is executed as a separate process (i.e., in a
 subshell).
+See
+<FONT SIZE=-1><B>COMMAND EXECUTION ENVIRONMENT</B></FONT>
+for a description of a subshell environment.
+If the <B>lastpipe</B> option is enabled using the <B>shopt</B> builtin
+(see the description of <B>shopt</B> below),
+the last element of a pipeline may be run by the shell process.
 <A NAME="lbAN">&nbsp;</A>
 <H4>Lists</H4>
 
-<P>
-
 A <I>list</I> is a sequence of one or more pipelines separated by one
 of the operators
 <B>;</B>,
@@ -829,8 +840,11 @@ If a command is terminated by the control operator
 <B>&amp;</B>,
 
 the shell executes the command in the <I>background</I>
-in a subshell.  The shell does not wait for the command to
-finish, and the return status is 0.  Commands separated by a
+in a subshell.
+The shell does not wait for the command to
+finish, and the return status is 0.
+These are referred to as <I>asynchronous</I> commands.
+Commands separated by a
 <B>;</B>
 
 are executed sequentially; the shell waits for each
@@ -855,7 +869,7 @@ An AND list has the form
 is executed if, and only if,
 <I>command1</I>
 
-returns an exit status of zero.
+returns an exit status of zero (success).
 <P>
 
 An OR list has the form
@@ -863,15 +877,13 @@ An OR list has the form
 <P>
 
 <I>command1</I> <B>||</B> <I>command2</I>
-<P>
-
 </DL>
 
 <P>
 
 <I>command2</I>
 
-is executed if and only if
+is executed if, and only if,
 <I>command1</I>
 
 returns a non-zero exit status.
@@ -881,8 +893,6 @@ executed in the list.
 <A NAME="lbAO">&nbsp;</A>
 <H4>Compound Commands</H4>
 
-<P>
-
 A <I>compound command</I> is one of the following.
 In most cases a <I>list</I> in a command's description may be separated from
 the rest of the command by one or more newlines, and may be followed by a
@@ -958,7 +968,9 @@ to be matched as a string.
 An additional binary operator, <B>=~</B>, is available, with the same
 precedence as <B>==</B> and <B>!=</B>.
 When it is used, the string to the right of the operator is considered
-an extended regular expression and matched accordingly (as in <I>regex</I>(3)).
+a POSIX extended regular expression and matched accordingly
+(using the POSIX <I>regcomp</I> and <I>regexec</I> interfaces
+usually described in <I>regex</I>(3)).
 The return value is 0 if the string matches
 the pattern, and 1 otherwise.
 If the regular expression is syntactically incorrect, the conditional
@@ -974,18 +986,29 @@ Bracket expressions in regular expressions must be treated carefully,
 since normal quoting characters lose their meanings between brackets.
 If the pattern is stored in a shell variable, quoting the variable
 expansion forces the entire pattern to be matched as a string.
-Substrings matched by parenthesized subexpressions within the regular
-expression are saved in the array variable
-<FONT SIZE=-1><B>BASH_REMATCH</B>.
+<P>
+
+
+The pattern will match if it matches any part of the string.
+Anchor the pattern using the <B>^</B> and <B>$</B> regular expression
+operators to force it to match the entire string.
+The array variable
+<FONT SIZE=-1><B>BASH_REMATCH</B>
 
 </FONT>
+records which parts of the string matched the pattern.
 The element of
 <FONT SIZE=-1><B>BASH_REMATCH</B>
 
 </FONT>
-with index 0 is the portion of the string
-matching the entire regular expression.
-The element of
+with index 0 contains the portion of
+the string matching the entire regular expression.
+Substrings matched by parenthesized subexpressions within the regular
+expression are saved in the remaining
+<FONT SIZE=-1><B>BASH_REMATCH</B>
+
+</FONT>
+indices. The element of
 <FONT SIZE=-1><B>BASH_REMATCH</B>
 
 </FONT>
@@ -1110,11 +1133,11 @@ or zero if no commands were executed.
 <DT><B>case</B> <I>word</I> <B>in</B> [ [(] <I>pattern</I> [ <B>|</B> <I>pattern</I> ] 
 <DD>
 A <B>case</B> command first expands <I>word</I>, and tries to match
-it against each <I>pattern</I> in turn, using the same matching rules
-as for pathname expansion (see
-<B>Pathname Expansion</B>
+it against each <I>pattern</I> in turn, using the matching rules
+described under
+<B>Pattern Matching</B>
 
-below).
+below.
 The <I>word</I> is expanded using tilde
 expansion, parameter and variable expansion, arithmetic expansion,
 command substitution, process substitution and quote removal.
@@ -1133,7 +1156,8 @@ Using <B>;&amp;</B> in place of <B>;;</B> causes execution to continue with
 the <I>list</I> associated with the next set of patterns.
 Using <B>;;&amp;</B> in place of <B>;;</B> causes the shell to test the next
 pattern list in the statement, if any, and execute any associated <I>list</I>
-on a successful match.
+on a successful match,
+continuing the case statement execution as if the pattern list had not matched.
 The exit status is zero if no
 pattern matches.  Otherwise, it is the exit status of the
 last command executed in <I>list</I>.
@@ -1172,8 +1196,6 @@ none was executed.
 <A NAME="lbAP">&nbsp;</A>
 <H4>Coprocesses</H4>
 
-<P>
-
 A <I>coprocess</I> is a shell command preceded by the <B>coproc</B> reserved
 word.
 A coprocess is executed asynchronously in a subshell, as if the command
@@ -1217,7 +1239,8 @@ command (see
 below).
 The file descriptors can be utilized as arguments to shell commands
 and redirections using standard word expansions.
-The file descriptors are not available in subshells.
+Other than those created to execute command and process substitutions,
+the file descriptors are not available in subshells.
 The process ID of the shell spawned to execute the coprocess is
 available as the value of the variable <I>NAME</I>_PID.
 The <B>wait</B>
@@ -1230,17 +1253,15 @@ The return status of a coprocess is the exit status of <I>command</I>.
 <A NAME="lbAQ">&nbsp;</A>
 <H4>Shell Function Definitions</H4>
 
-<P>
-
 A shell function is an object that is called like a simple command and
 executes a compound command with a new set of positional parameters.
 Shell functions are declared as follows:
 <DL COMPACT>
-<DT><I>name</I> () <I>compound-command</I> [<I>redirection</I>]<DD>
+<DT><I>fname</I> () <I>compound-command</I> [<I>redirection</I>]<DD>
 
-<DT><B>function</B> <I>name</I> [()] <I>compound-command</I> [<I>redirection</I>]<DD>
+<DT><B>function</B> <I>fname</I> [()] <I>compound-command</I> [<I>redirection</I>]<DD>
 
-This defines a function named <I>name</I>.
+This defines a function named <I>fname</I>.
 The reserved word <B>function</B> is optional.
 If the <B>function</B> reserved word is supplied, the parentheses are optional.
 The <I>body</I> of the function is the compound command
@@ -1251,10 +1272,13 @@ That command is usually a <I>list</I> of commands between { and }, but
 may be any command listed under <B>Compound Commands</B> above,
 with one exception: If the <B>function</B> reserved word is used, but the
 parentheses are not supplied, the braces are required.
-<I>compound-command</I> is executed whenever <I>name</I> is specified as the
+<I>compound-command</I> is executed whenever <I>fname</I> is specified as the
 name of a simple command.
-When in <I>posix mode</I>, <I>name</I> may not be the name of one of the
+When in <I>posix mode</I>, <I>fname</I> must be a valid shell <I>name</I>
+and may not be the name of one of the
 POSIX <I>special builtins</I>.
+In default mode, a function name can be any unquoted shell word that does
+not contain <B>$</B>.
 Any redirections (see
 <FONT SIZE=-1><B>REDIRECTION</B>
 
@@ -1463,7 +1487,7 @@ question mark
 
 <DD>
 the eight-bit character whose value is the octal value <I>nnn</I>
-(one to three digits)
+(one to three octal digits)
 <DT><B>\x</B><I>HH</I>
 
 <DD>
@@ -1494,8 +1518,12 @@ not been present.
 
 A double-quoted string preceded by a dollar sign (<B>$</B>dq<I>string</I>dq)
 will cause the string to be translated according to the current locale.
-If the current locale is <B>C</B> or <B>POSIX</B>, the dollar sign
-is ignored.
+The <I>gettext</I> infrastructure performs the message catalog lookup and
+translation, using the <B>LC_MESSAGES</B> and <B>TEXTDOMAIN</B> shell
+variables.
+If the current locale is <B>C</B> or <B>POSIX</B>,
+or if there are no translations available,
+the dollar sign is ignored.
 If the string is translated and replaced, the replacement is
 double-quoted.
 <A NAME="lbAT">&nbsp;</A>
@@ -1661,8 +1689,6 @@ as an argument, the variable referenced by the nameref variable will be unset.
 <A NAME="lbAU">&nbsp;</A>
 <H4>Positional Parameters</H4>
 
-<P>
-
 A
 <I>positional parameter</I>
 
@@ -1690,8 +1716,6 @@ below).
 <A NAME="lbAV">&nbsp;</A>
 <H4>Special Parameters</H4>
 
-<P>
-
 The shell treats several parameters specially.  These parameters may
 only be referenced; assignment to them is not allowed.
 
@@ -1730,7 +1754,14 @@ is null, the parameters are joined without intervening separators.
 <DT><B>@</B>
 
 <DD>
-Expands to the positional parameters, starting from one.  When the
+Expands to the positional parameters, starting from one.
+In contexts where word splitting is performed, this expands each
+positional parameter to a separate word; if not within double
+quotes, these words are subject to word splitting.
+In contexts where word splitting is not performed,
+this expands to a single word
+with each positional parameter separated by a space.
+When the
 expansion occurs within double quotes, each parameter expands to a
 separate word.  That is, &quot;<B>$@</B>&quot; is equivalent to
 &quot;<B>$1</B>&quot; &quot;<B>$2</B>&quot; ...
@@ -1754,7 +1785,7 @@ pipeline.
 <DT><B>-</B>
 
 <DD>
-Expands to the current option flags as specified upon invocation, 
+Expands to the current option flags as specified upon invocation,
 by the
 <B>set</B>
 
@@ -1804,30 +1835,28 @@ to the filename used to invoke
 <B>bash</B>,
 
 as given by argument zero.
-<DT><B>_</B>
-
-<DD>
-At shell startup, set to the absolute pathname used to invoke the
-shell or shell script being executed as passed in the environment
-or argument list.
-Subsequently, expands to the last argument to the previous command,
-after expansion.
-Also set to the full pathname used to invoke each command executed
-and placed in the environment exported to that command.
-When checking mail, this parameter holds the name of the mail file
-currently being checked.
 
 </DL>
 <A NAME="lbAW">&nbsp;</A>
 <H4>Shell Variables</H4>
 
-<P>
-
 The following variables are set by the shell:
 <P>
 
 
 <DL COMPACT>
+<DT><B>_</B>
+
+<DD>
+At shell startup, set to the pathname used to invoke the
+shell or shell script being executed as passed in the environment
+or argument list.
+Subsequently, expands to the last argument to the previous simple
+command executed in the foreground, after expansion.
+Also set to the full pathname used to invoke each command executed
+and placed in the environment exported to that command.
+When checking mail, this parameter holds the name of the mail file
+currently being checked.
 <DT><B>BASH</B>
 
 <DD>
@@ -1868,6 +1897,16 @@ This variable is read-only.
 Expands to the process ID of the current <B>bash</B> process.
 This differs from <B>$$</B> under certain circumstances, such as subshells
 that do not require <B>bash</B> to be re-initialized.
+Assignments to
+<FONT SIZE=-1><B>BASHPID</B>
+
+</FONT>
+have no effect.
+If
+<B>BASHPID</B>
+
+is unset, it loses its special properties, even if it is
+subsequently reset.
 <DT><B>BASH_ALIASES</B>
 
 <DD>
@@ -1903,7 +1942,10 @@ only when in extended debugging mode (see the description of the
 option to the
 <B>shopt</B>
 
-builtin below)
+builtin below).
+Setting <B>extdebug</B> after the shell has started to execute a script,
+or referencing this variable when <B>extdebug</B> is not set,
+may result in inconsistent values.
 <DT><B>BASH_ARGV</B>
 
 <DD>
@@ -1926,7 +1968,27 @@ only when in extended debugging mode
 option to the
 <B>shopt</B>
 
-builtin below)
+builtin below).
+Setting <B>extdebug</B> after the shell has started to execute a script,
+or referencing this variable when <B>extdebug</B> is not set,
+may result in inconsistent values.
+<DT><B>BASH_ARGV0</B>
+
+<DD>
+When referenced, this variable expands to the name of the shell or shell
+script (identical to
+<B>$0</B>;
+
+see the description of special parameter 0 above).
+Assignment to
+<B>BASH_ARGV0</B>
+
+causes the value assigned to also be assigned to <B>$0</B>.
+If
+<B>BASH_ARGV0</B>
+
+is unset, it loses its special properties, even if it is
+subsequently reset.
 <DT><B>BASH_CMDS</B>
 
 <DD>
@@ -1946,6 +2008,11 @@ subsequently reset.
 The command currently being executed or about to be executed, unless the
 shell is executing a command as the result of a trap,
 in which case it is the command executing at the time of the trap.
+If
+<B>BASH_COMMAND</B>
+
+is unset, it loses its special properties, even if it is
+subsequently reset.
 <DT><B>BASH_EXECUTION_STRING</B>
 
 <DD>
@@ -1986,7 +2053,6 @@ The element with index 0 is the portion of the string
 matching the entire regular expression.
 The element with index <I>n</I> is the portion of the
 string matching the <I>n</I>th parenthesized subexpression.
-This variable is read-only.
 <DT><B>BASH_SOURCE</B>
 
 <DD>
@@ -2006,6 +2072,11 @@ The shell function
 Incremented by one within each subshell or subshell environment when
 the shell begins executing in that environment.
 The initial value is 0.
+If
+<B>BASH_SUBSHELL</B>
+
+is unset, it loses its special properties, even if it is
+subsequently reset.
 <DT><B>BASH_VERSINFO</B>
 
 <DD>
@@ -2152,6 +2223,39 @@ Assignment to this variable will not change the current directory.
 If
 <FONT SIZE=-1><B>DIRSTACK</B>
 
+</FONT>
+is unset, it loses its special properties, even if it is
+subsequently reset.
+<DT><B>EPOCHREALTIME</B>
+
+<DD>
+Each time this parameter is referenced, it expands to the number of seconds
+since the Unix Epoch (see <I>time</I>(3)) as a floating point value
+with micro-second granularity.
+Assignments to
+<FONT SIZE=-1><B>EPOCHREALTIME</B>
+
+</FONT>
+are ignored.
+If
+<FONT SIZE=-1><B>EPOCHREALTIME</B>
+
+</FONT>
+is unset, it loses its special properties, even if it is
+subsequently reset.
+<DT><B>EPOCHSECONDS</B>
+
+<DD>
+Each time this parameter is referenced, it expands to the number of seconds
+since the Unix Epoch (see <I>time</I>(3)).
+Assignments to
+<FONT SIZE=-1><B>EPOCHSECONDS</B>
+
+</FONT>
+are ignored.
+If
+<FONT SIZE=-1><B>EPOCHSECONDS</B>
+
 </FONT>
 is unset, it loses its special properties, even if it is
 subsequently reset.
@@ -2214,6 +2318,11 @@ subsequently reset.
 <DD>
 The history number, or index in the history list, of the current
 command.
+Assignments to
+<FONT SIZE=-1><B>HISTCMD</B>
+
+</FONT>
+are ignored.
 If
 <FONT SIZE=-1><B>HISTCMD</B>
 
@@ -2322,13 +2431,14 @@ command.
 <DT><B>RANDOM</B>
 
 <DD>
-Each time this parameter is referenced, a random integer between
-0 and 32767 is
-generated.  The sequence of random numbers may be initialized by assigning
+Each time this parameter is referenced, it expands to a random integer
+between 0 and 32767.
+Assigning
 a value to
-<FONT SIZE=-1><B>RANDOM</B>.
+<FONT SIZE=-1><B>RANDOM</B>
 
 </FONT>
+initializes (seeds) the sequence of random numbers.
 If
 <FONT SIZE=-1><B>RANDOM</B>
 
@@ -2349,6 +2459,22 @@ line buffer, for use with
 
 </FONT>
 below).
+<DT><B>READLINE_MARK</B>
+
+<DD>
+The position of the mark (saved insertion point) in the
+<B>readline</B>
+
+line buffer, for use with
+<TT>bind -x</TT>
+
+(see
+<FONT SIZE=-1><B>SHELL BUILTIN COMMANDS</B>
+
+</FONT>
+below).
+The characters between the insertion point and the mark are often
+called the <I>region</I>.
 <DT><B>READLINE_POINT</B>
 
 <DD>
@@ -2382,6 +2508,8 @@ value is assigned to
 the value returned upon subsequent
 references is
 the number of seconds since the assignment plus the value assigned.
+The number of seconds at shell invocation and the current time is always
+determined by querying the system clock.
 If
 <FONT SIZE=-1><B>SECONDS</B>
 
@@ -2423,6 +2551,21 @@ Incremented by one each time an instance of
 <B>bash</B>
 
 is started.
+<DT><B>SRANDOM</B>
+
+<DD>
+This variable expands to a 32-bit pseudo-random number each time it is
+referenced. The random number generator is not linear on systems that
+support <TT>/dev/urandom</TT> or <I>arc4random</I>, so each returned number
+has no relationship to the numbers preceding it.
+The random number generator cannot be seeded, so assignments to this
+variable have no effect.
+If
+<FONT SIZE=-1><B>SRANDOM</B>
+
+</FONT>
+is unset, it loses its special properties,
+even if it is subsequently reset.
 <DT><B>UID</B>
 
 <DD>
@@ -2445,9 +2588,11 @@ below.
 
 <DD>
 The value is used to set the shell's compatibility level.
-See the description of the <B>shopt</B> builtin below under
-<B>SHELL BUILTIN COMMANDS</B>
-for a description of the various compatibility
+See
+<FONT SIZE=-1><B>SHELL COMPATIBILITY MODE</B>
+
+</FONT>
+below for a description of the various compatibility
 levels and their effects.
 The value may be a decimal number (e.g., 4.2) or an integer (e.g., 42)
 corresponding to the desired compatibility level.
@@ -2456,9 +2601,14 @@ level is set to the default for the current version.
 If <B>BASH_COMPAT</B> is set to a value that is not one of the valid
 compatibility levels, the shell prints an error message and sets the
 compatibility level to the default for the current version.
-The valid compatibility levels correspond to the compatibility options
-accepted by the <B>shopt</B> builtin described below (for example,
-<B>compat42</B> means that 4.2 and 42 are valid values).
+The valid values correspond to the compatibility levels
+described below under
+<FONT SIZE=-1><B>BSHELL</B>COMPATIBILITY<B>MODE</B>.
+
+</FONT>
+For example, 4.2 and 42 are valid values that correspond
+to the <B>compat42</B> <B>shopt</B> option
+and set the compatibility level to 42.
 The current version is also a valid value.
 <DT><B>BASH_ENV</B>
 
@@ -2558,11 +2708,12 @@ line editing.
 <DT><B>ENV</B>
 
 <DD>
-Similar to
-<FONT SIZE=-1><B>BASH_ENV</B>;
+Expanded and executed similarly to
+<FONT SIZE=-1><B>BASH_ENV</B>
 
 </FONT>
-used when the shell is invoked in POSIX mode.
+(see <B>INVOCATION</B> above)
+when an interactive shell is invoked in <I>posix mode</I>.
 <DT><B>EXECIGNORE</B>
 
 <DD>
@@ -2595,7 +2746,7 @@ filename completion (see
 
 </FONT>
 below).
-A filename whose suffix matches one of the entries in 
+A filename whose suffix matches one of the entries in
 <FONT SIZE=-1><B>FIGNORE</B>
 
 </FONT>
@@ -2612,9 +2763,9 @@ will cause the current command to abort.
 <DT><B>GLOBIGNORE</B>
 
 <DD>
-A colon-separated list of patterns defining the set of filenames to
+A colon-separated list of patterns defining the set of file names to
 be ignored by pathname expansion.
-If a filename matched by a pathname expansion pattern also matches one
+If a file name matched by a pathname expansion pattern also matches one
 of the patterns in
 <FONT SIZE=-1><B>GLOBIGNORE</B>,
 
@@ -2815,6 +2966,12 @@ startup file, overriding the default of
 
 </FONT>
 below).
+<DT><B>INSIDE_EMACS</B>
+
+<DD>
+If this variable appears in the environment when the shell starts,
+<B>bash</B> assumes that it is running inside an Emacs shell buffer
+and may disable line editing, depending on the value of <B>TERM</B>.
 <DT><B>LANG</B>
 
 <DD>
@@ -2971,11 +3128,16 @@ running, <B>bash</B> enables <I>posix mode</I>, as if the command
 <TT>set -o posix</TT>
 
 had been executed.
+When the shell enters <I>posix mode</I>, it sets this variable if it was
+not already set.
 <DT><B>PROMPT_COMMAND</B>
 
 <DD>
-If set, the value is executed as a command prior to issuing each primary
-prompt.
+If this variable is set, and is an array,
+the value of each set element is executed as a command
+prior to issuing each primary prompt.
+If this is set but not an array variable, 
+its value is used as a command to execute instead.
 <DT><B>PROMPT_DIRTRIM</B>
 
 <DD>
@@ -3035,6 +3197,7 @@ and the value is printed before each command
 <B>bash</B>
 
 displays during an execution trace.  The first character of
+the expanded value of
 <FONT SIZE=-1><B>PS4</B>
 
 </FONT>
@@ -3043,7 +3206,7 @@ levels of indirection.  The default is ``<B>+ </B>''.
 <DT><B>SHELL</B>
 
 <DD>
-The full pathname to the shell is kept in this environment variable.
+This variable expands to the full pathname to the shell.
 If it is not set when the shell starts,
 <B>bash</B>
 
@@ -3243,15 +3406,30 @@ builtins.  Each attribute applies to all members of an array.
 
 Arrays are assigned to using compound assignments of the form
 <I>name</I>=<B>(</B>value<I>1</I> ... value<I>n</I><B>)</B>, where each
-<I>value</I> is of the form [<I>subscript</I>]=<I>string</I>.
+<I>value</I> may be of the form [<I>subscript</I>]=<I>string</I>.
 Indexed array assignments do not require anything but <I>string</I>.
+Each <I>value</I> in the list is expanded using all the shell expansions
+described below under
+<FONT SIZE=-1><B>EXPANSION</B>.
+
+</FONT>
 When assigning to indexed arrays, if the optional brackets and subscript
 are supplied, that index is assigned to;
 otherwise the index of the element assigned is the last index assigned
 to by the statement plus one.  Indexing starts at zero.
 <P>
 
-When assigning to an associative array, the subscript is required.
+When assigning to an associative array, the words in a compound assignment
+may be either assignment statements, for which the subscript is required,
+or a list of words that is interpreted as a sequence of alternating keys
+and values:
+<I>name</I>=<B>( </B><I>key1 value1 key2 value2</I> ...<B>)</B>.
+These are treated identically to
+<I>name</I>=<B>(</B> [<I>key1</I>]=<I>value1</I> [<I>key2</I>]=<I>value2</I> ...<B>)</B>.
+The first word in the list determines how the remaining words
+are interpreted; all assignments in a list must be of the same type.
+When using key/value pairs, the keys may not be missing or empty;
+a final missing value is treated like the empty string.
 <P>
 
 This syntax is also accepted by the
@@ -3327,15 +3505,21 @@ The
 <B>unset</B>
 
 builtin is used to destroy arrays.  <B>unset</B> <I>name</I>[<I>subscript</I>]
-destroys the array element at index <I>subscript</I>.
+destroys the array element at index <I>subscript</I>,
+for both indexed and associative arrays.
 Negative subscripts to indexed arrays are interpreted as described above.
-Care must be taken to avoid unwanted side effects caused by pathname
-expansion.
+Unsetting the last element of an array variable does not unset the variable.
 <B>unset</B> <I>name</I>, where <I>name</I> is an array, or
 <B>unset</B> <I>name</I>[<I>subscript</I>], where
 <I>subscript</I> is <B>*</B> or <B>@</B>, removes the entire array.
 <P>
 
+When using a variable name with a subscript as an argument to a command,
+such as with <B>unset</B>, without using the word expansion syntax
+described above, the argument is subject to pathname expansion.
+If pathname expansion is not desired, the argument should be quoted.
+<P>
+
 The
 <B>declare</B>,
 
@@ -3413,10 +3597,11 @@ original word are removed unless they have been quoted themselves
 <P>
 
 Only brace expansion, word splitting, and pathname expansion
-can change the number of words of the expansion; other expansions
+can increase the number of words of the expansion; other expansions
 expand a single word to a single word.
 The only exceptions to this are the expansions of
-&quot;<B>$@</B>&quot; and &quot;<B>${</B><I>name</I><B>[@]}</B>&quot;
+&quot;<B>$@</B>&quot; and &quot;<B>${</B><I>name</I><B>[@]}</B>&quot;,
+and, in most cases, <B>$*</B> and <B>${</B><I>name</I><B>[*]}</B>
 as explained above (see
 <FONT SIZE=-1><B>PARAMETERS</B>).
 
@@ -3424,8 +3609,6 @@ as explained above (see
 <A NAME="lbAZ">&nbsp;</A>
 <H4>Brace Expansion</H4>
 
-<P>
-
 <I>Brace expansion</I>
 
 is a mechanism by which arbitrary strings
@@ -3485,7 +3668,8 @@ Any incorrectly formed brace expansion is left unchanged.
 A <B>{</B> or <B>,</B> may be quoted with a backslash to prevent its
 being considered part of a brace expression.
 To avoid conflicts with parameter expansion, the string <B>${</B>
-is not considered eligible for brace expansion.
+is not considered eligible for brace expansion, and inhibits brace
+expansion until the closing <B>}</B>.
 <P>
 
 This construct is typically used as shorthand when the common
@@ -3549,8 +3733,6 @@ below).
 <A NAME="lbBA">&nbsp;</A>
 <H4>Tilde Expansion</H4>
 
-<P>
-
 If a word begins with an unquoted tilde character (`<B>~</B>'), all of
 the characters preceding the first unquoted slash (or all characters,
 if there is no unquoted slash) are considered a <I>tilde-prefix</I>.
@@ -3617,11 +3799,19 @@ and
 
 </FONT>
 and the shell assigns the expanded value.
+<P>
+
+Bash also performs tilde expansion on words satisfying the conditions of
+variable assignments (as described above under
+<FONT SIZE=-1><B>PARAMETERS</B>)
+
+</FONT>
+when they appear as arguments to simple commands.
+Bash does not do this, except for the <I>declaration</I> commands listed
+above, when in <I>posix mode</I>.
 <A NAME="lbBB">&nbsp;</A>
 <H4>Parameter Expansion</H4>
 
-<P>
-
 The `<B>$</B>' character introduces parameter expansion,
 command substitution, or arithmetic expansion.  The parameter name
 or symbol to be expanded may be enclosed in braces, which
@@ -3657,14 +3847,16 @@ The <I>parameter</I> is a shell parameter as described above
 
 If the first character of <I>parameter</I> is an exclamation point (<B>!</B>),
 and <I>parameter</I> is not a <I>nameref</I>,
-it introduces a level of variable indirection.
-<B>Bash</B> uses the value of the variable formed from the rest of
-<I>parameter</I> as the name of the variable; this variable is then
-expanded and that value is used in the rest of the substitution, rather
-than the value of <I>parameter</I> itself.
+it introduces a level of indirection.
+<B>Bash</B> uses the value formed by expanding the rest of
+<I>parameter</I> as the new <I>parameter</I>; this is then
+expanded and that value is used in the rest of the expansion, rather
+than the expansion of the original <I>parameter</I>.
 This is known as <I>indirect expansion</I>.
+The value is subject to tilde expansion,
+parameter expansion, command substitution, and arithmetic expansion.
 If <I>parameter</I> is a nameref, this expands to the name of the
-variable referenced by <I>parameter</I> instead of performing the
+parameter referenced by <I>parameter</I> instead of performing the
 complete indirect expansion.
 The exceptions to this are the expansions of ${<B>!</B><I>prefix</I><B>*</B>} and
 ${<B>!</B><I>name</I>[<I>@</I>]} described below.
@@ -3848,7 +4040,14 @@ The
 <I>word</I>
 
 is expanded to produce a pattern just as in pathname
-expansion.  If the pattern matches the beginning of
+expansion, and matched against the expanded value of
+<I>parameter</I>
+
+using the rules described under
+<B>Pattern Matching</B>
+
+below.
+If the pattern matches the beginning of
 the value of
 <I>parameter</I>,
 
@@ -3885,7 +4084,13 @@ array in turn, and the expansion is the resultant list.
 
 <B>Remove matching suffix pattern</B>.
 The <I>word</I> is expanded to produce a pattern just as in
-pathname expansion.
+pathname expansion, and matched against the expanded value of
+<I>parameter</I>
+
+using the rules described under
+<B>Pattern Matching</B>
+
+below.
 If the pattern matches a trailing portion of the expanded value of
 <I>parameter</I>,
 
@@ -3919,9 +4124,13 @@ array in turn, and the expansion is the resultant list.
 <DT>${<I>parameter</I><B>/</B><I>pattern</I><B>/</B><I>string</I>}<DD>
 <B>Pattern substitution</B>.
 The <I>pattern</I> is expanded to produce a pattern just as in
-pathname expansion.
+pathname expansion,
 <I>Parameter</I> is expanded and the longest match of <I>pattern</I>
 against its value is replaced with <I>string</I>.
+The match is performed using the rules described under
+<B>Pattern Matching</B>
+
+below.
 If <I>pattern</I> begins with <B>/</B>, all matches of <I>pattern</I> are
 replaced with <I>string</I>.  Normally only the first match is replaced.
 If <I>pattern</I> begins with <B>#</B>, it must match at the beginning
@@ -4009,6 +4218,21 @@ or information about <I>parameter</I> itself, depending on the value of
 <DL COMPACT><DT><DD>
 
 <DL COMPACT>
+<DT><B>U</B>
+
+<DD>
+The expansion is a string that is the value of <I>parameter</I> with lowercase
+alphabetic characters converted to uppercase.
+<DT><B>u</B>
+
+<DD>
+The expansion is a string that is the value of <I>parameter</I> with the first
+character converted to uppercase, if it is alphabetic.
+<DT><B>L</B>
+
+<DD>
+The expansion is a string that is the value of <I>parameter</I> with uppercase
+alphabetic characters converted to lowercase.
 <DT><B>Q</B>
 
 <DD>
@@ -4018,7 +4242,7 @@ format that can be reused as input.
 
 <DD>
 The expansion is a string that is the value of <I>parameter</I> with backslash
-escape sequences expanded as with the <B>$'...'</B> quoting mechansim.
+escape sequences expanded as with the <B>$'...'</B> quoting mechanism.
 <DT><B>P</B>
 
 <DD>
@@ -4030,6 +4254,13 @@ The expansion is a string that is the result of expanding the value of
 The expansion is a string in the form of
 an assignment statement or <B>declare</B> command that, if
 evaluated, will recreate <I>parameter</I> with its attributes and value.
+<DT><B>K</B>
+
+<DD>
+Produces a possibly-quoted version of the value of <I>parameter</I>,
+except that it prints the values of
+indexed and associative arrays as a sequence of quoted key-value pairs
+(see <B>Arrays</B> above).
 <DT><B>a</B>
 
 <DD>
@@ -4059,7 +4290,7 @@ is an array variable subscripted with
 or
 <B>*</B>,
 
-the case modification operation is applied to each member of the
+the operation is applied to each member of the
 array in turn, and the expansion is the resultant list.
 <P>
 The result of the expansion is subject to word splitting and pathname
@@ -4070,8 +4301,6 @@ expansion as described below.
 <A NAME="lbBC">&nbsp;</A>
 <H4>Command Substitution</H4>
 
-<P>
-
 <I>Command substitution</I> allows the output of a command to replace
 the command name.  There are two forms:
 <DL COMPACT><DT><DD>
@@ -4122,8 +4351,6 @@ pathname expansion are not performed on the results.
 <A NAME="lbBD">&nbsp;</A>
 <H4>Arithmetic Expansion</H4>
 
-<P>
-
 Arithmetic expansion allows the evaluation of an arithmetic expression
 and the substitution of the result.  The format for arithmetic expansion is:
 <DL COMPACT><DT><DD>
@@ -4159,8 +4386,6 @@ prints a message indicating failure and no substitution occurs.
 <A NAME="lbBE">&nbsp;</A>
 <H4>Process Substitution</H4>
 
-<P>
-
 <I>Process substitution</I> allows a process's input or output to be
 referred to using a filename.
 It takes the form of
@@ -4187,8 +4412,6 @@ and arithmetic expansion.
 <A NAME="lbBF">&nbsp;</A>
 <H4>Word Splitting</H4>
 
-<P>
-
 The shell scans the results of
 parameter expansion,
 command substitution,
@@ -4297,8 +4520,6 @@ is performed.
 <A NAME="lbBG">&nbsp;</A>
 <H4>Pathname Expansion</H4>
 
-<P>
-
 After word splitting,
 unless the
 <B>-f</B>
@@ -4314,7 +4535,7 @@ scans each word for the characters
 and
 <B>[</B>.
 
-If one of these characters appears, then the word is
+If one of these characters appears, and is not quoted, then the word is
 regarded as a
 <I>pattern</I>,
 
@@ -4354,12 +4575,27 @@ must be matched explicitly, unless the shell option
 <B>dotglob</B>
 
 is set.
-When matching a pathname, the slash character must always be
-matched explicitly.
+The filenames
+<B>``.''</B>
+
+and
+<B>``..''</B>
+
+must always be matched explicitly, even if
+<B>dotglob</B>
+
+is set.
 In other cases, the
 <B>``.''</B>
 
 character is not treated specially.
+When matching a pathname, the slash character must always be
+matched explicitly by a slash in the pattern, but in other matching
+contexts it can be matched by a special pattern character as described
+below under
+<FONT SIZE=-1><B>Pattern Matching</B>.
+
+</FONT>
 See the description of
 <B>shopt</B>
 
@@ -4384,14 +4620,14 @@ The
 <FONT SIZE=-1><B>GLOBIGNORE</B>
 
 </FONT>
-shell variable may be used to restrict the set of filenames matching a
+shell variable may be used to restrict the set of file names matching a
 <I>pattern</I>.
 
 If
 <FONT SIZE=-1><B>GLOBIGNORE</B>
 
 </FONT>
-is set, each matching filename that also matches one of the patterns in
+is set, each matching file name that also matches one of the patterns in
 <FONT SIZE=-1><B>GLOBIGNORE</B>
 
 </FONT>
@@ -4613,11 +4849,16 @@ Matches anything except one of the given patterns
 </DL></DL>
 
 
+<P>
+
+Complicated extended pattern matching against long strings is slow,
+especially when the patterns contain alternations and the strings
+contain multiple matches.
+Using separate matches against shorter strings, or using arrays of
+strings instead of a single long string, may be faster.
 <A NAME="lbBH">&nbsp;</A>
 <H4>Quote Removal</H4>
 
-<P>
-
 After the preceding expansions, all unquoted occurrences of the
 characters
 <B>\</B>,
@@ -4659,6 +4900,9 @@ than or equal to 10 and assign it to <I>varname</I>.
 If &gt;&amp;- or &lt;&amp;- is preceded
 by {<I>varname</I>}, the value of <I>varname</I> defines the file
 descriptor to close.
+If {<I>varname</I>} is supplied, the redirection persists beyond
+the scope of the command, allowing the shell programmer to manage
+the file descriptor himself.
 <P>
 
 In the following descriptions, if the file descriptor number is
@@ -4767,8 +5011,6 @@ internally.
 <A NAME="lbBJ">&nbsp;</A>
 <H4>Redirecting Input</H4>
 
-<P>
-
 Redirection of input causes the file whose name results from
 the expansion of
 <I>word</I>
@@ -4792,8 +5034,6 @@ The general format for redirecting input is:
 <A NAME="lbBK">&nbsp;</A>
 <H4>Redirecting Output</H4>
 
-<P>
-
 Redirection of output causes the file whose name results from
 the expansion of
 <I>word</I>
@@ -4846,8 +5086,6 @@ if the file named by <I>word</I> exists.
 <A NAME="lbBL">&nbsp;</A>
 <H4>Appending Redirected Output</H4>
 
-<P>
-
 Redirection of output in this fashion
 causes the file whose name results from
 the expansion of
@@ -4869,13 +5107,9 @@ The general format for appending output is:
 [<I>n</I>]<B>&gt;&gt;</B><I>word</I>
 </DL>
 
-<P>
-
 <A NAME="lbBM">&nbsp;</A>
 <H4>Redirecting Standard Output and Standard Error</H4>
 
-<P>
-
 This construct allows both the
 standard output (file descriptor 1) and
 the standard error output (file descriptor 2)
@@ -4917,8 +5151,6 @@ reasons.
 <A NAME="lbBN">&nbsp;</A>
 <H4>Appending Standard Output and Standard Error</H4>
 
-<P>
-
 This construct allows both the
 standard output (file descriptor 1) and
 the standard error output (file descriptor 2)
@@ -4950,8 +5182,6 @@ This is semantically equivalent to
 <A NAME="lbBO">&nbsp;</A>
 <H4>Here Documents</H4>
 
-<P>
-
 This type of redirection instructs the shell to read input from the
 current source until a line containing only
 <I>delimiter</I>
@@ -5035,7 +5265,7 @@ A variant of here documents, the format is:
 <P>
 
 The <I>word</I> undergoes
-brace expansion, tilde expansion, parameter and variable expansion,
+tilde expansion, parameter and variable expansion,
 command substitution, arithmetic expansion, and quote removal.
 Pathname expansion and word splitting are not performed.
 The result is supplied as a single string, with a newline appended,
@@ -5044,8 +5274,6 @@ standard input (or file descriptor <I>n</I> if <I>n</I> is specified).
 <A NAME="lbBQ">&nbsp;</A>
 <H4>Duplicating File Descriptors</H4>
 
-<P>
-
 The redirection operator
 <DL COMPACT><DT><DD>
 <P>
@@ -5115,8 +5343,6 @@ error are redirected as described previously.
 <A NAME="lbBR">&nbsp;</A>
 <H4>Moving File Descriptors</H4>
 
-<P>
-
 The redirection operator
 <DL COMPACT><DT><DD>
 <P>
@@ -5149,8 +5375,6 @@ or the standard output (file descriptor 1) if <I>n</I> is not specified.
 <A NAME="lbBS">&nbsp;</A>
 <H4>Opening File Descriptors for Reading and Writing</H4>
 
-<P>
-
 The redirection operator
 <DL COMPACT><DT><DD>
 <P>
@@ -5250,9 +5474,10 @@ The rules concerning the definition and use of aliases are
 somewhat confusing.
 <B>Bash</B>
 
-always reads at least one complete line
-of input before executing any
-of the commands on that line.  Aliases are expanded when a
+always reads at least one complete line of input,
+and all lines that make up a compound command,
+before executing any of the commands on that line or the compound command.
+Aliases are expanded when a
 command is read, not when it is executed.  Therefore, an
 alias definition appearing on the same line as another
 command does not take effect until the next line of input is read.
@@ -5339,6 +5564,47 @@ Variables local to the function may be declared with the
 
 builtin command.  Ordinarily, variables and their values
 are shared between the function and its caller.
+If a variable is declared <B>local</B>, the variable's visible scope
+is restricted to that function and its children (including the functions
+it calls).
+Local variables &quot;shadow&quot; variables with the same name declared at
+previous scopes.
+For instance, a local variable declared in a function
+hides a global variable of the same name: references and assignments
+refer to the local variable, leaving the global variable unmodified.
+When the function returns, the global variable is once again visible.
+<P>
+
+The shell uses <I>dynamic scoping</I> to control a variable's visibility
+within functions.
+With dynamic scoping, visible variables and their values
+are a result of the sequence of function calls that caused execution
+to reach the current function.
+The value of a variable that a function sees depends
+on its value within its caller, if any, whether that caller is
+the &quot;global&quot; scope or another shell function.
+This is also the value that a local variable
+declaration &quot;shadows&quot;, and the value that is restored when the function
+returns.
+<P>
+
+For example, if a variable <I>var</I> is declared as local in function
+<I>func1</I>, and <I>func1</I> calls another function <I>func2</I>,
+references to <I>var</I> made from within <I>func2</I> will resolve to the
+local variable <I>var</I> from <I>func1</I>, shadowing any global variable
+named <I>var</I>.
+<P>
+
+The <B>unset</B> builtin also acts using the same dynamic scope: if a
+variable is local to the current scope, <B>unset</B> will unset it;
+otherwise the unset will refer to the variable found in any calling scope
+as described above.
+If a variable at the current local scope is unset, it will remain so
+until it is reset in that scope or until the function returns.
+Once the function returns, any instance of the variable at a previous
+scope will become visible.
+If the unset acts on a variable at a previous scope, any instance of a
+variable with that name that had been shadowed will become visible.
 <P>
 
 The <B>FUNCNEST</B> variable, if set to a numeric value greater
@@ -5388,7 +5654,7 @@ Functions may be exported so that subshells
 automatically have them defined with the
 <B>-f</B>
 
-option to the 
+option to the
 <B>export</B>
 
 builtin.
@@ -5397,10 +5663,6 @@ the
 <B>unset</B>
 
 builtin.
-Note that shell functions and variables with the same name may result
-in multiple identically-named entries in the environment passed to the
-shell's children.
-Care should be taken in cases where this may cause a problem.
 <P>
 
 Functions may be recursive.
@@ -5428,14 +5690,14 @@ The levels are listed in order of decreasing precedence.
 
 <DD>
 variable post-increment and post-decrement
-<DT><B>++</B><I>id</I> --<I>id</I>
-
-<DD>
-variable pre-increment and pre-decrement
 <DT><B>- +</B>
 
 <DD>
 unary minus and plus
+<DT><B>++</B><I>id</I> --<I>id</I>
+
+<DD>
+variable pre-increment and pre-decrement
 <DT><B>! ~</B>
 
 <DD>
@@ -5514,6 +5776,8 @@ A shell variable need not have its <I>integer</I> attribute
 turned on to be used in an expression.
 <P>
 
+Integer constants follow the C language definition, without suffixes or
+character constants.
 Constants with a leading 0 are interpreted as octal numbers.
 A leading 0x or 0X denotes hexadecimal.
 Otherwise, numbers take the form [<I>base#</I>]n, where the optional <I>base</I>
@@ -5521,6 +5785,7 @@ is a decimal number between 2 and 64 representing the arithmetic
 base, and <I>n</I> is a number in that base.
 If <I>base#</I> is omitted, then base 10 is used.
 When specifying <I>n</I>,
+if a non-digit is required,
 the digits greater than 9 are represented by the lowercase letters,
 the uppercase letters, @, and _, in that order.
 If <I>base</I> is less than or equal to 36, lowercase and uppercase
@@ -5537,6 +5802,11 @@ rules above.
 Conditional expressions are used by the <B>[[</B> compound command and
 the <B>test</B> and <B>[</B> builtin commands to test file attributes
 and perform string and arithmetic comparisons.
+The <B>test</B> and <B>[</B> commands determine their behavior based on
+the number of arguments; see the descriptions of those commands for any
+other command-specific actions.
+<P>
+
 Expressions are formed from the following unary or binary primaries.
 <B>Bash</B> handles several filenames specially when they are used in
 expressions.
@@ -5742,13 +6012,25 @@ and
 <I>arg2</I>
 
 may be positive or negative integers.
+When used with the <B>[[</B> command,
+<I>Arg1</I>
+
+and
+<I>Arg2</I>
+
+are evaluated as arithmetic expressions (see
+<FONT SIZE=-1><B>ARITHMETIC EVALUATION</B>
+
+</FONT>
+above).
 
 </DL>
 <A NAME="lbBX">&nbsp;</A>
 <H3>SIMPLE COMMAND EXPANSION</H3>
 
 When a simple command is executed, the shell performs the following
-expansions, assignments, and redirections, from left to right.
+expansions, assignments, and redirections, from left to right, in
+the following order.
 <DL COMPACT>
 <DT>1.<DD>
 The words that the parser has marked as variable assignments (those
@@ -5834,9 +6116,10 @@ A full search of the directories in
 is performed only if the command is not found in the hash table.
 If the search is unsuccessful, the shell searches for a defined shell
 function named <B>command_not_found_handle</B>.
-If that function exists, it is invoked with the original command and
+If that function exists, it is invoked in a separate execution environment
+with the original command and
 the original command's arguments as its arguments, and the function's
-exit status becomes the exit status of the shell.
+exit status becomes the exit status of that subshell.
 If that function is not defined, the shell prints an error
 message and returns an exit status of 127.
 <P>
@@ -5951,7 +6234,7 @@ cannot affect the shell's execution environment.
 <P>
 
 Subshells spawned to execute command substitutions inherit the value of
-the <B>-e</B> option from the parent shell.  When not in <I>posix</I> mode,
+the <B>-e</B> option from the parent shell.  When not in <I>posix mode</I>,
 <B>bash</B> clears the <B>-e</B> option in such subshells.
 <P>
 
@@ -6039,8 +6322,6 @@ command in its environment.
 <A NAME="lbCB">&nbsp;</A>
 <H3>EXIT STATUS</H3>
 
-<P>
-
 The exit status of an executed command is the value returned by the
 <I>waitpid</I> system call or equivalent function.  Exit statuses
 fall between 0 and 255, though, as explained below, the shell may
@@ -6265,7 +6546,7 @@ terminal are sent a
 <FONT SIZE=-1><B>SIGTTIN (SIGTTOU)</B>
 
 </FONT>
-signal by the kernel's terminal driver, 
+signal by the kernel's terminal driver,
 which, unless caught, suspends the process.
 <P>
 
@@ -6329,9 +6610,10 @@ For example,
 <B>%ce</B>
 
 refers to a stopped
-<B>ce</B>
+job whose command name begins with
+<B>ce</B>.
 
-job.  If a prefix matches more than one job,
+If a prefix matches more than one job,
 <B>bash</B>
 
 reports an error.  Using
@@ -6427,6 +6709,12 @@ command may then be used to inspect their status.
 If a second attempt to exit is made without an intervening command,
 the shell does not print another warning, and any stopped
 jobs are terminated.
+<P>
+
+When the shell is waiting for a job or process using the <B>wait</B>
+builtin, and job control is enabled, <B>wait</B> will return when the
+job changes state. The <B>-f</B> option causes <B>wait</B> to wait
+until the job or process terminates before returning.
 <A NAME="lbCE">&nbsp;</A>
 <H3>PROMPTING</H3>
 
@@ -6445,11 +6733,20 @@ when it needs more input to complete a command.
 <B>Bash</B>
 
 displays
-<B>PS0</B>
+<FONT SIZE=-1><B>PS0</B>
 
+</FONT>
 after it reads a command but before executing it.
 <B>Bash</B>
 
+displays
+<FONT SIZE=-1><B>PS4</B>
+
+</FONT>
+as described above
+before tracing each command when the <B>-x</B> option is enabled.
+<B>Bash</B>
+
 allows these prompt strings to be customized by inserting a number of
 backslash-escaped special characters that are decoded as follows:
 <DL COMPACT><DT><DD>
@@ -6614,6 +6911,9 @@ command under
 
 </FONT>
 below).
+This can have unwanted side effects if escaped portions of the string
+appear within command substitution or contain characters special to
+word expansion.
 <A NAME="lbCF">&nbsp;</A>
 <H3>READLINE</H3>
 
@@ -6653,8 +6953,6 @@ builtin.
 <A NAME="lbCG">&nbsp;</A>
 <H4>Readline Notation</H4>
 
-<P>
-
 In this section, the Emacs-style notation is used to denote
 keystrokes.  Control keys are denoted by C-<I>key</I>, e.g., C-n
 means Control-N.  Similarly,
@@ -6699,8 +6997,6 @@ on the kill ring.
 <A NAME="lbCH">&nbsp;</A>
 <H4>Readline Initialization</H4>
 
-<P>
-
 Readline is customized by putting commands in an initialization
 file (the <I>inputrc</I> file).
 The name of this file is taken from the value of the
@@ -6710,6 +7006,9 @@ The name of this file is taken from the value of the
 variable.  If that variable is unset, the default is
 <A HREF="file:~/.inputrc"><I>~/.inputrc</I></A>.
 
+If that file  does not exist or cannot be read, the ultimate default is
+<A HREF="file:/etc/inputrc"><I>/etc/inputrc</I></A>.
+
 When a program which uses the readline library starts up, the
 initialization file is read, and the key bindings and variables
 are set.
@@ -6778,8 +7077,6 @@ to a string that is inserted when the key is pressed (a <I>macro</I>).
 <A NAME="lbCI">&nbsp;</A>
 <H4>Readline Key Bindings</H4>
 
-<P>
-
 The syntax for controlling key bindings in the
 <I>inputrc</I>
 
@@ -6985,8 +7282,6 @@ below).
 <A NAME="lbCJ">&nbsp;</A>
 <H4>Readline Variables</H4>
 
-<P>
-
 Readline has variables that can be used to further customize its
 behavior.  A variable may be set in the
 <I>inputrc</I>
@@ -6998,6 +7293,11 @@ file with a statement of the form
 <B>set</B> <I>variable-name</I> <I>value</I>
 </DL>
 
+or using the <B>bind</B> builtin command (see
+<FONT SIZE=-1><B>SHELL BUILTIN COMMANDS</B>
+
+</FONT>
+below).
 <P>
 
 Except where noted, readline variables can take the values
@@ -7095,11 +7395,11 @@ replaced with an ellipsis when displaying possible completions.
 This determines when the user is queried about viewing
 the number of possible completions
 generated by the <B>possible-completions</B> command.
-It may be set to any integer value greater than or equal to
-zero.  If the number of possible completions is greater than
-or equal to the value of this variable, the user is asked whether
-or not he wishes to view them; otherwise they are simply listed
-on the terminal.
+It may be set to any integer value greater than or equal to zero.
+If the number of possible completions is greater than
+or equal to the value of this variable,
+readline will ask whether or not the user wishes to view them;
+otherwise they are simply listed on the terminal.
 <DT><B>convert-meta (On)</B>
 
 <DD>
@@ -7134,7 +7434,18 @@ can be set to either
 or
 <B>vi</B>.
 
-<DT><B>enable-bracketed-paste (Off)</B>
+<DT><B>emacs-mode-string (@)</B>
+
+<DD>
+If the <I>show-mode-in-prompt</I> variable is enabled,
+this string is displayed immediately before the last line of the primary
+prompt when emacs editing mode is active.  The value is expanded like a
+key binding, so the standard set of meta- and control prefixes and
+backslash escape sequences is available.
+Use the \1 and \2 escapes to begin and end sequences of
+non-printing characters, which can be used to embed a terminal control
+sequence into the mode string.
+<DT><B>enable-bracketed-paste (On)</B>
 
 <DD>
 When set to <B>On</B>, readline will configure the terminal in a way
@@ -7183,6 +7494,7 @@ the maximum number of history entries will be set to 500.
 When set to <B>On</B>, makes readline use a single line for display,
 scrolling the input horizontally on a single screen line when it
 becomes longer than the screen width rather than wrapping to a new line.
+This setting is automatically enabled for terminals of height 1.
 <DT><B>input-meta (Off)</B>
 
 <DD>
@@ -7217,16 +7529,6 @@ the value of
 <B>editing-mode</B>
 
 also affects the default keymap.
-<DT><B>emacs-mode-string (@)</B>
-
-<DD>
-This string is displayed immediately before the last line of the primary
-prompt when emacs editing mode is active.  The value is expanded like a
-key binding, so the standard set of meta- and control prefixes and
-backslash escape sequences is available.
-Use the \1 and \2 escapes to begin and end sequences of
-non-printing characters, which can be used to embed a terminal control
-sequence into the mode string.
 <DT><B>keyseq-timeout (500)</B>
 
 <DD>
@@ -7320,9 +7622,9 @@ of ringing the bell.
 <DT><B>show-mode-in-prompt (Off)</B>
 
 <DD>
-If set to <B>On</B>, add a character to the beginning of the prompt
-indicating the editing mode: emacs (@), vi command (:) or vi
-insertion (+).
+If set to <B>On</B>, add a string to the beginning of the prompt
+indicating the editing mode: emacs, vi command, or vi insertion.
+The mode strings are user-settable (e.g., <I>emacs-mode-string</I>).
 <DT><B>skip-completed-text (Off)</B>
 
 <DD>
@@ -7335,7 +7637,8 @@ following the cursor are not duplicated.
 <DT><B>vi-cmd-mode-string ((cmd))</B>
 
 <DD>
-This string is displayed immediately before the last line of the primary
+If the <I>show-mode-in-prompt</I> variable is enabled,
+this string is displayed immediately before the last line of the primary
 prompt when vi editing mode is active and in command mode.
 The value is expanded like a
 key binding, so the standard set of meta- and control prefixes and
@@ -7346,7 +7649,8 @@ sequence into the mode string.
 <DT><B>vi-ins-mode-string ((ins))</B>
 
 <DD>
-This string is displayed immediately before the last line of the primary
+If the <I>show-mode-in-prompt</I> variable is enabled,
+this string is displayed immediately before the last line of the primary
 prompt when vi editing mode is active and in insertion mode.
 The value is expanded like a
 key binding, so the standard set of meta- and control prefixes and
@@ -7365,8 +7669,6 @@ completions.
 <A NAME="lbCK">&nbsp;</A>
 <H4>Readline Conditional Constructs</H4>
 
-<P>
-
 Readline implements a facility similar in spirit to the conditional
 compilation features of the C preprocessor which allows key
 bindings and variable settings to be performed as the result
@@ -7378,8 +7680,9 @@ The
 
 construct allows bindings to be made based on the
 editing mode, the terminal being used, or the application using
-readline.  The text of the test extends to the end of the line;
-no characters are required to isolate it.
+readline.  The text of the test, after any comparison operator,
+<BR>&nbsp;extends&nbsp;to&nbsp;the&nbsp;end&nbsp;of&nbsp;the&nbsp;line;
+unless otherwise noted, no characters are required to isolate it.
 <DL COMPACT><DT><DD>
 <DL COMPACT>
 <DT><B>mode</B><DD>
@@ -7406,6 +7709,33 @@ and
 <I>sun-cmd</I>,
 
 for instance.
+<DT><B>version</B><DD>
+The <B>version</B> test may be used to perform comparisons against
+specific readline versions.
+The <B>version</B> expands to the current readline version.
+The set of comparison operators includes
+<B>=</B>,
+
+(and
+<B>==</B>),
+
+<B>!=</B>,
+
+<B>&lt;=</B>,
+
+<B>&gt;=</B>,
+
+<B>&lt;</B>,
+
+and
+<B>&gt;</B>.
+
+The version number supplied on the right side of the operator consists
+of a major version number, an optional decimal point, and an optional
+minor version (e.g., <B>7.1</B>). If the minor version is omitted, it
+is assumed to be <B>0</B>.
+The operator may be separated from the string <B>version</B>
+and from the version number argument by whitespace.
 <DT><B>application</B><DD>
 The <B>application</B> construct is used to include
 application-specific settings.  Each program using the readline
@@ -7425,6 +7755,15 @@ key sequence that quotes the current or previous word in <B>bash</B>:
 
 </DL>
 
+<DT><I>variable</I><DD>
+The <I>variable</I> construct provides simple equality tests for readline
+variables and values.
+The permitted comparison operators are <I>=</I>, <I>==</I>, and <I>!=</I>.
+The variable name must be separated from the comparison operator by
+whitespace; the operator may be separated from the value on the right hand
+side by whitespace.
+Both string and boolean variables may be tested. Boolean variables must be
+tested against the values <I>on</I> and <I>off</I>.
 </DL></DL>
 
 <DT><B>$endif</B><DD>
@@ -7449,8 +7788,6 @@ would read <A HREF="file:/etc/inputrc"><I>/etc/inputrc</I></A>:
 <A NAME="lbCL">&nbsp;</A>
 <H4>Searching</H4>
 
-<P>
-
 Readline provides commands for searching through the command history
 (see
 <FONT SIZE=-1><B>HISTORY</B>
@@ -7502,8 +7839,6 @@ typed by the user or be part of the contents of the current line.
 <A NAME="lbCM">&nbsp;</A>
 <H4>Readline Command Names</H4>
 
-<P>
-
 The following is a list of the names of the commands and the default
 key sequences to which they are bound.
 Command names without an accompanying key sequence are unbound by default.
@@ -7514,8 +7849,6 @@ The text between the point and mark is referred to as the <I>region</I>.
 <A NAME="lbCN">&nbsp;</A>
 <H4>Commands for Moving</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>beginning-of-line (C-a)</B>
@@ -7554,10 +7887,33 @@ Words are delimited by non-quoted shell metacharacters.
 <DD>
 Move back to the start of the current or previous word.
 Words are delimited by non-quoted shell metacharacters.
+<DT><B>previous-screen-line</B>
+
+<DD>
+Attempt to move point to the same physical screen column on the previous
+physical screen line. This will not have the desired effect if the current
+Readline line does not take up more than one physical line or if point is not
+greater than the length of the prompt plus the screen width.
+<DT><B>next-screen-line</B>
+
+<DD>
+Attempt to move point to the same physical screen column on the next
+physical screen line. This will not have the desired effect if the current
+Readline line does not take up more than one physical line or if the length
+of the current Readline line is not greater than the length of the prompt
+plus the screen width.
+<DT><B>clear-display (M-C-l)</B>
+
+<DD>
+Clear the screen and, if possible, the terminal's scrollback buffer,
+then redraw the current line,
+leaving the current line at the top of the screen.
 <DT><B>clear-screen (C-l)</B>
 
 <DD>
-Clear the screen leaving the current line at the top of the screen.
+Clear the screen,
+then redraw the current line,
+leaving the current line at the top of the screen.
 With an argument, refresh the current line without clearing the
 screen.
 <DT><B>redraw-current-line</B>
@@ -7569,8 +7925,6 @@ Refresh the current line.
 <A NAME="lbCO">&nbsp;</A>
 <H4>Commands for Manipulating the History</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>accept-line (Newline, Return)</B>
@@ -7634,6 +7988,21 @@ This is a non-incremental search.
 Search backward through the history for the string of characters
 between the start of the current line and the point.
 This is a non-incremental search.
+<DT><B>history-substring-search-backward</B>
+
+<DD>
+Search backward through the history for the string of characters
+between the start of the current line and the current cursor
+position (the <I>point</I>).
+The search string may match anywhere in a history line.
+This is a non-incremental search.
+<DT><B>history-substring-search-forward</B>
+
+<DD>
+Search forward through the history for the string of characters
+between the start of the current line and the point.
+The search string may match anywhere in a history line.
+This is a non-incremental search.
 <DT><B>yank-nth-arg (M-C-y)</B>
 
 <DD>
@@ -7710,9 +8079,10 @@ A synonym for <B>yank-last-arg</B>.
 
 <DD>
 Accept the current line for execution and fetch the next line
-relative to the current line from the history for editing.  Any
-argument is ignored.
-<DT><B>edit-and-execute-command (C-xC-e)</B>
+relative to the current line from the history for editing.
+A numeric argument, if supplied, specifies the history entry to use instead
+of the current line.
+<DT><B>edit-and-execute-command (C-x C-e)</B>
 
 <DD>
 Invoke an editor on the current command line, and execute the result as shell
@@ -7730,8 +8100,6 @@ and <I>emacs</I> as the editor, in that order.
 <A NAME="lbCP">&nbsp;</A>
 <H4>Commands for Changing Text</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B></B><I>end-of-file</I> (usually C-d)
@@ -7824,8 +8192,6 @@ before point with a space.  By default, this command is unbound.
 <A NAME="lbCQ">&nbsp;</A>
 <H4>Killing and Yanking</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>kill-line (C-k)</B>
@@ -7919,8 +8285,6 @@ or
 <A NAME="lbCR">&nbsp;</A>
 <H4>Numeric Arguments</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>digit-argument (M-0, M-1, ..., M--)</B>
@@ -7949,8 +8313,6 @@ argument count sixteen, and so on.
 <A NAME="lbCS">&nbsp;</A>
 <H4>Completing</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>complete (TAB)</B>
@@ -8080,8 +8442,6 @@ above).
 <A NAME="lbCT">&nbsp;</A>
 <H4>Keyboard Macros</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>start-kbd-macro (C-x ()</B>
@@ -8108,8 +8468,6 @@ Print the last keyboard macro defined in a format suitable for the
 <A NAME="lbCU">&nbsp;</A>
 <H4>Miscellaneous</H4>
 
-<P>
-
 
 <DL COMPACT>
 <DT><B>re-read-init-file (C-x C-r)</B>
@@ -8124,11 +8482,12 @@ Abort the current editing command and
 ring the terminal's bell (subject to the setting of
 <B>bell-style</B>).
 
-<DT><B>do-uppercase-version (M-a, M-b, M-</B><I>x</I>, ...)
+<DT><B>do-lowercase-version (M-A, M-B, M-</B><I>x</I>, ...)
 
 <DD>
-If the metafied character <I>x</I> is lowercase, run the command
-that is bound to the corresponding uppercase character.
+If the metafied character <I>x</I> is uppercase, run the command
+that is bound to the corresponding metafied lowercase character.
+The behavior is undefined if <I>x</I> is already lowercase.
 <DT><B>prefix-meta (ESC)</B>
 
 <DD>
@@ -8258,8 +8617,6 @@ Display version information about the current instance of
 <A NAME="lbCV">&nbsp;</A>
 <H4>Programmable Completion</H4>
 
-<P>
-
 When word completion is attempted for an argument to a command for
 which a completion specification (a <I>compspec</I>) has been defined
 using the <B>complete</B> builtin (see
@@ -8281,6 +8638,9 @@ If no compspec is found for the full pathname, an attempt is made to
 find a compspec for the portion following the final slash.
 If those searches do not result in a compspec, any compspec defined with
 the <B>-D</B> option to <B>complete</B> is used as the default.
+If there is no default compspec, <B>bash</B> attempts alias expansion
+on the command word as a final resort, and attempts to find a compspec
+for the command word from any successful expansion.
 <P>
 
 Once a compspec has been found, it is used to generate the list of
@@ -8542,7 +8902,7 @@ If <B>HISTFILESIZE</B> is unset, or set to null, a non-numeric value,
 or a numeric value less than zero, the history file is not truncated.
 When the history file is read,
 lines beginning with the history comment character followed immediately
-by a digit are interpreted as timestamps for the preceding history line.
+by a digit are interpreted as timestamps for the following history line.
 These timestamps are optionally displayed depending on the value of the
 <FONT SIZE=-1><B>HISTTIMEFORMAT</B>
 
@@ -8648,11 +9008,9 @@ for information on setting and unsetting shell options.
 <A NAME="lbCX">&nbsp;</A>
 <H3>HISTORY EXPANSION</H3>
 
-<P>
-
 The shell supports a history expansion feature that
 is similar to the history expansion in
-<B>csh.</B>
+<B>csh</B>.
 
 This section describes what syntax features are available.  This
 feature is enabled by default for interactive shells, and can be
@@ -8677,7 +9035,9 @@ fix errors in previous commands quickly.
 <P>
 
 History expansion is performed immediately after a complete line
-is read, before the shell breaks it into words.
+is read, before the shell breaks it into words, and is performed
+on each line individually without taking quoting on previous lines into
+account.
 It takes place in two parts.
 The first is to determine which line from the history list
 to use during substitution.
@@ -8766,8 +9126,6 @@ writing the history file.
 <A NAME="lbCY">&nbsp;</A>
 <H4>Event Designators</H4>
 
-<P>
-
 An event designator is a reference to a command line entry in the
 history list.
 Unless the reference is absolute, events are relative to the current
@@ -8819,6 +9177,8 @@ The trailing <B>?</B> may be omitted if
 <I>string</I>
 
 is followed immediately by a newline.
+If <I>string</I> is missing, the string from the most recent search is used;
+it is an error if there is no previous search string.
 <DT><B></B><FONT SIZE=+2><B>^</B></FONT><B></B><I>string1</I><FONT SIZE=+2>^</FONT><I>string2</I><FONT SIZE=+2>^</FONT>
 
 <DD>
@@ -8829,7 +9189,7 @@ with
 <I>string2</I>.
 
 Equivalent to
-``!!:s/<I>string1</I>/<I>string2</I>/''
+``!!:s<FONT SIZE=+2>^</FONT><I>string1</I><FONT SIZE=+2>^</FONT><I>string2</I><FONT SIZE=+2>^</FONT>''
 (see <B>Modifiers</B> below).
 <DT><B>!#</B>
 
@@ -8840,8 +9200,6 @@ The entire command line typed so far.
 <A NAME="lbCZ">&nbsp;</A>
 <H4>Word Designators</H4>
 
-<P>
-
 Word designators are used to select desired words from the event.
 A
 <B>:</B>
@@ -8887,7 +9245,8 @@ zeroth word if there is only one word in the line.
 <DT><B>%</B>
 
 <DD>
-The word matched by the most recent `?<I>string</I>?' search.
+The first word matched by the most recent `?<I>string</I>?' search,
+if the search string begins with a character that is part of a word.
 <DT><I>x</I><B>-</B>y
 
 <DD>
@@ -8909,6 +9268,7 @@ Abbreviates <I>x-$</I>.
 
 <DD>
 Abbreviates <I>x-$</I> like <B>x*</B>, but omits the last word.
+If <B>x</B> is missing, it defaults to 0.
 
 </DL>
 <P>
@@ -8918,15 +9278,12 @@ previous command is used as the event.
 <A NAME="lbDA">&nbsp;</A>
 <H4>Modifiers</H4>
 
-<P>
-
 After the optional word designator, there may appear a sequence of
 one or more of the following modifiers, each preceded by a `:'.
+These modify, or edit, the word or words selected from the history event.
 <P>
 
 
-<P>
-
 <DL COMPACT>
 <DT><B>h</B>
 
@@ -8963,6 +9320,8 @@ but break into words at
 <B>blanks</B>
 
 and newlines.
+The <B>q</B> and <B>x</B> modifiers are mutually exclusive; the last one
+supplied is used.
 <DT><B>s/</B><I>old</I>/<I>new</I>/
 
 <DD>
@@ -8972,9 +9331,11 @@ Substitute
 for the first occurrence of
 <I>old</I>
 
-in the event line.  Any delimiter can be used in place of /.  The
-final delimiter is optional if it is the last character of the
-event line.  The delimiter may be quoted in
+in the event line.
+Any character may be used as the delimiter in place of /.
+The final delimiter is optional if it is the last character of the
+event line.
+The delimiter may be quoted in
 <I>old</I>
 
 and
@@ -8986,7 +9347,8 @@ with a single backslash.  If &amp; appears in
 it is replaced by
 <I>old</I>.
 
-A single backslash will quote the &amp;.  If
+A single backslash will quote the &amp;.
+If
 <I>old</I>
 
 is null, it is set to the last
@@ -9000,6 +9362,13 @@ in a
 <B>!?</B><I>string</I><B>[?]</B>
 
 search.
+If
+<I>new</I>
+
+is null, each matching
+<I>old</I>
+
+is deleted.
 <DT><B>&amp;</B>
 
 <DD>
@@ -9017,7 +9386,8 @@ An <B>a</B> may be used as a synonym for <B>g</B>.
 <DT><B>G</B>
 
 <DD>
-Apply the following `<B>s</B>' modifier once to each word in the event line.
+Apply the following `<B>s</B>' or `<B>&amp;</B>' modifier once to each word
+in the event line.
 
 </DL>
 <A NAME="lbDB">&nbsp;</A>
@@ -9035,7 +9405,7 @@ accepts
 <B>--</B>
 
 to signify the end of the options.
-The <B>:</B>, <B>true</B>, <B>false</B>, and <B>test</B> builtins
+The <B>:</B>, <B>true</B>, <B>false</B>, and <B>test</B>/<B>[</B> builtins
 do not accept options and do not treat <B>--</B> specially.
 The <B>exit</B>, <B>logout</B>, <B>return</B>,
 <B>break</B>, <B>continue</B>, <B>let</B>,
@@ -9248,13 +9618,21 @@ variable to the contents of the <B>readline</B> line buffer and the
 <FONT SIZE=-1><B>READLINE_POINT</B>
 
 </FONT>
-variable to the current location of the insertion point.
-If the executed command changes the value of
-<FONT SIZE=-1><B>READLINE_LINE</B>
+and
+<FONT SIZE=-1><B>READLINE_MARK</B>
+
+</FONT>
+variables to the current location of the insertion point and the saved
+insertion point (the mark), respectively.
+If the executed command changes the value of any of
+<FONT SIZE=-1><B>READLINE_LINE</B>,
+
+</FONT>
+<FONT SIZE=-1><B>READLINE_POINT</B>,
 
 </FONT>
 or
-<FONT SIZE=-1><B>READLINE_POINT</B>,
+<FONT SIZE=-1><B>READLINE_MARK</B>,
 
 </FONT>
 those new values will be reflected in the editing state.
@@ -9482,12 +9860,12 @@ will be displayed.
 <P>
 The return value is true unless an invalid option is supplied, or no
 matches were generated.
-<DT><B>complete</B> [<B>-abcdefgjksuv</B>] [<B>-o</B> <I>comp-option</I>] [<B>-DE</B>] [<B>-A</B> <I>action</I>] [<B>-G</B> <I>globpat</I>] [<B>-W</B> <I>wordlist</I>] [<B>-F</B> <I>function</I>] [<B>-C</B> <I>command</I>]<DD>
+<DT><B>complete</B> [<B>-abcdefgjksuv</B>] [<B>-o</B> <I>comp-option</I>] [<B>-DEI</B>] [<B>-A</B> <I>action</I>] [<B>-G</B> <I>globpat</I>] [<B>-W</B> <I>wordlist</I>]<DD>
 <BR>
 
-[<B>-X</B> <I>filterpat</I>] [<B>-P</B> <I>prefix</I>] [<B>-S</B> <I>suffix</I>] <I>name</I> [<I>name ...</I>]
+[<B>-F</B> <I>function</I>] [<B>-C</B> <I>command</I>] [<B>-X</B> <I>filterpat</I>] [<B>-P</B> <I>prefix</I>] [<B>-S</B> <I>suffix</I>] <I>name</I> [<I>name ...</I>]
 
-<DT><B>complete</B> <B>-pr</B> [<B>-DE</B>] [<I>name</I> ...]<DD>
+<DT><B>complete</B> <B>-pr</B> [<B>-DEI</B>] [<I>name</I> ...]<DD>
 
 Specify how arguments to each <I>name</I> should be completed.
 If the <B>-p</B> option is supplied, or if no options are supplied,
@@ -9496,12 +9874,21 @@ them to be reused as input.
 The <B>-r</B> option removes a completion specification for
 each <I>name</I>, or, if no <I>name</I>s are supplied, all
 completion specifications.
-The <B>-D</B> option indicates that the remaining options and actions should
+The <B>-D</B> option indicates that other supplied options and actions should
 apply to the ``default'' command completion; that is, completion attempted
 on a command for which no completion has previously been defined.
-The <B>-E</B> option indicates that the remaining options and actions should
+The <B>-E</B> option indicates that other supplied options and actions should
 apply to ``empty'' command completion; that is, completion attempted on a
 blank line.
+The <B>-I</B> option indicates that other supplied options and actions should
+apply to completion on the initial non-assignment word on the line, or after
+a command delimiter such as <B>;</B> or <B>|</B>, which is usually command
+name completion.
+If multiple options are supplied, the <B>-D</B> option takes precedence
+over <B>-E</B>, and both take precedence over <B>-I</B>.
+If any of <B>-D</B>, <B>-E</B>, or <B>-I</B> are supplied, any other
+<I>name</I> arguments are ignored; these completions only apply to the case
+specified by the option.
 <P>
 The process of applying these completion specifications when word completion
 is attempted is described above under <B>Programmable Completion</B>.
@@ -9705,6 +10092,13 @@ The <I>wordlist</I> is split using the characters in the
 
 </FONT>
 special variable as delimiters, and each resultant word is expanded.
+Shell quoting is honored within <I>wordlist</I>,
+in order to provide a
+mechanism for the words to contain shell metacharacters or characters
+in the value of
+<FONT SIZE=-1><B>IFS</B>.
+
+</FONT>
 The possible completions are the members of the resultant list which
 match the word being completed.
 <DT><B>-X</B> <I>filterpat</I><DD>
@@ -9725,7 +10119,7 @@ a <I>name</I> for which no specification exists, or
 an error occurs adding a completion specification.
 </DL>
 
-<DT><B>compopt</B> [<B>-o</B> <I>option</I>] [<B>-DE</B>] [<B>+o</B> <I>option</I>] [<I>name</I>]<DD>
+<DT><B>compopt</B> [<B>-o</B> <I>option</I>] [<B>-DEI</B>] [<B>+o</B> <I>option</I>] [<I>name</I>]<DD>
 Modify completion options for each <I>name</I> according to the
 <I>option</I>s, or for the
 currently-executing completion if no <I>name</I>s are supplied.
@@ -9733,12 +10127,16 @@ If no <I>option</I>s are given, display the completion options for each
 <I>name</I> or the current completion.
 The possible values of <I>option</I> are those valid for the <B>complete</B>
 builtin described above.
-The <B>-D</B> option indicates that the remaining options should
+The <B>-D</B> option indicates that other supplied options should
 apply to the ``default'' command completion; that is, completion attempted
 on a command for which no completion has previously been defined.
-The <B>-E</B> option indicates that the remaining options should
+The <B>-E</B> option indicates that other supplied options should
 apply to ``empty'' command completion; that is, completion attempted on a
 blank line.
+The <B>-I</B> option indicates that other supplied options should
+apply to completion on the initial non-assignment word on the line,
+or after a command delimiter such as <B>;</B> or <B>|</B>, which is usually
+command name completion.
 <P>
 The return value is true unless an invalid option is supplied, an attempt
 is made to modify the options for a <I>name</I> for which no completion
@@ -9767,9 +10165,9 @@ must be >= 1.  If
 is greater than the number of enclosing loops, the last enclosing loop
 (the ``top-level'' loop) is resumed.
 The return value is 0 unless <I>n</I> is not greater than or equal to 1.
-<DT><B>declare</B> [<B>-aAfFgilnrtux</B>] [<B>-p</B>] [<I>name</I>[=<I>value</I>] ...]<DD>
+<DT><B>declare</B> [<B>-aAfFgiIlnrtux</B>] [<B>-p</B>] [<I>name</I>[=<I>value</I>] ...]<DD>
 
-<DT><B>typeset</B> [<B>-aAfFgilnrtux</B>] [<B>-p</B>] [<I>name</I>[=<I>value</I>] ...]<DD>
+<DT><B>typeset</B> [<B>-aAfFgiIlnrtux</B>] [<B>-p</B>] [<I>name</I>[=<I>value</I>] ...]<DD>
 
 Declare variables and/or give them attributes.
 If no <I>name</I>s are given then display the values of variables.
@@ -9812,6 +10210,14 @@ The
 option forces variables to be created or modified at the global scope,
 even when <B>declare</B> is executed in a shell function.
 It is ignored in all other cases.
+The
+<B>-I</B>
+
+option causes local variables to inherit the attributes
+(except the <I>nameref</I> attribute) 
+and value of any existing variable with the same
+<I>name</I> at a surrounding scope.
+If there is no existing variable, the local variable is initially unset.
 The following options can
 be used to restrict output to variables with the specified attribute or
 to give variables attributes:
@@ -9889,8 +10295,8 @@ Mark <I>name</I>s for export to subsequent commands via the environment.
 
 Using `+' instead of `-'
 turns off the attribute instead,
-with the exceptions that <B>+a</B>
-may not be used to destroy an array variable and <B>+r</B> will not
+with the exceptions that <B>+a</B> and <B>+A</B>
+may not be used to destroy array variables and <B>+r</B> will not
 remove the readonly attribute.
 When used in a function,
 <B>declare</B>
@@ -10209,6 +10615,7 @@ unless the
 shell option
 is enabled.  In that case, it returns failure.
 An interactive shell returns failure if the file cannot be executed.
+A subshell exits unconditionally if <B>exec</B> fails.
 If
 <I>command</I>
 
@@ -10289,10 +10696,15 @@ and
 may be specified as a string (to locate the last command beginning
 with that string) or as a number (an index into the history list,
 where a negative number is used as an offset from the current
-command number).  If
+command number).
+When listing, a <I>first</I> or <I>last</I> of
+0 is equivalent to -1 and -0 is equivalent to the current
+command (usually the <B>fc</B> command); otherwise 0 is equivalent to -1
+and -0 is invalid.
+If
 <I>last</I>
 
-is not specified it is set to
+is not specified, it is set to
 the current command for listing (so that
 
 <TT>fc -l -10</TT>
@@ -10303,7 +10715,7 @@ otherwise.
 If
 <I>first</I>
 
-is not specified it is set to the previous
+is not specified, it is set to the previous
 command for editing and -16 for listing.
 <P>
 The
@@ -10349,7 +10761,7 @@ echoed and executed.
 <P>
 In the second form, <I>command</I> is re-executed after each instance
 of <I>pat</I> is replaced by <I>rep</I>.
-<I>Command</I> is intepreted the same as <I>first</I> above.
+<I>Command</I> is interpreted the same as <I>first</I> above.
 A useful alias to use with this is
 
 <TT>r='fc -s'</TT>,
@@ -10403,7 +10815,7 @@ does not specify a valid job or
 <I>jobspec</I>
 
 specifies a job that was started without job control.
-<DT><B>getopts</B> <I>optstring</I> <I>name</I> [<I>args</I>]<DD>
+<DT><B>getopts</B> <I>optstring</I> <I>name</I> [<I>arg ...</I>]<DD>
 <B>getopts</B>
 
 is used by shell procedures to parse positional parameters.
@@ -10462,9 +10874,10 @@ and <I>name</I> is set to ?.
 <B>getopts</B>
 
 normally parses the positional parameters, but if more arguments are
-given in
-<I>args</I>,
+supplied as
+<I>arg</I>
 
+values,
 <B>getopts</B>
 
 parses those instead.
@@ -10621,6 +11034,7 @@ The return status is 0 unless no command matches
 
 <DT><B>history</B> <B>-c</B><DD>
 <DT><B>history -d</B> <I>offset</I><DD>
+<DT><B>history -d</B> <I>start</I>-<I>end</I><DD>
 <DT><B>history</B> <B>-anrw</B> [<I>filename</I>]<DD>
 <DT><B>history</B> <B>-p</B> <I>arg</I> [<I>arg ...</I>]<DD>
 <DT><B>history</B> <B>-s</B> <I>arg</I> [<I>arg ...</I>]<DD>
@@ -10661,6 +11075,14 @@ is used.  Options, if supplied, have the following meanings:
 Clear the history list by deleting all the entries.
 <DT><B>-d</B> <I>offset</I><DD>
 Delete the history entry at position <I>offset</I>.
+If <I>offset</I> is negative, it is interpreted as relative to one greater
+than the last history position, so negative indices count back from the
+end of the history, and an index of -1 refers to the current
+<B>history -d</B> command.
+<DT><B>-d</B> <I>start</I>-<I>end</I><DD>
+Delete the history entries between positions <I>start</I> and <I>end</I>,
+inclusive.  Positive and negative values for <I>start</I> and <I>end</I>
+are interpreted as described above.
 <DT><B>-a</B>
 
 <DD>
@@ -10888,6 +11310,8 @@ If <I>name</I> is -, the set of shell options is made local to the function
 in which <B>local</B> is invoked: shell options changed using the
 <B>set</B> builtin inside the function are restored to their original values
 when the function returns.
+The restore is effected as if a series of <B>set</B> commands were executed
+to restore the values that were in place before the function.
 With no operands,
 <B>local</B>
 
@@ -10935,6 +11359,8 @@ Options, if supplied, have the following meanings:
 <DD>
 The first character of <I>delim</I> is used to terminate each input line,
 rather than newline.
+If <I>delim</I> is the empty string, <B>mapfile</B> will terminate a line
+when it reads a NUL character.
 <DT><B>-n</B>
 
 <DD>
@@ -11106,6 +11532,12 @@ This is an exception to the usual <B>printf</B> behavior.
 </DL>
 <P>
 
+The %b, %q, and %T directives all use the field width and precision
+arguments from the format specification and write that many bytes from
+(or use that wide a field for) the expanded argument, which usually
+contains more characters than the original.
+<P>
+
 Arguments to non-string format specifiers are treated as C constants,
 except that a leading plus or minus sign is allowed, and if the leading
 character is a single or double quote, the value is the ASCII value of
@@ -11250,6 +11682,8 @@ Other <I>name</I> arguments are ignored.
 <DD>
 The first character of <I>delim</I> is used to terminate the input line,
 rather than newline.
+If <I>delim</I> is the empty string, <B>read</B> will terminate a line
+when it reads a NUL character.
 <DT><B>-e</B>
 
 <DD>
@@ -11263,7 +11697,7 @@ is coming from a terminal,
 </FONT>
 above) is used to obtain the line.
 Readline uses the current (or default, if line editing was not previously
-active) editing settings.
+active) editing settings, but uses Readline's default filename completion.
 <DT><B>-i </B><I>text</I>
 
 <DD>
@@ -11301,7 +11735,7 @@ is displayed only if input is coming from a terminal.
 <DD>
 Backslash does not act as an escape character.
 The backslash is considered to be part of the line.
-In particular, a backslash-newline pair may not be used as a line
+In particular, a backslash-newline pair may not then be used as a line
 continuation.
 <DT><B>-s</B>
 
@@ -11336,7 +11770,9 @@ Read input from file descriptor <I>fd</I>.
 If no
 <I>names</I>
 
-are supplied, the line read is assigned to the variable
+are supplied, the line read,
+without the ending delimiter but otherwise unmodified,
+is assigned to the variable
 <FONT SIZE=-1><B>REPLY</B>.
 
 </FONT>
@@ -11409,7 +11845,7 @@ is omitted, the return status is that of the last command
 executed in the function body.
 If <B>return</B> is executed by a trap handler, the last command used to
 determine the status is the last command executed before the trap handler.
-if <B>return</B> is executed during a <B>DEBUG</B> trap, the last command
+If <B>return</B> is executed during a <B>DEBUG</B> trap, the last command
 used to determine the status is the last command executed by the trap
 handler before <B>return</B> was invoked.
 If
@@ -11443,7 +11879,7 @@ Without options, the name and value of each shell variable are displayed
 in a format that can be reused as input
 for setting or resetting the currently-set variables.
 Read-only variables cannot be reset.
-In <I>posix</I> mode, only shell variables are listed.
+In <I>posix mode</I>, only shell variables are listed.
 The output is sorted according to the current locale.
 When options are specified, they set or unset shell attributes.
 Any arguments remaining after option processing are treated
@@ -11970,7 +12406,8 @@ With no options, or with the
 <B>-p</B>
 
 option, a list of all settable options is displayed, with
-an indication of whether or not each is set.
+an indication of whether or not each is set;
+if <I>optnames</I> are supplied, the output is restricted to those options.
 The <B>-p</B> option causes output to be displayed in a form that
 may be reused as input.
 Other options have the following meanings:
@@ -12035,6 +12472,13 @@ The list of <B>shopt</B> options is:
 
 
 <DL COMPACT>
+<DT><B>assoc_expand_once</B>
+
+<DD>
+If set, the shell suppresses multiple evaluation of associative array
+subscripts during arithmetic expression evaluation, while executing
+builtins that can perform variable assignments,
+and while executing builtins that perform array dereferencing.
 <DT><B>autocd</B>
 
 <DD>
@@ -12083,8 +12527,8 @@ postpones exiting if any jobs are stopped.
 <DT><B>checkwinsize</B>
 
 <DD>
-If set, <B>bash</B> checks the window size after each command
-and, if necessary, updates the values of
+If set, <B>bash</B> checks the window size after each external (non-builtin)
+command and, if necessary, updates the values of
 <FONT SIZE=-1><B>LINES</B>
 
 </FONT>
@@ -12092,6 +12536,7 @@ and
 <FONT SIZE=-1><B>COLUMNS</B>.
 
 </FONT>
+This option is enabled by default.
 <DT><B>cmdhist</B>
 
 <DD>
@@ -12101,80 +12546,40 @@ If set,
 attempts to save all lines of a multiple-line
 command in the same history entry.  This allows
 easy re-editing of multi-line commands.
+This option is enabled by default, but only has an effect if command
+history is enabled, as described above under
+<FONT SIZE=-1><B>HISTORY</B>.
+
+</FONT>
+
 <DT><B>compat31</B>
 
 <DD>
-If set,
-<B>bash</B>
-
-changes its behavior to that of version 3.1 with respect to quoted
-arguments to the <B>[[</B> conditional command's <B>=~</B> operator
-and locale-specific string comparison when using the <B>[[</B>
-conditional command's <B>&lt;</B> and <B>&gt;</B> operators.
-Bash versions prior to bash-4.1 use ASCII collation and
-<I>strcmp</I>(3);
-
-bash-4.1 and later use the current locale's collation sequence and
-<I>strcoll</I>(3).
-
 <DT><B>compat32</B>
 
 <DD>
-If set,
-<B>bash</B>
-
-changes its behavior to that of version 3.2 with respect to
-locale-specific string comparison when using the <B>[[</B>
-conditional command's <B>&lt;</B> and <B>&gt;</B> operators (see previous item)
-and the effect of interrupting a command list.
-Bash versions 3.2 and earlier continue with the next command in the list
-after one terminates due to an interrupt.
 <DT><B>compat40</B>
 
 <DD>
-If set,
-<B>bash</B>
-
-changes its behavior to that of version 4.0 with respect to locale-specific
-string comparison when using the <B>[[</B>
-conditional command's <B>&lt;</B> and <B>&gt;</B> operators (see description of
-<B>compat31</B>)
-and the effect of interrupting a command list.
-Bash versions 4.0 and later interrupt the list as if the shell received the
-interrupt; previous versions continue with the next command in the list.
 <DT><B>compat41</B>
 
 <DD>
-If set,
-<B>bash</B>,
-
-when in <I>posix</I> mode, treats a single quote in a double-quoted
-parameter expansion as a special character.  The single quotes must match
-(an even number) and the characters between the single quotes are considered
-quoted.  This is the behavior of posix mode through version 4.1.
-The default bash behavior remains as in previous versions.
 <DT><B>compat42</B>
 
 <DD>
-If set,
-<B>bash</B>
-
-does not process the replacement string in the pattern substitution word
-expansion using quote removal.
 <DT><B>compat43</B>
 
 <DD>
-If set,
-<B>bash</B>
+<DT><B>compat44</B>
 
-does not print a warning message if an attempt is made to use a quoted compound
-array assignment as an argument to <B>declare</B>,
-makes word expansion errors
-non-fatal errors that cause the current command to fail (the default behavior is
-to make them fatal errors that cause the shell to exit),
-and does not reset the
-loop state when a shell function is executed (this allows <B>break</B> or
-<B>continue</B> in a shell function to affect loops in the caller's context).
+<DD>
+
+These control aspects of the shell's compatibility mode
+(see
+<FONT SIZE=-1><B>SHELL COMPATIBILITY MODE</B>
+
+</FONT>
+below).
 <DT><B>complete_fullquote</B>
 
 <DD>
@@ -12226,6 +12631,16 @@ If set,
 
 includes filenames beginning with a `.' in the results of pathname
 expansion.
+The filenames
+<B>``.''</B>
+
+and
+<B>``..''</B>
+
+must always be matched explicitly, even if
+<B>dotglob</B>
+
+is set.
 <DT><B>execfail</B>
 
 <DD>
@@ -12248,7 +12663,9 @@ This option is enabled by default for interactive shells.
 <DT><B>extdebug</B>
 
 <DD>
-If set at shell invocation, arrange to execute the debugger profile
+If set at shell invocation,
+or in a shell startup file,
+arrange to execute the debugger profile
 before the shell starts, identical to the <B>--debugger</B> option.
 If set after invocation, behavior intended for use by debuggers is enabled:
 <DL COMPACT><DT><DD>
@@ -12441,6 +12858,19 @@ If set, and the
 
 option is enabled, multi-line commands are saved to the history with
 embedded newlines rather than using semicolon separators where possible.
+<DT><B>localvar_inherit</B>
+
+<DD>
+If set, local variables inherit the value and attributes of a variable of
+the same name that exists at a previous scope before any new value is
+assigned.  The nameref attribute is not inherited.
+<DT><B>localvar_unset</B>
+
+<DD>
+If set, calling <B>unset</B> on local variables in previous function scopes
+marks them so subsequent lookups find them unset until that function
+returns. This is identical to the behavior of unsetting local variables
+at the current function scope.
 <DT><B>login_shell</B>
 
 <DD>
@@ -12510,6 +12940,13 @@ to expand to a null string, rather than themselves.
 If set, the programmable completion facilities (see
 <B>Programmable Completion</B> above) are enabled.
 This option is enabled by default.
+<DT><B>progcomp_alias</B>
+
+<DD>
+If set, and programmable completion is enabled, <B>bash</B> treats a command
+name that doesn't have any completions as a possible alias and attempts
+alias expansion. If it has an alias, <B>bash</B> attempts programmable
+completion using the command word resulting from the expanded alias.
 <DT><B>promptvars</B>
 
 <DD>
@@ -12579,6 +13016,7 @@ the evaluation of the conditional expression
 
 Each operator and operand must be a separate argument.
 Expressions are composed of the primaries described above under
+
 <FONT SIZE=-1><B>CONDITIONAL EXPRESSIONS</B>.
 
 </FONT>
@@ -12951,7 +13389,10 @@ option suppresses shell function lookup, as with the <B>command</B> builtin.
 
 returns true if all of the arguments are found, false if
 any are not found.
-<DT><B>ulimit</B> [<B>-HSabcdefiklmnpqrstuvxPT</B> [<I>limit</I>]]<DD>
+<DT><B>ulimit</B> [<B>-HS</B>] <B>-a</B><DD>
+
+<DT><B>ulimit</B> [<B>-HS</B>] [<B>-bcdefiklmnpqrstuvxPRT</B> [<I>limit</I>]]<DD>
+
 Provides control over the resources available to the shell and to
 processes started by it, on systems that allow such control.
 The <B>-H</B> and <B>-S</B> options specify that the hard or soft limit is
@@ -12979,7 +13420,8 @@ If
 
 is omitted, the current value of the soft limit of the resource is
 printed, unless the <B>-H</B> option is given.  When more than one
-resource is specified, the limit name and unit are printed before the value.
+resource is specified, the limit name and unit, if appropriate,
+are printed before the value.
 Other options are interpreted as follows:
 <DL COMPACT><DT><DD>
 
@@ -12987,7 +13429,7 @@ Other options are interpreted as follows:
 <DT><B>-a</B>
 
 <DD>
-All current limits are reported
+All current limits are reported; no limits are set
 <DT><B>-b</B>
 
 <DD>
@@ -13066,6 +13508,10 @@ The maximum number of file locks
 
 <DD>
 The maximum number of pseudoterminals
+<DT><B>-R</B>
+
+<DD>
+The maximum time a real-time process can run before blocking, in microseconds
 <DT><B>-T</B>
 
 <DD>
@@ -13089,6 +13535,9 @@ is assumed.  Values are in 1024-byte increments, except for
 <B>-t</B>,
 
 which is in seconds;
+<B>-R</B>,
+
+which is in microseconds;
 <B>-p</B>,
 
 which is in units of 512-byte blocks;
@@ -13106,7 +13555,7 @@ and
 <B>-u</B>,
 
 which are unscaled values;
-and, when in Posix mode,
+and, when in posix mode,
 <B>-c</B>
 
 and
@@ -13186,24 +13635,39 @@ attribute, <I>name</I> will be unset rather than the variable it
 references.
 <B>-n</B> has no effect if the <B>-f</B> option is supplied.
 If no options are supplied, each <I>name</I> refers to a variable; if
-there is no variable by that name, any function with that name is
+there is no variable by that name, a function with that name, if any, is
 unset.
 Each unset variable or function is removed from the environment
 passed to subsequent commands.
 If any of
+<FONT SIZE=-1><B>BASH_ALIASES</B>,
+
+</FONT>
+<FONT SIZE=-1><B>BASH_ARGV0</B>,
+
+</FONT>
+<FONT SIZE=-1><B>BASH_CMDS</B>,
+
+</FONT>
+<FONT SIZE=-1><B>BASH_COMMAND</B>,
+
+</FONT>
+<FONT SIZE=-1><B>BASH_SUBSHELL</B>,
+
+</FONT>
+<FONT SIZE=-1><B>BASHPID</B>,
+
+</FONT>
 <FONT SIZE=-1><B>COMP_WORDBREAKS</B>,
 
 </FONT>
-<FONT SIZE=-1><B>RANDOM</B>,
+<FONT SIZE=-1><B>DIRSTACK</B>,
 
 </FONT>
-<FONT SIZE=-1><B>SECONDS</B>,
+<FONT SIZE=-1><B>EPOCHREALTIME</B>,
 
 </FONT>
-<FONT SIZE=-1><B>LINENO</B>,
-
-</FONT>
-<FONT SIZE=-1><B>HISTCMD</B>,
+<FONT SIZE=-1><B>EPOCHSECONDS</B>,
 
 </FONT>
 <FONT SIZE=-1><B>FUNCNAME</B>,
@@ -13211,9 +13675,21 @@ If any of
 </FONT>
 <FONT SIZE=-1><B>GROUPS</B>,
 
+</FONT>
+<FONT SIZE=-1><B>HISTCMD</B>,
+
+</FONT>
+<FONT SIZE=-1><B>LINENO</B>,
+
+</FONT>
+<FONT SIZE=-1><B>RANDOM</B>,
+
+</FONT>
+<FONT SIZE=-1><B>SECONDS</B>,
+
 </FONT>
 or
-<FONT SIZE=-1><B>DIRSTACK</B>
+<FONT SIZE=-1><B>SRANDOM</B>
 
 </FONT>
 are unset, they lose their special properties, even if they are
@@ -13221,30 +13697,276 @@ subsequently reset.  The exit status is true unless a
 <I>name</I>
 
 is readonly.
-<DT><B>wait</B> [<B>-n</B>] [<I>n ...</I>]<DD>
+<DT><B>wait</B> [<B>-fn</B>] [-p <I>varname</I>] [<I>id ...</I>]<DD>
 Wait for each specified child process and return its termination status.
 Each
-<I>n</I>
+<I>id</I>
 
 may be a process
 ID or a job specification; if a job spec is given, all processes
 in that job's pipeline are waited for.  If
-<I>n</I>
+<I>id</I>
 
-is not given, all currently active child processes
-are waited for, and the return status is zero.
-If the <B>-n</B> option is supplied, <B>wait</B> waits for any job to
-terminate and returns its exit status.
+is not given,
+<B>wait</B> waits for all running background jobs and
+the last-executed process substitution, if its process id is the same as
+<B>$!</B>,
+and the return status is zero.
+If the <B>-n</B> option is supplied,
+<B>wait</B> waits for a single job
+from the list of <I>id</I>s or, if no <I>id</I>s are supplied, any job,
+to complete and returns its exit status.
+If none of the supplied arguments is a child of the shell, or if no arguments
+are supplied and the shell has no unwaited-for children, the exit status
+is 127.
+If the <B>-p</B> option is supplied, the process or job identifier of the job
+for which the exit status is returned is assigned to the variable
+<I>varname</I> named by the option argument.
+The variable will be unset initially, before any assignment.
+This is useful only when the <B>-n</B> option is supplied.
+Supplying the <B>-f</B> option, when job control is enabled,
+forces <B>wait</B> to wait for <I>id</I> to terminate before returning
+its status, instead of returning when it changes status.
 If
-<I>n</I>
+<I>id</I>
 
 specifies a non-existent process or job, the return status is
 127.  Otherwise, the return status is the exit status of the last
 process or job waited for.
+</DL>
+<A NAME="lbDC">&nbsp;</A>
+<H3>SHELL COMPATIBILITY MODE</H3>
+
+Bash-4.0 introduced the concept of a `shell compatibility level', specified
+as a set of options to the shopt builtin
+<B>compat31</B>,
+
+<B>compat32</B>,
+
+<B>compat40</B>,
+
+<B>compat41</B>,
+
+and so on).
+There is only one current
+compatibility level -- each option is mutually exclusive.
+The compatibility level is intended to allow users to select behavior
+from previous versions that is incompatible with newer versions
+while they migrate scripts to use current features and
+behavior. It's intended to be a temporary solution.
+<P>
+
+This section does not mention behavior that is standard for a particular
+version (e.g., setting <B>compat32</B> means that quoting the rhs of the regexp
+matching operator quotes special regexp characters in the word, which is
+default behavior in bash-3.2 and above). 
+<P>
+
+If a user enables, say, <B>compat32</B>, it may affect the behavior of other
+compatibility levels up to and including the current compatibility level.
+The idea is that each compatibility level controls behavior that changed
+in that version of <B>bash</B>,
+but that behavior may have been present in earlier versions.
+For instance, the change to use locale-based comparisons with the <B>[[</B>
+command came in bash-4.1, and earlier versions used ASCII-based comparisons,
+so enabling <B>compat32</B> will enable ASCII-based comparisons as well.
+That granularity may not be sufficient for
+all uses, and as a result users should employ compatibility levels carefully.
+Read the documentation for a particular feature to find out the
+current behavior.
+<P>
+
+Bash-4.3 introduced a new shell variable:
+<FONT SIZE=-1><B>BASH_COMPAT</B>.
+
+</FONT>
+The value assigned
+to this variable (a decimal version number like 4.2, or an integer
+corresponding to the <B>compat</B><I>NN</I> option, like 42) determines the
+compatibility level.
+<P>
+
+Starting with bash-4.4, Bash has begun deprecating older compatibility
+levels.
+Eventually, the options will be removed in favor of
+<FONT SIZE=-1><B>BASH_COMPAT</B>.
+
+</FONT>
+<P>
+
+Bash-5.0 is the final version for which there will be an individual shopt
+option for the previous version. Users should use
+<FONT SIZE=-1><B>BASH_COMPAT</B>
+
+</FONT>
+on bash-5.0 and later versions.
+<P>
+
+The following table describes the behavior changes controlled by each
+compatibility level setting.
+The <B>compat</B><I>NN</I> tag is used as shorthand for setting the
+compatibility level
+to <I>NN</I> using one of the following mechanisms.
+For versions prior to bash-5.0, the compatibility level may be set using
+the corresponding <B>compat</B><I>NN</I> shopt option.
+For bash-4.3 and later versions, the
+<FONT SIZE=-1><B>BASH_COMPAT</B>
+
+</FONT>
+variable is preferred,
+and it is required for bash-5.1 and later versions.
+<DL COMPACT>
+<DT><B>compat31</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+quoting the rhs of the <B>[[</B> command's regexp matching operator (=~)
+has no special effect
+</DL></DL>
+
+
+<DT><B>compat32</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+interrupting a command list such as &quot;a ; b ; c&quot; causes the execution
+of the next command in the list (in bash-4.0 and later versions,
+the shell acts as if it received the interrupt, so
+interrupting one command in a list aborts the execution of the
+entire list)
+</DL></DL>
+
+
+<DT><B>compat40</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+the <B>&lt;</B> and <B>&gt;</B> operators to the <B>[[</B> command do not
+consider the current locale when comparing strings; they use ASCII
+ordering.
+Bash versions prior to bash-4.1 use ASCII collation and
+<I>strcmp</I>(3);
+
+bash-4.1 and later use the current locale's collation sequence and
+<I>strcoll</I>(3).
+
+</DL></DL>
+
+
+<DT><B>compat41</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+in <I>posix</I> mode, <B>time</B> may be followed by options and still be
+recognized as a reserved word (this is POSIX interpretation 267)
+<DT>*<DD>
+in <I>posix</I> mode, the parser requires that an even number of single
+quotes occur in the <I>word</I> portion of a double-quoted
+parameter expansion and treats them specially, so that characters within
+the single quotes are considered quoted
+(this is POSIX interpretation 221)
+</DL></DL>
+
+
+<DT><B>compat42</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+the replacement string in double-quoted pattern substitution does not
+undergo quote removal, as it does in versions after bash-4.2
+<DT>*<DD>
+in posix mode, single quotes are considered special when expanding
+the <I>word</I> portion of a double-quoted parameter expansion
+and can be used to quote a closing brace or other special character
+(this is part of POSIX interpretation 221);
+in later versions, single quotes
+are not special within double-quoted word expansions
+</DL></DL>
+
+
+<DT><B>compat43</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+the shell does not print a warning message if an attempt is made to
+use a quoted compound assignment as an argument to declare
+(declare -a foo='(1 2)'). Later versions warn that this usage is
+deprecated
+<DT>*<DD>
+word expansion errors are considered non-fatal errors that cause the
+current command to fail, even in posix mode
+(the default behavior is to make them fatal errors that cause the shell
+to exit)
+<DT>*<DD>
+when executing a shell function, the loop state (while/until/etc.)
+is not reset, so <B>break</B> or <B>continue</B> in that function will break
+or continue loops in the calling context. Bash-4.4 and later reset
+the loop state to prevent this
+</DL></DL>
+
+
+<DT><B>compat44</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+the shell sets up the values used by
+<FONT SIZE=-1><B>BASH_ARGV</B>
+
+</FONT>
+and
+<FONT SIZE=-1><B>BASH_ARGC</B>
+
+</FONT>
+so they can expand to the shell's positional parameters even if extended
+debugging mode is not enabled
+<DT>*<DD>
+a subshell inherits loops from its parent context, so <B>break</B>
+or <B>continue</B> will cause the subshell to exit.
+Bash-5.0 and later reset the loop state to prevent the exit
+<DT>*<DD>
+variable assignments preceding builtins like <B>export</B> and <B>readonly</B>
+that set attributes continue to affect variables with the same
+name in the calling environment even if the shell is not in posix
+mode
+</DL></DL>
+
+
+<DT><B>compat50</B><DD>
+
+<DL COMPACT><DT><DD>
+<DL COMPACT>
+<DT>*<DD>
+Bash-5.1 changed the way
+<FONT SIZE=-1><B>$RANDOM</B>
+
+</FONT>
+is generated to introduce slightly
+more randomness. If the shell compatibility level is set to 50 or
+lower, it reverts to the method from bash-5.0 and previous versions,
+so seeding the random number generator by assigning a value to
+<FONT SIZE=-1><B>RANDOM</B>
+
+</FONT>
+will produce the same sequence as in bash-5.0
+<DT>*<DD>
+If the command hash table is empty, bash versions prior to bash-5.1
+printed an informational message to that effect, even when producing
+output that can be reused as input. Bash-5.1 suppresses that message
+when the <B>-l</B> option is supplied.
+</DL></DL>
+
+
 
 
 </DL>
-<A NAME="lbDC">&nbsp;</A>
+<A NAME="lbDD">&nbsp;</A>
 <H3>RESTRICTED SHELL</H3>
 
 
@@ -13278,6 +14000,9 @@ setting or unsetting the values of
 </FONT>
 <FONT SIZE=-1><B>PATH</B>,
 
+</FONT>
+<FONT SIZE=-1><B>HISTFILE</B>,
+
 </FONT>
 <FONT SIZE=-1><B>ENV</B>,
 
@@ -13297,6 +14022,11 @@ specifying a filename containing a
 as an argument to the
 <B>.</B>
 
+builtin command
+<DT>*<DD>
+specifying a filename containing a slash as an argument to the
+<B>history</B>
+
 builtin command
 <DT>*<DD>
 specifying a filename containing a slash as an argument to the
@@ -13366,7 +14096,7 @@ turns off any restrictions in the shell spawned to execute the
 script.
 
 
-<A NAME="lbDD">&nbsp;</A>
+<A NAME="lbDE">&nbsp;</A>
 <H3>SEE ALSO</H3>
 
 
@@ -13382,7 +14112,7 @@ script.
 <DT><I>readline</I>(3)<DD>
 
 </DL>
-<A NAME="lbDE">&nbsp;</A>
+<A NAME="lbDF">&nbsp;</A>
 <H3>FILES</H3>
 
 
@@ -13419,7 +14149,7 @@ The individual login shell cleanup file, executed when a login shell exits
 Individual <I>readline</I> initialization file
 
 </DL>
-<A NAME="lbDF">&nbsp;</A>
+<A NAME="lbDG">&nbsp;</A>
 <H3>AUTHORS</H3>
 
 Brian Fox, Free Software Foundation
@@ -13432,7 +14162,7 @@ Chet Ramey, Case Western Reserve University
 <BR>
 
 <A HREF="mailto:chet.ramey@case.edu">chet.ramey@case.edu</A>
-<A NAME="lbDG">&nbsp;</A>
+<A NAME="lbDH">&nbsp;</A>
 <H3>BUG REPORTS</H3>
 
 If you find a bug in
@@ -13483,11 +14213,9 @@ Comments and bug reports concerning
 this manual page should be directed to
 <I><A HREF="mailto:chet.ramey@case.edu">chet.ramey@case.edu</A></I>.
 
-<A NAME="lbDH">&nbsp;</A>
+<A NAME="lbDI">&nbsp;</A>
 <H3>BUGS</H3>
 
-<P>
-
 It's too big and too slow.
 <P>
 
@@ -13529,7 +14257,7 @@ There may be only one active coprocess at a time.
 <HR>
 <TABLE WIDTH=100%>
 <TR>
-<TH ALIGN=LEFT width=33%>GNU Bash 4.4<TH ALIGN=CENTER width=33%>2016 August 26<TH ALIGN=RIGHT width=33%>BASH(1)
+<TH ALIGN=LEFT width=33%>GNU Bash 5.1<TH ALIGN=CENTER width=33%>2020 October 29<TH ALIGN=RIGHT width=33%>BASH(1)
 </TR>
 </TABLE>
 <HR>
@@ -13626,15 +14354,16 @@ There may be only one active coprocess at a time.
 <DT><A HREF="#lbDA">Modifiers</A><DD>
 </DL>
 <DT><A HREF="#lbDB">SHELL BUILTIN COMMANDS</A><DD>
-<DT><A HREF="#lbDC">RESTRICTED SHELL</A><DD>
-<DT><A HREF="#lbDD">SEE ALSO</A><DD>
-<DT><A HREF="#lbDE">FILES</A><DD>
-<DT><A HREF="#lbDF">AUTHORS</A><DD>
-<DT><A HREF="#lbDG">BUG REPORTS</A><DD>
-<DT><A HREF="#lbDH">BUGS</A><DD>
+<DT><A HREF="#lbDC">SHELL COMPATIBILITY MODE</A><DD>
+<DT><A HREF="#lbDD">RESTRICTED SHELL</A><DD>
+<DT><A HREF="#lbDE">SEE ALSO</A><DD>
+<DT><A HREF="#lbDF">FILES</A><DD>
+<DT><A HREF="#lbDG">AUTHORS</A><DD>
+<DT><A HREF="#lbDH">BUG REPORTS</A><DD>
+<DT><A HREF="#lbDI">BUGS</A><DD>
 </DL>
 <HR>
 This document was created by man2html from bash.1.<BR>
-Time: 31 August 2016 10:24:30 EDT
+Time: 18 November 2020 15:13:09 EST
 </BODY>
 </HTML>
diff --git a/msys2/usr/share/doc/bash/bashref.html b/msys2/usr/share/doc/bash/bashref.html
index 8c2eabf06..6a4c3ab88 100644
--- a/msys2/usr/share/doc/bash/bashref.html
+++ b/msys2/usr/share/doc/bash/bashref.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!-- This text is a brief description of the features that are present in
-the Bash shell (version 4.4, 7 September 2016).
+the Bash shell (version 5.1, 29 October 2020).
 
-This is Edition 4.4, last updated 7 September 2016,
+This is Edition 5.1, last updated 29 October 2020,
 of The GNU Bash Reference Manual,
-for Bash, Version 4.4.
+for Bash, Version 5.1.
 
-Copyright (C) 1988-2016 Free Software Foundation, Inc.
+Copyright (C) 1988-2020 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -15,8 +15,9 @@ any later version published by the Free Software Foundation; with no
 Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 A copy of the license is included in the section entitled
 "GNU Free Documentation License". -->
-<!-- Created by GNU Texinfo 6.1, http://www.gnu.org/software/texinfo/ -->
+<!-- Created by GNU Texinfo 6.7, http://www.gnu.org/software/texinfo/ -->
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Bash Reference Manual</title>
 
 <meta name="description" content="Bash Reference Manual">
@@ -24,7 +25,6 @@ A copy of the license is included in the section entitled
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="makeinfo">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="#Top" rel="start" title="Top">
 <link href="#Indexes" rel="index" title="Indexes">
 <link href="#SEC_Contents" rel="contents" title="Table of Contents">
@@ -33,23 +33,14 @@ A copy of the license is included in the section entitled
 <!--
 a.summary-letter {text-decoration: none}
 blockquote.indentedblock {margin-right: 0em}
-blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
-blockquote.smallquotation {font-size: smaller}
 div.display {margin-left: 3.2em}
 div.example {margin-left: 3.2em}
 div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smalllisp {margin-left: 3.2em}
 kbd {font-style: oblique}
 pre.display {font-family: inherit}
 pre.format {font-family: inherit}
 pre.menu-comment {font-family: serif}
 pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
 span.nolinebreak {white-space: nowrap}
 span.roman {font-family: initial; font-weight: normal}
 span.sansserif {font-family: sans-serif; font-weight: normal}
@@ -72,224 +63,224 @@ ul.no-bullet {list-style: none}
 
 
 
-<a name="SEC_Contents"></a>
+<span id="SEC_Contents"></span>
 <h2 class="contents-heading">Table of Contents</h2>
 
 <div class="contents">
 
 <ul class="no-bullet">
-  <li><a name="toc-Introduction-1" href="#Introduction">1 Introduction</a>
+  <li><a id="toc-Introduction-1" href="#Introduction">1 Introduction</a>
   <ul class="no-bullet">
-    <li><a name="toc-What-is-Bash_003f-1" href="#What-is-Bash_003f">1.1 What is Bash?</a></li>
-    <li><a name="toc-What-is-a-shell_003f-1" href="#What-is-a-shell_003f">1.2 What is a shell?</a></li>
+    <li><a id="toc-What-is-Bash_003f-1" href="#What-is-Bash_003f">1.1 What is Bash?</a></li>
+    <li><a id="toc-What-is-a-shell_003f-1" href="#What-is-a-shell_003f">1.2 What is a shell?</a></li>
   </ul></li>
-  <li><a name="toc-Definitions-1" href="#Definitions">2 Definitions</a></li>
-  <li><a name="toc-Basic-Shell-Features-1" href="#Basic-Shell-Features">3 Basic Shell Features</a>
+  <li><a id="toc-Definitions-1" href="#Definitions">2 Definitions</a></li>
+  <li><a id="toc-Basic-Shell-Features-1" href="#Basic-Shell-Features">3 Basic Shell Features</a>
   <ul class="no-bullet">
-    <li><a name="toc-Shell-Syntax-1" href="#Shell-Syntax">3.1 Shell Syntax</a>
+    <li><a id="toc-Shell-Syntax-1" href="#Shell-Syntax">3.1 Shell Syntax</a>
     <ul class="no-bullet">
-      <li><a name="toc-Shell-Operation-1" href="#Shell-Operation">3.1.1 Shell Operation</a></li>
-      <li><a name="toc-Quoting-1" href="#Quoting">3.1.2 Quoting</a>
+      <li><a id="toc-Shell-Operation-1" href="#Shell-Operation">3.1.1 Shell Operation</a></li>
+      <li><a id="toc-Quoting-1" href="#Quoting">3.1.2 Quoting</a>
       <ul class="no-bullet">
-        <li><a name="toc-Escape-Character-1" href="#Escape-Character">3.1.2.1 Escape Character</a></li>
-        <li><a name="toc-Single-Quotes-1" href="#Single-Quotes">3.1.2.2 Single Quotes</a></li>
-        <li><a name="toc-Double-Quotes-1" href="#Double-Quotes">3.1.2.3 Double Quotes</a></li>
-        <li><a name="toc-ANSI_002dC-Quoting-1" href="#ANSI_002dC-Quoting">3.1.2.4 ANSI-C Quoting</a></li>
-        <li><a name="toc-Locale_002dSpecific-Translation" href="#Locale-Translation">3.1.2.5 Locale-Specific Translation</a></li>
+        <li><a id="toc-Escape-Character-1" href="#Escape-Character">3.1.2.1 Escape Character</a></li>
+        <li><a id="toc-Single-Quotes-1" href="#Single-Quotes">3.1.2.2 Single Quotes</a></li>
+        <li><a id="toc-Double-Quotes-1" href="#Double-Quotes">3.1.2.3 Double Quotes</a></li>
+        <li><a id="toc-ANSI_002dC-Quoting-1" href="#ANSI_002dC-Quoting">3.1.2.4 ANSI-C Quoting</a></li>
+        <li><a id="toc-Locale_002dSpecific-Translation" href="#Locale-Translation">3.1.2.5 Locale-Specific Translation</a></li>
       </ul></li>
-      <li><a name="toc-Comments-1" href="#Comments">3.1.3 Comments</a></li>
+      <li><a id="toc-Comments-1" href="#Comments">3.1.3 Comments</a></li>
     </ul></li>
-    <li><a name="toc-Shell-Commands-1" href="#Shell-Commands">3.2 Shell Commands</a>
+    <li><a id="toc-Shell-Commands-1" href="#Shell-Commands">3.2 Shell Commands</a>
     <ul class="no-bullet">
-      <li><a name="toc-Simple-Commands-1" href="#Simple-Commands">3.2.1 Simple Commands</a></li>
-      <li><a name="toc-Pipelines-1" href="#Pipelines">3.2.2 Pipelines</a></li>
-      <li><a name="toc-Lists-of-Commands" href="#Lists">3.2.3 Lists of Commands</a></li>
-      <li><a name="toc-Compound-Commands-1" href="#Compound-Commands">3.2.4 Compound Commands</a>
+      <li><a id="toc-Reserved-Words-1" href="#Reserved-Words">3.2.1 Reserved Words</a></li>
+      <li><a id="toc-Simple-Commands-1" href="#Simple-Commands">3.2.2 Simple Commands</a></li>
+      <li><a id="toc-Pipelines-1" href="#Pipelines">3.2.3 Pipelines</a></li>
+      <li><a id="toc-Lists-of-Commands" href="#Lists">3.2.4 Lists of Commands</a></li>
+      <li><a id="toc-Compound-Commands-1" href="#Compound-Commands">3.2.5 Compound Commands</a>
       <ul class="no-bullet">
-        <li><a name="toc-Looping-Constructs-1" href="#Looping-Constructs">3.2.4.1 Looping Constructs</a></li>
-        <li><a name="toc-Conditional-Constructs-1" href="#Conditional-Constructs">3.2.4.2 Conditional Constructs</a></li>
-        <li><a name="toc-Grouping-Commands" href="#Command-Grouping">3.2.4.3 Grouping Commands</a></li>
+        <li><a id="toc-Looping-Constructs-1" href="#Looping-Constructs">3.2.5.1 Looping Constructs</a></li>
+        <li><a id="toc-Conditional-Constructs-1" href="#Conditional-Constructs">3.2.5.2 Conditional Constructs</a></li>
+        <li><a id="toc-Grouping-Commands" href="#Command-Grouping">3.2.5.3 Grouping Commands</a></li>
       </ul></li>
-      <li><a name="toc-Coprocesses-1" href="#Coprocesses">3.2.5 Coprocesses</a></li>
-      <li><a name="toc-GNU-Parallel-1" href="#GNU-Parallel">3.2.6 GNU Parallel</a></li>
+      <li><a id="toc-Coprocesses-1" href="#Coprocesses">3.2.6 Coprocesses</a></li>
+      <li><a id="toc-GNU-Parallel-1" href="#GNU-Parallel">3.2.7 GNU Parallel</a></li>
     </ul></li>
-    <li><a name="toc-Shell-Functions-1" href="#Shell-Functions">3.3 Shell Functions</a></li>
-    <li><a name="toc-Shell-Parameters-1" href="#Shell-Parameters">3.4 Shell Parameters</a>
+    <li><a id="toc-Shell-Functions-1" href="#Shell-Functions">3.3 Shell Functions</a></li>
+    <li><a id="toc-Shell-Parameters-1" href="#Shell-Parameters">3.4 Shell Parameters</a>
     <ul class="no-bullet">
-      <li><a name="toc-Positional-Parameters-1" href="#Positional-Parameters">3.4.1 Positional Parameters</a></li>
-      <li><a name="toc-Special-Parameters-1" href="#Special-Parameters">3.4.2 Special Parameters</a></li>
+      <li><a id="toc-Positional-Parameters-1" href="#Positional-Parameters">3.4.1 Positional Parameters</a></li>
+      <li><a id="toc-Special-Parameters-1" href="#Special-Parameters">3.4.2 Special Parameters</a></li>
     </ul></li>
-    <li><a name="toc-Shell-Expansions-1" href="#Shell-Expansions">3.5 Shell Expansions</a>
+    <li><a id="toc-Shell-Expansions-1" href="#Shell-Expansions">3.5 Shell Expansions</a>
     <ul class="no-bullet">
-      <li><a name="toc-Brace-Expansion-1" href="#Brace-Expansion">3.5.1 Brace Expansion</a></li>
-      <li><a name="toc-Tilde-Expansion-1" href="#Tilde-Expansion">3.5.2 Tilde Expansion</a></li>
-      <li><a name="toc-Shell-Parameter-Expansion-1" href="#Shell-Parameter-Expansion">3.5.3 Shell Parameter Expansion</a></li>
-      <li><a name="toc-Command-Substitution-1" href="#Command-Substitution">3.5.4 Command Substitution</a></li>
-      <li><a name="toc-Arithmetic-Expansion-1" href="#Arithmetic-Expansion">3.5.5 Arithmetic Expansion</a></li>
-      <li><a name="toc-Process-Substitution-1" href="#Process-Substitution">3.5.6 Process Substitution</a></li>
-      <li><a name="toc-Word-Splitting-1" href="#Word-Splitting">3.5.7 Word Splitting</a></li>
-      <li><a name="toc-Filename-Expansion-1" href="#Filename-Expansion">3.5.8 Filename Expansion</a>
+      <li><a id="toc-Brace-Expansion-1" href="#Brace-Expansion">3.5.1 Brace Expansion</a></li>
+      <li><a id="toc-Tilde-Expansion-1" href="#Tilde-Expansion">3.5.2 Tilde Expansion</a></li>
+      <li><a id="toc-Shell-Parameter-Expansion-1" href="#Shell-Parameter-Expansion">3.5.3 Shell Parameter Expansion</a></li>
+      <li><a id="toc-Command-Substitution-1" href="#Command-Substitution">3.5.4 Command Substitution</a></li>
+      <li><a id="toc-Arithmetic-Expansion-1" href="#Arithmetic-Expansion">3.5.5 Arithmetic Expansion</a></li>
+      <li><a id="toc-Process-Substitution-1" href="#Process-Substitution">3.5.6 Process Substitution</a></li>
+      <li><a id="toc-Word-Splitting-1" href="#Word-Splitting">3.5.7 Word Splitting</a></li>
+      <li><a id="toc-Filename-Expansion-1" href="#Filename-Expansion">3.5.8 Filename Expansion</a>
       <ul class="no-bullet">
-        <li><a name="toc-Pattern-Matching-1" href="#Pattern-Matching">3.5.8.1 Pattern Matching</a></li>
+        <li><a id="toc-Pattern-Matching-1" href="#Pattern-Matching">3.5.8.1 Pattern Matching</a></li>
       </ul></li>
-      <li><a name="toc-Quote-Removal-1" href="#Quote-Removal">3.5.9 Quote Removal</a></li>
+      <li><a id="toc-Quote-Removal-1" href="#Quote-Removal">3.5.9 Quote Removal</a></li>
     </ul></li>
-    <li><a name="toc-Redirections-1" href="#Redirections">3.6 Redirections</a>
+    <li><a id="toc-Redirections-1" href="#Redirections">3.6 Redirections</a>
     <ul class="no-bullet">
-      <li><a name="toc-Redirecting-Input" href="#Redirecting-Input">3.6.1 Redirecting Input</a></li>
-      <li><a name="toc-Redirecting-Output" href="#Redirecting-Output">3.6.2 Redirecting Output</a></li>
-      <li><a name="toc-Appending-Redirected-Output" href="#Appending-Redirected-Output">3.6.3 Appending Redirected Output</a></li>
-      <li><a name="toc-Redirecting-Standard-Output-and-Standard-Error" href="#Redirecting-Standard-Output-and-Standard-Error">3.6.4 Redirecting Standard Output and Standard Error</a></li>
-      <li><a name="toc-Appending-Standard-Output-and-Standard-Error" href="#Appending-Standard-Output-and-Standard-Error">3.6.5 Appending Standard Output and Standard Error</a></li>
-      <li><a name="toc-Here-Documents" href="#Here-Documents">3.6.6 Here Documents</a></li>
-      <li><a name="toc-Here-Strings" href="#Here-Strings">3.6.7 Here Strings</a></li>
-      <li><a name="toc-Duplicating-File-Descriptors" href="#Duplicating-File-Descriptors">3.6.8 Duplicating File Descriptors</a></li>
-      <li><a name="toc-Moving-File-Descriptors" href="#Moving-File-Descriptors">3.6.9 Moving File Descriptors</a></li>
-      <li><a name="toc-Opening-File-Descriptors-for-Reading-and-Writing" href="#Opening-File-Descriptors-for-Reading-and-Writing">3.6.10 Opening File Descriptors for Reading and Writing</a></li>
+      <li><a id="toc-Redirecting-Input" href="#Redirecting-Input">3.6.1 Redirecting Input</a></li>
+      <li><a id="toc-Redirecting-Output" href="#Redirecting-Output">3.6.2 Redirecting Output</a></li>
+      <li><a id="toc-Appending-Redirected-Output" href="#Appending-Redirected-Output">3.6.3 Appending Redirected Output</a></li>
+      <li><a id="toc-Redirecting-Standard-Output-and-Standard-Error" href="#Redirecting-Standard-Output-and-Standard-Error">3.6.4 Redirecting Standard Output and Standard Error</a></li>
+      <li><a id="toc-Appending-Standard-Output-and-Standard-Error" href="#Appending-Standard-Output-and-Standard-Error">3.6.5 Appending Standard Output and Standard Error</a></li>
+      <li><a id="toc-Here-Documents" href="#Here-Documents">3.6.6 Here Documents</a></li>
+      <li><a id="toc-Here-Strings" href="#Here-Strings">3.6.7 Here Strings</a></li>
+      <li><a id="toc-Duplicating-File-Descriptors" href="#Duplicating-File-Descriptors">3.6.8 Duplicating File Descriptors</a></li>
+      <li><a id="toc-Moving-File-Descriptors" href="#Moving-File-Descriptors">3.6.9 Moving File Descriptors</a></li>
+      <li><a id="toc-Opening-File-Descriptors-for-Reading-and-Writing" href="#Opening-File-Descriptors-for-Reading-and-Writing">3.6.10 Opening File Descriptors for Reading and Writing</a></li>
     </ul></li>
-    <li><a name="toc-Executing-Commands-1" href="#Executing-Commands">3.7 Executing Commands</a>
+    <li><a id="toc-Executing-Commands-1" href="#Executing-Commands">3.7 Executing Commands</a>
     <ul class="no-bullet">
-      <li><a name="toc-Simple-Command-Expansion-1" href="#Simple-Command-Expansion">3.7.1 Simple Command Expansion</a></li>
-      <li><a name="toc-Command-Search-and-Execution-1" href="#Command-Search-and-Execution">3.7.2 Command Search and Execution</a></li>
-      <li><a name="toc-Command-Execution-Environment-1" href="#Command-Execution-Environment">3.7.3 Command Execution Environment</a></li>
-      <li><a name="toc-Environment-1" href="#Environment">3.7.4 Environment</a></li>
-      <li><a name="toc-Exit-Status-1" href="#Exit-Status">3.7.5 Exit Status</a></li>
-      <li><a name="toc-Signals-1" href="#Signals">3.7.6 Signals</a></li>
+      <li><a id="toc-Simple-Command-Expansion-1" href="#Simple-Command-Expansion">3.7.1 Simple Command Expansion</a></li>
+      <li><a id="toc-Command-Search-and-Execution-1" href="#Command-Search-and-Execution">3.7.2 Command Search and Execution</a></li>
+      <li><a id="toc-Command-Execution-Environment-1" href="#Command-Execution-Environment">3.7.3 Command Execution Environment</a></li>
+      <li><a id="toc-Environment-1" href="#Environment">3.7.4 Environment</a></li>
+      <li><a id="toc-Exit-Status-1" href="#Exit-Status">3.7.5 Exit Status</a></li>
+      <li><a id="toc-Signals-1" href="#Signals">3.7.6 Signals</a></li>
     </ul></li>
-    <li><a name="toc-Shell-Scripts-1" href="#Shell-Scripts">3.8 Shell Scripts</a></li>
+    <li><a id="toc-Shell-Scripts-1" href="#Shell-Scripts">3.8 Shell Scripts</a></li>
   </ul></li>
-  <li><a name="toc-Shell-Builtin-Commands-1" href="#Shell-Builtin-Commands">4 Shell Builtin Commands</a>
+  <li><a id="toc-Shell-Builtin-Commands-1" href="#Shell-Builtin-Commands">4 Shell Builtin Commands</a>
   <ul class="no-bullet">
-    <li><a name="toc-Bourne-Shell-Builtins-1" href="#Bourne-Shell-Builtins">4.1 Bourne Shell Builtins</a></li>
-    <li><a name="toc-Bash-Builtin-Commands" href="#Bash-Builtins">4.2 Bash Builtin Commands</a></li>
-    <li><a name="toc-Modifying-Shell-Behavior-1" href="#Modifying-Shell-Behavior">4.3 Modifying Shell Behavior</a>
+    <li><a id="toc-Bourne-Shell-Builtins-1" href="#Bourne-Shell-Builtins">4.1 Bourne Shell Builtins</a></li>
+    <li><a id="toc-Bash-Builtin-Commands" href="#Bash-Builtins">4.2 Bash Builtin Commands</a></li>
+    <li><a id="toc-Modifying-Shell-Behavior-1" href="#Modifying-Shell-Behavior">4.3 Modifying Shell Behavior</a>
     <ul class="no-bullet">
-      <li><a name="toc-The-Set-Builtin-1" href="#The-Set-Builtin">4.3.1 The Set Builtin</a></li>
-      <li><a name="toc-The-Shopt-Builtin-1" href="#The-Shopt-Builtin">4.3.2 The Shopt Builtin</a></li>
+      <li><a id="toc-The-Set-Builtin-1" href="#The-Set-Builtin">4.3.1 The Set Builtin</a></li>
+      <li><a id="toc-The-Shopt-Builtin-1" href="#The-Shopt-Builtin">4.3.2 The Shopt Builtin</a></li>
     </ul></li>
-    <li><a name="toc-Special-Builtins-1" href="#Special-Builtins">4.4 Special Builtins</a></li>
+    <li><a id="toc-Special-Builtins-1" href="#Special-Builtins">4.4 Special Builtins</a></li>
   </ul></li>
-  <li><a name="toc-Shell-Variables-1" href="#Shell-Variables">5 Shell Variables</a>
+  <li><a id="toc-Shell-Variables-1" href="#Shell-Variables">5 Shell Variables</a>
   <ul class="no-bullet">
-    <li><a name="toc-Bourne-Shell-Variables-1" href="#Bourne-Shell-Variables">5.1 Bourne Shell Variables</a></li>
-    <li><a name="toc-Bash-Variables-1" href="#Bash-Variables">5.2 Bash Variables</a></li>
+    <li><a id="toc-Bourne-Shell-Variables-1" href="#Bourne-Shell-Variables">5.1 Bourne Shell Variables</a></li>
+    <li><a id="toc-Bash-Variables-1" href="#Bash-Variables">5.2 Bash Variables</a></li>
   </ul></li>
-  <li><a name="toc-Bash-Features-2" href="#Bash-Features">6 Bash Features</a>
+  <li><a id="toc-Bash-Features-2" href="#Bash-Features">6 Bash Features</a>
   <ul class="no-bullet">
-    <li><a name="toc-Invoking-Bash-1" href="#Invoking-Bash">6.1 Invoking Bash</a></li>
-    <li><a name="toc-Bash-Startup-Files-1" href="#Bash-Startup-Files">6.2 Bash Startup Files</a></li>
-    <li><a name="toc-Interactive-Shells-1" href="#Interactive-Shells">6.3 Interactive Shells</a>
+    <li><a id="toc-Invoking-Bash-1" href="#Invoking-Bash">6.1 Invoking Bash</a></li>
+    <li><a id="toc-Bash-Startup-Files-1" href="#Bash-Startup-Files">6.2 Bash Startup Files</a></li>
+    <li><a id="toc-Interactive-Shells-1" href="#Interactive-Shells">6.3 Interactive Shells</a>
     <ul class="no-bullet">
-      <li><a name="toc-What-is-an-Interactive-Shell_003f-1" href="#What-is-an-Interactive-Shell_003f">6.3.1 What is an Interactive Shell?</a></li>
-      <li><a name="toc-Is-this-Shell-Interactive_003f-1" href="#Is-this-Shell-Interactive_003f">6.3.2 Is this Shell Interactive?</a></li>
-      <li><a name="toc-Interactive-Shell-Behavior-1" href="#Interactive-Shell-Behavior">6.3.3 Interactive Shell Behavior</a></li>
+      <li><a id="toc-What-is-an-Interactive-Shell_003f-1" href="#What-is-an-Interactive-Shell_003f">6.3.1 What is an Interactive Shell?</a></li>
+      <li><a id="toc-Is-this-Shell-Interactive_003f-1" href="#Is-this-Shell-Interactive_003f">6.3.2 Is this Shell Interactive?</a></li>
+      <li><a id="toc-Interactive-Shell-Behavior-1" href="#Interactive-Shell-Behavior">6.3.3 Interactive Shell Behavior</a></li>
     </ul></li>
-    <li><a name="toc-Bash-Conditional-Expressions-1" href="#Bash-Conditional-Expressions">6.4 Bash Conditional Expressions</a></li>
-    <li><a name="toc-Shell-Arithmetic-1" href="#Shell-Arithmetic">6.5 Shell Arithmetic</a></li>
-    <li><a name="toc-Aliases-1" href="#Aliases">6.6 Aliases</a></li>
-    <li><a name="toc-Arrays-1" href="#Arrays">6.7 Arrays</a></li>
-    <li><a name="toc-The-Directory-Stack-1" href="#The-Directory-Stack">6.8 The Directory Stack</a>
+    <li><a id="toc-Bash-Conditional-Expressions-1" href="#Bash-Conditional-Expressions">6.4 Bash Conditional Expressions</a></li>
+    <li><a id="toc-Shell-Arithmetic-1" href="#Shell-Arithmetic">6.5 Shell Arithmetic</a></li>
+    <li><a id="toc-Aliases-1" href="#Aliases">6.6 Aliases</a></li>
+    <li><a id="toc-Arrays-1" href="#Arrays">6.7 Arrays</a></li>
+    <li><a id="toc-The-Directory-Stack-1" href="#The-Directory-Stack">6.8 The Directory Stack</a>
     <ul class="no-bullet">
-      <li><a name="toc-Directory-Stack-Builtins-1" href="#Directory-Stack-Builtins">6.8.1 Directory Stack Builtins</a></li>
+      <li><a id="toc-Directory-Stack-Builtins-1" href="#Directory-Stack-Builtins">6.8.1 Directory Stack Builtins</a></li>
     </ul></li>
-    <li><a name="toc-Controlling-the-Prompt-1" href="#Controlling-the-Prompt">6.9 Controlling the Prompt</a></li>
-    <li><a name="toc-The-Restricted-Shell-1" href="#The-Restricted-Shell">6.10 The Restricted Shell</a></li>
-    <li><a name="toc-Bash-POSIX-Mode-1" href="#Bash-POSIX-Mode">6.11 Bash POSIX Mode</a></li>
+    <li><a id="toc-Controlling-the-Prompt-1" href="#Controlling-the-Prompt">6.9 Controlling the Prompt</a></li>
+    <li><a id="toc-The-Restricted-Shell-1" href="#The-Restricted-Shell">6.10 The Restricted Shell</a></li>
+    <li><a id="toc-Bash-POSIX-Mode-1" href="#Bash-POSIX-Mode">6.11 Bash POSIX Mode</a></li>
+    <li><a id="toc-Shell-Compatibility-Mode-1" href="#Shell-Compatibility-Mode">6.12 Shell Compatibility Mode</a></li>
   </ul></li>
-  <li><a name="toc-Job-Control-1" href="#Job-Control">7 Job Control</a>
+  <li><a id="toc-Job-Control-1" href="#Job-Control">7 Job Control</a>
   <ul class="no-bullet">
-    <li><a name="toc-Job-Control-Basics-1" href="#Job-Control-Basics">7.1 Job Control Basics</a></li>
-    <li><a name="toc-Job-Control-Builtins-1" href="#Job-Control-Builtins">7.2 Job Control Builtins</a></li>
-    <li><a name="toc-Job-Control-Variables-1" href="#Job-Control-Variables">7.3 Job Control Variables</a></li>
+    <li><a id="toc-Job-Control-Basics-1" href="#Job-Control-Basics">7.1 Job Control Basics</a></li>
+    <li><a id="toc-Job-Control-Builtins-1" href="#Job-Control-Builtins">7.2 Job Control Builtins</a></li>
+    <li><a id="toc-Job-Control-Variables-1" href="#Job-Control-Variables">7.3 Job Control Variables</a></li>
   </ul></li>
-  <li><a name="toc-Command-Line-Editing-1" href="#Command-Line-Editing">8 Command Line Editing</a>
+  <li><a id="toc-Command-Line-Editing-1" href="#Command-Line-Editing">8 Command Line Editing</a>
   <ul class="no-bullet">
-    <li><a name="toc-Introduction-to-Line-Editing" href="#Introduction-and-Notation">8.1 Introduction to Line Editing</a></li>
-    <li><a name="toc-Readline-Interaction-1" href="#Readline-Interaction">8.2 Readline Interaction</a>
+    <li><a id="toc-Introduction-to-Line-Editing" href="#Introduction-and-Notation">8.1 Introduction to Line Editing</a></li>
+    <li><a id="toc-Readline-Interaction-1" href="#Readline-Interaction">8.2 Readline Interaction</a>
     <ul class="no-bullet">
-      <li><a name="toc-Readline-Bare-Essentials-1" href="#Readline-Bare-Essentials">8.2.1 Readline Bare Essentials</a></li>
-      <li><a name="toc-Readline-Movement-Commands-1" href="#Readline-Movement-Commands">8.2.2 Readline Movement Commands</a></li>
-      <li><a name="toc-Readline-Killing-Commands-1" href="#Readline-Killing-Commands">8.2.3 Readline Killing Commands</a></li>
-      <li><a name="toc-Readline-Arguments-1" href="#Readline-Arguments">8.2.4 Readline Arguments</a></li>
-      <li><a name="toc-Searching-for-Commands-in-the-History" href="#Searching">8.2.5 Searching for Commands in the History</a></li>
+      <li><a id="toc-Readline-Bare-Essentials-1" href="#Readline-Bare-Essentials">8.2.1 Readline Bare Essentials</a></li>
+      <li><a id="toc-Readline-Movement-Commands-1" href="#Readline-Movement-Commands">8.2.2 Readline Movement Commands</a></li>
+      <li><a id="toc-Readline-Killing-Commands-1" href="#Readline-Killing-Commands">8.2.3 Readline Killing Commands</a></li>
+      <li><a id="toc-Readline-Arguments-1" href="#Readline-Arguments">8.2.4 Readline Arguments</a></li>
+      <li><a id="toc-Searching-for-Commands-in-the-History" href="#Searching">8.2.5 Searching for Commands in the History</a></li>
     </ul></li>
-    <li><a name="toc-Readline-Init-File-1" href="#Readline-Init-File">8.3 Readline Init File</a>
+    <li><a id="toc-Readline-Init-File-1" href="#Readline-Init-File">8.3 Readline Init File</a>
     <ul class="no-bullet">
-      <li><a name="toc-Readline-Init-File-Syntax-1" href="#Readline-Init-File-Syntax">8.3.1 Readline Init File Syntax</a></li>
-      <li><a name="toc-Conditional-Init-Constructs-1" href="#Conditional-Init-Constructs">8.3.2 Conditional Init Constructs</a></li>
-      <li><a name="toc-Sample-Init-File-1" href="#Sample-Init-File">8.3.3 Sample Init File</a></li>
+      <li><a id="toc-Readline-Init-File-Syntax-1" href="#Readline-Init-File-Syntax">8.3.1 Readline Init File Syntax</a></li>
+      <li><a id="toc-Conditional-Init-Constructs-1" href="#Conditional-Init-Constructs">8.3.2 Conditional Init Constructs</a></li>
+      <li><a id="toc-Sample-Init-File-1" href="#Sample-Init-File">8.3.3 Sample Init File</a></li>
     </ul></li>
-    <li><a name="toc-Bindable-Readline-Commands-1" href="#Bindable-Readline-Commands">8.4 Bindable Readline Commands</a>
+    <li><a id="toc-Bindable-Readline-Commands-1" href="#Bindable-Readline-Commands">8.4 Bindable Readline Commands</a>
     <ul class="no-bullet">
-      <li><a name="toc-Commands-For-Moving-1" href="#Commands-For-Moving">8.4.1 Commands For Moving</a></li>
-      <li><a name="toc-Commands-For-Manipulating-The-History" href="#Commands-For-History">8.4.2 Commands For Manipulating The History</a></li>
-      <li><a name="toc-Commands-For-Changing-Text" href="#Commands-For-Text">8.4.3 Commands For Changing Text</a></li>
-      <li><a name="toc-Killing-And-Yanking" href="#Commands-For-Killing">8.4.4 Killing And Yanking</a></li>
-      <li><a name="toc-Specifying-Numeric-Arguments" href="#Numeric-Arguments">8.4.5 Specifying Numeric Arguments</a></li>
-      <li><a name="toc-Letting-Readline-Type-For-You" href="#Commands-For-Completion">8.4.6 Letting Readline Type For You</a></li>
-      <li><a name="toc-Keyboard-Macros-1" href="#Keyboard-Macros">8.4.7 Keyboard Macros</a></li>
-      <li><a name="toc-Some-Miscellaneous-Commands" href="#Miscellaneous-Commands">8.4.8 Some Miscellaneous Commands</a></li>
+      <li><a id="toc-Commands-For-Moving-1" href="#Commands-For-Moving">8.4.1 Commands For Moving</a></li>
+      <li><a id="toc-Commands-For-Manipulating-The-History" href="#Commands-For-History">8.4.2 Commands For Manipulating The History</a></li>
+      <li><a id="toc-Commands-For-Changing-Text" href="#Commands-For-Text">8.4.3 Commands For Changing Text</a></li>
+      <li><a id="toc-Killing-And-Yanking" href="#Commands-For-Killing">8.4.4 Killing And Yanking</a></li>
+      <li><a id="toc-Specifying-Numeric-Arguments" href="#Numeric-Arguments">8.4.5 Specifying Numeric Arguments</a></li>
+      <li><a id="toc-Letting-Readline-Type-For-You" href="#Commands-For-Completion">8.4.6 Letting Readline Type For You</a></li>
+      <li><a id="toc-Keyboard-Macros-1" href="#Keyboard-Macros">8.4.7 Keyboard Macros</a></li>
+      <li><a id="toc-Some-Miscellaneous-Commands" href="#Miscellaneous-Commands">8.4.8 Some Miscellaneous Commands</a></li>
     </ul></li>
-    <li><a name="toc-Readline-vi-Mode-1" href="#Readline-vi-Mode">8.5 Readline vi Mode</a></li>
-    <li><a name="toc-Programmable-Completion-1" href="#Programmable-Completion">8.6 Programmable Completion</a></li>
-    <li><a name="toc-Programmable-Completion-Builtins-1" href="#Programmable-Completion-Builtins">8.7 Programmable Completion Builtins</a></li>
-    <li><a name="toc-A-Programmable-Completion-Example-1" href="#A-Programmable-Completion-Example">8.8 A Programmable Completion Example</a></li>
+    <li><a id="toc-Readline-vi-Mode-1" href="#Readline-vi-Mode">8.5 Readline vi Mode</a></li>
+    <li><a id="toc-Programmable-Completion-1" href="#Programmable-Completion">8.6 Programmable Completion</a></li>
+    <li><a id="toc-Programmable-Completion-Builtins-1" href="#Programmable-Completion-Builtins">8.7 Programmable Completion Builtins</a></li>
+    <li><a id="toc-A-Programmable-Completion-Example-1" href="#A-Programmable-Completion-Example">8.8 A Programmable Completion Example</a></li>
   </ul></li>
-  <li><a name="toc-Using-History-Interactively-1" href="#Using-History-Interactively">9 Using History Interactively</a>
+  <li><a id="toc-Using-History-Interactively-1" href="#Using-History-Interactively">9 Using History Interactively</a>
   <ul class="no-bullet">
-    <li><a name="toc-Bash-History-Facilities-1" href="#Bash-History-Facilities">9.1 Bash History Facilities</a></li>
-    <li><a name="toc-Bash-History-Builtins-1" href="#Bash-History-Builtins">9.2 Bash History Builtins</a></li>
-    <li><a name="toc-History-Expansion" href="#History-Interaction">9.3 History Expansion</a>
+    <li><a id="toc-Bash-History-Facilities-1" href="#Bash-History-Facilities">9.1 Bash History Facilities</a></li>
+    <li><a id="toc-Bash-History-Builtins-1" href="#Bash-History-Builtins">9.2 Bash History Builtins</a></li>
+    <li><a id="toc-History-Expansion" href="#History-Interaction">9.3 History Expansion</a>
     <ul class="no-bullet">
-      <li><a name="toc-Event-Designators-1" href="#Event-Designators">9.3.1 Event Designators</a></li>
-      <li><a name="toc-Word-Designators-1" href="#Word-Designators">9.3.2 Word Designators</a></li>
-      <li><a name="toc-Modifiers-1" href="#Modifiers">9.3.3 Modifiers</a></li>
+      <li><a id="toc-Event-Designators-1" href="#Event-Designators">9.3.1 Event Designators</a></li>
+      <li><a id="toc-Word-Designators-1" href="#Word-Designators">9.3.2 Word Designators</a></li>
+      <li><a id="toc-Modifiers-1" href="#Modifiers">9.3.3 Modifiers</a></li>
     </ul></li>
   </ul></li>
-  <li><a name="toc-Installing-Bash-1" href="#Installing-Bash">10 Installing Bash</a>
+  <li><a id="toc-Installing-Bash-1" href="#Installing-Bash">10 Installing Bash</a>
   <ul class="no-bullet">
-    <li><a name="toc-Basic-Installation-1" href="#Basic-Installation">10.1 Basic Installation</a></li>
-    <li><a name="toc-Compilers-and-Options-1" href="#Compilers-and-Options">10.2 Compilers and Options</a></li>
-    <li><a name="toc-Compiling-For-Multiple-Architectures-1" href="#Compiling-For-Multiple-Architectures">10.3 Compiling For Multiple Architectures</a></li>
-    <li><a name="toc-Installation-Names-1" href="#Installation-Names">10.4 Installation Names</a></li>
-    <li><a name="toc-Specifying-the-System-Type-1" href="#Specifying-the-System-Type">10.5 Specifying the System Type</a></li>
-    <li><a name="toc-Sharing-Defaults-1" href="#Sharing-Defaults">10.6 Sharing Defaults</a></li>
-    <li><a name="toc-Operation-Controls-1" href="#Operation-Controls">10.7 Operation Controls</a></li>
-    <li><a name="toc-Optional-Features-1" href="#Optional-Features">10.8 Optional Features</a></li>
+    <li><a id="toc-Basic-Installation-1" href="#Basic-Installation">10.1 Basic Installation</a></li>
+    <li><a id="toc-Compilers-and-Options-1" href="#Compilers-and-Options">10.2 Compilers and Options</a></li>
+    <li><a id="toc-Compiling-For-Multiple-Architectures-1" href="#Compiling-For-Multiple-Architectures">10.3 Compiling For Multiple Architectures</a></li>
+    <li><a id="toc-Installation-Names-1" href="#Installation-Names">10.4 Installation Names</a></li>
+    <li><a id="toc-Specifying-the-System-Type-1" href="#Specifying-the-System-Type">10.5 Specifying the System Type</a></li>
+    <li><a id="toc-Sharing-Defaults-1" href="#Sharing-Defaults">10.6 Sharing Defaults</a></li>
+    <li><a id="toc-Operation-Controls-1" href="#Operation-Controls">10.7 Operation Controls</a></li>
+    <li><a id="toc-Optional-Features-1" href="#Optional-Features">10.8 Optional Features</a></li>
   </ul></li>
-  <li><a name="toc-Reporting-Bugs-1" href="#Reporting-Bugs">Appendix A Reporting Bugs</a></li>
-  <li><a name="toc-Major-Differences-From-The-Bourne-Shell-1" href="#Major-Differences-From-The-Bourne-Shell">Appendix B Major Differences From The Bourne Shell</a>
+  <li><a id="toc-Reporting-Bugs-1" href="#Reporting-Bugs">Appendix A Reporting Bugs</a></li>
+  <li><a id="toc-Major-Differences-From-The-Bourne-Shell-1" href="#Major-Differences-From-The-Bourne-Shell">Appendix B Major Differences From The Bourne Shell</a>
   <ul class="no-bullet">
-    <li><a name="toc-Implementation-Differences-From-The-SVR4_002e2-Shell" href="#Implementation-Differences-From-The-SVR4_002e2-Shell">B.1 Implementation Differences From The SVR4.2 Shell</a></li>
+    <li><a id="toc-Implementation-Differences-From-The-SVR4_002e2-Shell" href="#Implementation-Differences-From-The-SVR4_002e2-Shell">B.1 Implementation Differences From The SVR4.2 Shell</a></li>
   </ul></li>
-  <li><a name="toc-GNU-Free-Documentation-License-1" href="#GNU-Free-Documentation-License">Appendix C GNU Free Documentation License</a></li>
-  <li><a name="toc-Indexes-1" href="#Indexes">Appendix D Indexes</a>
+  <li><a id="toc-GNU-Free-Documentation-License-1" href="#GNU-Free-Documentation-License">Appendix C GNU Free Documentation License</a></li>
+  <li><a id="toc-Indexes-1" href="#Indexes">Appendix D Indexes</a>
   <ul class="no-bullet">
-    <li><a name="toc-Index-of-Shell-Builtin-Commands" href="#Builtin-Index">D.1 Index of Shell Builtin Commands</a></li>
-    <li><a name="toc-Index-of-Shell-Reserved-Words" href="#Reserved-Word-Index">D.2 Index of Shell Reserved Words</a></li>
-    <li><a name="toc-Parameter-and-Variable-Index" href="#Variable-Index">D.3 Parameter and Variable Index</a></li>
-    <li><a name="toc-Function-Index-1" href="#Function-Index">D.4 Function Index</a></li>
-    <li><a name="toc-Concept-Index-1" href="#Concept-Index">D.5 Concept Index</a></li>
+    <li><a id="toc-Index-of-Shell-Builtin-Commands" href="#Builtin-Index" rel="index">D.1 Index of Shell Builtin Commands</a></li>
+    <li><a id="toc-Index-of-Shell-Reserved-Words" href="#Reserved-Word-Index" rel="index">D.2 Index of Shell Reserved Words</a></li>
+    <li><a id="toc-Parameter-and-Variable-Index" href="#Variable-Index" rel="index">D.3 Parameter and Variable Index</a></li>
+    <li><a id="toc-Function-Index-1" href="#Function-Index" rel="index">D.4 Function Index</a></li>
+    <li><a id="toc-Concept-Index-1" href="#Concept-Index" rel="index">D.5 Concept Index</a></li>
   </ul></li>
 </ul>
 </div>
 
 
-<a name="Top"></a>
-<div class="header">
+<span id="Top"></span><div class="header">
 <p>
 Next: <a href="#Introduction" accesskey="n" rel="next">Introduction</a>, Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Features-1"></a>
-<h1 class="top">Bash Features</h1>
+<span id="Bash-Features-1"></span><h1 class="top">Bash Features</h1>
 
 <p>This text is a brief description of the features that are present in
-the Bash shell (version 4.4, 7 September 2016).
+the Bash shell (version 5.1, 29 October 2020).
 The Bash home page is <a href="http://www.gnu.org/software/bash/">http://www.gnu.org/software/bash/</a>.
 </p>
-<p>This is Edition 4.4, last updated 7 September 2016,
+<p>This is Edition 5.1, last updated 29 October 2020,
 of <cite>The GNU Bash Reference Manual</cite>,
-for <code>Bash</code>, Version 4.4.
+for <code>Bash</code>, Version 5.1.
 </p>
 <p>Bash contains features that appear in other popular shells, and some
 features that only appear in Bash.  Some of the shells that Bash has
@@ -304,64 +295,60 @@ Bash.  The Bash manual page should be used as the definitive
 reference on shell behavior.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Introduction" accesskey="1">Introduction</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An introduction to the shell.
+<tr><td align="left" valign="top">&bull; <a href="#Introduction" accesskey="1">Introduction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An introduction to the shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Definitions" accesskey="2">Definitions</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Some definitions used in the rest of this
+<tr><td align="left" valign="top">&bull; <a href="#Definitions" accesskey="2">Definitions</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Some definitions used in the rest of this
 				manual.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Basic-Shell-Features" accesskey="3">Basic Shell Features</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The shell &quot;building blocks&quot;.
+<tr><td align="left" valign="top">&bull; <a href="#Basic-Shell-Features" accesskey="3">Basic Shell Features</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The shell &quot;building blocks&quot;.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Builtin-Commands" accesskey="4">Shell Builtin Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands that are a part of the shell.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Builtin-Commands" accesskey="4">Shell Builtin Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands that are a part of the shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Variables" accesskey="5">Shell Variables</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables used or set by Bash.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Variables" accesskey="5">Shell Variables</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables used or set by Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-Features" accesskey="6">Bash Features</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Features found only in Bash.
+<tr><td align="left" valign="top">&bull; <a href="#Bash-Features" accesskey="6">Bash Features</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Features found only in Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Job-Control" accesskey="7">Job Control</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What job control is and how Bash allows you
+<tr><td align="left" valign="top">&bull; <a href="#Job-Control" accesskey="7">Job Control</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What job control is and how Bash allows you
 				to use it.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Command-Line-Editing" accesskey="8">Command Line Editing</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter describing the command line
+<tr><td align="left" valign="top">&bull; <a href="#Command-Line-Editing" accesskey="8">Command Line Editing</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter describing the command line
 				editing features.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Using-History-Interactively" accesskey="9">Using History Interactively</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Command History Expansion
+<tr><td align="left" valign="top">&bull; <a href="#Using-History-Interactively" accesskey="9">Using History Interactively</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Command History Expansion
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Installing-Bash">Installing Bash</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to build and install Bash on your system.
+<tr><td align="left" valign="top">&bull; <a href="#Installing-Bash">Installing Bash</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to build and install Bash on your system.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Reporting-Bugs">Reporting Bugs</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to report bugs in Bash.
+<tr><td align="left" valign="top">&bull; <a href="#Reporting-Bugs">Reporting Bugs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to report bugs in Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Major-Differences-From-The-Bourne-Shell">Major Differences From The Bourne Shell</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A terse list of the differences
+<tr><td align="left" valign="top">&bull; <a href="#Major-Differences-From-The-Bourne-Shell">Major Differences From The Bourne Shell</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A terse list of the differences
 						between Bash and historical
 						versions of /bin/sh.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#GNU-Free-Documentation-License">GNU Free Documentation License</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Copying and sharing this documentation.
+<tr><td align="left" valign="top">&bull; <a href="#GNU-Free-Documentation-License">GNU Free Documentation License</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Copying and sharing this documentation.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Indexes">Indexes</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Various indexes for this manual.
+<tr><td align="left" valign="top">&bull; <a href="#Indexes">Indexes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Various indexes for this manual.
 </td></tr>
 </table>
 
 <hr>
-<a name="Introduction"></a>
-<div class="header">
+<span id="Introduction"></span><div class="header">
 <p>
 Next: <a href="#Definitions" accesskey="n" rel="next">Definitions</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Introduction-1"></a>
-<h2 class="chapter">1 Introduction</h2>
+<span id="Introduction-1"></span><h2 class="chapter">1 Introduction</h2>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#What-is-Bash_003f" accesskey="1">What is Bash?</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A short description of Bash.
+<tr><td align="left" valign="top">&bull; <a href="#What-is-Bash_003f" accesskey="1">What is Bash?</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A short description of Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#What-is-a-shell_003f" accesskey="2">What is a shell?</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A brief introduction to shells.
+<tr><td align="left" valign="top">&bull; <a href="#What-is-a-shell_003f" accesskey="2">What is a shell?</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A brief introduction to shells.
 </td></tr>
 </table>
 
 <hr>
-<a name="What-is-Bash_003f"></a>
-<div class="header">
+<span id="What-is-Bash_003f"></span><div class="header">
 <p>
 Next: <a href="#What-is-a-shell_003f" accesskey="n" rel="next">What is a shell?</a>, Up: <a href="#Introduction" accesskey="u" rel="up">Introduction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="What-is-Bash_003f-1"></a>
-<h3 class="section">1.1 What is Bash?</h3>
+<span id="What-is-Bash_003f-1"></span><h3 class="section">1.1 What is Bash?</h3>
 
 <p>Bash is the shell, or command language interpreter,
 for the <small>GNU</small> operating system.
@@ -387,13 +374,11 @@ independently-supported ports exist for <small>MS-DOS</small>, <small>OS/2</smal
 and Windows platforms.
 </p>
 <hr>
-<a name="What-is-a-shell_003f"></a>
-<div class="header">
+<span id="What-is-a-shell_003f"></span><div class="header">
 <p>
 Previous: <a href="#What-is-Bash_003f" accesskey="p" rel="prev">What is Bash?</a>, Up: <a href="#Introduction" accesskey="u" rel="up">Introduction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="What-is-a-shell_003f-1"></a>
-<h3 class="section">1.2 What is a shell?</h3>
+<span id="What-is-a-shell_003f-1"></span><h3 class="section">1.2 What is a shell?</h3>
 
 <p>At its base, a shell is simply a macro processor that executes
 commands.  The term macro processor means functionality where text
@@ -448,18 +433,16 @@ editing, command history and aliases.  Each of these features is
 described in this manual.
 </p>
 <hr>
-<a name="Definitions"></a>
-<div class="header">
+<span id="Definitions"></span><div class="header">
 <p>
 Next: <a href="#Basic-Shell-Features" accesskey="n" rel="next">Basic Shell Features</a>, Previous: <a href="#Introduction" accesskey="p" rel="prev">Introduction</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Definitions-1"></a>
-<h2 class="chapter">2 Definitions</h2>
+<span id="Definitions-1"></span><h2 class="chapter">2 Definitions</h2>
 <p>These definitions are used throughout the remainder of this manual.
 </p>
 <dl compact="compact">
 <dt><code>POSIX</code></dt>
-<dd><a name="index-POSIX"></a>
+<dd><span id="index-POSIX"></span>
 <p>A family of open system standards based on Unix.  Bash
 is primarily concerned with the Shell and Utilities portion of the
 <small>POSIX</small> 1003.1 standard. 
@@ -470,13 +453,13 @@ is primarily concerned with the Shell and Utilities portion of the
 </p>
 </dd>
 <dt><code>builtin</code></dt>
-<dd><a name="index-builtin-1"></a>
+<dd><span id="index-builtin-1"></span>
 <p>A command that is implemented internally by the shell itself, rather
 than by an executable program somewhere in the file system.
 </p>
 </dd>
 <dt><code>control operator</code></dt>
-<dd><a name="index-control-operator"></a>
+<dd><span id="index-control-operator"></span>
 <p>A <code>token</code> that performs a control function.  It is a <code>newline</code>
 or one of the following:
 &lsquo;<samp>||</samp>&rsquo;, &lsquo;<samp>&amp;&amp;</samp>&rsquo;, &lsquo;<samp>&amp;</samp>&rsquo;, &lsquo;<samp>;</samp>&rsquo;, &lsquo;<samp>;;</samp>&rsquo;, &lsquo;<samp>;&amp;</samp>&rsquo;, &lsquo;<samp>;;&amp;</samp>&rsquo;,
@@ -484,37 +467,37 @@ or one of the following:
 </p>
 </dd>
 <dt><code>exit status</code></dt>
-<dd><a name="index-exit-status"></a>
+<dd><span id="index-exit-status"></span>
 <p>The value returned by a command to its caller.  The value is restricted
 to eight bits, so the maximum value is 255.
 </p>
 </dd>
 <dt><code>field</code></dt>
-<dd><a name="index-field"></a>
+<dd><span id="index-field"></span>
 <p>A unit of text that is the result of one of the shell expansions.  After
 expansion, when executing a command, the resulting fields are used as
 the command name and arguments.
 </p>
 </dd>
 <dt><code>filename</code></dt>
-<dd><a name="index-filename"></a>
+<dd><span id="index-filename"></span>
 <p>A string of characters used to identify a file.
 </p>
 </dd>
 <dt><code>job</code></dt>
-<dd><a name="index-job"></a>
+<dd><span id="index-job"></span>
 <p>A set of processes comprising a pipeline, and any processes descended
 from it, that are all in the same process group.
 </p>
 </dd>
 <dt><code>job control</code></dt>
-<dd><a name="index-job-control"></a>
+<dd><span id="index-job-control"></span>
 <p>A mechanism by which users can selectively stop (suspend) and restart
 (resume) execution of processes.
 </p>
 </dd>
 <dt><code>metacharacter</code></dt>
-<dd><a name="index-metacharacter"></a>
+<dd><span id="index-metacharacter"></span>
 <p>A character that, when unquoted, separates words.  A metacharacter is
 a <code>space</code>, <code>tab</code>, <code>newline</code>, or one of the following characters:
 &lsquo;<samp>|</samp>&rsquo;, &lsquo;<samp>&amp;</samp>&rsquo;, &lsquo;<samp>;</samp>&rsquo;, &lsquo;<samp>(</samp>&rsquo;, &lsquo;<samp>)</samp>&rsquo;, &lsquo;<samp>&lt;</samp>&rsquo;, or
@@ -522,8 +505,8 @@ a <code>space</code>, <code>tab</code>, <code>newline</code>, or one of the foll
 </p>
 </dd>
 <dt><code>name</code></dt>
-<dd><a name="index-name"></a>
-<a name="index-identifier"></a>
+<dd><span id="index-name"></span>
+<span id="index-identifier"></span>
 <p>A <code>word</code> consisting solely of letters, numbers, and underscores,
 and beginning with a letter or underscore.  <code>Name</code>s are used as
 shell variable and function names.
@@ -531,70 +514,68 @@ Also referred to as an <code>identifier</code>.
 </p>
 </dd>
 <dt><code>operator</code></dt>
-<dd><a name="index-operator_002c-shell"></a>
+<dd><span id="index-operator_002c-shell"></span>
 <p>A <code>control operator</code> or a <code>redirection operator</code>.
 See <a href="#Redirections">Redirections</a>, for a list of redirection operators.
 Operators contain at least one unquoted <code>metacharacter</code>.
 </p>
 </dd>
 <dt><code>process group</code></dt>
-<dd><a name="index-process-group"></a>
+<dd><span id="index-process-group"></span>
 <p>A collection of related processes each having the same process
 group <small>ID</small>.
 </p>
 </dd>
 <dt><code>process group ID</code></dt>
-<dd><a name="index-process-group-ID"></a>
+<dd><span id="index-process-group-ID"></span>
 <p>A unique identifier that represents a <code>process group</code>
 during its lifetime.
 </p>
 </dd>
 <dt><code>reserved word</code></dt>
-<dd><a name="index-reserved-word"></a>
+<dd><span id="index-reserved-word"></span>
 <p>A <code>word</code> that has a special meaning to the shell.  Most reserved
 words introduce shell flow control constructs, such as <code>for</code> and
 <code>while</code>.
 </p>
 </dd>
 <dt><code>return status</code></dt>
-<dd><a name="index-return-status"></a>
+<dd><span id="index-return-status"></span>
 <p>A synonym for <code>exit status</code>.
 </p>
 </dd>
 <dt><code>signal</code></dt>
-<dd><a name="index-signal"></a>
+<dd><span id="index-signal"></span>
 <p>A mechanism by which a process may be notified by the kernel
 of an event occurring in the system.
 </p>
 </dd>
 <dt><code>special builtin</code></dt>
-<dd><a name="index-special-builtin"></a>
+<dd><span id="index-special-builtin"></span>
 <p>A shell builtin command that has been classified as special by the
 <small>POSIX</small> standard.
 </p>
 </dd>
 <dt><code>token</code></dt>
-<dd><a name="index-token"></a>
+<dd><span id="index-token"></span>
 <p>A sequence of characters considered a single unit by the shell.
 It is either a <code>word</code> or an <code>operator</code>.
 </p>
 </dd>
 <dt><code>word</code></dt>
-<dd><a name="index-word"></a>
+<dd><span id="index-word"></span>
 <p>A sequence of characters treated as a unit by the shell.
 Words may not include unquoted <code>metacharacters</code>.
 </p></dd>
 </dl>
 
 <hr>
-<a name="Basic-Shell-Features"></a>
-<div class="header">
+<span id="Basic-Shell-Features"></span><div class="header">
 <p>
 Next: <a href="#Shell-Builtin-Commands" accesskey="n" rel="next">Shell Builtin Commands</a>, Previous: <a href="#Definitions" accesskey="p" rel="prev">Definitions</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Basic-Shell-Features-1"></a>
-<h2 class="chapter">3 Basic Shell Features</h2>
-<a name="index-Bourne-shell"></a>
+<span id="Basic-Shell-Features-1"></span><h2 class="chapter">3 Basic Shell Features</h2>
+<span id="index-Bourne-shell"></span>
 
 <p>Bash is an acronym for &lsquo;<samp>Bourne-Again SHell</samp>&rsquo;.
 The Bourne shell is
@@ -610,39 +591,37 @@ shell expansions,
 and to named files, and how the shell executes commands.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Syntax" accesskey="1">Shell Syntax</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What your input means to the shell.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Syntax" accesskey="1">Shell Syntax</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What your input means to the shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Commands" accesskey="2">Shell Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The types of commands you can use.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Commands" accesskey="2">Shell Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The types of commands you can use.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Functions" accesskey="3">Shell Functions</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Grouping commands by name.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Functions" accesskey="3">Shell Functions</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Grouping commands by name.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Parameters" accesskey="4">Shell Parameters</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the shell stores values.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Parameters" accesskey="4">Shell Parameters</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the shell stores values.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Expansions" accesskey="5">Shell Expansions</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands parameters and the various
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Expansions" accesskey="5">Shell Expansions</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands parameters and the various
 				expansions available.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Redirections" accesskey="6">Redirections</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A way to control where input and output go.
+<tr><td align="left" valign="top">&bull; <a href="#Redirections" accesskey="6">Redirections</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A way to control where input and output go.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Executing-Commands" accesskey="7">Executing Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What happens when you run a command.
+<tr><td align="left" valign="top">&bull; <a href="#Executing-Commands" accesskey="7">Executing Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What happens when you run a command.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Scripts" accesskey="8">Shell Scripts</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Executing files of shell commands.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Scripts" accesskey="8">Shell Scripts</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Executing files of shell commands.
 </td></tr>
 </table>
 
 <hr>
-<a name="Shell-Syntax"></a>
-<div class="header">
+<span id="Shell-Syntax"></span><div class="header">
 <p>
 Next: <a href="#Shell-Commands" accesskey="n" rel="next">Shell Commands</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Syntax-1"></a>
-<h3 class="section">3.1 Shell Syntax</h3>
+<span id="Shell-Syntax-1"></span><h3 class="section">3.1 Shell Syntax</h3>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Operation" accesskey="1">Shell Operation</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The basic operation of the shell.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Operation" accesskey="1">Shell Operation</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The basic operation of the shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Quoting" accesskey="2">Quoting</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to remove the special meaning from characters.
+<tr><td align="left" valign="top">&bull; <a href="#Quoting" accesskey="2">Quoting</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to remove the special meaning from characters.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Comments" accesskey="3">Comments</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify comments.
+<tr><td align="left" valign="top">&bull; <a href="#Comments" accesskey="3">Comments</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify comments.
 </td></tr>
 </table>
 
@@ -662,13 +641,11 @@ command, waits for the command&rsquo;s exit status, and makes that exit status
 available for further inspection or processing.
 </p>
 <hr>
-<a name="Shell-Operation"></a>
-<div class="header">
+<span id="Shell-Operation"></span><div class="header">
 <p>
 Next: <a href="#Quoting" accesskey="n" rel="next">Quoting</a>, Up: <a href="#Shell-Syntax" accesskey="u" rel="up">Shell Syntax</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Operation-1"></a>
-<h4 class="subsection">3.1.1 Shell Operation</h4>
+<span id="Shell-Operation-1"></span><h4 class="subsection">3.1.1 Shell Operation</h4>
 
 <p>The following is a brief description of the shell&rsquo;s operation when it
 reads and executes a command.  Basically, the shell does the
@@ -702,27 +679,25 @@ status (see <a href="#Exit-Status">Exit Status</a>).
 </li></ol>
 
 <hr>
-<a name="Quoting"></a>
-<div class="header">
+<span id="Quoting"></span><div class="header">
 <p>
 Next: <a href="#Comments" accesskey="n" rel="next">Comments</a>, Previous: <a href="#Shell-Operation" accesskey="p" rel="prev">Shell Operation</a>, Up: <a href="#Shell-Syntax" accesskey="u" rel="up">Shell Syntax</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Quoting-1"></a>
-<h4 class="subsection">3.1.2 Quoting</h4>
-<a name="index-quoting"></a>
+<span id="Quoting-1"></span><h4 class="subsection">3.1.2 Quoting</h4>
+<span id="index-quoting"></span>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Escape-Character" accesskey="1">Escape Character</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to remove the special meaning from a single
+<tr><td align="left" valign="top">&bull; <a href="#Escape-Character" accesskey="1">Escape Character</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to remove the special meaning from a single
 			character.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Single-Quotes" accesskey="2">Single Quotes</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to inhibit all interpretation of a sequence
+<tr><td align="left" valign="top">&bull; <a href="#Single-Quotes" accesskey="2">Single Quotes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to inhibit all interpretation of a sequence
 			of characters.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Double-Quotes" accesskey="3">Double Quotes</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to suppress most of the interpretation of a
+<tr><td align="left" valign="top">&bull; <a href="#Double-Quotes" accesskey="3">Double Quotes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to suppress most of the interpretation of a
 			sequence of characters.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#ANSI_002dC-Quoting" accesskey="4">ANSI-C Quoting</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to expand ANSI-C sequences in quoted strings.
+<tr><td align="left" valign="top">&bull; <a href="#ANSI_002dC-Quoting" accesskey="4">ANSI-C Quoting</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to expand ANSI-C sequences in quoted strings.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Locale-Translation" accesskey="5">Locale Translation</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to translate strings into different languages.
+<tr><td align="left" valign="top">&bull; <a href="#Locale-Translation" accesskey="5">Locale Translation</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to translate strings into different languages.
 </td></tr>
 </table>
 
@@ -745,13 +720,11 @@ more details concerning history expansion.
 <var>escape character</var>, single quotes, and double quotes.
 </p>
 <hr>
-<a name="Escape-Character"></a>
-<div class="header">
+<span id="Escape-Character"></span><div class="header">
 <p>
 Next: <a href="#Single-Quotes" accesskey="n" rel="next">Single Quotes</a>, Up: <a href="#Quoting" accesskey="u" rel="up">Quoting</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Escape-Character-1"></a>
-<h4 class="subsubsection">3.1.2.1 Escape Character</h4>
+<span id="Escape-Character-1"></span><h4 class="subsubsection">3.1.2.1 Escape Character</h4>
 <p>A non-quoted backslash &lsquo;<samp>\</samp>&rsquo; is the Bash escape character.
 It preserves the literal value of the next character that follows,
 with the exception of <code>newline</code>.  If a <code>\newline</code> pair
@@ -760,26 +733,22 @@ is treated as a line continuation (that is, it is removed from
 the input stream and effectively ignored).
 </p>
 <hr>
-<a name="Single-Quotes"></a>
-<div class="header">
+<span id="Single-Quotes"></span><div class="header">
 <p>
 Next: <a href="#Double-Quotes" accesskey="n" rel="next">Double Quotes</a>, Previous: <a href="#Escape-Character" accesskey="p" rel="prev">Escape Character</a>, Up: <a href="#Quoting" accesskey="u" rel="up">Quoting</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Single-Quotes-1"></a>
-<h4 class="subsubsection">3.1.2.2 Single Quotes</h4>
+<span id="Single-Quotes-1"></span><h4 class="subsubsection">3.1.2.2 Single Quotes</h4>
 
 <p>Enclosing characters in single quotes (&lsquo;<samp>'</samp>&rsquo;) preserves the literal value
 of each character within the quotes.  A single quote may not occur
 between single quotes, even when preceded by a backslash.
 </p>
 <hr>
-<a name="Double-Quotes"></a>
-<div class="header">
+<span id="Double-Quotes"></span><div class="header">
 <p>
 Next: <a href="#ANSI_002dC-Quoting" accesskey="n" rel="next">ANSI-C Quoting</a>, Previous: <a href="#Single-Quotes" accesskey="p" rel="prev">Single Quotes</a>, Up: <a href="#Quoting" accesskey="u" rel="up">Quoting</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Double-Quotes-1"></a>
-<h4 class="subsubsection">3.1.2.3 Double Quotes</h4>
+<span id="Double-Quotes-1"></span><h4 class="subsubsection">3.1.2.3 Double Quotes</h4>
 
 <p>Enclosing characters in double quotes (&lsquo;<samp>&quot;</samp>&rsquo;) preserves the literal value
 of all characters within the quotes, with the exception of
@@ -807,14 +776,12 @@ The backslash preceding the &lsquo;<samp>!</samp>&rsquo; is not removed.
 when in double quotes (see <a href="#Shell-Parameter-Expansion">Shell Parameter Expansion</a>).
 </p>
 <hr>
-<a name="ANSI_002dC-Quoting"></a>
-<div class="header">
+<span id="ANSI_002dC-Quoting"></span><div class="header">
 <p>
 Next: <a href="#Locale-Translation" accesskey="n" rel="next">Locale Translation</a>, Previous: <a href="#Double-Quotes" accesskey="p" rel="prev">Double Quotes</a>, Up: <a href="#Quoting" accesskey="u" rel="up">Quoting</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="ANSI_002dC-Quoting-1"></a>
-<h4 class="subsubsection">3.1.2.4 ANSI-C Quoting</h4>
-<a name="index-quoting_002c-ANSI"></a>
+<span id="ANSI_002dC-Quoting-1"></span><h4 class="subsubsection">3.1.2.4 ANSI-C Quoting</h4>
+<span id="index-quoting_002c-ANSI"></span>
 
 <p>Words of the form <code>$'<var>string</var>'</code> are treated specially.  The
 word expands to <var>string</var>, with backslash-escaped characters replaced
@@ -861,7 +828,7 @@ present, are decoded as follows:
 </p></dd>
 <dt><code>\<var>nnn</var></code></dt>
 <dd><p>the eight-bit character whose value is the octal value <var>nnn</var>
-(one to three digits)
+(one to three octal digits)
 </p></dd>
 <dt><code>\x<var>HH</var></code></dt>
 <dd><p>the eight-bit character whose value is the hexadecimal value <var>HH</var>
@@ -884,28 +851,31 @@ present, are decoded as follows:
 been present.
 </p>
 <hr>
-<a name="Locale-Translation"></a>
-<div class="header">
+<span id="Locale-Translation"></span><div class="header">
 <p>
 Previous: <a href="#ANSI_002dC-Quoting" accesskey="p" rel="prev">ANSI-C Quoting</a>, Up: <a href="#Quoting" accesskey="u" rel="up">Quoting</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Locale_002dSpecific-Translation"></a>
-<h4 class="subsubsection">3.1.2.5 Locale-Specific Translation</h4>
-<a name="index-localization"></a>
-<a name="index-internationalization"></a>
-<a name="index-native-languages"></a>
-<a name="index-translation_002c-native-languages"></a>
+<span id="Locale_002dSpecific-Translation"></span><h4 class="subsubsection">3.1.2.5 Locale-Specific Translation</h4>
+<span id="index-localization"></span>
+<span id="index-internationalization"></span>
+<span id="index-native-languages"></span>
+<span id="index-translation_002c-native-languages"></span>
 
-<p>A double-quoted string preceded by a dollar sign (&lsquo;<samp>$</samp>&rsquo;) will cause
-the string to be translated according to the current locale.
-If the current locale is <code>C</code> or <code>POSIX</code>, the dollar sign
-is ignored.
+<p>A double-quoted string preceded by a dollar sign (&lsquo;<samp>$</samp>&rsquo;)
+will cause the string to be translated according to the current locale.
+The <var>gettext</var> infrastructure performs the message catalog lookup and 
+translation, using the <code>LC_MESSAGES</code> and <code>TEXTDOMAIN</code> shell
+variables, as explained below. See the gettext documentation for additional
+details.
+If the current locale is <code>C</code> or <code>POSIX</code>,
+or if there are no translations available,
+the dollar sign is ignored.
 If the string is translated and replaced, the replacement is
 double-quoted.
 </p>
-<a name="index-LC_005fMESSAGES"></a>
-<a name="index-TEXTDOMAIN"></a>
-<a name="index-TEXTDOMAINDIR"></a>
+<span id="index-LC_005fMESSAGES"></span>
+<span id="index-TEXTDOMAIN"></span>
+<span id="index-TEXTDOMAINDIR"></span>
 <p>Some systems use the message catalog selected by the <code>LC_MESSAGES</code>
 shell variable.  Others create the name of the message catalog from the
 value of the <code>TEXTDOMAIN</code> shell variable, possibly adding a
@@ -916,14 +886,12 @@ fashion:
 <code>TEXTDOMAINDIR</code>/<code>LC_MESSAGES</code>/LC_MESSAGES/<code>TEXTDOMAIN</code>.mo.
 </p>
 <hr>
-<a name="Comments"></a>
-<div class="header">
+<span id="Comments"></span><div class="header">
 <p>
 Previous: <a href="#Quoting" accesskey="p" rel="prev">Quoting</a>, Up: <a href="#Shell-Syntax" accesskey="u" rel="up">Shell Syntax</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Comments-1"></a>
-<h4 class="subsection">3.1.3 Comments</h4>
-<a name="index-comments_002c-shell"></a>
+<span id="Comments-1"></span><h4 class="subsection">3.1.3 Comments</h4>
+<span id="index-comments_002c-shell"></span>
 
 <p>In a non-interactive shell, or an interactive shell in which the
 <code>interactive_comments</code> option to the <code>shopt</code>
@@ -937,14 +905,12 @@ See <a href="#Interactive-Shells">Interactive Shells</a>, for a description of w
 a shell interactive.
 </p>
 <hr>
-<a name="Shell-Commands"></a>
-<div class="header">
+<span id="Shell-Commands"></span><div class="header">
 <p>
 Next: <a href="#Shell-Functions" accesskey="n" rel="next">Shell Functions</a>, Previous: <a href="#Shell-Syntax" accesskey="p" rel="prev">Shell Syntax</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Commands-1"></a>
-<h3 class="section">3.2 Shell Commands</h3>
-<a name="index-commands_002c-shell"></a>
+<span id="Shell-Commands-1"></span><h3 class="section">3.2 Shell Commands</h3>
+<span id="index-commands_002c-shell"></span>
 
 <p>A simple shell command such as <code>echo a b c</code> consists of the command
 itself followed by arguments, separated by spaces.
@@ -955,30 +921,56 @@ becomes the input of a second, in a loop or conditional construct, or in
 some other grouping.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Simple-Commands" accesskey="1">Simple Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The most common type of command.
+<tr><td align="left" valign="top">&bull; <a href="#Reserved-Words" accesskey="1">Reserved Words</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Words that have special meaning to the shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Pipelines" accesskey="2">Pipelines</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Connecting the input and output of several
+<tr><td align="left" valign="top">&bull; <a href="#Simple-Commands" accesskey="2">Simple Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The most common type of command.
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Pipelines" accesskey="3">Pipelines</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Connecting the input and output of several
 				commands.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Lists" accesskey="3">Lists</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to execute commands sequentially.
+<tr><td align="left" valign="top">&bull; <a href="#Lists" accesskey="4">Lists</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to execute commands sequentially.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Compound-Commands" accesskey="4">Compound Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for control flow.
+<tr><td align="left" valign="top">&bull; <a href="#Compound-Commands" accesskey="5">Compound Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for control flow.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Coprocesses" accesskey="5">Coprocesses</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Two-way communication between commands.
+<tr><td align="left" valign="top">&bull; <a href="#Coprocesses" accesskey="6">Coprocesses</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Two-way communication between commands.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#GNU-Parallel" accesskey="6">GNU Parallel</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Running commands in parallel.
+<tr><td align="left" valign="top">&bull; <a href="#GNU-Parallel" accesskey="7">GNU Parallel</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Running commands in parallel.
 </td></tr>
 </table>
 
 <hr>
-<a name="Simple-Commands"></a>
-<div class="header">
+<span id="Reserved-Words"></span><div class="header">
 <p>
-Next: <a href="#Pipelines" accesskey="n" rel="next">Pipelines</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Simple-Commands" accesskey="n" rel="next">Simple Commands</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Simple-Commands-1"></a>
-<h4 class="subsection">3.2.1 Simple Commands</h4>
-<a name="index-commands_002c-simple"></a>
+<span id="Reserved-Words-1"></span><h4 class="subsection">3.2.1 Reserved Words</h4>
+<span id="index-reserved-words"></span>
+
+<p>Reserved words are words that have special meaning to the shell.
+They are used to begin and end the shell&rsquo;s compound commands.
+</p>
+<p>The following words are recognized as reserved when unquoted and 
+the first word of a command (see below for exceptions):
+</p>
+<table>
+<tr><td width="10%"><code>if</code></td><td width="10%"><code>then</code></td><td width="10%"><code>elif</code></td><td width="10%"><code>else</code></td><td width="12%"><code>fi</code></td><td width="10%"><code>time</code></td></tr>
+<tr><td width="10%"><code>for</code></td><td width="10%"><code>in</code></td><td width="10%"><code>until</code></td><td width="10%"><code>while</code></td><td width="12%"><code>do</code></td><td width="10%"><code>done</code></td></tr>
+<tr><td width="10%"><code>case</code></td><td width="10%"><code>esac</code></td><td width="10%"><code>coproc</code></td><td width="10%"><code>select</code></td><td width="12%"><code>function</code></td></tr>
+<tr><td width="10%"><code>{</code></td><td width="10%"><code>}</code></td><td width="10%"><code>[[</code></td><td width="10%"><code>]]</code></td><td width="12%"><code>!</code></td></tr>
+</table>
+
+<p><code>in</code> is recognized as a reserved word if it is the third word of a
+<code>case</code> or <code>select</code> command.
+<code>in</code> and <code>do</code> are recognized as reserved
+words if they are the third word in a <code>for</code> command.
+</p>
+<hr>
+<span id="Simple-Commands"></span><div class="header">
+<p>
+Next: <a href="#Pipelines" accesskey="n" rel="next">Pipelines</a>, Previous: <a href="#Reserved-Words" accesskey="p" rel="prev">Reserved Words</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
+</div>
+<span id="Simple-Commands-1"></span><h4 class="subsection">3.2.2 Simple Commands</h4>
+<span id="index-commands_002c-simple"></span>
 
 <p>A simple command is the kind of command encountered most often.
 It&rsquo;s just a sequence of words separated by <code>blank</code>s, terminated
@@ -992,22 +984,20 @@ by the <small>POSIX</small> 1003.1 <code>waitpid</code> function, or 128+<var>n<
 the command was terminated by signal <var>n</var>.
 </p>
 <hr>
-<a name="Pipelines"></a>
-<div class="header">
+<span id="Pipelines"></span><div class="header">
 <p>
 Next: <a href="#Lists" accesskey="n" rel="next">Lists</a>, Previous: <a href="#Simple-Commands" accesskey="p" rel="prev">Simple Commands</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Pipelines-1"></a>
-<h4 class="subsection">3.2.2 Pipelines</h4>
-<a name="index-pipeline"></a>
-<a name="index-commands_002c-pipelines"></a>
+<span id="Pipelines-1"></span><h4 class="subsection">3.2.3 Pipelines</h4>
+<span id="index-pipeline"></span>
+<span id="index-commands_002c-pipelines"></span>
 
 <p>A <code>pipeline</code> is a sequence of one or more commands separated by
 one of the control operators &lsquo;<samp>|</samp>&rsquo; or &lsquo;<samp>|&amp;</samp>&rsquo;.
 </p>
-<a name="index-time"></a>
-<a name="index-_0021"></a>
-<a name="index-command-timing"></a>
+<span id="index-time"></span>
+<span id="index-_0021"></span>
+<span id="index-command-timing"></span>
 <p>The format for a pipeline is
 </p><div class="example">
 <pre class="example">[time [-p]] [!] <var>command1</var> [ | or |&amp; <var>command2</var> ] &hellip;
@@ -1051,8 +1041,13 @@ the time information.
 <p>If the pipeline is not executed asynchronously (see <a href="#Lists">Lists</a>), the
 shell waits for all commands in the pipeline to complete.
 </p>
-<p>Each command in a pipeline is executed in its own subshell
-(see <a href="#Command-Execution-Environment">Command Execution Environment</a>).  The exit
+<p>Each command in a pipeline is executed in its own subshell, which is a
+separate process (see <a href="#Command-Execution-Environment">Command Execution Environment</a>).
+If the <code>lastpipe</code> option is enabled using the <code>shopt</code> builtin
+(see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>),
+the last element of a pipeline may be run by the shell process.
+</p>
+<p>The exit
 status of a pipeline is the exit status of the last command in the
 pipeline, unless the <code>pipefail</code> option is enabled
 (see <a href="#The-Set-Builtin">The Set Builtin</a>).
@@ -1066,14 +1061,12 @@ The shell waits for all commands in the pipeline to terminate before
 returning a value.
 </p>
 <hr>
-<a name="Lists"></a>
-<div class="header">
+<span id="Lists"></span><div class="header">
 <p>
 Next: <a href="#Compound-Commands" accesskey="n" rel="next">Compound Commands</a>, Previous: <a href="#Pipelines" accesskey="p" rel="prev">Pipelines</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Lists-of-Commands"></a>
-<h4 class="subsection">3.2.3 Lists of Commands</h4>
-<a name="index-commands_002c-lists"></a>
+<span id="Lists-of-Commands"></span><h4 class="subsection">3.2.4 Lists of Commands</h4>
+<span id="index-commands_002c-lists"></span>
 
 <p>A <code>list</code> is a sequence of one or more pipelines separated by one
 of the operators &lsquo;<samp>;</samp>&rsquo;, &lsquo;<samp>&amp;</samp>&rsquo;, &lsquo;<samp>&amp;&amp;</samp>&rsquo;, or &lsquo;<samp>||</samp>&rsquo;,
@@ -1089,7 +1082,8 @@ to delimit commands, equivalent to a semicolon.
 </p>
 <p>If a command is terminated by the control operator &lsquo;<samp>&amp;</samp>&rsquo;,
 the shell executes the command asynchronously in a subshell.
-This is known as executing the command in the <var>background</var>.
+This is known as executing the command in the <var>background</var>,
+and these are referred to as <var>asynchronous</var> commands.
 The shell does not wait for the command to finish, and the return
 status is 0 (true).
 When job control is not active (see <a href="#Job-Control">Job Control</a>),
@@ -1111,7 +1105,7 @@ associativity.
 </pre></div>
 
 <p><var>command2</var> is executed if, and only if, <var>command1</var>
-returns an exit status of zero.
+returns an exit status of zero (success).
 </p>
 <p>An <small>OR</small> list has the form
 </p><div class="example">
@@ -1126,25 +1120,23 @@ returns a non-zero exit status.
 executed in the list.
 </p>
 <hr>
-<a name="Compound-Commands"></a>
-<div class="header">
+<span id="Compound-Commands"></span><div class="header">
 <p>
 Next: <a href="#Coprocesses" accesskey="n" rel="next">Coprocesses</a>, Previous: <a href="#Lists" accesskey="p" rel="prev">Lists</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Compound-Commands-1"></a>
-<h4 class="subsection">3.2.4 Compound Commands</h4>
-<a name="index-commands_002c-compound"></a>
+<span id="Compound-Commands-1"></span><h4 class="subsection">3.2.5 Compound Commands</h4>
+<span id="index-commands_002c-compound"></span>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Looping-Constructs" accesskey="1">Looping Constructs</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for iterative action.
+<tr><td align="left" valign="top">&bull; <a href="#Looping-Constructs" accesskey="1">Looping Constructs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for iterative action.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Conditional-Constructs" accesskey="2">Conditional Constructs</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for conditional execution.
+<tr><td align="left" valign="top">&bull; <a href="#Conditional-Constructs" accesskey="2">Conditional Constructs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Shell commands for conditional execution.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Command-Grouping" accesskey="3">Command Grouping</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Ways to group commands.
+<tr><td align="left" valign="top">&bull; <a href="#Command-Grouping" accesskey="3">Command Grouping</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Ways to group commands.
 </td></tr>
 </table>
 
-<p>Compound commands are the shell programming constructs.
+<p>Compound commands are the shell programming language constructs.
 Each construct begins with a reserved word or control operator and is
 terminated by a corresponding reserved word or operator.
 Any redirections (see <a href="#Redirections">Redirections</a>) associated with a compound command
@@ -1158,14 +1150,12 @@ followed by a newline in place of a semicolon.
 to group commands and execute them as a unit.
 </p>
 <hr>
-<a name="Looping-Constructs"></a>
-<div class="header">
+<span id="Looping-Constructs"></span><div class="header">
 <p>
 Next: <a href="#Conditional-Constructs" accesskey="n" rel="next">Conditional Constructs</a>, Up: <a href="#Compound-Commands" accesskey="u" rel="up">Compound Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Looping-Constructs-1"></a>
-<h4 class="subsubsection">3.2.4.1 Looping Constructs</h4>
-<a name="index-commands_002c-looping"></a>
+<span id="Looping-Constructs-1"></span><h4 class="subsubsection">3.2.5.1 Looping Constructs</h4>
+<span id="index-commands_002c-looping"></span>
 
 <p>Bash supports the following looping constructs.
 </p>
@@ -1174,9 +1164,9 @@ command&rsquo;s syntax, it may be replaced with one or more newlines.
 </p>
 <dl compact="compact">
 <dt><code>until</code></dt>
-<dd><a name="index-until"></a>
-<a name="index-do"></a>
-<a name="index-done"></a>
+<dd><span id="index-until"></span>
+<span id="index-do"></span>
+<span id="index-done"></span>
 <p>The syntax of the <code>until</code> command is:
 </p>
 <div class="example">
@@ -1190,7 +1180,7 @@ in <var>consequent-commands</var>, or zero if none was executed.
 </p>
 </dd>
 <dt><code>while</code></dt>
-<dd><a name="index-while"></a>
+<dd><span id="index-while"></span>
 <p>The syntax of the <code>while</code> command is:
 </p>
 <div class="example">
@@ -1204,20 +1194,22 @@ in <var>consequent-commands</var>, or zero if none was executed.
 </p>
 </dd>
 <dt><code>for</code></dt>
-<dd><a name="index-for"></a>
+<dd><span id="index-for"></span>
 <p>The syntax of the <code>for</code> command is:
 </p>
 <div class="example">
 <pre class="example">for <var>name</var> [ [in [<var>words</var> &hellip;] ] ; ] do <var>commands</var>; done
 </pre></div>
 
-<p>Expand <var>words</var>, and execute <var>commands</var> once for each member
+<p>Expand <var>words</var> (see <a href="#Shell-Expansions">Shell Expansions</a>), and execute <var>commands</var>
+once for each member
 in the resultant list, with <var>name</var> bound to the current member.
 If &lsquo;<samp>in <var>words</var></samp>&rsquo; is not present, the <code>for</code> command
 executes the <var>commands</var> once for each positional parameter that is
 set, as if &lsquo;<samp>in &quot;$@&quot;</samp>&rsquo; had been specified
 (see <a href="#Special-Parameters">Special Parameters</a>).
-The return status is the exit status of the last command that executes.
+</p>
+<p>The return status is the exit status of the last command that executes.
 If there are no items in the expansion of <var>words</var>, no commands are
 executed, and the return status is zero.
 </p>
@@ -1243,22 +1235,20 @@ that is executed, or false if any of the expressions is invalid.
 may be used to control loop execution.
 </p>
 <hr>
-<a name="Conditional-Constructs"></a>
-<div class="header">
+<span id="Conditional-Constructs"></span><div class="header">
 <p>
 Next: <a href="#Command-Grouping" accesskey="n" rel="next">Command Grouping</a>, Previous: <a href="#Looping-Constructs" accesskey="p" rel="prev">Looping Constructs</a>, Up: <a href="#Compound-Commands" accesskey="u" rel="up">Compound Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Conditional-Constructs-1"></a>
-<h4 class="subsubsection">3.2.4.2 Conditional Constructs</h4>
-<a name="index-commands_002c-conditional"></a>
+<span id="Conditional-Constructs-1"></span><h4 class="subsubsection">3.2.5.2 Conditional Constructs</h4>
+<span id="index-commands_002c-conditional"></span>
 
 <dl compact="compact">
 <dt><code>if</code></dt>
-<dd><a name="index-if"></a>
-<a name="index-then"></a>
-<a name="index-else"></a>
-<a name="index-elif"></a>
-<a name="index-fi"></a>
+<dd><span id="index-if"></span>
+<span id="index-then"></span>
+<span id="index-else"></span>
+<span id="index-elif"></span>
+<span id="index-fi"></span>
 <p>The syntax of the <code>if</code> command is:
 </p>
 <div class="example">
@@ -1284,17 +1274,21 @@ zero if no condition tested true.
 </p>
 </dd>
 <dt><code>case</code></dt>
-<dd><a name="index-case"></a>
-<a name="index-in"></a>
-<a name="index-esac"></a>
+<dd><span id="index-case"></span>
+<span id="index-in"></span>
+<span id="index-esac"></span>
 <p>The syntax of the <code>case</code> command is:
 </p>
 <div class="example">
-<pre class="example">case <var>word</var> in [ [(] <var>pattern</var> [| <var>pattern</var>]&hellip;) <var>command-list</var> ;;]&hellip; esac
+<pre class="example">case <var>word</var> in
+    [ [(] <var>pattern</var> [| <var>pattern</var>]&hellip;) <var>command-list</var> ;;]&hellip;
+esac
 </pre></div>
 
 <p><code>case</code> will selectively execute the <var>command-list</var> corresponding to
 the first <var>pattern</var> that matches <var>word</var>.
+The match is performed according
+to the rules described below in <a href="#Pattern-Matching">Pattern Matching</a>.
 If the <code>nocasematch</code> shell option
 (see the description of <code>shopt</code> in <a href="#The-Shopt-Builtin">The Shopt Builtin</a>)
 is enabled, the match is performed without regard to the case
@@ -1306,7 +1300,9 @@ as a <var>clause</var>.
 </p>
 <p>Each clause must be terminated with &lsquo;<samp>;;</samp>&rsquo;, &lsquo;<samp>;&amp;</samp>&rsquo;, or &lsquo;<samp>;;&amp;</samp>&rsquo;.
 The <var>word</var> undergoes tilde expansion, parameter expansion, command
-substitution, arithmetic expansion, and quote removal before matching is
+substitution, arithmetic expansion, and quote removal
+(see <a href="#Shell-Parameter-Expansion">Shell Parameter Expansion</a>)
+before matching is
 attempted.  Each <var>pattern</var> undergoes tilde expansion, parameter
 expansion, command substitution, and arithmetic expansion.
 </p>
@@ -1339,14 +1335,15 @@ Using &lsquo;<samp>;&amp;</samp>&rsquo;  in place of &lsquo;<samp>;;</samp>&rsqu
 the <var>command-list</var> associated with the next clause, if any.
 Using &lsquo;<samp>;;&amp;</samp>&rsquo; in place of &lsquo;<samp>;;</samp>&rsquo; causes the shell to test the patterns
 in the next clause, if any, and execute any associated <var>command-list</var>
-on a successful match.
+on a successful match,
+continuing the case statement execution as if the pattern list had not matched.
 </p>
 <p>The return status is zero if no <var>pattern</var> is matched.  Otherwise, the
 return status is the exit status of the <var>command-list</var> executed.
 </p>
 </dd>
 <dt><code>select</code></dt>
-<dd><a name="index-select"></a>
+<dd><span id="index-select"></span>
 
 <p>The <code>select</code> construct allows the easy generation of menus.
 It has almost the same syntax as the <code>for</code> command:
@@ -1402,8 +1399,8 @@ otherwise the return status is 1.  This is exactly equivalent to
 </p>
 </dd>
 <dt><code>[[&hellip;]]</code></dt>
-<dd><a name="index-_005b_005b"></a>
-<a name="index-_005d_005d"></a>
+<dd><span id="index-_005b_005b"></span>
+<span id="index-_005d_005d"></span>
 <div class="example">
 <pre class="example">[[ <var>expression</var> ]]
 </pre></div>
@@ -1432,14 +1429,16 @@ If the <code>nocasematch</code> shell option
 is enabled, the match is performed without regard to the case
 of alphabetic characters.
 The return value is 0 if the string matches (&lsquo;<samp>==</samp>&rsquo;) or does not
-match (&lsquo;<samp>!=</samp>&rsquo;)the pattern, and 1 otherwise.
+match (&lsquo;<samp>!=</samp>&rsquo;) the pattern, and 1 otherwise.
 Any part of the pattern may be quoted to force the quoted portion
 to be matched as a string.
 </p>
 <p>An additional binary operator, &lsquo;<samp>=~</samp>&rsquo;, is available, with the same
 precedence as &lsquo;<samp>==</samp>&rsquo; and &lsquo;<samp>!=</samp>&rsquo;.
 When it is used, the string to the right of the operator is considered
-an extended regular expression and matched accordingly (as in <i>regex</i>3)).
+a <small>POSIX</small> extended regular expression and matched accordingly
+(using the <small>POSIX</small> <code>regcomp</code> and <code>regexec</code> interfaces
+usually described in <i>regex</i>(3)).
 The return value is 0 if the string matches
 the pattern, and 1 otherwise.
 If the regular expression is syntactically incorrect, the conditional
@@ -1454,18 +1453,25 @@ Bracket expressions in regular expressions must be treated carefully,
 since normal quoting characters lose their meanings between brackets.
 If the pattern is stored in a shell variable, quoting the variable
 expansion forces the entire pattern to be matched as a string.
+</p>
+<p>The pattern will match if it matches any part of the string.
+Anchor the pattern using the &lsquo;<samp>^</samp>&rsquo; and &lsquo;<samp>$</samp>&rsquo; regular expression
+operators to force it to match the entire string.
+The array variable <code>BASH_REMATCH</code> records which parts of the string
+matched the pattern.
+The element of <code>BASH_REMATCH</code> with index 0 contains the portion of
+the string matching the entire regular expression.
 Substrings matched by parenthesized subexpressions within the regular
-expression are saved in the array variable <code>BASH_REMATCH</code>.
-The element of <code>BASH_REMATCH</code> with index 0 is the portion of the string
-matching the entire regular expression.
+expression are saved in the remaining <code>BASH_REMATCH</code> indices.
 The element of <code>BASH_REMATCH</code> with index <var>n</var> is the portion of the
 string matching the <var>n</var>th parenthesized subexpression.
 </p>
 <p>For example, the following will match a line
 (stored in the shell variable <var>line</var>)
-if there is a sequence of characters in the value consisting of
+if there is a sequence of characters anywhere in the value consisting of
 any number, including zero, of 
-space characters, zero or one instances of &lsquo;<samp>a</samp>&rsquo;, then a &lsquo;<samp>b</samp>&rsquo;:
+characters in the <code>space</code> character class,
+zero or one instances of &lsquo;<samp>a</samp>&rsquo;, then a &lsquo;<samp>b</samp>&rsquo;:
 </p><div class="example">
 <pre class="example">[[ $line =~ [[:space:]]*(a)?b ]]
 </pre></div>
@@ -1542,14 +1548,12 @@ value of the entire conditional expression.
 </dl>
 
 <hr>
-<a name="Command-Grouping"></a>
-<div class="header">
+<span id="Command-Grouping"></span><div class="header">
 <p>
 Previous: <a href="#Conditional-Constructs" accesskey="p" rel="prev">Conditional Constructs</a>, Up: <a href="#Compound-Commands" accesskey="u" rel="up">Compound Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Grouping-Commands"></a>
-<h4 class="subsubsection">3.2.4.3 Grouping Commands</h4>
-<a name="index-commands_002c-grouping"></a>
+<span id="Grouping-Commands"></span><h4 class="subsubsection">3.2.5.3 Grouping Commands</h4>
+<span id="index-commands_002c-grouping"></span>
 
 <p>Bash provides two ways to group a list of commands to be executed
 as a unit.  When commands are grouped, redirections may be applied
@@ -1570,8 +1574,8 @@ effect after the subshell completes.
 </p>
 </dd>
 <dt><code>{}</code></dt>
-<dd><a name="index-_007b"></a>
-<a name="index-_007d"></a>
+<dd><span id="index-_007b"></span>
+<span id="index-_007d"></span>
 <div class="example">
 <pre class="example">{ <var>list</var>; }
 </pre></div>
@@ -1594,14 +1598,12 @@ from the <var>list</var> by whitespace.
 <var>list</var>.
 </p>
 <hr>
-<a name="Coprocesses"></a>
-<div class="header">
+<span id="Coprocesses"></span><div class="header">
 <p>
 Next: <a href="#GNU-Parallel" accesskey="n" rel="next">GNU Parallel</a>, Previous: <a href="#Compound-Commands" accesskey="p" rel="prev">Compound Commands</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Coprocesses-1"></a>
-<h4 class="subsection">3.2.5 Coprocesses</h4>
-<a name="index-coprocess"></a>
+<span id="Coprocesses-1"></span><h4 class="subsection">3.2.6 Coprocesses</h4>
+<span id="index-coprocess"></span>
 
 <p>A <code>coprocess</code> is a shell command preceded by the <code>coproc</code>
 reserved word.
@@ -1633,7 +1635,8 @@ This pipe is established before any redirections specified by the
 command (see <a href="#Redirections">Redirections</a>).
 The file descriptors can be utilized as arguments to shell commands
 and redirections using standard word expansions.
-The file descriptors are not available in subshells.
+Other than those created to execute command and process substitutions,
+the file descriptors are not available in subshells.
 </p>
 <p>The process ID of the shell spawned to execute the coprocess is
 available as the value of the variable <code>NAME</code>_PID.
@@ -1645,13 +1648,11 @@ the <code>coproc</code> command always returns success.
 The return status of a coprocess is the exit status of <var>command</var>.
 </p>
 <hr>
-<a name="GNU-Parallel"></a>
-<div class="header">
+<span id="GNU-Parallel"></span><div class="header">
 <p>
 Previous: <a href="#Coprocesses" accesskey="p" rel="prev">Coprocesses</a>, Up: <a href="#Shell-Commands" accesskey="u" rel="up">Shell Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="GNU-Parallel-1"></a>
-<h4 class="subsection">3.2.6 GNU Parallel</h4>
+<span id="GNU-Parallel-1"></span><h4 class="subsection">3.2.7 GNU Parallel</h4>
 
 <p>There are ways to run commands in parallel that are not built into Bash.
 GNU Parallel is a tool to do just that.
@@ -1678,16 +1679,18 @@ use find&rsquo;s <samp>-print0</samp> option and parallel&rsquo;s <samp>-0</samp
 <p>You can use Parallel to move files from the current directory when the
 number of files is too large to process with one <code>mv</code> invocation:
 </p><div class="example">
-<pre class="example">ls | parallel mv {} destdir
+<pre class="example">printf '%s\n' * | parallel mv {} destdir
 </pre></div>
 
 <p>As you can see, the {} is replaced with each line read from standard input.
 While using <code>ls</code> will work in most instances, it is not sufficient to
-deal with all filenames.
+deal with all filenames. <code>printf</code> is a shell builtin, and therefore is
+not subject to the kernel&rsquo;s limit on the number of arguments to a program,
+so you can use &lsquo;<samp>*</samp>&rsquo; (but see below about the <code>dotglob</code> shell option).
 If you need to accommodate special characters in filenames, you can use
 </p>
 <div class="example">
-<pre class="example">find . -depth 1 \! -name '.*' -print0 | parallel -0 mv {} destdir
+<pre class="example">printf '%s\0' * | parallel -0 mv {} destdir
 </pre></div>
 
 <p>as alluded to above.
@@ -1696,9 +1699,12 @@ If you need to accommodate special characters in filenames, you can use
 directory.
 You can emulate a parallel <code>xargs</code> by adding the <samp>-X</samp> option:
 </p><div class="example">
-<pre class="example">find . -depth 1 \! -name '.*' -print0 | parallel -0 -X mv {} destdir
+<pre class="example">printf '%s\0' * | parallel -0 -X mv {} destdir
 </pre></div>
 
+<p>(You may have to modify the pattern if you have the <code>dotglob</code> option
+enabled.)
+</p>
 <p>GNU Parallel can replace certain common idioms that operate on lines read
 from a file (in this case, filenames listed one per line):
 </p><div class="example">
@@ -1710,7 +1716,8 @@ from a file (in this case, filenames listed one per line):
 
 <p>with a more compact syntax reminiscent of lambdas:
 </p><div class="example">
-<pre class="example">cat list | parallel &quot;do-something1 {} config-{} ; do-something2 &lt; {}&quot; | process-output
+<pre class="example">cat list | parallel &quot;do-something1 {} config-{} ; do-something2 &lt; {}&quot; |
+           process-output
 </pre></div>
 
 <p>Parallel provides a built-in mechanism to remove filename extensions, which
@@ -1732,19 +1739,27 @@ written as
 <p>If a command generates output, you may want to preserve the input order in
 the output.  For instance, the following command
 </p><div class="example">
-<pre class="example">{ echo foss.org.my ; echo debian.org; echo freenetproject.org; } | parallel traceroute
+<pre class="example">{
+    echo foss.org.my ;
+    echo debian.org ;
+    echo freenetproject.org ;
+} | parallel traceroute
 </pre></div>
 <p>will display as output the traceroute invocation that finishes first.
 Adding the <samp>-k</samp> option 
 </p><div class="example">
-<pre class="example">{ echo foss.org.my ; echo debian.org; echo freenetproject.org; } | parallel -k traceroute
+<pre class="example">{
+    echo foss.org.my ;
+    echo debian.org ;
+    echo freenetproject.org ;
+} | parallel -k traceroute
 </pre></div>
 <p>will ensure that the output of <code>traceroute foss.org.my</code> is displayed first.
 </p>
 <p>Finally, Parallel can be used to run a sequence of shell commands in parallel,
 similar to &lsquo;<samp>cat file | bash</samp>&rsquo;.
 It is not uncommon to take a list of filenames, create a series of shell
-commands to operate on them, and feed that list of commnds to a shell.
+commands to operate on them, and feed that list of commands to a shell.
 Parallel can speed this up.  Assuming that <samp>file</samp> contains a list of
 shell commands, one per line,
 </p>
@@ -1756,15 +1771,13 @@ shell commands, one per line,
 supplied as an argument), in blocks of ten shell jobs at a time.
 </p>
 <hr>
-<a name="Shell-Functions"></a>
-<div class="header">
+<span id="Shell-Functions"></span><div class="header">
 <p>
 Next: <a href="#Shell-Parameters" accesskey="n" rel="next">Shell Parameters</a>, Previous: <a href="#Shell-Commands" accesskey="p" rel="prev">Shell Commands</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Functions-1"></a>
-<h3 class="section">3.3 Shell Functions</h3>
-<a name="index-shell-function"></a>
-<a name="index-functions_002c-shell"></a>
+<span id="Shell-Functions-1"></span><h3 class="section">3.3 Shell Functions</h3>
+<span id="index-shell-function"></span>
+<span id="index-functions_002c-shell"></span>
 
 <p>Shell functions are a way to group commands for later execution
 using a single name for the group.  They are executed just like
@@ -1775,18 +1788,18 @@ Shell functions are executed in the current
 shell context; no new process is created to interpret them.
 </p>
 <p>Functions are declared using this syntax:
-<a name="index-function"></a>
+<span id="index-function"></span>
 </p><div class="example">
-<pre class="example"><var>name</var> () <var>compound-command</var> [ <var>redirections</var> ]
+<pre class="example"><var>fname</var> () <var>compound-command</var> [ <var>redirections</var> ]
 </pre></div>
 
 <p>or
 </p>
 <div class="example">
-<pre class="example">function <var>name</var> [()] <var>compound-command</var> [ <var>redirections</var> ]
+<pre class="example">function <var>fname</var> [()] <var>compound-command</var> [ <var>redirections</var> ]
 </pre></div>
 
-<p>This defines a shell function named <var>name</var>.  The reserved
+<p>This defines a shell function named <var>fname</var>.  The reserved
 word <code>function</code> is optional.
 If the <code>function</code> reserved
 word is supplied, the parentheses are optional.
@@ -1796,15 +1809,17 @@ That command is usually a <var>list</var> enclosed between { and }, but
 may be any compound command listed above,
 with one exception: If the <code>function</code> reserved word is used, but the
 parentheses are not supplied, the braces are required.                   
-<var>compound-command</var> is executed whenever <var>name</var> is specified as the
+<var>compound-command</var> is executed whenever <var>fname</var> is specified as the
 name of a command.
 When the shell is in <small>POSIX</small> mode (see <a href="#Bash-POSIX-Mode">Bash POSIX Mode</a>),
-<var>name</var> may not be the same as one of the special builtins
+<var>fname</var> must be a valid shell <var>name</var> and
+may not be the same as one of the special builtins
 (see <a href="#Special-Builtins">Special Builtins</a>).
+In default mode, a function name can be any unquoted shell word that does
+not contain &lsquo;<samp>$</samp>&rsquo;.
 Any redirections (see <a href="#Redirections">Redirections</a>) associated with the shell function
 are performed when the function is executed.
-</p>
-<p>A function definition may be deleted using the <samp>-f</samp> option to the
+A function definition may be deleted using the <samp>-f</samp> option to the
 <code>unset</code> builtin (see <a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a>).
 </p>
 <p>The exit status of a function definition is zero unless a syntax error
@@ -1865,7 +1880,66 @@ before the <code>return</code>.
 </p>
 <p>Variables local to the function may be declared with the
 <code>local</code> builtin.  These variables are visible only to
-the function and the commands it invokes.
+the function and the commands it invokes.  This is particularly
+important when a shell function calls other functions.
+</p>
+<p>Local variables &quot;shadow&quot; variables with the same name declared at
+previous scopes.  For instance, a local variable declared in a function
+hides a global variable of the same name: references and assignments
+refer to the local variable, leaving the global variable unmodified.
+When the function returns, the global variable is once again visible.
+</p>
+<p>The shell uses <var>dynamic scoping</var> to control a variable&rsquo;s visibility
+within functions.
+With dynamic scoping, visible variables and their values
+are a result of the sequence of function calls that caused execution
+to reach the current function.
+The value of a variable that a function sees depends
+on its value within its caller, if any, whether that caller is
+the &quot;global&quot; scope or another shell function.
+This is also the value that a local variable
+declaration &quot;shadows&quot;, and the value that is restored when the function
+returns.
+</p>
+<p>For example, if a variable <var>var</var> is declared as local in function
+<var>func1</var>, and <var>func1</var> calls another function <var>func2</var>,
+references to <var>var</var> made from within <var>func2</var> will resolve to the
+local variable <var>var</var> from <var>func1</var>, shadowing any global variable
+named <var>var</var>.
+</p>
+<p>The following script demonstrates this behavior.
+When executed, the script displays
+</p>
+<div class="example">
+<pre class="example">In func2, var = func1 local
+</pre></div>
+
+<div class="example">
+<pre class="example">func1()
+{
+    local var='func1 local'
+    func2
+}
+
+func2()
+{
+    echo &quot;In func2, var = $var&quot;
+}
+
+var=global
+func1
+</pre></div>
+
+<p>The <code>unset</code> builtin also acts using the same dynamic scope: if a  
+variable is local to the current scope, <code>unset</code> will unset it;         
+otherwise the unset will refer to the variable found in any calling scope 
+as described above.
+If a variable at the current local scope is unset, it will remain so
+until it is reset in that scope or until the function returns.
+Once the function returns, any instance of the variable at a previous
+scope will become visible.
+If the unset acts on a variable at a previous scope, any instance of a   
+variable with that name that had been shadowed will become visible.
 </p>
 <p>Function names and definitions may be listed with the
 <samp>-f</samp> option to the <code>declare</code> (<code>typeset</code>)
@@ -1878,10 +1952,6 @@ Functions may be exported so that subshells
 automatically have them defined with the
 <samp>-f</samp> option to the <code>export</code> builtin
 (see <a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a>).
-Note that shell functions and variables with the same name may result
-in multiple identically-named entries in the environment passed to the
-shell&rsquo;s children.
-Care should be taken in cases where this may cause a problem.
 </p>
 <p>Functions may be recursive.
 The <code>FUNCNEST</code> variable may be used to limit the depth of the
@@ -1889,21 +1959,19 @@ function call stack and restrict the number of function invocations.
 By default, no limit is placed on the number of recursive  calls.
 </p>
 <hr>
-<a name="Shell-Parameters"></a>
-<div class="header">
+<span id="Shell-Parameters"></span><div class="header">
 <p>
 Next: <a href="#Shell-Expansions" accesskey="n" rel="next">Shell Expansions</a>, Previous: <a href="#Shell-Functions" accesskey="p" rel="prev">Shell Functions</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Parameters-1"></a>
-<h3 class="section">3.4 Shell Parameters</h3>
-<a name="index-parameters"></a>
-<a name="index-variable_002c-shell"></a>
-<a name="index-shell-variable"></a>
+<span id="Shell-Parameters-1"></span><h3 class="section">3.4 Shell Parameters</h3>
+<span id="index-parameters"></span>
+<span id="index-variable_002c-shell"></span>
+<span id="index-shell-variable"></span>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Positional-Parameters" accesskey="1">Positional Parameters</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The shell&rsquo;s command-line arguments.
+<tr><td align="left" valign="top">&bull; <a href="#Positional-Parameters" accesskey="1">Positional Parameters</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The shell&rsquo;s command-line arguments.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Special-Parameters" accesskey="2">Special Parameters</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Parameters denoted by special characters.
+<tr><td align="left" valign="top">&bull; <a href="#Special-Parameters" accesskey="2">Special Parameters</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Parameters denoted by special characters.
 </td></tr>
 </table>
 
@@ -1996,14 +2064,12 @@ Otherwise, if <code>unset</code> is executed with the name of a nameref variable
 as an argument, the variable referenced by the nameref variable will be unset.
 </p>
 <hr>
-<a name="Positional-Parameters"></a>
-<div class="header">
+<span id="Positional-Parameters"></span><div class="header">
 <p>
 Next: <a href="#Special-Parameters" accesskey="n" rel="next">Special Parameters</a>, Up: <a href="#Shell-Parameters" accesskey="u" rel="up">Shell Parameters</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Positional-Parameters-1"></a>
-<h4 class="subsection">3.4.1 Positional Parameters</h4>
-<a name="index-parameters_002c-positional"></a>
+<span id="Positional-Parameters-1"></span><h4 class="subsection">3.4.1 Positional Parameters</h4>
+<span id="index-parameters_002c-positional"></span>
 
 <p>A <var>positional parameter</var> is a parameter denoted by one or more
 digits, other than the single digit <code>0</code>.  Positional parameters are
@@ -2022,28 +2088,26 @@ temporarily replaced when a shell function is executed
 digit is expanded, it must be enclosed in braces.
 </p>
 <hr>
-<a name="Special-Parameters"></a>
-<div class="header">
+<span id="Special-Parameters"></span><div class="header">
 <p>
 Previous: <a href="#Positional-Parameters" accesskey="p" rel="prev">Positional Parameters</a>, Up: <a href="#Shell-Parameters" accesskey="u" rel="up">Shell Parameters</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Special-Parameters-1"></a>
-<h4 class="subsection">3.4.2 Special Parameters</h4>
-<a name="index-parameters_002c-special"></a>
+<span id="Special-Parameters-1"></span><h4 class="subsection">3.4.2 Special Parameters</h4>
+<span id="index-parameters_002c-special"></span>
 
 <p>The shell treats several parameters specially.  These parameters may
 only be referenced; assignment to them is not allowed.
 </p>
 <dl compact="compact">
 <dt><code>*</code>
-<a name="index-_002a"></a>
+<span id="index-_002a"></span>
 </dt>
-<dd><a name="index-_0024_002a"></a>
+<dd><span id="index-_0024_002a"></span>
 <p>($*) Expands to the positional parameters, starting from one.
 When the expansion is not within double quotes, each positional parameter
 expands to a separate word.
 In contexts where it is performed, those words
-are subject to further word splitting and pathname expansion.
+are subject to further word splitting and filename expansion.
 When the expansion occurs within double quotes, it expands to a single word
 with the value of each parameter separated by the first character of the
 <code>IFS</code> special variable.  That is, <code>&quot;$*&quot;</code> is equivalent
@@ -2056,11 +2120,19 @@ separators.
 </p>
 </dd>
 <dt><code>@</code>
-<a name="index-_0040"></a>
+<span id="index-_0040"></span>
 </dt>
-<dd><a name="index-_0024_0040"></a>
-<p>($@) Expands to the positional parameters, starting from one.  When the
-expansion occurs within double quotes, each parameter expands to a
+<dd><span id="index-_0024_0040"></span>
+<p>($@) Expands to the positional parameters, starting from one.
+In contexts where word splitting is performed, this expands each
+positional parameter to a separate word; if not within double
+quotes, these words are subject to word splitting.
+In contexts where word splitting is not performed,
+this expands to a single word
+with each positional parameter separated by a space.
+When the
+expansion occurs within double quotes, and word splitting is performed,
+each parameter expands to a
 separate word.  That is, <code>&quot;$@&quot;</code> is equivalent to
 <code>&quot;$1&quot; &quot;$2&quot; &hellip;</code>.
 If the double-quoted expansion occurs within a word, the expansion of
@@ -2073,24 +2145,24 @@ expand to nothing (i.e., they are removed).
 </p>
 </dd>
 <dt><code>#</code>
-<a name="index-_0023"></a>
+<span id="index-_0023"></span>
 </dt>
-<dd><a name="index-_0024_0023"></a>
+<dd><span id="index-_0024_0023"></span>
 <p>($#) Expands to the number of positional parameters in decimal.
 </p>
 </dd>
 <dt><code>?</code>
-<a name="index-_003f"></a>
+<span id="index-_003f"></span>
 </dt>
-<dd><a name="index-_0024_003f"></a>
+<dd><span id="index-_0024_003f"></span>
 <p>($?) Expands to the exit status of the most recently executed foreground
 pipeline.
 </p>
 </dd>
 <dt><code>-</code>
-<a name="index-_002d"></a>
+<span id="index-_002d"></span>
 </dt>
-<dd><a name="index-_0024_002d"></a>
+<dd><span id="index-_0024_002d"></span>
 <p>($-, a hyphen.)  Expands to the current option flags as specified upon
 invocation, by the <code>set</code>
 builtin command, or those set by the shell itself
@@ -2098,26 +2170,26 @@ builtin command, or those set by the shell itself
 </p>
 </dd>
 <dt><code>$</code>
-<a name="index-_0024"></a>
+<span id="index-_0024"></span>
 </dt>
-<dd><a name="index-_0024_0024"></a>
+<dd><span id="index-_0024_0024"></span>
 <p>($$) Expands to the process <small>ID</small> of the shell.  In a <code>()</code> subshell, it
 expands to the process <small>ID</small> of the invoking shell, not the subshell.
 </p>
 </dd>
 <dt><code>!</code>
-<a name="index-_0021-1"></a>
+<span id="index-_0021-1"></span>
 </dt>
-<dd><a name="index-_0024_0021"></a>
+<dd><span id="index-_0024_0021"></span>
 <p>($!) Expands to the process <small>ID</small> of the job most recently placed into the
 background, whether executed as an asynchronous command or using
 the <code>bg</code> builtin (see <a href="#Job-Control-Builtins">Job Control Builtins</a>).
 </p>
 </dd>
 <dt><code>0</code>
-<a name="index-0"></a>
+<span id="index-0"></span>
 </dt>
-<dd><a name="index-_00240"></a>
+<dd><span id="index-_00240"></span>
 <p>($0) Expands to the name of the shell or shell script.  This is set at
 shell initialization.  If Bash is invoked with a file of commands
 (see <a href="#Shell-Scripts">Shell Scripts</a>), <code>$0</code> is set to the name of that file.
@@ -2125,33 +2197,16 @@ If Bash is started with the <samp>-c</samp> option (see <a href="#Invoking-Bash"
 then <code>$0</code> is set to the first argument after the string to be
 executed, if one is present.  Otherwise, it is set
 to the filename used to invoke Bash, as given by argument zero.
-</p>
-</dd>
-<dt><code>_</code>
-<a name="index-_005f"></a>
-</dt>
-<dd><a name="index-_0024_005f"></a>
-<p>($_, an underscore.)
-At shell startup, set to the absolute pathname used to invoke the
-shell or shell script being executed as passed in the environment
-or argument list.
-Subsequently, expands to the last argument to the previous command,
-after expansion.   
-Also set to the full pathname used to invoke each command executed
-and placed in the environment exported to that command.
-When checking mail, this parameter holds the name of the mail file.
 </p></dd>
 </dl>
 
 <hr>
-<a name="Shell-Expansions"></a>
-<div class="header">
+<span id="Shell-Expansions"></span><div class="header">
 <p>
 Next: <a href="#Redirections" accesskey="n" rel="next">Redirections</a>, Previous: <a href="#Shell-Parameters" accesskey="p" rel="prev">Shell Parameters</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Expansions-1"></a>
-<h3 class="section">3.5 Shell Expansions</h3>
-<a name="index-expansion"></a>
+<span id="Shell-Expansions-1"></span><h3 class="section">3.5 Shell Expansions</h3>
+<span id="index-expansion"></span>
 
 <p>Expansion is performed on the command line after it has been split into
 <code>token</code>s.  There are seven kinds of expansion performed:
@@ -2167,25 +2222,25 @@ Next: <a href="#Redirections" accesskey="n" rel="next">Redirections</a>, Previou
 </li></ul>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Brace-Expansion" accesskey="1">Brace Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Expansion of expressions within braces.
+<tr><td align="left" valign="top">&bull; <a href="#Brace-Expansion" accesskey="1">Brace Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Expansion of expressions within braces.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Tilde-Expansion" accesskey="2">Tilde Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Expansion of the ~ character.
+<tr><td align="left" valign="top">&bull; <a href="#Tilde-Expansion" accesskey="2">Tilde Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Expansion of the ~ character.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Parameter-Expansion" accesskey="3">Shell Parameter Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands variables to their values.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Parameter-Expansion" accesskey="3">Shell Parameter Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands variables to their values.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Command-Substitution" accesskey="4">Command Substitution</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Using the output of a command as an argument.
+<tr><td align="left" valign="top">&bull; <a href="#Command-Substitution" accesskey="4">Command Substitution</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Using the output of a command as an argument.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Arithmetic-Expansion" accesskey="5">Arithmetic Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to use arithmetic in shell expansions.
+<tr><td align="left" valign="top">&bull; <a href="#Arithmetic-Expansion" accesskey="5">Arithmetic Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to use arithmetic in shell expansions.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Process-Substitution" accesskey="6">Process Substitution</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A way to write and read to and from a
+<tr><td align="left" valign="top">&bull; <a href="#Process-Substitution" accesskey="6">Process Substitution</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A way to write and read to and from a
 				command.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Word-Splitting" accesskey="7">Word Splitting</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the results of expansion are split into separate
+<tr><td align="left" valign="top">&bull; <a href="#Word-Splitting" accesskey="7">Word Splitting</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the results of expansion are split into separate
 			arguments.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Filename-Expansion" accesskey="8">Filename Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A shorthand for specifying filenames matching patterns.
+<tr><td align="left" valign="top">&bull; <a href="#Filename-Expansion" accesskey="8">Filename Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A shorthand for specifying filenames matching patterns.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Quote-Removal" accesskey="9">Quote Removal</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How and when quote characters are removed from
+<tr><td align="left" valign="top">&bull; <a href="#Quote-Removal" accesskey="9">Quote Removal</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How and when quote characters are removed from
 			words.
 </td></tr>
 </table>
@@ -2208,25 +2263,24 @@ original word are removed unless they have been quoted themselves
 (<var>quote removal</var>).
 </p>
 <p>Only brace expansion, word splitting, and filename expansion
-can change the number of words of the expansion; other expansions
+can increase the number of words of the expansion; other expansions
 expand a single word to a single word.
 The only exceptions to this are the expansions of
-<code>&quot;$@&quot;</code> (see <a href="#Special-Parameters">Special Parameters</a>) and <code>&quot;${<var>name</var>[@]}&quot;</code>
+<code>&quot;$@&quot;</code> and <code>$*</code> (see <a href="#Special-Parameters">Special Parameters</a>), and
+<code>&quot;${<var>name</var>[@]}&quot;</code> and <code>${<var>name</var>[*]}</code>
 (see <a href="#Arrays">Arrays</a>).
 </p>
 <p>After all expansions, <code>quote removal</code> (see <a href="#Quote-Removal">Quote Removal</a>)
 is performed.
 </p>
 <hr>
-<a name="Brace-Expansion"></a>
-<div class="header">
+<span id="Brace-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Tilde-Expansion" accesskey="n" rel="next">Tilde Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Brace-Expansion-1"></a>
-<h4 class="subsection">3.5.1 Brace Expansion</h4>
-<a name="index-brace-expansion"></a>
-<a name="index-expansion_002c-brace"></a>
+<span id="Brace-Expansion-1"></span><h4 class="subsection">3.5.1 Brace Expansion</h4>
+<span id="index-brace-expansion"></span>
+<span id="index-expansion_002c-brace"></span>
 
 <p>Brace expansion is a mechanism by which arbitrary strings may be generated.
 This mechanism is similar to
@@ -2271,8 +2325,6 @@ and any characters special to other expansions are preserved
 in the result.  It is strictly textual.  Bash
 does not apply any syntactic interpretation to the context of the
 expansion or the text between the braces.
-To avoid conflicts with parameter expansion, the string &lsquo;<samp>${</samp>&rsquo;
-is not considered eligible for brace expansion.
 </p>
 <p>A correctly-formed brace expansion must contain unquoted opening
 and closing braces, and at least one unquoted comma or a valid
@@ -2282,7 +2334,8 @@ Any incorrectly formed brace expansion is left unchanged.
 <p>A { or &lsquo;<samp>,</samp>&rsquo; may be quoted with a backslash to prevent its
 being considered part of a brace expression.
 To avoid conflicts with parameter expansion, the string &lsquo;<samp>${</samp>&rsquo;
-is not considered eligible for brace expansion.
+is not considered eligible for brace expansion,
+and inhibits brace expansion until the closing &lsquo;<samp>}</samp>&rsquo;.
 </p>
 <p>This construct is typically used as shorthand when the common
 prefix of the strings to be generated is longer than in the
@@ -2296,15 +2349,13 @@ above example:
 </pre></div>
 
 <hr>
-<a name="Tilde-Expansion"></a>
-<div class="header">
+<span id="Tilde-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Shell-Parameter-Expansion" accesskey="n" rel="next">Shell Parameter Expansion</a>, Previous: <a href="#Brace-Expansion" accesskey="p" rel="prev">Brace Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Tilde-Expansion-1"></a>
-<h4 class="subsection">3.5.2 Tilde Expansion</h4>
-<a name="index-tilde-expansion"></a>
-<a name="index-expansion_002c-tilde"></a>
+<span id="Tilde-Expansion-1"></span><h4 class="subsection">3.5.2 Tilde Expansion</h4>
+<span id="index-tilde-expansion"></span>
+<span id="index-expansion_002c-tilde"></span>
 
 <p>If a word begins with an unquoted tilde character (&lsquo;<samp>~</samp>&rsquo;), all of the
 characters up to the first unquoted slash (or all characters,
@@ -2379,16 +2430,20 @@ and the shell assigns the expanded value.
 </p></dd>
 </dl>
 
+<p>Bash also performs tilde expansion on words satisfying the conditions of
+variable assignments (see <a href="#Shell-Parameters">Shell Parameters</a>)
+when they appear as arguments to simple commands.
+Bash does not do this, except for the <var>declaration</var> commands listed
+above, when in <small>POSIX</small> mode.
+</p>
 <hr>
-<a name="Shell-Parameter-Expansion"></a>
-<div class="header">
+<span id="Shell-Parameter-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Command-Substitution" accesskey="n" rel="next">Command Substitution</a>, Previous: <a href="#Tilde-Expansion" accesskey="p" rel="prev">Tilde Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Parameter-Expansion-1"></a>
-<h4 class="subsection">3.5.3 Shell Parameter Expansion</h4>
-<a name="index-parameter-expansion"></a>
-<a name="index-expansion_002c-parameter"></a>
+<span id="Shell-Parameter-Expansion-1"></span><h4 class="subsection">3.5.3 Shell Parameter Expansion</h4>
+<span id="index-parameter-expansion"></span>
+<span id="index-expansion_002c-parameter"></span>
 
 <p>The &lsquo;<samp>$</samp>&rsquo; character introduces parameter expansion,
 command substitution, or arithmetic expansion.  The parameter name
@@ -2413,12 +2468,14 @@ interpreted as part of its name.
 </p>
 <p>If the first character of <var>parameter</var> is an exclamation point (!),
 and <var>parameter</var> is not a <var>nameref</var>,
-it introduces a level of variable indirection.
-Bash uses the value of the variable formed from the rest of
-<var>parameter</var> as the name of the variable; this variable is then
-expanded and that value is used in the rest of the substitution, rather
-than the value of <var>parameter</var> itself.
+it introduces a level of indirection.
+Bash uses the value formed by expanding the rest of
+<var>parameter</var> as the new <var>parameter</var>; this is then
+expanded and that value is used in the rest of the expansion, rather
+than the expansion of the original <var>parameter</var>.
 This is known as <code>indirect expansion</code>.
+The value is subject to tilde expansion,
+parameter expansion, command substitution, and arithmetic expansion.
 If <var>parameter</var> is a nameref, this expands to the name of the
 variable referenced by <var>parameter</var> instead of performing the
 complete indirect expansion.
@@ -2608,7 +2665,7 @@ results.
 </p>
 <p>Substring indexing is zero-based unless the positional parameters
 are used, in which case the indexing starts at 1 by default.
-If <var>offset</var> is 0, and the positional parameters are used, <code>$@</code> is
+If <var>offset</var> is 0, and the positional parameters are used, <code>$0</code> is
 prefixed to the list.
 </p>
 </dd>
@@ -2647,8 +2704,8 @@ array, and an index of -1 references the last element.
 <dt><code>${<var>parameter</var>#<var>word</var>}</code></dt>
 <dt><code>${<var>parameter</var>##<var>word</var>}</code></dt>
 <dd><p>The <var>word</var>
-is expanded to produce a pattern just as in filename
-expansion (see <a href="#Filename-Expansion">Filename Expansion</a>).  If the pattern matches
+is expanded to produce a pattern and matched according to the rules
+described below (see <a href="#Pattern-Matching">Pattern Matching</a>).  If the pattern matches
 the beginning of the expanded value of <var>parameter</var>,
 then the result of the expansion is the expanded value of <var>parameter</var>
 with the shortest matching pattern (the &lsquo;<samp>#</samp>&rsquo; case) or the
@@ -2664,8 +2721,9 @@ array in turn, and the expansion is the resultant list.
 </dd>
 <dt><code>${<var>parameter</var>%<var>word</var>}</code></dt>
 <dt><code>${<var>parameter</var>%%<var>word</var>}</code></dt>
-<dd><p>The <var>word</var> is expanded to produce a pattern just as in
-filename expansion.
+<dd><p>The <var>word</var>
+is expanded to produce a pattern and matched according to the rules
+described below (see <a href="#Pattern-Matching">Pattern Matching</a>).
 If the pattern matches a trailing portion of the expanded value of
 <var>parameter</var>, then the result of the expansion is the value of
 <var>parameter</var> with the shortest matching pattern (the &lsquo;<samp>%</samp>&rsquo; case)
@@ -2685,6 +2743,8 @@ array in turn, and the expansion is the resultant list.
 filename expansion.
 <var>Parameter</var> is expanded and the longest match of <var>pattern</var>
 against its value is replaced with <var>string</var>.
+The match is performed according to the rules described below
+(see <a href="#Pattern-Matching">Pattern Matching</a>).
 If <var>pattern</var> begins with &lsquo;<samp>/</samp>&rsquo;, all matches of <var>pattern</var> are
 replaced with <var>string</var>.  Normally only the first match is replaced.
 If <var>pattern</var> begins with &lsquo;<samp>#</samp>&rsquo;, it must match at the beginning
@@ -2739,13 +2799,25 @@ or information about <var>parameter</var> itself, depending on the value of
 <var>operator</var>.  Each <var>operator</var> is a single letter:
 </p>
 <dl compact="compact">
+<dt><code>U</code></dt>
+<dd><p>The expansion is a string that is the value of <var>parameter</var> with lowercase
+alphabetic characters converted to uppercase.
+</p></dd>
+<dt><code>u</code></dt>
+<dd><p>The expansion is a string that is the value of <var>parameter</var> with the first
+character converted to uppercase, if it is alphabetic.
+</p></dd>
+<dt><code>L</code></dt>
+<dd><p>The expansion is a string that is the value of <var>parameter</var> with uppercase
+alphabetic characters converted to lowercase.
+</p></dd>
 <dt><code>Q</code></dt>
 <dd><p>The expansion is a string that is the value of <var>parameter</var> quoted in a
 format that can be reused as input.
 </p></dd>
 <dt><code>E</code></dt>
 <dd><p>The expansion is a string that is the value of <var>parameter</var> with backslash
-escape sequences expanded as with the <code>$'&hellip;'</code> quoting mechansim.
+escape sequences expanded as with the <code>$'&hellip;'</code> quoting mechanism.
 </p></dd>
 <dt><code>P</code></dt>
 <dd><p>The expansion is a string that is the result of expanding the value of
@@ -2756,6 +2828,12 @@ escape sequences expanded as with the <code>$'&hellip;'</code> quoting mechansim
 an assignment statement or <code>declare</code> command that, if
 evaluated, will recreate <var>parameter</var> with its attributes and value.
 </p></dd>
+<dt><code>K</code></dt>
+<dd><p>Produces a possibly-quoted version of the value of <var>parameter</var>,
+except that it prints the values of
+indexed and associative arrays as a sequence of quoted key-value pairs
+(see <a href="#Arrays">Arrays</a>).
+</p></dd>
 <dt><code>a</code></dt>
 <dd><p>The expansion is a string consisting of flag values representing
 <var>parameter</var>&rsquo;s attributes.
@@ -2770,20 +2848,18 @@ is an array variable subscripted with &lsquo;<samp>@</samp>&rsquo; or &lsquo;<sa
 the operation is applied to each member of the
 array in turn, and the expansion is the resultant list.
 </p>
-<p>The result of the expansion is subject to word splitting and pathname
+<p>The result of the expansion is subject to word splitting and filename
 expansion as described below.
 </p></dd>
 </dl>
 
 <hr>
-<a name="Command-Substitution"></a>
-<div class="header">
+<span id="Command-Substitution"></span><div class="header">
 <p>
 Next: <a href="#Arithmetic-Expansion" accesskey="n" rel="next">Arithmetic Expansion</a>, Previous: <a href="#Shell-Parameter-Expansion" accesskey="p" rel="prev">Shell Parameter Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Command-Substitution-1"></a>
-<h4 class="subsection">3.5.4 Command Substitution</h4>
-<a name="index-command-substitution"></a>
+<span id="Command-Substitution-1"></span><h4 class="subsection">3.5.4 Command Substitution</h4>
+<span id="index-command-substitution"></span>
 
 <p>Command substitution allows the output of a command to replace
 the command itself.
@@ -2819,15 +2895,13 @@ form, escape the inner backquotes with backslashes.
 filename expansion are not performed on the results.
 </p>
 <hr>
-<a name="Arithmetic-Expansion"></a>
-<div class="header">
+<span id="Arithmetic-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Process-Substitution" accesskey="n" rel="next">Process Substitution</a>, Previous: <a href="#Command-Substitution" accesskey="p" rel="prev">Command Substitution</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Arithmetic-Expansion-1"></a>
-<h4 class="subsection">3.5.5 Arithmetic Expansion</h4>
-<a name="index-expansion_002c-arithmetic"></a>
-<a name="index-arithmetic-expansion"></a>
+<span id="Arithmetic-Expansion-1"></span><h4 class="subsection">3.5.5 Arithmetic Expansion</h4>
+<span id="index-expansion_002c-arithmetic"></span>
+<span id="index-arithmetic-expansion"></span>
 
 <p>Arithmetic expansion allows the evaluation of an arithmetic expression
 and the substitution of the result.  The format for arithmetic expansion is:
@@ -2849,14 +2923,12 @@ If the expression is invalid, Bash prints a message indicating
 failure to the standard error and no substitution occurs.
 </p>
 <hr>
-<a name="Process-Substitution"></a>
-<div class="header">
+<span id="Process-Substitution"></span><div class="header">
 <p>
 Next: <a href="#Word-Splitting" accesskey="n" rel="next">Word Splitting</a>, Previous: <a href="#Arithmetic-Expansion" accesskey="p" rel="prev">Arithmetic Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Process-Substitution-1"></a>
-<h4 class="subsection">3.5.6 Process Substitution</h4>
-<a name="index-process-substitution"></a>
+<span id="Process-Substitution-1"></span><h4 class="subsection">3.5.6 Process Substitution</h4>
+<span id="index-process-substitution"></span>
 
 <p>Process substitution allows a process&rsquo;s input or output to be
 referred to using a filename.
@@ -2888,14 +2960,12 @@ parameter and variable expansion, command substitution, and arithmetic
 expansion.
 </p>
 <hr>
-<a name="Word-Splitting"></a>
-<div class="header">
+<span id="Word-Splitting"></span><div class="header">
 <p>
 Next: <a href="#Filename-Expansion" accesskey="n" rel="next">Filename Expansion</a>, Previous: <a href="#Process-Substitution" accesskey="p" rel="prev">Process Substitution</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Word-Splitting-1"></a>
-<h4 class="subsection">3.5.7 Word Splitting</h4>
-<a name="index-word-splitting"></a>
+<span id="Word-Splitting-1"></span><h4 class="subsection">3.5.7 Word Splitting</h4>
+<span id="index-word-splitting"></span>
 
 <p>The shell scans the results of parameter expansion, command substitution,
 and arithmetic expansion that did not occur within double quotes for
@@ -2938,26 +3008,24 @@ null argument removal.
 is performed.
 </p>
 <hr>
-<a name="Filename-Expansion"></a>
-<div class="header">
+<span id="Filename-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Quote-Removal" accesskey="n" rel="next">Quote Removal</a>, Previous: <a href="#Word-Splitting" accesskey="p" rel="prev">Word Splitting</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Filename-Expansion-1"></a>
-<h4 class="subsection">3.5.8 Filename Expansion</h4>
+<span id="Filename-Expansion-1"></span><h4 class="subsection">3.5.8 Filename Expansion</h4>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Pattern-Matching" accesskey="1">Pattern Matching</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the shell matches patterns.
+<tr><td align="left" valign="top">&bull; <a href="#Pattern-Matching" accesskey="1">Pattern Matching</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How the shell matches patterns.
 </td></tr>
 </table>
-<a name="index-expansion_002c-filename"></a>
-<a name="index-expansion_002c-pathname"></a>
-<a name="index-filename-expansion"></a>
-<a name="index-pathname-expansion"></a>
+<span id="index-expansion_002c-filename"></span>
+<span id="index-expansion_002c-pathname"></span>
+<span id="index-filename-expansion"></span>
+<span id="index-pathname-expansion"></span>
 
 <p>After word splitting, unless the <samp>-f</samp> option has been set
 (see <a href="#The-Set-Builtin">The Set Builtin</a>), Bash scans each word for the characters
 &lsquo;<samp>*</samp>&rsquo;, &lsquo;<samp>?</samp>&rsquo;, and &lsquo;<samp>[</samp>&rsquo;.
-If one of these characters appears, then the word is
+If one of these characters appears, and is not quoted, then the word is
 regarded as a <var>pattern</var>,
 and replaced with an alphabetically sorted list of
 filenames matching the pattern (see <a href="#Pattern-Matching">Pattern Matching</a>).
@@ -2974,18 +3042,23 @@ without regard to the case of alphabetic characters.
 <p>When a pattern is used for filename expansion, the character &lsquo;<samp>.</samp>&rsquo;
 at the start of a filename or immediately following a slash
 must be matched explicitly, unless the shell option <code>dotglob</code> is set.
-When matching a filename, the slash character must always be
-matched explicitly.
+The filenames &lsquo;<samp>.</samp>&rsquo; and &lsquo;<samp>..</samp>&rsquo; must always be matched explicitly,
+even if <code>dotglob</code> is set.
 In other cases, the &lsquo;<samp>.</samp>&rsquo; character is not treated specially.
 </p>
+<p>When matching a filename, the slash character must always be
+matched explicitly by a slash in the pattern, but in other matching
+contexts it can be matched by a special pattern character as described
+below (see <a href="#Pattern-Matching">Pattern Matching</a>).
+</p>
 <p>See the description of <code>shopt</code> in <a href="#The-Shopt-Builtin">The Shopt Builtin</a>,
 for a description of the <code>nocaseglob</code>, <code>nullglob</code>,
 <code>failglob</code>, and <code>dotglob</code> options.
 </p>
 <p>The <code>GLOBIGNORE</code>
-shell variable may be used to restrict the set of filenames matching a
+shell variable may be used to restrict the set of file names matching a
 pattern.  If <code>GLOBIGNORE</code>
-is set, each matching filename that also matches one of the patterns in
+is set, each matching file name that also matches one of the patterns in
 <code>GLOBIGNORE</code> is removed from the list of matches.
 If the <code>nocaseglob</code> option is set, the matching against the patterns in
 <code>GLOBIGNORE</code> is performed without regard to case.
@@ -3003,15 +3076,13 @@ The <code>dotglob</code> option is disabled when <code>GLOBIGNORE</code>
 is unset.
 </p>
 <hr>
-<a name="Pattern-Matching"></a>
-<div class="header">
+<span id="Pattern-Matching"></span><div class="header">
 <p>
 Up: <a href="#Filename-Expansion" accesskey="u" rel="up">Filename Expansion</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Pattern-Matching-1"></a>
-<h4 class="subsubsection">3.5.8.1 Pattern Matching</h4>
-<a name="index-pattern-matching"></a>
-<a name="index-matching_002c-pattern"></a>
+<span id="Pattern-Matching-1"></span><h4 class="subsubsection">3.5.8.1 Pattern Matching</h4>
+<span id="index-pattern-matching"></span>
+<span id="index-matching_002c-pattern"></span>
 
 <p>Any character that appears in a pattern, other than the special pattern
 characters described below, matches itself.
@@ -3110,28 +3181,30 @@ sub-patterns:
 </p></dd>
 </dl>
 
+<p>Complicated extended pattern matching against long strings is slow,
+especially when the patterns contain alternations and the strings
+contain multiple matches.
+Using separate matches against shorter strings, or using arrays of
+strings instead of a single long string, may be faster.
+</p>
 <hr>
-<a name="Quote-Removal"></a>
-<div class="header">
+<span id="Quote-Removal"></span><div class="header">
 <p>
 Previous: <a href="#Filename-Expansion" accesskey="p" rel="prev">Filename Expansion</a>, Up: <a href="#Shell-Expansions" accesskey="u" rel="up">Shell Expansions</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Quote-Removal-1"></a>
-<h4 class="subsection">3.5.9 Quote Removal</h4>
+<span id="Quote-Removal-1"></span><h4 class="subsection">3.5.9 Quote Removal</h4>
 
 <p>After the preceding expansions, all unquoted occurrences of the
 characters &lsquo;<samp>\</samp>&rsquo;, &lsquo;<samp>'</samp>&rsquo;, and &lsquo;<samp>&quot;</samp>&rsquo; that did not
 result from one of the above expansions are removed.
 </p>
 <hr>
-<a name="Redirections"></a>
-<div class="header">
+<span id="Redirections"></span><div class="header">
 <p>
 Next: <a href="#Executing-Commands" accesskey="n" rel="next">Executing Commands</a>, Previous: <a href="#Shell-Expansions" accesskey="p" rel="prev">Shell Expansions</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Redirections-1"></a>
-<h3 class="section">3.6 Redirections</h3>
-<a name="index-redirection"></a>
+<span id="Redirections-1"></span><h3 class="section">3.6 Redirections</h3>
+<span id="index-redirection"></span>
 
 <p>Before a command is executed, its input and output
 may be <var>redirected</var>
@@ -3154,6 +3227,9 @@ In this case, for each redirection operator except
 than 10 and assign it to {<var>varname</var>}.  If &gt;&amp;- or &lt;&amp;- is preceded
 by {<var>varname</var>}, the value of <var>varname</var> defines the file
 descriptor to close.
+If {<var>varname</var>} is supplied, the redirection persists beyond
+the scope of the command, allowing the shell programmer to manage
+the file descriptor&rsquo;s lifetime manually.
 </p>
 <p>In the following descriptions, if the file descriptor number is
 omitted, and the first character of the redirection operator is
@@ -3224,8 +3300,7 @@ the corresponding UDP socket.
 care, as they may conflict with file descriptors the shell uses
 internally.
 </p>
-<a name="Redirecting-Input"></a>
-<h4 class="subsection">3.6.1 Redirecting Input</h4>
+<span id="Redirecting-Input"></span><h4 class="subsection">3.6.1 Redirecting Input</h4>
 <p>Redirection of input causes the file whose name results from
 the expansion of <var>word</var>
 to be opened for reading on file descriptor <code>n</code>,
@@ -3237,8 +3312,7 @@ is not specified.
 <pre class="example">[<var>n</var>]&lt;<var>word</var>
 </pre></div>
 
-<a name="Redirecting-Output"></a>
-<h4 class="subsection">3.6.2 Redirecting Output</h4>
+<span id="Redirecting-Output"></span><h4 class="subsection">3.6.2 Redirecting Output</h4>
 <p>Redirection of output causes the file whose name results from
 the expansion of <var>word</var>
 to be opened for writing on file descriptor <var>n</var>,
@@ -3259,8 +3333,7 @@ If the redirection operator is &lsquo;<samp>&gt;|</samp>&rsquo;, or the redirect
 &lsquo;<samp>&gt;</samp>&rsquo; and the <code>noclobber</code> option is not enabled, the redirection
 is attempted even if the file named by <var>word</var> exists.
 </p>
-<a name="Appending-Redirected-Output"></a>
-<h4 class="subsection">3.6.3 Appending Redirected Output</h4>
+<span id="Appending-Redirected-Output"></span><h4 class="subsection">3.6.3 Appending Redirected Output</h4>
 <p>Redirection of output in this fashion
 causes the file whose name results from
 the expansion of <var>word</var>
@@ -3273,8 +3346,7 @@ is not specified.  If the file does not exist it is created.
 <pre class="example">[<var>n</var>]&gt;&gt;<var>word</var>
 </pre></div>
 
-<a name="Redirecting-Standard-Output-and-Standard-Error"></a>
-<h4 class="subsection">3.6.4 Redirecting Standard Output and Standard Error</h4>
+<span id="Redirecting-Standard-Output-and-Standard-Error"></span><h4 class="subsection">3.6.4 Redirecting Standard Output and Standard Error</h4>
 <p>This construct allows both the
 standard output (file descriptor 1) and
 the standard error output (file descriptor 2)
@@ -3299,8 +3371,7 @@ This is semantically equivalent to
 &lsquo;<samp>-</samp>&rsquo;.  If it does, other redirection operators apply
 (see Duplicating File Descriptors below) for compatibility reasons.
 </p>
-<a name="Appending-Standard-Output-and-Standard-Error"></a>
-<h4 class="subsection">3.6.5 Appending Standard Output and Standard Error</h4>
+<span id="Appending-Standard-Output-and-Standard-Error"></span><h4 class="subsection">3.6.5 Appending Standard Output and Standard Error</h4>
 <p>This construct allows both the
 standard output (file descriptor 1) and
 the standard error output (file descriptor 2)
@@ -3317,8 +3388,7 @@ expansion of <var>word</var>.
 </pre></div>
 <p>(see Duplicating File Descriptors below).
 </p>
-<a name="Here-Documents"></a>
-<h4 class="subsection">3.6.6 Here Documents</h4>
+<span id="Here-Documents"></span><h4 class="subsection">3.6.6 Here Documents</h4>
 <p>This type of redirection instructs the shell to read input from the
 current source until a line containing only <var>word</var>
 (with no trailing blanks) is seen.  All of
@@ -3350,24 +3420,22 @@ line containing <var>delimiter</var>.
 This allows here-documents within shell scripts to be indented in a
 natural fashion.
 </p>
-<a name="Here-Strings"></a>
-<h4 class="subsection">3.6.7 Here Strings</h4>
+<span id="Here-Strings"></span><h4 class="subsection">3.6.7 Here Strings</h4>
 <p>A variant of here documents, the format is:
 </p><div class="example">
 <pre class="example">[<var>n</var>]&lt;&lt;&lt; <var>word</var>
 </pre></div>
 
 <p>The <var>word</var> undergoes
-brace expansion, tilde expansion, parameter and variable expansion,
+tilde expansion, parameter and variable expansion,
 command substitution, arithmetic expansion, and quote removal.
-Pathname expansion and word splitting are not performed.
+Filename expansion and word splitting are not performed.
 The result is supplied as a single string,
 with a newline appended,
 to the command on its
 standard input (or file descriptor <var>n</var> if <var>n</var> is specified).
 </p>
-<a name="Duplicating-File-Descriptors"></a>
-<h4 class="subsection">3.6.8 Duplicating File Descriptors</h4>
+<span id="Duplicating-File-Descriptors"></span><h4 class="subsection">3.6.8 Duplicating File Descriptors</h4>
 <p>The redirection operator
 </p><div class="example">
 <pre class="example">[<var>n</var>]&lt;&amp;<var>word</var>
@@ -3396,8 +3464,7 @@ As a special case, if <var>n</var> is omitted, and <var>word</var> does not
 expand to one or more digits or &lsquo;<samp>-</samp>&rsquo;, the standard output and standard
 error are redirected as described previously.
 </p>
-<a name="Moving-File-Descriptors"></a>
-<h4 class="subsection">3.6.9 Moving File Descriptors</h4>
+<span id="Moving-File-Descriptors"></span><h4 class="subsection">3.6.9 Moving File Descriptors</h4>
 <p>The redirection operator
 </p><div class="example">
 <pre class="example">[<var>n</var>]&lt;&amp;<var>digit</var>-
@@ -3413,8 +3480,7 @@ or the standard input (file descriptor 0) if <var>n</var> is not specified.
 <p>moves the file descriptor <var>digit</var> to file descriptor <var>n</var>,
 or the standard output (file descriptor 1) if <var>n</var> is not specified.
 </p>
-<a name="Opening-File-Descriptors-for-Reading-and-Writing"></a>
-<h4 class="subsection">3.6.10 Opening File Descriptors for Reading and Writing</h4>
+<span id="Opening-File-Descriptors-for-Reading-and-Writing"></span><h4 class="subsection">3.6.10 Opening File Descriptors for Reading and Writing</h4>
 <p>The redirection operator
 </p><div class="example">
 <pre class="example">[<var>n</var>]&lt;&gt;<var>word</var>
@@ -3425,46 +3491,43 @@ to be opened for both reading and writing on file descriptor
 is not specified.  If the file does not exist, it is created.
 </p>
 <hr>
-<a name="Executing-Commands"></a>
-<div class="header">
+<span id="Executing-Commands"></span><div class="header">
 <p>
 Next: <a href="#Shell-Scripts" accesskey="n" rel="next">Shell Scripts</a>, Previous: <a href="#Redirections" accesskey="p" rel="prev">Redirections</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Executing-Commands-1"></a>
-<h3 class="section">3.7 Executing Commands</h3>
+<span id="Executing-Commands-1"></span><h3 class="section">3.7 Executing Commands</h3>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Simple-Command-Expansion" accesskey="1">Simple Command Expansion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands simple commands before
+<tr><td align="left" valign="top">&bull; <a href="#Simple-Command-Expansion" accesskey="1">Simple Command Expansion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash expands simple commands before
 				executing them.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Command-Search-and-Execution" accesskey="2">Command Search and Execution</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash finds commands and runs them.
+<tr><td align="left" valign="top">&bull; <a href="#Command-Search-and-Execution" accesskey="2">Command Search and Execution</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash finds commands and runs them.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Command-Execution-Environment" accesskey="3">Command Execution Environment</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The environment in which Bash
+<tr><td align="left" valign="top">&bull; <a href="#Command-Execution-Environment" accesskey="3">Command Execution Environment</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The environment in which Bash
 					executes commands that are not
 					shell builtins.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Environment" accesskey="4">Environment</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The environment given to a command.
+<tr><td align="left" valign="top">&bull; <a href="#Environment" accesskey="4">Environment</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The environment given to a command.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Exit-Status" accesskey="5">Exit Status</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The status returned by commands and how Bash
+<tr><td align="left" valign="top">&bull; <a href="#Exit-Status" accesskey="5">Exit Status</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The status returned by commands and how Bash
 			interprets it.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Signals" accesskey="6">Signals</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What happens when Bash or a command it runs
+<tr><td align="left" valign="top">&bull; <a href="#Signals" accesskey="6">Signals</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What happens when Bash or a command it runs
 			receives a signal.
 </td></tr>
 </table>
 
 <hr>
-<a name="Simple-Command-Expansion"></a>
-<div class="header">
+<span id="Simple-Command-Expansion"></span><div class="header">
 <p>
 Next: <a href="#Command-Search-and-Execution" accesskey="n" rel="next">Command Search and Execution</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Simple-Command-Expansion-1"></a>
-<h4 class="subsection">3.7.1 Simple Command Expansion</h4>
-<a name="index-command-expansion"></a>
+<span id="Simple-Command-Expansion-1"></span><h4 class="subsection">3.7.1 Simple Command Expansion</h4>
+<span id="index-command-expansion"></span>
 
 <p>When a simple command is executed, the shell performs the following
-expansions, assignments, and redirections, from left to right.
+expansions, assignments, and redirections, from left to right, in
+the following order.
 </p>
 <ol>
 <li> The words that the parser has marked as variable assignments (those
@@ -3501,15 +3564,13 @@ the exit status of the last command substitution performed.  If there
 were no command substitutions, the command exits with a status of zero.
 </p>
 <hr>
-<a name="Command-Search-and-Execution"></a>
-<div class="header">
+<span id="Command-Search-and-Execution"></span><div class="header">
 <p>
 Next: <a href="#Command-Execution-Environment" accesskey="n" rel="next">Command Execution Environment</a>, Previous: <a href="#Simple-Command-Expansion" accesskey="p" rel="prev">Simple Command Expansion</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Command-Search-and-Execution-1"></a>
-<h4 class="subsection">3.7.2 Command Search and Execution</h4>
-<a name="index-command-execution"></a>
-<a name="index-command-search"></a>
+<span id="Command-Search-and-Execution-1"></span><h4 class="subsection">3.7.2 Command Search and Execution</h4>
+<span id="index-command-execution"></span>
+<span id="index-command-search"></span>
 
 <p>After a command has been split into words, if it results in a
 simple command and an optional list of arguments, the following
@@ -3534,9 +3595,10 @@ A full search of the directories in <code>$PATH</code>
 is performed only if the command is not found in the hash table.
 If the search is unsuccessful, the shell searches for a defined shell
 function named <code>command_not_found_handle</code>.
-If that function exists, it is invoked with the original command and
+If that function exists, it is invoked in a separate execution environment
+with the original command and
 the original command&rsquo;s arguments as its arguments, and the function&rsquo;s
-exit status becomes the exit status of the shell.
+exit status becomes the exit status of that subshell.
 If that function is not defined, the shell prints an error
 message and returns an exit status of 127.
 
@@ -3557,14 +3619,12 @@ the command to complete and collects its exit status.
 </li></ol>
 
 <hr>
-<a name="Command-Execution-Environment"></a>
-<div class="header">
+<span id="Command-Execution-Environment"></span><div class="header">
 <p>
 Next: <a href="#Environment" accesskey="n" rel="next">Environment</a>, Previous: <a href="#Command-Search-and-Execution" accesskey="p" rel="prev">Command Search and Execution</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Command-Execution-Environment-1"></a>
-<h4 class="subsection">3.7.3 Command Execution Environment</h4>
-<a name="index-execution-environment"></a>
+<span id="Command-Execution-Environment-1"></span><h4 class="subsection">3.7.3 Command Execution Environment</h4>
+<span id="index-execution-environment"></span>
 
 <p>The shell has an <var>execution environment</var>, which consists of the
 following:
@@ -3644,14 +3704,12 @@ Otherwise, the invoked command inherits the file descriptors of the calling
 shell as modified by redirections.
 </p>
 <hr>
-<a name="Environment"></a>
-<div class="header">
+<span id="Environment"></span><div class="header">
 <p>
 Next: <a href="#Exit-Status" accesskey="n" rel="next">Exit Status</a>, Previous: <a href="#Command-Execution-Environment" accesskey="p" rel="prev">Command Execution Environment</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Environment-1"></a>
-<h4 class="subsection">3.7.4 Environment</h4>
-<a name="index-environment"></a>
+<span id="Environment-1"></span><h4 class="subsection">3.7.4 Environment</h4>
+<span id="index-environment"></span>
 
 <p>When a program is invoked it is given an array of strings
 called the <var>environment</var>.
@@ -3688,14 +3746,12 @@ is set to the full pathname of the command and passed to that
 command in its environment.
 </p>
 <hr>
-<a name="Exit-Status"></a>
-<div class="header">
+<span id="Exit-Status"></span><div class="header">
 <p>
 Next: <a href="#Signals" accesskey="n" rel="next">Signals</a>, Previous: <a href="#Environment" accesskey="p" rel="prev">Environment</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Exit-Status-1"></a>
-<h4 class="subsection">3.7.5 Exit Status</h4>
-<a name="index-exit-status-1"></a>
+<span id="Exit-Status-1"></span><h4 class="subsection">3.7.5 Exit Status</h4>
+<span id="index-exit-status-1"></span>
 
 <p>The exit status of an executed command is the value returned by the
 <var>waitpid</var> system call or equivalent function.  Exit statuses    
@@ -3732,14 +3788,12 @@ All builtins return an exit status of 2 to indicate incorrect usage,
 generally invalid options or missing arguments.
 </p>
 <hr>
-<a name="Signals"></a>
-<div class="header">
+<span id="Signals"></span><div class="header">
 <p>
 Previous: <a href="#Exit-Status" accesskey="p" rel="prev">Exit Status</a>, Up: <a href="#Executing-Commands" accesskey="u" rel="up">Executing Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Signals-1"></a>
-<h4 class="subsection">3.7.6 Signals</h4>
-<a name="index-signal-handling"></a>
+<span id="Signals-1"></span><h4 class="subsection">3.7.6 Signals</h4>
+<span id="index-signal-handling"></span>
 
 <p>When Bash is interactive, in the absence of any traps, it ignores
 <code>SIGTERM</code> (so that &lsquo;<samp>kill 0</samp>&rsquo; does not kill an interactive shell),
@@ -3784,14 +3838,12 @@ immediately with an exit status greater than 128, immediately after
 which the trap is executed.
 </p>
 <hr>
-<a name="Shell-Scripts"></a>
-<div class="header">
+<span id="Shell-Scripts"></span><div class="header">
 <p>
 Previous: <a href="#Executing-Commands" accesskey="p" rel="prev">Executing Commands</a>, Up: <a href="#Basic-Shell-Features" accesskey="u" rel="up">Basic Shell Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Scripts-1"></a>
-<h3 class="section">3.8 Shell Scripts</h3>
-<a name="index-shell-script"></a>
+<span id="Shell-Scripts-1"></span><h3 class="section">3.8 Shell Scripts</h3>
+<span id="index-shell-script"></span>
 
 <p>A shell script is a text file containing shell commands.  When such
 a file is used as the first non-option argument when invoking Bash,
@@ -3831,42 +3883,49 @@ are retained by the child.
 <p>Most versions of Unix make this a part of the operating system&rsquo;s command
 execution mechanism.  If the first line of a script begins with
 the two characters &lsquo;<samp>#!</samp>&rsquo;, the remainder of the line specifies
-an interpreter for the program.
+an interpreter for the program and, depending on the operating system, one
+or more optional arguments for that interpreter.
 Thus, you can specify Bash, <code>awk</code>, Perl, or some other
 interpreter and write the rest of the script file in that language.
 </p>
 <p>The arguments to the interpreter
-consist of a single optional argument following the interpreter
+consist of one or more optional arguments following the interpreter
 name on the first line of the script file, followed by the name of
-the script file, followed by the rest of the arguments.  Bash
-will perform this action on operating systems that do not handle it
-themselves.  Note that some older versions of Unix limit the interpreter
-name and argument to a maximum of 32 characters.
+the script file, followed by the rest of the arguments supplied to the
+script.
+The details of how the interpreter line is split into an interpreter name
+and a set of arguments vary across systems.
+Bash will perform this action on operating systems that do not handle it
+themselves.
+Note that some older versions of Unix limit the interpreter
+name and a single argument to a maximum of 32 characters, so it&rsquo;s not
+portable to assume that using more than one argument will work.
 </p>
 <p>Bash scripts often begin with <code>#! /bin/bash</code> (assuming that
 Bash has been installed in <samp>/bin</samp>), since this ensures that
 Bash will be used to interpret the script, even if it is executed
-under another shell.
+under another shell. It&rsquo;s a common idiom to use <code>env</code> to find
+<code>bash</code> even if it&rsquo;s been installed in another directory:
+<code>#!/usr/bin/env bash</code> will find the first occurrence of <code>bash</code>
+in <code>$PATH</code>.
 </p>
 <hr>
-<a name="Shell-Builtin-Commands"></a>
-<div class="header">
+<span id="Shell-Builtin-Commands"></span><div class="header">
 <p>
 Next: <a href="#Shell-Variables" accesskey="n" rel="next">Shell Variables</a>, Previous: <a href="#Basic-Shell-Features" accesskey="p" rel="prev">Basic Shell Features</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Builtin-Commands-1"></a>
-<h2 class="chapter">4 Shell Builtin Commands</h2>
+<span id="Shell-Builtin-Commands-1"></span><h2 class="chapter">4 Shell Builtin Commands</h2>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Bourne-Shell-Builtins" accesskey="1">Bourne Shell Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands inherited from the Bourne
+<tr><td align="left" valign="top">&bull; <a href="#Bourne-Shell-Builtins" accesskey="1">Bourne Shell Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands inherited from the Bourne
 				Shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-Builtins" accesskey="2">Bash Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Table of builtins specific to Bash.
+<tr><td align="left" valign="top">&bull; <a href="#Bash-Builtins" accesskey="2">Bash Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Table of builtins specific to Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Modifying-Shell-Behavior" accesskey="3">Modifying Shell Behavior</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtins to modify shell attributes and
+<tr><td align="left" valign="top">&bull; <a href="#Modifying-Shell-Behavior" accesskey="3">Modifying Shell Behavior</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtins to modify shell attributes and
 				optional behavior.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Special-Builtins" accesskey="4">Special Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands classified specially by
+<tr><td align="left" valign="top">&bull; <a href="#Special-Builtins" accesskey="4">Special Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands classified specially by
 				POSIX.
 </td></tr>
 </table>
@@ -3894,7 +3953,7 @@ facilities (see <a href="#Programmable-Completion-Builtins">Programmable Complet
 <p>Unless otherwise noted, each builtin command documented as accepting
 options preceded by &lsquo;<samp>-</samp>&rsquo; accepts &lsquo;<samp>--</samp>&rsquo;
 to signify the end of the options.
-The <code>:</code>, <code>true</code>, <code>false</code>, and <code>test</code>
+The <code>:</code>, <code>true</code>, <code>false</code>, and <code>test</code>/<code>[</code>
 builtins do not accept options and do not treat &lsquo;<samp>--</samp>&rsquo; specially.
 The <code>exit</code>, <code>logout</code>, <code>return</code>,
 <code>break</code>, <code>continue</code>, <code>let</code>,
@@ -3905,20 +3964,18 @@ options interpret arguments beginning with &lsquo;<samp>-</samp>&rsquo; as inval
 require &lsquo;<samp>--</samp>&rsquo; to prevent this interpretation.
 </p>
 <hr>
-<a name="Bourne-Shell-Builtins"></a>
-<div class="header">
+<span id="Bourne-Shell-Builtins"></span><div class="header">
 <p>
 Next: <a href="#Bash-Builtins" accesskey="n" rel="next">Bash Builtins</a>, Up: <a href="#Shell-Builtin-Commands" accesskey="u" rel="up">Shell Builtin Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bourne-Shell-Builtins-1"></a>
-<h3 class="section">4.1 Bourne Shell Builtins</h3>
+<span id="Bourne-Shell-Builtins-1"></span><h3 class="section">4.1 Bourne Shell Builtins</h3>
 
 <p>The following shell builtin commands are inherited from the Bourne Shell.
 These commands are implemented as specified by the <small>POSIX</small> standard.
 </p>
 <dl compact="compact">
 <dt><code>:    <span class="roman">(a colon)</span></code></dt>
-<dd><a name="index-_003a"></a>
+<dd><span id="index-_003a"></span>
 <div class="example">
 <pre class="example">: [<var>arguments</var>]
 </pre></div>
@@ -3928,7 +3985,7 @@ The return status is zero.
 </p>
 </dd>
 <dt><code>.    <span class="roman">(a period)</span></code></dt>
-<dd><a name="index-_002e"></a>
+<dd><span id="index-_002e"></span>
 <div class="example">
 <pre class="example">. <var>filename</var> [<var>arguments</var>]
 </pre></div>
@@ -3954,7 +4011,7 @@ This builtin is equivalent to <code>source</code>.
 </p>
 </dd>
 <dt><code>break</code></dt>
-<dd><a name="index-break"></a>
+<dd><span id="index-break"></span>
 <div class="example">
 <pre class="example">break [<var>n</var>]
 </pre></div>
@@ -3966,7 +4023,7 @@ The return status is zero unless <var>n</var> is not greater than or equal to 1.
 </p>
 </dd>
 <dt><code>cd</code></dt>
-<dd><a name="index-cd"></a>
+<dd><span id="index-cd"></span>
 <div class="example">
 <pre class="example">cd [-L|[-P [-e]] [-@] [<var>directory</var>]
 </pre></div>
@@ -4015,7 +4072,7 @@ non-zero otherwise.
 </p>
 </dd>
 <dt><code>continue</code></dt>
-<dd><a name="index-continue"></a>
+<dd><span id="index-continue"></span>
 <div class="example">
 <pre class="example">continue [<var>n</var>]
 </pre></div>
@@ -4029,7 +4086,7 @@ The return status is zero unless <var>n</var> is not greater than or equal to 1.
 </p>
 </dd>
 <dt><code>eval</code></dt>
-<dd><a name="index-eval"></a>
+<dd><span id="index-eval"></span>
 <div class="example">
 <pre class="example">eval [<var>arguments</var>]
 </pre></div>
@@ -4042,7 +4099,7 @@ zero.
 </p>
 </dd>
 <dt><code>exec</code></dt>
-<dd><a name="index-exec"></a>
+<dd><span id="index-exec"></span>
 <div class="example">
 <pre class="example">exec [-cl] [-a <var>name</var>] [<var>command</var> [<var>arguments</var>]]
 </pre></div>
@@ -4061,13 +4118,14 @@ cannot be executed for some reason, a non-interactive shell exits,
 unless the <code>execfail</code> shell option
 is enabled.  In that case, it returns failure.
 An interactive shell returns failure if the file cannot be executed.
+A subshell exits unconditionally if <code>exec</code> fails.
 If no <var>command</var> is specified, redirections may be used to affect
 the current shell environment.  If there are no redirection errors, the
 return status is zero; otherwise the return status is non-zero.
 </p>
 </dd>
 <dt><code>exit</code></dt>
-<dd><a name="index-exit"></a>
+<dd><span id="index-exit"></span>
 <div class="example">
 <pre class="example">exit [<var>n</var>]
 </pre></div>
@@ -4078,7 +4136,7 @@ Any trap on <code>EXIT</code> is executed before the shell terminates.
 </p>
 </dd>
 <dt><code>export</code></dt>
-<dd><a name="index-export"></a>
+<dd><span id="index-export"></span>
 <div class="example">
 <pre class="example">export [-fn] [-p] [<var>name</var>[=<var>value</var>]]
 </pre></div>
@@ -4099,9 +4157,9 @@ with a name that is not a shell function.
 </p>
 </dd>
 <dt><code>getopts</code></dt>
-<dd><a name="index-getopts"></a>
+<dd><span id="index-getopts"></span>
 <div class="example">
-<pre class="example">getopts <var>optstring</var> <var>name</var> [<var>args</var>]
+<pre class="example">getopts <var>optstring</var> <var>name</var> [<var>arg</var> &hellip;]
 </pre></div>
 
 <p><code>getopts</code> is used by shell scripts to parse positional parameters.
@@ -4130,7 +4188,7 @@ and <var>name</var> is set to &lsquo;<samp>?</samp>&rsquo;.
 </p>
 <p><code>getopts</code>
 normally parses the positional parameters, but if more arguments are
-given in <var>args</var>, <code>getopts</code> parses those instead.
+supplied as <var>arg</var> values, <code>getopts</code> parses those instead.
 </p>
 <p><code>getopts</code> can report errors in two ways.  If the first character of
 <var>optstring</var> is a colon, <var>silent</var>
@@ -4155,7 +4213,7 @@ If <code>getopts</code> is silent, then a colon (&lsquo;<samp>:</samp>&rsquo;) i
 </p>
 </dd>
 <dt><code>hash</code></dt>
-<dd><a name="index-hash"></a>
+<dd><span id="index-hash"></span>
 <div class="example">
 <pre class="example">hash [-r] [-p <var>filename</var>] [-dt] [<var>name</var>]
 </pre></div>
@@ -4173,7 +4231,7 @@ The <samp>-d</samp> option causes the shell to forget the remembered location
 of each <var>name</var>.
 If the <samp>-t</samp> option is supplied, the full pathname to which each
 <var>name</var> corresponds is printed.  If multiple <var>name</var> arguments are
-supplied with <samp>-t</samp> the <var>name</var> is printed before the hashed
+supplied with <samp>-t</samp>, the <var>name</var> is printed before the hashed
 full pathname.
 The <samp>-l</samp> option causes output to be displayed in a format
 that may be reused as input.
@@ -4184,7 +4242,7 @@ option is supplied.
 </p>
 </dd>
 <dt><code>pwd</code></dt>
-<dd><a name="index-pwd"></a>
+<dd><span id="index-pwd"></span>
 <div class="example">
 <pre class="example">pwd [-LP]
 </pre></div>
@@ -4200,7 +4258,7 @@ is supplied.
 </p>
 </dd>
 <dt><code>readonly</code></dt>
-<dd><a name="index-readonly"></a>
+<dd><span id="index-readonly"></span>
 <div class="example">
 <pre class="example">readonly [-aAf] [-p] [<var>name</var>[=<var>value</var>]] &hellip;
 </pre></div>
@@ -4227,7 +4285,7 @@ or the <samp>-f</samp> option is supplied with a name that is not a shell functi
 </p>
 </dd>
 <dt><code>return</code></dt>
-<dd><a name="index-return"></a>
+<dd><span id="index-return"></span>
 <div class="example">
 <pre class="example">return [<var>n</var>]
 </pre></div>
@@ -4238,7 +4296,7 @@ If <var>n</var> is not supplied, the return value is the exit status of the
 last command executed in the function.
 If <code>return</code> is executed by a trap handler, the last command used to
 determine the status is the last command executed before the trap handler.
-if <code>return</code> is executed during a <code>DEBUG</code> trap, the last command
+If <code>return</code> is executed during a <code>DEBUG</code> trap, the last command
 used to determine the status is the last command executed by the trap
 handler before <code>return</code> was invoked.
 <code>return</code> may also be used to terminate execution of a script
@@ -4256,7 +4314,7 @@ and not during the execution of a script by <code>.</code> or <code>source</code
 </p>
 </dd>
 <dt><code>shift</code></dt>
-<dd><a name="index-shift"></a>
+<dd><span id="index-shift"></span>
 <div class="example">
 <pre class="example">shift [<var>n</var>]
 </pre></div>
@@ -4264,7 +4322,7 @@ and not during the execution of a script by <code>.</code> or <code>source</code
 <p>Shift the positional parameters to the left by <var>n</var>.
 The positional parameters from <var>n</var>+1 &hellip; <code>$#</code> are
 renamed to <code>$1</code> &hellip; <code>$#</code>-<var>n</var>.
-Parameters represented by the numbers <code>$#</code> to <code>$#</code>-<var>n</var>+1
+Parameters represented by the numbers <code>$#</code> down to <code>$#</code>-<var>n</var>+1
 are unset.
 <var>n</var> must be a non-negative number less than or equal to <code>$#</code>.
 If <var>n</var> is zero or greater than <code>$#</code>, the positional parameters
@@ -4276,8 +4334,8 @@ less than zero, non-zero otherwise.
 </dd>
 <dt><code>test</code></dt>
 <dt><code>[</code></dt>
-<dd><a name="index-test"></a>
-<a name="index-_005b"></a>
+<dd><span id="index-test"></span>
+<span id="index-_005b"></span>
 <div class="example">
 <pre class="example">test <var>expr</var>
 </pre></div>
@@ -4326,7 +4384,7 @@ expressions using a set of rules based on the number of arguments.
 </p>
 </dd>
 <dt>1 argument</dt>
-<dd><p>The expression is true if and only if the argument is not null.
+<dd><p>The expression is true if, and only if, the argument is not null.
 </p>
 </dd>
 <dt>2 arguments</dt>
@@ -4341,19 +4399,22 @@ false.
 </dd>
 <dt>3 arguments</dt>
 <dd><p>The following conditions are applied in the order listed.
-If the second argument is one of the binary conditional
+</p>
+<ol>
+<li> If the second argument is one of the binary conditional
 operators (see <a href="#Bash-Conditional-Expressions">Bash Conditional Expressions</a>), the
 result of the expression is the result of the binary test using the
 first and third arguments as operands.
 The &lsquo;<samp>-a</samp>&rsquo; and &lsquo;<samp>-o</samp>&rsquo; operators are considered binary operators
 when there are three arguments.
-If the first argument is &lsquo;<samp>!</samp>&rsquo;, the value is the negation of
+</li><li> If the first argument is &lsquo;<samp>!</samp>&rsquo;, the value is the negation of
 the two-argument test using the second and third arguments.
-If the first argument is exactly &lsquo;<samp>(</samp>&rsquo; and the third argument is
+</li><li> If the first argument is exactly &lsquo;<samp>(</samp>&rsquo; and the third argument is
 exactly &lsquo;<samp>)</samp>&rsquo;, the result is the one-argument test of the second
 argument.
-Otherwise, the expression is false.
-</p>
+</li><li> Otherwise, the expression is false.
+</li></ol>
+
 </dd>
 <dt>4 arguments</dt>
 <dd><p>If the first argument is &lsquo;<samp>!</samp>&rsquo;, the result is the negation of
@@ -4373,7 +4434,7 @@ operators sort lexicographically using ASCII ordering.
 </p>
 </dd>
 <dt><code>times</code></dt>
-<dd><a name="index-times"></a>
+<dd><span id="index-times"></span>
 <div class="example">
 <pre class="example">times
 </pre></div>
@@ -4383,7 +4444,7 @@ The return status is zero.
 </p>
 </dd>
 <dt><code>trap</code></dt>
-<dd><a name="index-trap"></a>
+<dd><span id="index-trap"></span>
 <div class="example">
 <pre class="example">trap [-lp] [<var>arg</var>] [<var>sigspec</var> &hellip;]
 </pre></div>
@@ -4445,7 +4506,7 @@ valid signal.
 </p>
 </dd>
 <dt><code>umask</code></dt>
-<dd><a name="index-umask"></a>
+<dd><span id="index-umask"></span>
 <div class="example">
 <pre class="example">umask [-p] [-S] [<var>mode</var>]
 </pre></div>
@@ -4468,7 +4529,7 @@ results in permissions of <code>755</code>.
 </p>
 </dd>
 <dt><code>unset</code></dt>
-<dd><a name="index-unset"></a>
+<dd><span id="index-unset"></span>
 <div class="example">
 <pre class="example">unset [-fnv] [<var>name</var>]
 </pre></div>
@@ -4483,21 +4544,21 @@ the <var>nameref</var> attribute, <var>name</var> will be unset rather than the
 variable it references.
 <samp>-n</samp> has no effect if the <samp>-f</samp> option is supplied.
 If no options are supplied, each <var>name</var> refers to a variable; if
-there is no variable by that name, any function with that name is
+there is no variable by that name, a function with that name, if any, is
 unset.
 Readonly variables and functions may not be unset.
+Some shell variables lose their special behavior if they are unset; such
+behavior is noted in the description of the individual variables.
 The return status is zero unless a <var>name</var> is readonly.
 </p></dd>
 </dl>
 
 <hr>
-<a name="Bash-Builtins"></a>
-<div class="header">
+<span id="Bash-Builtins"></span><div class="header">
 <p>
 Next: <a href="#Modifying-Shell-Behavior" accesskey="n" rel="next">Modifying Shell Behavior</a>, Previous: <a href="#Bourne-Shell-Builtins" accesskey="p" rel="prev">Bourne Shell Builtins</a>, Up: <a href="#Shell-Builtin-Commands" accesskey="u" rel="up">Shell Builtin Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Builtin-Commands"></a>
-<h3 class="section">4.2 Bash Builtin Commands</h3>
+<span id="Bash-Builtin-Commands"></span><h3 class="section">4.2 Bash Builtin Commands</h3>
 
 <p>This section describes builtin commands which are unique to
 or have been extended in Bash.
@@ -4505,7 +4566,7 @@ Some of these commands are specified in the <small>POSIX</small> standard.
 </p>
 <dl compact="compact">
 <dt><code>alias</code></dt>
-<dd><a name="index-alias"></a>
+<dd><span id="index-alias"></span>
 <div class="example">
 <pre class="example">alias [-p] [<var>name</var>[=<var>value</var>] &hellip;]
 </pre></div>
@@ -4520,7 +4581,7 @@ Aliases are described in <a href="#Aliases">Aliases</a>.
 </p>
 </dd>
 <dt><code>bind</code></dt>
-<dd><a name="index-bind"></a>
+<dd><span id="index-bind"></span>
 <div class="example">
 <pre class="example">bind [-m <var>keymap</var>] [-lpsvPSVX]
 bind [-m <var>keymap</var>] [-q <var>function</var>] [-u <var>function</var>] [-r <var>keyseq</var>]
@@ -4611,11 +4672,12 @@ initialization file.
 entered.
 When <var>shell-command</var> is executed, the shell sets the
 <code>READLINE_LINE</code> variable to the contents of the Readline line
-buffer and the <code>READLINE_POINT</code> variable to the current location
-of the insertion point.
-If the executed command changes the value of <code>READLINE_LINE</code> or
-<code>READLINE_POINT</code>, those new values will be reflected in the
-editing state.
+buffer and the <code>READLINE_POINT</code> and <code>READLINE_MARK</code> variables
+to the current location of the insertion point and the saved insertion
+point (the <var>mark</var>), respectively.
+If the executed command changes the value of any of <code>READLINE_LINE</code>,
+<code>READLINE_POINT</code>, or <code>READLINE_MARK</code>, those new values will be
+reflected in the editing state.
 </p>
 </dd>
 <dt><code>-X</code></dt>
@@ -4629,7 +4691,7 @@ error occurs.
 </p>
 </dd>
 <dt><code>builtin</code></dt>
-<dd><a name="index-builtin"></a>
+<dd><span id="index-builtin"></span>
 <div class="example">
 <pre class="example">builtin [<var>shell-builtin</var> [<var>args</var>]]
 </pre></div>
@@ -4643,7 +4705,7 @@ builtin command.
 </p>
 </dd>
 <dt><code>caller</code></dt>
-<dd><a name="index-caller"></a>
+<dd><span id="index-caller"></span>
 <div class="example">
 <pre class="example">caller [<var>expr</var>]
 </pre></div>
@@ -4665,7 +4727,7 @@ call stack.
 </p>
 </dd>
 <dt><code>command</code></dt>
-<dd><a name="index-command"></a>
+<dd><span id="index-command"></span>
 <div class="example">
 <pre class="example">command [-pVv] <var>command</var> [<var>arguments</var> &hellip;]
 </pre></div>
@@ -4692,9 +4754,9 @@ zero if <var>command</var> is found, and non-zero if not.
 </p>
 </dd>
 <dt><code>declare</code></dt>
-<dd><a name="index-declare"></a>
+<dd><span id="index-declare"></span>
 <div class="example">
-<pre class="example">declare [-aAfFgilnrtux] [-p] [<var>name</var>[=<var>value</var>] &hellip;]
+<pre class="example">declare [-aAfFgiIlnrtux] [-p] [<var>name</var>[=<var>value</var>] &hellip;]
 </pre></div>
 
 <p>Declare variables and give them attributes.  If no <var>name</var>s
@@ -4723,6 +4785,12 @@ each <var>name</var> is defined are displayed as well.
 the global scope, even when <code>declare</code> is executed in a shell function.
 It is ignored in all other cases.
 </p>
+<p>The <samp>-I</samp> option causes local variables to inherit the attributes
+(except the <var>nameref</var> attribute)
+and value of any existing variable with the same
+<var>name</var> at a surrounding scope.
+If there is no existing variable, the local variable is initially unset.
+</p>
 <p>The following options can be used to restrict output to variables with
 the specified attributes or to give variables attributes:
 </p>
@@ -4787,8 +4855,8 @@ the environment.
 </dl>
 
 <p>Using &lsquo;<samp>+</samp>&rsquo; instead of &lsquo;<samp>-</samp>&rsquo; turns off the attribute instead,
-with the exceptions that &lsquo;<samp>+a</samp>&rsquo;
-may not be used to destroy an array variable and &lsquo;<samp>+r</samp>&rsquo; will not
+with the exceptions that &lsquo;<samp>+a</samp>&rsquo; and &lsquo;<samp>+A</samp>&rsquo;
+may not be used to destroy array variables and &lsquo;<samp>+r</samp>&rsquo; will not
 remove the readonly attribute.
 When used in a function, <code>declare</code> makes each <var>name</var> local,
 as with the <code>local</code> command, unless the <samp>-g</samp> option is used.
@@ -4811,7 +4879,7 @@ or an attempt is made to display a non-existent function with <samp>-f</samp>.
 </p>
 </dd>
 <dt><code>echo</code></dt>
-<dd><a name="index-echo"></a>
+<dd><span id="index-echo"></span>
 <div class="example">
 <pre class="example">echo [-neE] [<var>arg</var> &hellip;]
 </pre></div>
@@ -4882,7 +4950,7 @@ escape characters by default.
 
 </dd>
 <dt><code>enable</code></dt>
-<dd><a name="index-enable"></a>
+<dd><span id="index-enable"></span>
 <div class="example">
 <pre class="example">enable [-a] [-dnps] [-f <var>filename</var>] [<var>name</var> &hellip;]
 </pre></div>
@@ -4916,7 +4984,7 @@ or there is an error loading a new builtin from a shared object.
 </p>
 </dd>
 <dt><code>help</code></dt>
-<dd><a name="index-help"></a>
+<dd><span id="index-help"></span>
 <div class="example">
 <pre class="example">help [-dms] [<var>pattern</var>]
 </pre></div>
@@ -4944,7 +5012,7 @@ the builtins is printed.
 </p>
 </dd>
 <dt><code>let</code></dt>
-<dd><a name="index-let"></a>
+<dd><span id="index-let"></span>
 <div class="example">
 <pre class="example">let <var>expression</var> [<var>expression</var> &hellip;]
 </pre></div>
@@ -4957,7 +5025,7 @@ otherwise 0 is returned.
 </p>
 </dd>
 <dt><code>local</code></dt>
-<dd><a name="index-local"></a>
+<dd><span id="index-local"></span>
 <div class="example">
 <pre class="example">local [<var>option</var>] <var>name</var>[=<var>value</var>] &hellip;
 </pre></div>
@@ -4972,13 +5040,15 @@ If <var>name</var> is &lsquo;<samp>-</samp>&rsquo;, the set of shell options is
 function in which <code>local</code> is invoked: shell options changed using
 the <code>set</code> builtin inside the function are restored to their original
 values when the function returns.
+The restore is effected as if a series of <code>set</code> commands were executed
+to restore the values that were in place before the function.
 The return status is zero unless <code>local</code> is used outside
 a function, an invalid <var>name</var> is supplied, or <var>name</var> is a
 readonly variable.
 </p>
 </dd>
 <dt><code>logout</code></dt>
-<dd><a name="index-logout"></a>
+<dd><span id="index-logout"></span>
 <div class="example">
 <pre class="example">logout [<var>n</var>]
 </pre></div>
@@ -4988,10 +5058,10 @@ parent.
 </p>
 </dd>
 <dt><code>mapfile</code></dt>
-<dd><a name="index-mapfile"></a>
+<dd><span id="index-mapfile"></span>
 <div class="example">
-<pre class="example">mapfile [-d <var>delim</var>] [-n <var>count</var>] [-O <var>origin</var>] [-s <var>count</var>] [-t] [-u <var>fd</var>]
-    [-C <var>callback</var>] [-c <var>quantum</var>] [<var>array</var>]
+<pre class="example">mapfile [-d <var>delim</var>] [-n <var>count</var>] [-O <var>origin</var>] [-s <var>count</var>]
+    [-t] [-u <var>fd</var>] [-C <var>callback</var>] [-c <var>quantum</var>] [<var>array</var>]
 </pre></div>
 
 <p>Read lines from the standard input into the indexed array variable <var>array</var>,
@@ -5004,6 +5074,8 @@ Options, if supplied, have the following meanings:
 <dt><code>-d</code></dt>
 <dd><p>The first character of <var>delim</var> is used to terminate each input line,
 rather than newline.
+If <var>delim</var> is the empty string, <code>mapfile</code> will terminate a line
+when it reads a NUL character.
 </p></dd>
 <dt><code>-n</code></dt>
 <dd><p>Copy at most <var>count</var> lines.  If <var>count</var> is 0, all lines are copied.
@@ -5022,7 +5094,7 @@ The default index is 0.
 <dd><p>Read lines from file descriptor <var>fd</var> instead of the standard input.
 </p></dd>
 <dt><code>-C</code></dt>
-<dd><p>Evaluate <var>callback</var> each time <var>quantum</var>P lines are read.
+<dd><p>Evaluate <var>callback</var> each time <var>quantum</var> lines are read.
 The <samp>-c</samp> option specifies <var>quantum</var>.
 </p></dd>
 <dt><code>-c</code></dt>
@@ -5047,7 +5119,7 @@ is not an indexed array.
 </p>
 </dd>
 <dt><code>printf</code></dt>
-<dd><a name="index-printf"></a>
+<dd><span id="index-printf"></span>
 <div class="example">
 <pre class="example">printf [-v <var>var</var>] <var>format</var> [<var>arguments</var>]
 </pre></div>
@@ -5087,6 +5159,11 @@ This is an exception to the usual <code>printf</code> behavior.
 </p></dd>
 </dl>
 
+<p>The %b, %q, and %T directives all use the field width and precision
+arguments from the format specification and write that many bytes from    
+(or use that wide a field for) the expanded argument, which usually
+contains more characters than the original.
+</p>
 <p>Arguments to non-string format specifiers are treated as C language constants,
 except that a leading plus or minus sign is allowed, and if the leading
 character is a single or double quote, the value is the ASCII value of
@@ -5100,7 +5177,7 @@ non-zero on failure.
 </p>
 </dd>
 <dt><code>read</code></dt>
-<dd><a name="index-read"></a>
+<dd><span id="index-read"></span>
 <div class="example">
 <pre class="example">read [-ers] [-a <var>aname</var>] [-d <var>delim</var>] [-i <var>text</var>] [-n <var>nchars</var>]
     [-N <var>nchars</var>] [-p <var>prompt</var>] [-t <var>timeout</var>] [-u <var>fd</var>] [<var>name</var> &hellip;]
@@ -5122,12 +5199,6 @@ are used to split the line into words using the same rules the shell
 uses for expansion (described above in <a href="#Word-Splitting">Word Splitting</a>).
 The backslash character &lsquo;<samp>\</samp>&rsquo; may be used to remove any special
 meaning for the next character read and for line continuation.
-If no names are supplied, the line read is assigned to the
-variable <code>REPLY</code>.
-The exit status is zero, unless end-of-file is encountered, <code>read</code>
-times out (in which case the status is greater than 128),
-a variable assignment error (such as assigning to a readonly variable) occurs,
-or an invalid file descriptor is supplied as the argument to <samp>-u</samp>.
 </p>
 <p>Options, if supplied, have the following meanings:
 </p>
@@ -5142,12 +5213,14 @@ Other <var>name</var> arguments are ignored.
 <dt><code>-d <var>delim</var></code></dt>
 <dd><p>The first character of <var>delim</var> is used to terminate the input line,
 rather than newline.
+If <var>delim</var> is the empty string, <code>read</code> will terminate a line
+when it reads a NUL character.
 </p>
 </dd>
 <dt><code>-e</code></dt>
 <dd><p>Readline (see <a href="#Command-Line-Editing">Command Line Editing</a>) is used to obtain the line.
 Readline uses the current (or default, if line editing was not previously
-active) editing settings.
+active) editing settings, but uses Readline&rsquo;s default filename completion.
 </p>
 </dd>
 <dt><code>-i <var>text</var></code></dt>
@@ -5182,7 +5255,7 @@ The prompt is displayed only if input is coming from a terminal.
 <dt><code>-r</code></dt>
 <dd><p>If this option is given, backslash does not act as an escape character.
 The backslash is considered to be part of the line.
-In particular, a backslash-newline pair may not be used as a line
+In particular, a backslash-newline pair may not then be used as a line
 continuation.
 </p>
 </dd>
@@ -5203,7 +5276,7 @@ from regular files.
 If <code>read</code> times out, <code>read</code> saves any partial input read into
 the specified variable <var>name</var>.
 If <var>timeout</var> is 0, <code>read</code> returns immediately, without trying to
-read and data.  The exit status is 0 if input is available on
+read any data.  The exit status is 0 if input is available on
 the specified file descriptor, non-zero otherwise.
 The exit status is greater than 128 if the timeout is exceeded.
 </p>
@@ -5213,12 +5286,21 @@ The exit status is greater than 128 if the timeout is exceeded.
 </p></dd>
 </dl>
 
+<p>If no <var>name</var>s are supplied, the line read,
+without the ending delimiter but otherwise unmodified,
+is assigned to the
+variable <code>REPLY</code>.
+The exit status is zero, unless end-of-file is encountered, <code>read</code>
+times out (in which case the status is greater than 128),
+a variable assignment error (such as assigning to a readonly variable) occurs,
+or an invalid file descriptor is supplied as the argument to <samp>-u</samp>.
+</p>
 </dd>
 <dt><code>readarray</code></dt>
-<dd><a name="index-readarray"></a>
+<dd><span id="index-readarray"></span>
 <div class="example">
-<pre class="example">readarray [-d <var>delim</var>] [-n <var>count</var>] [-O <var>origin</var>] [-s <var>count</var>] [-t] [-u <var>fd</var>]
-    [-C <var>callback</var>] [-c <var>quantum</var>] [<var>array</var>]
+<pre class="example">readarray [-d <var>delim</var>] [-n <var>count</var>] [-O <var>origin</var>] [-s <var>count</var>]
+    [-t] [-u <var>fd</var>] [-C <var>callback</var>] [-c <var>quantum</var>] [<var>array</var>]
 </pre></div>
 
 <p>Read lines from the standard input into the indexed array variable <var>array</var>,
@@ -5229,7 +5311,7 @@ if the <samp>-u</samp> option is supplied.
 </p>
 </dd>
 <dt><code>source</code></dt>
-<dd><a name="index-source"></a>
+<dd><span id="index-source"></span>
 <div class="example">
 <pre class="example">source <var>filename</var>
 </pre></div>
@@ -5238,7 +5320,7 @@ if the <samp>-u</samp> option is supplied.
 </p>
 </dd>
 <dt><code>type</code></dt>
-<dd><a name="index-type"></a>
+<dd><span id="index-type"></span>
 <div class="example">
 <pre class="example">type [-afptP] [<var>name</var> &hellip;]
 </pre></div>
@@ -5277,7 +5359,7 @@ if any are not found.
 </p>
 </dd>
 <dt><code>typeset</code></dt>
-<dd><a name="index-typeset"></a>
+<dd><span id="index-typeset"></span>
 <div class="example">
 <pre class="example">typeset [-afFgrxilnrtux] [-p] [<var>name</var>[=<var>value</var>] &hellip;]
 </pre></div>
@@ -5288,9 +5370,10 @@ It is a synonym for the <code>declare</code> builtin command.
 </p>
 </dd>
 <dt><code>ulimit</code></dt>
-<dd><a name="index-ulimit"></a>
+<dd><span id="index-ulimit"></span>
 <div class="example">
-<pre class="example">ulimit [-HSabcdefiklmnpqrstuvxPT] [<var>limit</var>]
+<pre class="example">ulimit [-HS] -a
+ulimit [-HS] [-bcdefiklmnpqrstuvxPRT] [<var>limit</var>]
 </pre></div>
 
 <p><code>ulimit</code> provides control over the resources available to processes
@@ -5307,7 +5390,7 @@ option is given, it is interpreted as follows:
 </p>
 </dd>
 <dt><code>-a</code></dt>
-<dd><p>All current limits are reported.
+<dd><p>All current limits are reported; no limits are set.
 </p>
 </dd>
 <dt><code>-b</code></dt>
@@ -5356,7 +5439,7 @@ allow this value to be set).
 </p>
 </dd>
 <dt><code>-q</code></dt>
-<dd><p>The maximum number of bytes in POSIX message queues.
+<dd><p>The maximum number of bytes in <small>POSIX</small> message queues.
 </p>
 </dd>
 <dt><code>-r</code></dt>
@@ -5388,6 +5471,10 @@ some systems, to its children.
 <dd><p>The maximum number of pseudoterminals.
 </p>
 </dd>
+<dt><code>-R</code></dt>
+<dd><p>The maximum time a real-time process can run before blocking, in microseconds.
+</p>
+</dd>
 <dt><code>-T</code></dt>
 <dd><p>The maximum number of threads.
 </p></dd>
@@ -5402,11 +5489,16 @@ A hard limit cannot be increased by a non-root user once it is set;
 a soft limit may be increased up to the value of the hard limit.
 Otherwise, the current value of the soft limit for the specified resource
 is printed, unless the <samp>-H</samp> option is supplied.
+When more than one
+resource is specified, the limit name and unit, if appropriate,
+are printed before the value.
 When setting new limits, if neither <samp>-H</samp> nor <samp>-S</samp> is supplied,
 both the hard and soft limits are set.
 If no option is given, then <samp>-f</samp> is assumed.  Values are in 1024-byte
-increments, except for <samp>-t</samp>, which is in seconds; <samp>-p</samp>,
-which is in units of 512-byte blocks;
+increments, except for
+<samp>-t</samp>, which is in seconds;
+<samp>-R</samp>, which is in microseconds;
+<samp>-p</samp>, which is in units of 512-byte blocks;
 <samp>-P</samp>,
 <samp>-T</samp>,
 <samp>-b</samp>,
@@ -5420,7 +5512,7 @@ or an error occurs while setting a new limit.
 </p>
 </dd>
 <dt><code>unalias</code></dt>
-<dd><a name="index-unalias"></a>
+<dd><span id="index-unalias"></span>
 <div class="example">
 <pre class="example">unalias [-a] [<var>name</var> &hellip; ]
 </pre></div>
@@ -5432,30 +5524,26 @@ Aliases are described in <a href="#Aliases">Aliases</a>.
 </dl>
 
 <hr>
-<a name="Modifying-Shell-Behavior"></a>
-<div class="header">
+<span id="Modifying-Shell-Behavior"></span><div class="header">
 <p>
 Next: <a href="#Special-Builtins" accesskey="n" rel="next">Special Builtins</a>, Previous: <a href="#Bash-Builtins" accesskey="p" rel="prev">Bash Builtins</a>, Up: <a href="#Shell-Builtin-Commands" accesskey="u" rel="up">Shell Builtin Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Modifying-Shell-Behavior-1"></a>
-<h3 class="section">4.3 Modifying Shell Behavior</h3>
+<span id="Modifying-Shell-Behavior-1"></span><h3 class="section">4.3 Modifying Shell Behavior</h3>
  
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#The-Set-Builtin" accesskey="1">The Set Builtin</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Change the values of shell attributes and
+<tr><td align="left" valign="top">&bull; <a href="#The-Set-Builtin" accesskey="1">The Set Builtin</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Change the values of shell attributes and
 				positional parameters.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#The-Shopt-Builtin" accesskey="2">The Shopt Builtin</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Modify shell optional behavior.
+<tr><td align="left" valign="top">&bull; <a href="#The-Shopt-Builtin" accesskey="2">The Shopt Builtin</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Modify shell optional behavior.
 </td></tr>
 </table>
 
 <hr>
-<a name="The-Set-Builtin"></a>
-<div class="header">
+<span id="The-Set-Builtin"></span><div class="header">
 <p>
 Next: <a href="#The-Shopt-Builtin" accesskey="n" rel="next">The Shopt Builtin</a>, Up: <a href="#Modifying-Shell-Behavior" accesskey="u" rel="up">Modifying Shell Behavior</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="The-Set-Builtin-1"></a>
-<h4 class="subsection">4.3.1 The Set Builtin</h4>
+<span id="The-Set-Builtin-1"></span><h4 class="subsection">4.3.1 The Set Builtin</h4>
 
 <p>This builtin is so complicated that it deserves its own section.  <code>set</code>
 allows you to change the values of shell options and set the positional
@@ -5463,7 +5551,7 @@ parameters, or to display the names and values of shell variables.
 </p>
 <dl compact="compact">
 <dt><code>set</code></dt>
-<dd><a name="index-set"></a>
+<dd><span id="index-set"></span>
 <div class="example">
 <pre class="example">set [--abefhkmnptuvxBCEHPT] [-o <var>option-name</var>] [<var>argument</var> &hellip;]
 set [+abefhkmnptuvxBCEHPT] [+o <var>option-name</var>] [<var>argument</var> &hellip;]
@@ -5794,19 +5882,17 @@ The special parameter <code>#</code> is set to N.
 </dl>
 
 <hr>
-<a name="The-Shopt-Builtin"></a>
-<div class="header">
+<span id="The-Shopt-Builtin"></span><div class="header">
 <p>
 Previous: <a href="#The-Set-Builtin" accesskey="p" rel="prev">The Set Builtin</a>, Up: <a href="#Modifying-Shell-Behavior" accesskey="u" rel="up">Modifying Shell Behavior</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="The-Shopt-Builtin-1"></a>
-<h4 class="subsection">4.3.2 The Shopt Builtin</h4>
+<span id="The-Shopt-Builtin-1"></span><h4 class="subsection">4.3.2 The Shopt Builtin</h4>
 
 <p>This builtin allows you to change additional shell optional behavior.
 </p>
 <dl compact="compact">
 <dt><code>shopt</code></dt>
-<dd><a name="index-shopt"></a>
+<dd><span id="index-shopt"></span>
 <div class="example">
 <pre class="example">shopt [-pqsu] [-o] [<var>optname</var> &hellip;]
 </pre></div>
@@ -5816,7 +5902,8 @@ The settings can be either those listed below, or, if the
 <samp>-o</samp> option is used, those available with the <samp>-o</samp>
 option to the <code>set</code> builtin command (see <a href="#The-Set-Builtin">The Set Builtin</a>).
 With no options, or with the <samp>-p</samp> option, a list of all settable
-options is displayed, with an indication of whether or not each is set.
+options is displayed, with an indication of whether or not each is set;
+if <var>optnames</var> are supplied, the output is restricted to those options.
 The <samp>-p</samp> option causes output to be displayed in a form that
 may be reused as input.
 Other options have the following meanings:
@@ -5859,6 +5946,13 @@ option.
 </p>
 <p>The list of <code>shopt</code> options is:
 </p><dl compact="compact">
+<dt><code>assoc_expand_once</code></dt>
+<dd><p>If set, the shell suppresses multiple evaluation of associative array
+subscripts during arithmetic expression evaluation, while executing
+builtins that can perform variable assignments,
+and while executing builtins that perform array dereferencing.
+</p>
+</dd>
 <dt><code>autocd</code></dt>
 <dd><p>If set, a command name that is the name of a directory is executed as if
 it were the argument to the <code>cd</code> command.
@@ -5896,9 +5990,10 @@ The shell always postpones exiting if any jobs are stopped.
 </p>
 </dd>
 <dt><code>checkwinsize</code></dt>
-<dd><p>If set, Bash checks the window size after each command
- and, if necessary, updates the values of    
+<dd><p>If set, Bash checks the window size after each external (non-builtin)
+command and, if necessary, updates the values of    
 <code>LINES</code> and <code>COLUMNS</code>.
+This option is enabled by default.
 </p>
 </dd>
 <dt><code>cmdhist</code></dt>
@@ -5906,64 +6001,19 @@ The shell always postpones exiting if any jobs are stopped.
 attempts to save all lines of a multiple-line
 command in the same history entry.  This allows
 easy re-editing of multi-line commands.
+This option is enabled by default, but only has an effect if command
+history is enabled (see <a href="#Bash-History-Facilities">Bash History Facilities</a>).
 </p>
 </dd>
 <dt><code>compat31</code></dt>
-<dd><p>If set, Bash
-changes its behavior to that of version 3.1 with respect to quoted
-arguments to the conditional command&rsquo;s &lsquo;<samp>=~</samp>&rsquo; operator
-and with respect to locale-specific
-string comparison when using the <code>[[</code>
-conditional command&rsquo;s &lsquo;<samp>&lt;</samp>&rsquo; and &lsquo;<samp>&gt;</samp>&rsquo; operators.
-Bash versions prior to bash-4.1 use ASCII collation and strcmp(3);
-bash-4.1 and later use the current locale&rsquo;s collation sequence and strcoll(3).
-</p>
-</dd>
 <dt><code>compat32</code></dt>
-<dd><p>If set, Bash
-changes its behavior to that of version 3.2 with respect to locale-specific
-string comparison when using the <code>[[</code>
-conditional command&rsquo;s &lsquo;<samp>&lt;</samp>&rsquo; and &lsquo;<samp>&gt;</samp>&rsquo; operators (see previous item)
-and the effect of interrupting a command list.
-Bash versions 3.2 and earlier continue with the next command in the list
-after one terminates due to an interrupt.
-</p>
-</dd>
 <dt><code>compat40</code></dt>
-<dd><p>If set, Bash
-changes its behavior to that of version 4.0 with respect to locale-specific
-string comparison when using the <code>[[</code>
-conditional command&rsquo;s &lsquo;<samp>&lt;</samp>&rsquo; and &lsquo;<samp>&gt;</samp>&rsquo; operators (see description
-of <code>compat31</code>)
-and the effect of interrupting a command list.
-Bash versions 4.0 and later interrupt the list as if the shell received the
-interrupt; previous versions continue with the next command in the list.
-</p>
-</dd>
 <dt><code>compat41</code></dt>
-<dd><p>If set, Bash, when in <small>POSIX</small> mode, treats a single quote in a double-quoted
-parameter expansion as a special character.  The single quotes must match
-(an even number) and the characters between the single quotes are considered
-quoted.  This is the behavior of <small>POSIX</small> mode through version 4.1.
-The default Bash behavior remains as in previous versions.
-</p>
-</dd>
 <dt><code>compat42</code></dt>
-<dd><p>If set, Bash
-does not process the replacement string in the pattern substitution word
-expansion using quote removal.
-</p>
-</dd>
 <dt><code>compat43</code></dt>
-<dd><p>If set, Bash
-does not print a warning message if an attempt is made to use a quoted compound
-array assignment as an argument to <code>declare</code>,
-makes word expansion errors
-non-fatal errors that cause the current command to fail (the default behavior is
-to make them fatal errors that cause the shell to exit),
-and does not reset the
-loop state when a shell function is executed (this allows <code>break</code> or
-<code>continue</code> in a shell function to affect loops in the caller&rsquo;s context).
+<dt><code>compat44</code></dt>
+<dd><p>These control aspects of the shell&rsquo;s compatibility mode
+(see <a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a>).
 </p>
 </dd>
 <dt><code>complete_fullquote</code></dt>
@@ -6001,6 +6051,8 @@ if the directory name initially supplied does not exist.
 <dt><code>dotglob</code></dt>
 <dd><p>If set, Bash includes filenames beginning with a &lsquo;.&rsquo; in
 the results of filename expansion.
+The filenames &lsquo;<samp>.</samp>&rsquo; and &lsquo;<samp>..</samp>&rsquo; must always be matched explicitly,
+even if <code>dotglob</code> is set.
 </p>
 </dd>
 <dt><code>execfail</code></dt>
@@ -6017,7 +6069,9 @@ This option is enabled by default for interactive shells.
 </p>
 </dd>
 <dt><code>extdebug</code></dt>
-<dd><p>If set at shell invocation, arrange to execute the debugger profile
+<dd><p>If set at shell invocation,
+or in a shell startup file,
+arrange to execute the debugger profile
 before the shell starts, identical to the <samp>--debugger</samp> option.
 If set after invocation, behavior intended for use by debuggers is enabled:
 </p>
@@ -6148,6 +6202,19 @@ option is enabled, multi-line commands are saved to the history with
 embedded newlines rather than using semicolon separators where possible.
 </p>
 </dd>
+<dt><code>localvar_inherit</code></dt>
+<dd><p>If set, local variables inherit the value and attributes of a variable of
+the same name that exists at a previous scope before any new value is
+assigned.  The <var>nameref</var> attribute is not inherited.
+</p>
+</dd>
+<dt><code>localvar_unset</code></dt>
+<dd><p>If set, calling <code>unset</code> on local variables in previous function scopes
+marks them so subsequent lookups find them unset until that function
+returns. This is identical to the behavior of unsetting local variables
+at the current function scope.
+</p>
+</dd>
 <dt><code>login_shell</code></dt>
 <dd><p>The shell sets this option if it is started as a login shell
 (see <a href="#Invoking-Bash">Invoking Bash</a>).
@@ -6190,6 +6257,13 @@ files to expand to a null string, rather than themselves.
 This option is enabled by default.
 </p>
 </dd>
+<dt><code>progcomp_alias</code></dt>
+<dd><p>If set, and programmable completion is enabled, Bash treats a command
+name that doesn&rsquo;t have any completions as a possible alias and attempts
+alias expansion. If it has an alias, Bash attempts programmable
+completion using the command word resulting from the expanded alias.
+</p>
+</dd>
 <dt><code>promptvars</code></dt>
 <dd><p>If set, prompt strings undergo
 parameter expansion, command substitution, arithmetic
@@ -6224,23 +6298,16 @@ by default.
 </p>
 </dd>
 </dl>
-
-<p>The return status when listing options is zero if all <var>optnames</var>
-are enabled, non-zero otherwise.
-When setting or unsetting options, the return status is zero unless an
-<var>optname</var> is not a valid shell option.
-</p></dd>
+</dd>
 </dl>
 
 <hr>
-<a name="Special-Builtins"></a>
-<div class="header">
+<span id="Special-Builtins"></span><div class="header">
 <p>
 Previous: <a href="#Modifying-Shell-Behavior" accesskey="p" rel="prev">Modifying Shell Behavior</a>, Up: <a href="#Shell-Builtin-Commands" accesskey="u" rel="up">Shell Builtin Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Special-Builtins-1"></a>
-<h3 class="section">4.4 Special Builtins</h3>
-<a name="index-special-builtin-1"></a>
+<span id="Special-Builtins-1"></span><h3 class="section">4.4 Special Builtins</h3>
+<span id="index-special-builtin-1"></span>
 
 <p>For historical reasons, the <small>POSIX</small> standard has classified
 several builtin commands as <em>special</em>.
@@ -6267,19 +6334,17 @@ shift trap unset<!-- /@w -->
 </pre></div>
 
 <hr>
-<a name="Shell-Variables"></a>
-<div class="header">
+<span id="Shell-Variables"></span><div class="header">
 <p>
 Next: <a href="#Bash-Features" accesskey="n" rel="next">Bash Features</a>, Previous: <a href="#Shell-Builtin-Commands" accesskey="p" rel="prev">Shell Builtin Commands</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Variables-1"></a>
-<h2 class="chapter">5 Shell Variables</h2>
+<span id="Shell-Variables-1"></span><h2 class="chapter">5 Shell Variables</h2>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Bourne-Shell-Variables" accesskey="1">Bourne Shell Variables</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables which Bash uses in the same way
+<tr><td align="left" valign="top">&bull; <a href="#Bourne-Shell-Variables" accesskey="1">Bourne Shell Variables</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables which Bash uses in the same way
 				as the Bourne Shell.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-Variables" accesskey="2">Bash Variables</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">List of variables that exist in Bash.
+<tr><td align="left" valign="top">&bull; <a href="#Bash-Variables" accesskey="2">Bash Variables</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">List of variables that exist in Bash.
 </td></tr>
 </table>
 
@@ -6287,27 +6352,25 @@ Next: <a href="#Bash-Features" accesskey="n" rel="next">Bash Features</a>, Previ
 Bash automatically assigns default values to a number of variables.
 </p>
 <hr>
-<a name="Bourne-Shell-Variables"></a>
-<div class="header">
+<span id="Bourne-Shell-Variables"></span><div class="header">
 <p>
 Next: <a href="#Bash-Variables" accesskey="n" rel="next">Bash Variables</a>, Up: <a href="#Shell-Variables" accesskey="u" rel="up">Shell Variables</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bourne-Shell-Variables-1"></a>
-<h3 class="section">5.1 Bourne Shell Variables</h3>
+<span id="Bourne-Shell-Variables-1"></span><h3 class="section">5.1 Bourne Shell Variables</h3>
 
 <p>Bash uses certain shell variables in the same way as the Bourne shell.
 In some cases, Bash assigns a default value to the variable.
 </p>
 <dl compact="compact">
 <dt><code>CDPATH</code>
-<a name="index-CDPATH"></a>
+<span id="index-CDPATH"></span>
 </dt>
 <dd><p>A colon-separated list of directories used as a search path for
 the <code>cd</code> builtin command.
 </p>
 </dd>
 <dt><code>HOME</code>
-<a name="index-HOME"></a>
+<span id="index-HOME"></span>
 </dt>
 <dd><p>The current user&rsquo;s home directory; the default for the <code>cd</code> builtin
 command.
@@ -6316,14 +6379,14 @@ The value of this variable is also used by tilde expansion
 </p>
 </dd>
 <dt><code>IFS</code>
-<a name="index-IFS"></a>
+<span id="index-IFS"></span>
 </dt>
 <dd><p>A list of characters that separate fields; used when the shell splits
 words as part of expansion.
 </p>
 </dd>
 <dt><code>MAIL</code>
-<a name="index-MAIL"></a>
+<span id="index-MAIL"></span>
 </dt>
 <dd><p>If this parameter is set to a filename or directory name
 and the <code>MAILPATH</code> variable
@@ -6332,7 +6395,7 @@ the specified file or Maildir-format directory.
 </p>
 </dd>
 <dt><code>MAILPATH</code>
-<a name="index-MAILPATH"></a>
+<span id="index-MAILPATH"></span>
 </dt>
 <dd><p>A colon-separated list of filenames which the shell periodically checks
 for new mail.
@@ -6344,19 +6407,19 @@ the current mail file.
 </p>
 </dd>
 <dt><code>OPTARG</code>
-<a name="index-OPTARG"></a>
+<span id="index-OPTARG"></span>
 </dt>
 <dd><p>The value of the last option argument processed by the <code>getopts</code> builtin.
 </p>
 </dd>
 <dt><code>OPTIND</code>
-<a name="index-OPTIND"></a>
+<span id="index-OPTIND"></span>
 </dt>
 <dd><p>The index of the last option argument processed by the <code>getopts</code> builtin.
 </p>
 </dd>
 <dt><code>PATH</code>
-<a name="index-PATH"></a>
+<span id="index-PATH"></span>
 </dt>
 <dd><p>A colon-separated list of directories in which the shell looks for
 commands.
@@ -6367,7 +6430,7 @@ or trailing colon.
 </p>
 </dd>
 <dt><code>PS1</code>
-<a name="index-PS1"></a>
+<span id="index-PS1"></span>
 </dt>
 <dd><p>The primary prompt string.  The default value is &lsquo;<samp>\s-\v\$ </samp>&rsquo;.
 See <a href="#Controlling-the-Prompt">Controlling the Prompt</a>, for the complete list of escape
@@ -6375,21 +6438,21 @@ sequences that are expanded before <code>PS1</code> is displayed.
 </p>
 </dd>
 <dt><code>PS2</code>
-<a name="index-PS2"></a>
+<span id="index-PS2"></span>
 </dt>
 <dd><p>The secondary prompt string.  The default value is &lsquo;<samp>&gt; </samp>&rsquo;.
+<code>PS2</code> is expanded in the same way as <code>PS1</code> before being
+displayed.
 </p>
 </dd>
 </dl>
 
 <hr>
-<a name="Bash-Variables"></a>
-<div class="header">
+<span id="Bash-Variables"></span><div class="header">
 <p>
 Previous: <a href="#Bourne-Shell-Variables" accesskey="p" rel="prev">Bourne Shell Variables</a>, Up: <a href="#Shell-Variables" accesskey="u" rel="up">Shell Variables</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Variables-1"></a>
-<h3 class="section">5.2 Bash Variables</h3>
+<span id="Bash-Variables-1"></span><h3 class="section">5.2 Bash Variables</h3>
 
 <p>These variables are set or used by Bash, but other shells
 do not normally treat them specially.
@@ -6399,14 +6462,29 @@ variables for controlling the job control facilities
 (see <a href="#Job-Control-Variables">Job Control Variables</a>).
 </p>
 <dl compact="compact">
+<dt><code>_</code>
+<span id="index-_005f"></span>
+</dt>
+<dd><span id="index-_0024_005f"></span>
+<p>($_, an underscore.)
+At shell startup, set to the pathname used to invoke the
+shell or shell script being executed as passed in the environment
+or argument list.
+Subsequently, expands to the last argument to the previous simple
+command executed in the foreground, after expansion. 
+Also set to the full pathname used to invoke each command executed
+and placed in the environment exported to that command.
+When checking mail, this parameter holds the name of the mail file.
+</p>
+</dd>
 <dt><code>BASH</code>
-<a name="index-BASH"></a>
+<span id="index-BASH"></span>
 </dt>
 <dd><p>The full pathname used to execute the current instance of Bash.
 </p>
 </dd>
 <dt><code>BASHOPTS</code>
-<a name="index-BASHOPTS"></a>
+<span id="index-BASHOPTS"></span>
 </dt>
 <dd><p>A colon-separated list of enabled shell options.  Each word in
 the list is a valid argument for the <samp>-s</samp> option to the
@@ -6419,15 +6497,19 @@ reading any startup files.  This variable is readonly.
 </p>
 </dd>
 <dt><code>BASHPID</code>
-<a name="index-BASHPID"></a>
+<span id="index-BASHPID"></span>
 </dt>
 <dd><p>Expands to the process ID of the current Bash process.
 This differs from <code>$$</code> under certain circumstances, such as subshells
 that do not require Bash to be re-initialized.
+Assignments to <code>BASHPID</code> have no effect.
+If <code>BASHPID</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_ALIASES</code>
-<a name="index-BASH_005fALIASES"></a>
+<span id="index-BASH_005fALIASES"></span>
 </dt>
 <dd><p>An associative array variable whose members correspond to the internal
 list of aliases as maintained by the <code>alias</code> builtin.
@@ -6441,7 +6523,7 @@ subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_ARGC</code>
-<a name="index-BASH_005fARGC"></a>
+<span id="index-BASH_005fARGC"></span>
 </dt>
 <dd><p>An array variable whose values are the number of parameters in each
 frame of the current bash execution call stack.  The number of
@@ -6453,10 +6535,13 @@ The shell sets <code>BASH_ARGC</code> only when in extended debugging mode
 (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>
 for a description of the <code>extdebug</code> option to the <code>shopt</code>
 builtin).
+Setting <code>extdebug</code> after the shell has started to execute a script,
+or referencing this variable when <code>extdebug</code> is not set,
+may result in inconsistent values.
 </p>
 </dd>
 <dt><code>BASH_ARGV</code>
-<a name="index-BASH_005fARGV"></a>
+<span id="index-BASH_005fARGV"></span>
 </dt>
 <dd><p>An array variable containing all of the parameters in the current bash
 execution call stack.  The final parameter of the last subroutine call
@@ -6467,10 +6552,26 @@ The shell sets <code>BASH_ARGV</code> only when in extended debugging mode
 (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>
 for a description of the <code>extdebug</code> option to the <code>shopt</code>
 builtin).
+Setting <code>extdebug</code> after the shell has started to execute a script,
+or referencing this variable when <code>extdebug</code> is not set,
+may result in inconsistent values.
+</p>
+</dd>
+<dt><code>BASH_ARGV0</code>
+<span id="index-BASH_005fARGV0"></span>
+</dt>
+<dd><p>When referenced, this variable expands to the name of the shell or shell
+script (identical to <code>$0</code>; See <a href="#Special-Parameters">Special Parameters</a>,
+for the description of special parameter 0).
+Assignment to <code>BASH_ARGV0</code>
+causes the value assigned to also be assigned to <code>$0</code>.
+If <code>BASH_ARGV0</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_CMDS</code>
-<a name="index-BASH_005fCMDS"></a>
+<span id="index-BASH_005fCMDS"></span>
 </dt>
 <dd><p>An associative array variable whose members correspond to the internal
 hash table of commands as maintained by the <code>hash</code> builtin
@@ -6484,19 +6585,22 @@ subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_COMMAND</code>
-<a name="index-BASH_005fCOMMAND"></a>
+<span id="index-BASH_005fCOMMAND"></span>
 </dt>
 <dd><p>The command currently being executed or about to be executed, unless the
 shell is executing a command as the result of a trap,
 in which case it is the command executing at the time of the trap.
+If <code>BASH_COMMAND</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_COMPAT</code>
-<a name="index-BASH_005fCOMPAT"></a>
+<span id="index-BASH_005fCOMPAT"></span>
 </dt>
 <dd><p>The value is used to set the shell&rsquo;s compatibility level.
-See <a href="#The-Shopt-Builtin">The Shopt Builtin</a>, for a description of the various compatibility
-levels and their effects.
+See <a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a>, for a description of the various
+compatibility levels and their effects.
 The value may be a decimal number (e.g., 4.2) or an integer (e.g., 42)
 corresponding to the desired compatibility level.
 If <code>BASH_COMPAT</code> is unset or set to the empty string, the compatibility
@@ -6504,14 +6608,16 @@ level is set to the default for the current version.
 If <code>BASH_COMPAT</code> is set to a value that is not one of the valid
 compatibility levels, the shell prints an error message and sets the
 compatibility level to the default for the current version.
-The valid compatibility levels correspond to the compatibility options
-accepted by the <code>shopt</code> builtin described above (for example,
-<var>compat42</var> means that 4.2 and 42 are valid values).
+The valid values correspond to the compatibility levels
+described below (see <a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a>).
+For example, 4.2 and 42 are valid values that correspond
+to the <code>compat42</code> <code>shopt</code> option
+and set the compatibility level to 42.
 The current version is also a valid value.
 </p>
 </dd>
 <dt><code>BASH_ENV</code>
-<a name="index-BASH_005fENV"></a>
+<span id="index-BASH_005fENV"></span>
 </dt>
 <dd><p>If this variable is set when Bash is invoked to execute a shell
 script, its value is expanded and used as the name of a startup file
@@ -6519,13 +6625,13 @@ to read before executing the script.  See <a href="#Bash-Startup-Files">Bash Sta
 </p>
 </dd>
 <dt><code>BASH_EXECUTION_STRING</code>
-<a name="index-BASH_005fEXECUTION_005fSTRING"></a>
+<span id="index-BASH_005fEXECUTION_005fSTRING"></span>
 </dt>
 <dd><p>The command argument to the <samp>-c</samp> invocation option.
 </p>
 </dd>
 <dt><code>BASH_LINENO</code>
-<a name="index-BASH_005fLINENO"></a>
+<span id="index-BASH_005fLINENO"></span>
 </dt>
 <dd><p>An array variable whose members are the line numbers in source files
 where each corresponding member of <var>FUNCNAME</var> was invoked.
@@ -6537,7 +6643,7 @@ Use <code>LINENO</code> to obtain the current line number.
 </p>
 </dd>
 <dt><code>BASH_LOADABLES_PATH</code>
-<a name="index-BASH_005fLOADABLES_005fPATH"></a>
+<span id="index-BASH_005fLOADABLES_005fPATH"></span>
 </dt>
 <dd><p>A colon-separated list of directories in which the shell looks for
 dynamically loadable builtins specified by the
@@ -6545,7 +6651,7 @@ dynamically loadable builtins specified by the
 </p>
 </dd>
 <dt><code>BASH_REMATCH</code>
-<a name="index-BASH_005fREMATCH"></a>
+<span id="index-BASH_005fREMATCH"></span>
 </dt>
 <dd><p>An array variable whose members are assigned by the &lsquo;<samp>=~</samp>&rsquo; binary
 operator to the <code>[[</code> conditional command
@@ -6554,11 +6660,10 @@ The element with index 0 is the portion of the string
 matching the entire regular expression.
 The element with index <var>n</var> is the portion of the
 string matching the <var>n</var>th parenthesized subexpression.
-This variable is read-only.
 </p>
 </dd>
 <dt><code>BASH_SOURCE</code>
-<a name="index-BASH_005fSOURCE"></a>
+<span id="index-BASH_005fSOURCE"></span>
 </dt>
 <dd><p>An array variable whose members are the source filenames where the
 corresponding shell function names in the <code>FUNCNAME</code> array
@@ -6568,15 +6673,18 @@ The shell function <code>${FUNCNAME[$i]}</code> is defined in the file
 </p>
 </dd>
 <dt><code>BASH_SUBSHELL</code>
-<a name="index-BASH_005fSUBSHELL"></a>
+<span id="index-BASH_005fSUBSHELL"></span>
 </dt>
 <dd><p>Incremented by one within each subshell or subshell environment when
 the shell begins executing in that environment.
 The initial value is 0.
+If <code>BASH_SUBSHELL</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>BASH_VERSINFO</code>
-<a name="index-BASH_005fVERSINFO"></a>
+<span id="index-BASH_005fVERSINFO"></span>
 </dt>
 <dd><p>A readonly array variable (see <a href="#Arrays">Arrays</a>)
 whose members hold version information for this instance of Bash.
@@ -6610,13 +6718,13 @@ The values assigned to the array members are as follows:
 
 </dd>
 <dt><code>BASH_VERSION</code>
-<a name="index-BASH_005fVERSION"></a>
+<span id="index-BASH_005fVERSION"></span>
 </dt>
 <dd><p>The version number of the current instance of Bash.
 </p>
 </dd>
 <dt><code>BASH_XTRACEFD</code>
-<a name="index-BASH_005fXTRACEFD"></a>
+<span id="index-BASH_005fXTRACEFD"></span>
 </dt>
 <dd><p>If set to an integer corresponding to a valid file descriptor, Bash
 will write the trace output generated when &lsquo;<samp>set -x</samp>&rsquo;
@@ -6633,7 +6741,7 @@ being closed.
 </p>
 </dd>
 <dt><code>CHILD_MAX</code>
-<a name="index-CHILD_005fMAX"></a>
+<span id="index-CHILD_005fMAX"></span>
 </dt>
 <dd><p>Set the number of exited child status values for the shell to remember.
 Bash will not allow this value to be decreased below a <small>POSIX</small>-mandated
@@ -6643,7 +6751,7 @@ The minimum value is system-dependent.
 </p>
 </dd>
 <dt><code>COLUMNS</code>
-<a name="index-COLUMNS"></a>
+<span id="index-COLUMNS"></span>
 </dt>
 <dd><p>Used by the <code>select</code> command to determine the terminal width
 when printing selection lists.
@@ -6653,7 +6761,7 @@ Automatically set if the <code>checkwinsize</code> option is enabled
 </p>
 </dd>
 <dt><code>COMP_CWORD</code>
-<a name="index-COMP_005fCWORD"></a>
+<span id="index-COMP_005fCWORD"></span>
 </dt>
 <dd><p>An index into <code>${COMP_WORDS}</code> of the word containing the current
 cursor position.
@@ -6662,7 +6770,7 @@ programmable completion facilities (see <a href="#Programmable-Completion">Progr
 </p>
 </dd>
 <dt><code>COMP_LINE</code>
-<a name="index-COMP_005fLINE"></a>
+<span id="index-COMP_005fLINE"></span>
 </dt>
 <dd><p>The current command line.
 This variable is available only in shell functions and external
@@ -6671,7 +6779,7 @@ programmable completion facilities (see <a href="#Programmable-Completion">Progr
 </p>
 </dd>
 <dt><code>COMP_POINT</code>
-<a name="index-COMP_005fPOINT"></a>
+<span id="index-COMP_005fPOINT"></span>
 </dt>
 <dd><p>The index of the current cursor position relative to the beginning of
 the current command.
@@ -6683,7 +6791,7 @@ programmable completion facilities (see <a href="#Programmable-Completion">Progr
 </p>
 </dd>
 <dt><code>COMP_TYPE</code>
-<a name="index-COMP_005fTYPE"></a>
+<span id="index-COMP_005fTYPE"></span>
 </dt>
 <dd><p>Set to an integer value corresponding to the type of completion attempted
 that caused a completion function to be called:
@@ -6699,23 +6807,24 @@ programmable completion facilities (see <a href="#Programmable-Completion">Progr
 </p>
 </dd>
 <dt><code>COMP_KEY</code>
-<a name="index-COMP_005fKEY"></a>
+<span id="index-COMP_005fKEY"></span>
 </dt>
 <dd><p>The key (or final key of a key sequence) used to invoke the current
 completion function.
 </p>
 </dd>
 <dt><code>COMP_WORDBREAKS</code>
-<a name="index-COMP_005fWORDBREAKS"></a>
+<span id="index-COMP_005fWORDBREAKS"></span>
 </dt>
 <dd><p>The set of characters that the Readline library treats as word
 separators when performing word completion.
-If <code>COMP_WORDBREAKS</code> is unset, it loses its special properties,
+If <code>COMP_WORDBREAKS</code>
+is unset, it loses its special properties,
 even if it is subsequently reset.
 </p>
 </dd>
 <dt><code>COMP_WORDS</code>
-<a name="index-COMP_005fWORDS"></a>
+<span id="index-COMP_005fWORDS"></span>
 </dt>
 <dd><p>An array variable consisting of the individual
 words in the current command line.
@@ -6726,7 +6835,7 @@ programmable completion facilities (see <a href="#Programmable-Completion">Progr
 </p>
 </dd>
 <dt><code>COMPREPLY</code>
-<a name="index-COMPREPLY"></a>
+<span id="index-COMPREPLY"></span>
 </dt>
 <dd><p>An array variable from which Bash reads the possible completions
 generated by a shell function invoked by the programmable completion
@@ -6735,14 +6844,14 @@ Each array element contains one possible completion.
 </p>
 </dd>
 <dt><code>COPROC</code>
-<a name="index-COPROC"></a>
+<span id="index-COPROC"></span>
 </dt>
 <dd><p>An array variable created to hold the file descriptors
 for output from and input to an unnamed coprocess (see <a href="#Coprocesses">Coprocesses</a>).
 </p>
 </dd>
 <dt><code>DIRSTACK</code>
-<a name="index-DIRSTACK"></a>
+<span id="index-DIRSTACK"></span>
 </dt>
 <dd><p>An array variable containing the current contents of the directory stack.
 Directories appear in the stack in the order they are displayed by the
@@ -6751,12 +6860,13 @@ Assigning to members of this array variable may be used to modify
 directories already in the stack, but the <code>pushd</code> and <code>popd</code>
 builtins must be used to add and remove directories.
 Assignment to this variable will not change the current directory.
-If <code>DIRSTACK</code> is unset, it loses its special properties, even if
+If <code>DIRSTACK</code>
+is unset, it loses its special properties, even if
 it is subsequently reset.
 </p>
 </dd>
 <dt><code>EMACS</code>
-<a name="index-EMACS"></a>
+<span id="index-EMACS"></span>
 </dt>
 <dd><p>If Bash finds this variable in the environment when the shell
 starts with value &lsquo;<samp>t</samp>&rsquo;, it assumes that the shell is running in an
@@ -6764,21 +6874,48 @@ Emacs shell buffer and disables line editing.
 </p>
 </dd>
 <dt><code>ENV</code>
-<a name="index-ENV"></a>
+<span id="index-ENV"></span>
 </dt>
-<dd><p>Similar to <code>BASH_ENV</code>; used when the shell is invoked in
+<dd><p>Expanded and executed similarlty to <code>BASH_ENV</code>
+(see <a href="#Bash-Startup-Files">Bash Startup Files</a>)
+when an interactive shell is invoked in
 <small>POSIX</small> Mode (see <a href="#Bash-POSIX-Mode">Bash POSIX Mode</a>).
 </p>
 </dd>
+<dt><code>EPOCHREALTIME</code>
+<span id="index-EPOCHREALTIME"></span>
+</dt>
+<dd><p>Each time this parameter is referenced, it expands to the number of seconds
+since the Unix Epoch as a floating point value with micro-second granularity
+(see the documentation for the C library function <var>time</var> for the
+definition of Epoch).
+Assignments to <code>EPOCHREALTIME</code> are ignored.
+If <code>EPOCHREALTIME</code>
+is unset, it loses its special properties, even if
+it is subsequently reset.
+</p>
+</dd>
+<dt><code>EPOCHSECONDS</code>
+<span id="index-EPOCHSECONDS"></span>
+</dt>
+<dd><p>Each time this parameter is referenced, it expands to the number of seconds
+since the Unix Epoch (see the documentation for the C library function
+<var>time</var> for the definition of Epoch).
+Assignments to <code>EPOCHSECONDS</code> are ignored.
+If <code>EPOCHSECONDS</code>
+is unset, it loses its special properties, even if
+it is subsequently reset.
+</p>
+</dd>
 <dt><code>EUID</code>
-<a name="index-EUID"></a>
+<span id="index-EUID"></span>
 </dt>
 <dd><p>The numeric effective user id of the current user.  This variable
 is readonly.
 </p>
 </dd>
 <dt><code>EXECIGNORE</code>
-<a name="index-EXECIGNORE"></a>
+<span id="index-EXECIGNORE"></span>
 </dt>
 <dd><p>A colon-separated list of shell patterns (see <a href="#Pattern-Matching">Pattern Matching</a>)
 defining the list of filenames to be ignored by command search using
@@ -6796,14 +6933,14 @@ option.
 </p>
 </dd>
 <dt><code>FCEDIT</code>
-<a name="index-FCEDIT"></a>
+<span id="index-FCEDIT"></span>
 </dt>
 <dd><p>The editor used as a default by the <samp>-e</samp> option to the <code>fc</code>
 builtin command.
 </p>
 </dd>
 <dt><code>FIGNORE</code>
-<a name="index-FIGNORE"></a>
+<span id="index-FIGNORE"></span>
 </dt>
 <dd><p>A colon-separated list of suffixes to ignore when performing
 filename completion.
@@ -6814,7 +6951,7 @@ value is &lsquo;<samp>.o:~</samp>&rsquo;
 </p>
 </dd>
 <dt><code>FUNCNAME</code>
-<a name="index-FUNCNAME"></a>
+<span id="index-FUNCNAME"></span>
 </dt>
 <dd><p>An array variable containing the names of all shell functions
 currently in the execution call stack.
@@ -6824,7 +6961,8 @@ The bottom-most element (the one with the highest index)
 is <code>&quot;main&quot;</code>.
 This variable exists only when a shell function is executing.
 Assignments to <code>FUNCNAME</code> have no effect.
-If <code>FUNCNAME</code> is unset, it loses its special properties, even if
+If <code>FUNCNAME</code>
+is unset, it loses its special properties, even if
 it is subsequently reset.
 </p>
 <p>This variable can be used with <code>BASH_LINENO</code> and <code>BASH_SOURCE</code>.
@@ -6837,7 +6975,7 @@ information.
 </p>
 </dd>
 <dt><code>FUNCNEST</code>
-<a name="index-FUNCNEST"></a>
+<span id="index-FUNCNEST"></span>
 </dt>
 <dd><p>If set to a numeric value greater than 0, defines a maximum function
 nesting level.  Function invocations that exceed this nesting level
@@ -6845,11 +6983,11 @@ will cause the current command to abort.
 </p>
 </dd>
 <dt><code>GLOBIGNORE</code>
-<a name="index-GLOBIGNORE"></a>
+<span id="index-GLOBIGNORE"></span>
 </dt>
-<dd><p>A colon-separated list of patterns defining the set of filenames to
+<dd><p>A colon-separated list of patterns defining the set of file names to
 be ignored by filename expansion.
-If a filename matched by a filename expansion pattern also matches one
+If a file name matched by a filename expansion pattern also matches one
 of the patterns in <code>GLOBIGNORE</code>, it is removed from the list
 of matches.
 The pattern matching honors the setting of the <code>extglob</code> shell
@@ -6857,17 +6995,18 @@ option.
 </p>
 </dd>
 <dt><code>GROUPS</code>
-<a name="index-GROUPS"></a>
+<span id="index-GROUPS"></span>
 </dt>
 <dd><p>An array variable containing the list of groups of which the current    
 user is a member.
 Assignments to <code>GROUPS</code> have no effect.
-If <code>GROUPS</code> is unset, it loses its special properties, even if it is
+If <code>GROUPS</code>
+is unset, it loses its special properties, even if it is
 subsequently reset.
 </p>
 </dd>
 <dt><code>histchars</code>
-<a name="index-histchars"></a>
+<span id="index-histchars"></span>
 </dt>
 <dd><p>Up to three characters which control history expansion, quick
 substitution, and tokenization (see <a href="#History-Interaction">History Interaction</a>).
@@ -6884,15 +7023,18 @@ parser to treat the rest of the line as a comment.
 </p>
 </dd>
 <dt><code>HISTCMD</code>
-<a name="index-HISTCMD"></a>
+<span id="index-HISTCMD"></span>
 </dt>
 <dd><p>The history number, or index in the history list, of the current
-command.  If <code>HISTCMD</code> is unset, it loses its special properties,
+command.
+Assignments to <code>HISTCMD</code> are ignored.
+If <code>HISTCMD</code>
+is unset, it loses its special properties,
 even if it is subsequently reset.
 </p>
 </dd>
 <dt><code>HISTCONTROL</code>
-<a name="index-HISTCONTROL"></a>
+<span id="index-HISTCONTROL"></span>
 </dt>
 <dd><p>A colon-separated list of values controlling how commands are saved on
 the history list.
@@ -6915,14 +7057,14 @@ not tested, and are added to the history regardless of the value of
 </p>
 </dd>
 <dt><code>HISTFILE</code>
-<a name="index-HISTFILE"></a>
+<span id="index-HISTFILE"></span>
 </dt>
 <dd><p>The name of the file to which the command history is saved.  The
 default value is <samp>~/.bash_history</samp>.
 </p>
 </dd>
 <dt><code>HISTFILESIZE</code>
-<a name="index-HISTFILESIZE"></a>
+<span id="index-HISTFILESIZE"></span>
 </dt>
 <dd><p>The maximum number of lines contained in the history file.
 When this variable is assigned a value, the history file is truncated,
@@ -6937,7 +7079,7 @@ after reading any startup files.
 </p>
 </dd>
 <dt><code>HISTIGNORE</code>
-<a name="index-HISTIGNORE"></a>
+<span id="index-HISTIGNORE"></span>
 </dt>
 <dd><p>A colon-separated list of patterns used to decide which command
 lines should be saved on the history list.  Each pattern is
@@ -6962,7 +7104,7 @@ provides the functionality of <code>ignoreboth</code>.
 </p>
 </dd>
 <dt><code>HISTSIZE</code>
-<a name="index-HISTSIZE"></a>
+<span id="index-HISTSIZE"></span>
 </dt>
 <dd><p>The maximum number of commands to remember on the history list.
 If the value is 0, commands are not saved in the history list.
@@ -6972,7 +7114,7 @@ The shell sets the default value to 500 after reading any startup files.
 </p>
 </dd>
 <dt><code>HISTTIMEFORMAT</code>
-<a name="index-HISTTIMEFORMAT"></a>
+<span id="index-HISTTIMEFORMAT"></span>
 </dt>
 <dd><p>If this variable is set and not null, its value is used as a format string
 for <var>strftime</var> to print the time stamp associated with each history
@@ -6984,7 +7126,7 @@ other history lines.
 </p>
 </dd>
 <dt><code>HOSTFILE</code>
-<a name="index-HOSTFILE"></a>
+<span id="index-HOSTFILE"></span>
 </dt>
 <dd><p>Contains the name of a file in the same format as <samp>/etc/hosts</samp> that
 should be read when the shell needs to complete a hostname.
@@ -7000,53 +7142,61 @@ When <code>HOSTFILE</code> is unset, the hostname list is cleared.
 </p>
 </dd>
 <dt><code>HOSTNAME</code>
-<a name="index-HOSTNAME"></a>
+<span id="index-HOSTNAME"></span>
 </dt>
 <dd><p>The name of the current host.
 </p>
 </dd>
 <dt><code>HOSTTYPE</code>
-<a name="index-HOSTTYPE"></a>
+<span id="index-HOSTTYPE"></span>
 </dt>
 <dd><p>A string describing the machine Bash is running on.
 </p>
 </dd>
 <dt><code>IGNOREEOF</code>
-<a name="index-IGNOREEOF"></a>
+<span id="index-IGNOREEOF"></span>
 </dt>
 <dd><p>Controls the action of the shell on receipt of an <code>EOF</code> character
 as the sole input.  If set, the value denotes the number
 of consecutive <code>EOF</code> characters that can be read as the
 first character on an input line
 before the shell will exit.  If the variable exists but does not
-have a numeric value (or has no value) then the default is 10.
+have a numeric value, or has no value, then the default is 10.
 If the variable does not exist, then <code>EOF</code> signifies the end of 
 input to the shell.  This is only in effect for interactive shells.
 </p>
 </dd>
 <dt><code>INPUTRC</code>
-<a name="index-INPUTRC"></a>
+<span id="index-INPUTRC"></span>
 </dt>
 <dd><p>The name of the Readline initialization file, overriding the default
 of <samp>~/.inputrc</samp>.
 </p>
 </dd>
+<dt><code>INSIDE_EMACS</code>
+<span id="index-INSIDE_005fEMACS"></span>
+</dt>
+<dd><p>If Bash finds this variable in the environment when the shell
+starts, it assumes that the shell is running in an Emacs shell buffer
+and may disable line editing depending on the value of <code>TERM</code>.
+</p>
+</dd>
 <dt><code>LANG</code>
-<a name="index-LANG"></a>
+<span id="index-LANG"></span>
 </dt>
 <dd><p>Used to determine the locale category for any category not specifically
 selected with a variable starting with <code>LC_</code>.
 </p>
 </dd>
 <dt><code>LC_ALL</code>
-<a name="index-LC_005fALL"></a>
+<span id="index-LC_005fALL"></span>
 </dt>
 <dd><p>This variable overrides the value of <code>LANG</code> and any other
 <code>LC_</code> variable specifying a locale category.
 </p>
 </dd>
 <dt><code>LC_COLLATE</code>
-<a name="index-LC_005fCOLLATE"></a>
+<span id="index-LC_005fCOLLATE"></span>
 </dt>
 <dd><p>This variable determines the collation order used when sorting the
 results of filename expansion, and
@@ -7056,7 +7206,7 @@ and collating sequences within filename expansion and pattern matching
 </p>
 </dd>
 <dt><code>LC_CTYPE</code>
-<a name="index-LC_005fCTYPE"></a>
+<span id="index-LC_005fCTYPE"></span>
 </dt>
 <dd><p>This variable determines the interpretation of characters and the
 behavior of character classes within filename expansion and pattern
@@ -7064,33 +7214,36 @@ matching (see <a href="#Filename-Expansion">Filename Expansion</a>).
 </p>
 </dd>
 <dt><code>LC_MESSAGES</code>
-<a name="index-LC_005fMESSAGES-1"></a>
+<span id="index-LC_005fMESSAGES-1"></span>
 </dt>
 <dd><p>This variable determines the locale used to translate double-quoted
 strings preceded by a &lsquo;<samp>$</samp>&rsquo; (see <a href="#Locale-Translation">Locale Translation</a>).
 </p>
 </dd>
 <dt><code>LC_NUMERIC</code>
-<a name="index-LC_005fNUMERIC"></a>
+<span id="index-LC_005fNUMERIC"></span>
 </dt>
 <dd><p>This variable determines the locale category used for number formatting.
 </p>
 </dd>
 <dt><code>LC_TIME</code>
-<a name="index-LC_005fTIME"></a>
+<span id="index-LC_005fTIME"></span>
 </dt>
 <dd><p>This variable determines the locale category used for data and time
 formatting.
 </p>
 </dd>
 <dt><code>LINENO</code>
-<a name="index-LINENO"></a>
+<span id="index-LINENO"></span>
 </dt>
 <dd><p>The line number in the script or shell function currently executing.
+If <code>LINENO</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>LINES</code>
-<a name="index-LINES"></a>
+<span id="index-LINES"></span>
 </dt>
 <dd><p>Used by the <code>select</code> command to determine the column length
 for printing selection lists.
@@ -7100,14 +7253,14 @@ Automatically set if the <code>checkwinsize</code> option is enabled
 </p>
 </dd>
 <dt><code>MACHTYPE</code>
-<a name="index-MACHTYPE"></a>
+<span id="index-MACHTYPE"></span>
 </dt>
 <dd><p>A string that fully describes the system type on which Bash
 is executing, in the standard <small>GNU</small> <var>cpu-company-system</var> format.
 </p>
 </dd>
 <dt><code>MAILCHECK</code>
-<a name="index-MAILCHECK"></a>
+<span id="index-MAILCHECK"></span>
 </dt>
 <dd><p>How often (in seconds) that the shell should check for mail in the
 files specified in the <code>MAILPATH</code> or <code>MAIL</code> variables.
@@ -7118,33 +7271,33 @@ greater than or equal to zero, the shell disables mail checking.
 </p>
 </dd>
 <dt><code>MAPFILE</code>
-<a name="index-MAPFILE"></a>
+<span id="index-MAPFILE"></span>
 </dt>
 <dd><p>An array variable created to hold the text read by the
 <code>mapfile</code> builtin when no variable name is supplied.
 </p>
 </dd>
 <dt><code>OLDPWD</code>
-<a name="index-OLDPWD"></a>
+<span id="index-OLDPWD"></span>
 </dt>
 <dd><p>The previous working directory as set by the <code>cd</code> builtin.
 </p>
 </dd>
 <dt><code>OPTERR</code>
-<a name="index-OPTERR"></a>
+<span id="index-OPTERR"></span>
 </dt>
 <dd><p>If set to the value 1, Bash displays error messages
 generated by the <code>getopts</code> builtin command.
 </p>
 </dd>
 <dt><code>OSTYPE</code>
-<a name="index-OSTYPE"></a>
+<span id="index-OSTYPE"></span>
 </dt>
 <dd><p>A string describing the operating system Bash is running on.
 </p>
 </dd>
 <dt><code>PIPESTATUS</code>
-<a name="index-PIPESTATUS"></a>
+<span id="index-PIPESTATUS"></span>
 </dt>
 <dd><p>An array variable (see <a href="#Arrays">Arrays</a>)
 containing a list of exit status values from the processes
@@ -7153,7 +7306,7 @@ contain only a single command).
 </p>
 </dd>
 <dt><code>POSIXLY_CORRECT</code>
-<a name="index-POSIXLY_005fCORRECT"></a>
+<span id="index-POSIXLY_005fCORRECT"></span>
 </dt>
 <dd><p>If this variable is in the environment when Bash starts, the shell
 enters <small>POSIX</small> mode (see <a href="#Bash-POSIX-Mode">Bash POSIX Mode</a>) before reading the
@@ -7163,25 +7316,30 @@ as if the command
 </p><div class="example">
 <pre class="example"><code>set -o posix</code>
 </pre></div>
-<p>had been executed.  
+<p>had been executed.
+When the shell enters <small>POSIX</small> mode, it sets this variable if it was
+not already set.
 </p>
 </dd>
 <dt><code>PPID</code>
-<a name="index-PPID"></a>
+<span id="index-PPID"></span>
 </dt>
 <dd><p>The process <small>ID</small> of the shell&rsquo;s parent process.  This variable
 is readonly.
 </p>
 </dd>
 <dt><code>PROMPT_COMMAND</code>
-<a name="index-PROMPT_005fCOMMAND"></a>
+<span id="index-PROMPT_005fCOMMAND"></span>
 </dt>
-<dd><p>If set, the value is interpreted as a command to execute
-before the printing of each primary prompt (<code>$PS1</code>).
+<dd><p>If this variable is set, and is an array,
+the value of each set element is interpreted as a command to execute
+before printing the primary prompt (<code>$PS1</code>).
+If this is set but not an array variable,
+its value is used as a command to execute instead.
 </p>
 </dd>
 <dt><code>PROMPT_DIRTRIM</code>
-<a name="index-PROMPT_005fDIRTRIM"></a>
+<span id="index-PROMPT_005fDIRTRIM"></span>
 </dt>
 <dd><p>If set to a number greater than zero, the value is used as the number of
 trailing directory components to retain when expanding the <code>\w</code> and
@@ -7190,15 +7348,15 @@ Characters removed are replaced with an ellipsis.
 </p>
 </dd>
 <dt><code>PS0</code>
-<a name="index-PS0"></a>
+<span id="index-PS0"></span>
 </dt>
-<dd><p>The value of this parameter is expanded like <var>PS1</var>
+<dd><p>The value of this parameter is expanded like <code>PS1</code>
 and displayed by interactive shells after reading a command
 and before the command is executed.
 </p>
 </dd>
 <dt><code>PS3</code>
-<a name="index-PS3"></a>
+<span id="index-PS3"></span>
 </dt>
 <dd><p>The value of this variable is used as the prompt for the
 <code>select</code> command.  If this variable is not set, the
@@ -7206,69 +7364,88 @@ and before the command is executed.
 </p>
 </dd>
 <dt><code>PS4</code>
-<a name="index-PS4"></a>
+<span id="index-PS4"></span>
 </dt>
-<dd><p>The value is the prompt printed before the command line is echoed
-when the <samp>-x</samp> option is set (see <a href="#The-Set-Builtin">The Set Builtin</a>).
-The first character of <code>PS4</code> is replicated multiple times, as
-necessary, to indicate multiple levels of indirection.
+<dd><p>The value of this parameter is expanded like <var>PS1</var>
+and the expanded value is the prompt printed before the command line
+is echoed when the <samp>-x</samp> option is set (see <a href="#The-Set-Builtin">The Set Builtin</a>).
+The first character of the expanded value is replicated multiple times,
+as necessary, to indicate multiple levels of indirection.
 The default is &lsquo;<samp>+ </samp>&rsquo;.
 </p>
 </dd>
 <dt><code>PWD</code>
-<a name="index-PWD"></a>
+<span id="index-PWD"></span>
 </dt>
 <dd><p>The current working directory as set by the <code>cd</code> builtin.
 </p>
 </dd>
 <dt><code>RANDOM</code>
-<a name="index-RANDOM"></a>
+<span id="index-RANDOM"></span>
 </dt>
-<dd><p>Each time this parameter is referenced, a random integer
-between 0 and 32767 is generated.  Assigning a value to this
+<dd><p>Each time this parameter is referenced, it expands to a random integer
+between 0 and 32767. Assigning a value to this
 variable seeds the random number generator.
+If <code>RANDOM</code>
+is unset, it loses its special properties, even if it is
+subsequently reset.
 </p>
 </dd>
 <dt><code>READLINE_LINE</code>
-<a name="index-READLINE_005fLINE"></a>
+<span id="index-READLINE_005fLINE"></span>
 </dt>
 <dd><p>The contents of the Readline line buffer, for use
 with &lsquo;<samp>bind -x</samp>&rsquo; (see <a href="#Bash-Builtins">Bash Builtins</a>).
 </p>
 </dd>
+<dt><code>READLINE_MARK</code>
+<span id="index-READLINE_005fMARK"></span>
+</dt>
+<dd><p>The position of the <var>mark</var> (saved insertion point) in the
+Readline line buffer, for use
+with &lsquo;<samp>bind -x</samp>&rsquo; (see <a href="#Bash-Builtins">Bash Builtins</a>).
+The characters between the insertion point and the mark are often
+called the <var>region</var>.
+</p>
+</dd>
 <dt><code>READLINE_POINT</code>
-<a name="index-READLINE_005fPOINT"></a>
+<span id="index-READLINE_005fPOINT"></span>
 </dt>
 <dd><p>The position of the insertion point in the Readline line buffer, for use
 with &lsquo;<samp>bind -x</samp>&rsquo; (see <a href="#Bash-Builtins">Bash Builtins</a>).
 </p>
 </dd>
 <dt><code>REPLY</code>
-<a name="index-REPLY"></a>
+<span id="index-REPLY"></span>
 </dt>
 <dd><p>The default variable for the <code>read</code> builtin.
 </p>
 </dd>
 <dt><code>SECONDS</code>
-<a name="index-SECONDS"></a>
+<span id="index-SECONDS"></span>
 </dt>
 <dd><p>This variable expands to the number of seconds since the
 shell was started.  Assignment to this variable resets
 the count to the value assigned, and the expanded value
 becomes the value assigned plus the number of seconds
 since the assignment.
+The number of seconds at shell invocation and the current time is always
+determined by querying the system clock.
+If <code>SECONDS</code>
+is unset, it loses its special properties,
+even if it is subsequently reset.
 </p>
 </dd>
 <dt><code>SHELL</code>
-<a name="index-SHELL"></a>
+<span id="index-SHELL"></span>
 </dt>
-<dd><p>The full pathname to the shell is kept in this environment variable.
+<dd><p>This environment variable expands to the full pathname to the shell.
 If it is not set when the shell starts,
 Bash assigns to it the full pathname of the current user&rsquo;s login shell.
 </p>
 </dd>
 <dt><code>SHELLOPTS</code>
-<a name="index-SHELLOPTS"></a>
+<span id="index-SHELLOPTS"></span>
 </dt>
 <dd><p>A colon-separated list of enabled shell options.  Each word in
 the list is a valid argument for the <samp>-o</samp> option to the
@@ -7281,14 +7458,28 @@ reading any startup files.  This variable is readonly.
 </p>
 </dd>
 <dt><code>SHLVL</code>
-<a name="index-SHLVL"></a>
+<span id="index-SHLVL"></span>
 </dt>
 <dd><p>Incremented by one each time a new instance of Bash is started.  This is
 intended to be a count of how deeply your Bash shells are nested.
 </p>
 </dd>
+<dt><code>SRANDOM</code>
+<span id="index-SRANDOM"></span>
+</dt>
+<dd><p>This variable expands to a 32-bit pseudo-random number each time it is
+referenced. The random number generator is not linear on systems that
+support <samp>/dev/urandom</samp> or <code>arc4random</code>, so each returned number
+has no relationship to the numbers preceding it.
+The random number generator cannot be seeded, so assignments to this
+variable have no effect.
+If <code>SRANDOM</code>
+is unset, it loses its special properties,
+even if it is subsequently reset.
+</p>
+</dd>
 <dt><code>TIMEFORMAT</code>
-<a name="index-TIMEFORMAT"></a>
+<span id="index-TIMEFORMAT"></span>
 </dt>
 <dd><p>The value of this parameter is used as a format string specifying
 how the timing information for pipelines prefixed with the <code>time</code>
@@ -7341,7 +7532,7 @@ A trailing newline is added when the format string is displayed.
 </p>
 </dd>
 <dt><code>TMOUT</code>
-<a name="index-TMOUT"></a>
+<span id="index-TMOUT"></span>
 </dt>
 <dd><p>If set to a value greater than zero, <code>TMOUT</code> is treated as the
 default timeout for the <code>read</code> builtin (see <a href="#Bash-Builtins">Bash Builtins</a>).
@@ -7358,14 +7549,14 @@ line of input does not arrive.
 </p>
 </dd>
 <dt><code>TMPDIR</code>
-<a name="index-TMPDIR"></a>
+<span id="index-TMPDIR"></span>
 </dt>
 <dd><p>If set, Bash uses its value as the name of a directory in which
 Bash creates temporary files for the shell&rsquo;s use.
 </p>
 </dd>
 <dt><code>UID</code>
-<a name="index-UID"></a>
+<span id="index-UID"></span>
 </dt>
 <dd><p>The numeric real user id of the current user.  This variable is readonly.
 </p>
@@ -7373,57 +7564,59 @@ Bash creates temporary files for the shell&rsquo;s use.
 </dl>
 
 <hr>
-<a name="Bash-Features"></a>
-<div class="header">
+<span id="Bash-Features"></span><div class="header">
 <p>
 Next: <a href="#Job-Control" accesskey="n" rel="next">Job Control</a>, Previous: <a href="#Shell-Variables" accesskey="p" rel="prev">Shell Variables</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Features-2"></a>
-<h2 class="chapter">6 Bash Features</h2>
+<span id="Bash-Features-2"></span><h2 class="chapter">6 Bash Features</h2>
 
 <p>This chapter describes features unique to Bash.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Invoking-Bash" accesskey="1">Invoking Bash</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Command line options that you can give
+<tr><td align="left" valign="top">&bull; <a href="#Invoking-Bash" accesskey="1">Invoking Bash</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Command line options that you can give
 				to Bash.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-Startup-Files" accesskey="2">Bash Startup Files</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">When and how Bash executes scripts.
+<tr><td align="left" valign="top">&bull; <a href="#Bash-Startup-Files" accesskey="2">Bash Startup Files</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">When and how Bash executes scripts.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Interactive-Shells" accesskey="3">Interactive Shells</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What an interactive shell is.
+<tr><td align="left" valign="top">&bull; <a href="#Interactive-Shells" accesskey="3">Interactive Shells</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What an interactive shell is.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-Conditional-Expressions" accesskey="4">Bash Conditional Expressions</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Primitives used in composing expressions for
+<tr><td align="left" valign="top">&bull; <a href="#Bash-Conditional-Expressions" accesskey="4">Bash Conditional Expressions</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Primitives used in composing expressions for
 				the <code>test</code> builtin.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Shell-Arithmetic" accesskey="5">Shell Arithmetic</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Arithmetic on shell variables.
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Arithmetic" accesskey="5">Shell Arithmetic</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Arithmetic on shell variables.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Aliases" accesskey="6">Aliases</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Substituting one command for another.
+<tr><td align="left" valign="top">&bull; <a href="#Aliases" accesskey="6">Aliases</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Substituting one command for another.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Arrays" accesskey="7">Arrays</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Array Variables.
+<tr><td align="left" valign="top">&bull; <a href="#Arrays" accesskey="7">Arrays</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Array Variables.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#The-Directory-Stack" accesskey="8">The Directory Stack</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">History of visited directories.
+<tr><td align="left" valign="top">&bull; <a href="#The-Directory-Stack" accesskey="8">The Directory Stack</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">History of visited directories.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Controlling-the-Prompt" accesskey="9">Controlling the Prompt</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Customizing the various prompt strings.
+<tr><td align="left" valign="top">&bull; <a href="#Controlling-the-Prompt" accesskey="9">Controlling the Prompt</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Customizing the various prompt strings.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#The-Restricted-Shell">The Restricted Shell</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A more controlled mode of shell execution.
+<tr><td align="left" valign="top">&bull; <a href="#The-Restricted-Shell">The Restricted Shell</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A more controlled mode of shell execution.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-POSIX-Mode">Bash POSIX Mode</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Making Bash behave more closely to what
+<tr><td align="left" valign="top">&bull; <a href="#Bash-POSIX-Mode">Bash POSIX Mode</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Making Bash behave more closely to what
 				the POSIX standard specifies.
 </td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash supports behavior that was present
+				in earlier versions and has changed.
+</td></tr>
 </table>
 
 <hr>
-<a name="Invoking-Bash"></a>
-<div class="header">
+<span id="Invoking-Bash"></span><div class="header">
 <p>
 Next: <a href="#Bash-Startup-Files" accesskey="n" rel="next">Bash Startup Files</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Invoking-Bash-1"></a>
-<h3 class="section">6.1 Invoking Bash</h3>
+<span id="Invoking-Bash-1"></span><h3 class="section">6.1 Invoking Bash</h3>
 
 <div class="example">
-<pre class="example">bash [long-opt] [-ir] [-abefhkmnptuvxdBCDHP] [-o <var>option</var>] [-O <var>shopt_option</var>] [<var>argument</var> &hellip;]
-bash [long-opt] [-abefhkmnptuvxdBCDHP] [-o <var>option</var>] [-O <var>shopt_option</var>] -c <var>string</var> [<var>argument</var> &hellip;]
-bash [long-opt] -s [-abefhkmnptuvxdBCDHP] [-o <var>option</var>] [-O <var>shopt_option</var>] [<var>argument</var> &hellip;]
+<pre class="example">bash [long-opt] [-ir] [-abefhkmnptuvxdBCDHP] [-o <var>option</var>]
+    [-O <var>shopt_option</var>] [<var>argument</var> &hellip;]
+bash [long-opt] [-abefhkmnptuvxdBCDHP] [-o <var>option</var>]
+    [-O <var>shopt_option</var>] -c <var>string</var> [<var>argument</var> &hellip;]
+bash [long-opt] -s [-abefhkmnptuvxdBCDHP] [-o <var>option</var>]
+    [-O <var>shopt_option</var>] [<var>argument</var> &hellip;]
 </pre></div>
 
 <p>All of the single-character options used with the <code>set</code> builtin
@@ -7544,7 +7737,8 @@ of a login shell.
 <dd><p>If this option is present, or if no arguments remain after option
 processing, then commands are read from the standard input.
 This option allows the positional parameters to be set
-when invoking an interactive shell.
+when invoking an interactive shell or when reading input
+through a pipe.
 </p>
 </dd>
 <dt><code>-D</code></dt>
@@ -7574,11 +7768,11 @@ Any arguments after the <code>--</code> are treated as filenames and arguments.
 </p></dd>
 </dl>
 
-<a name="index-login-shell"></a>
+<span id="index-login-shell"></span>
 <p>A <em>login</em> shell is one whose first character of argument zero is
 &lsquo;<samp>-</samp>&rsquo;, or one invoked with the <samp>--login</samp> option.
 </p>
-<a name="index-interactive-shell"></a>
+<span id="index-interactive-shell"></span>
 <p>An <em>interactive</em> shell is one started without non-option arguments,
 unless <samp>-s</samp> is specified,
 without specifying the <samp>-c</samp> option, and whose input and output are both
@@ -7598,14 +7792,12 @@ Bash&rsquo;s exit status is the exit status of the last command executed
 in the script.  If no commands are executed, the exit status is 0.
 </p>
 <hr>
-<a name="Bash-Startup-Files"></a>
-<div class="header">
+<span id="Bash-Startup-Files"></span><div class="header">
 <p>
 Next: <a href="#Interactive-Shells" accesskey="n" rel="next">Interactive Shells</a>, Previous: <a href="#Invoking-Bash" accesskey="p" rel="prev">Invoking Bash</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Startup-Files-1"></a>
-<h3 class="section">6.2 Bash Startup Files</h3>
-<a name="index-startup-files"></a>
+<span id="Bash-Startup-Files-1"></span><h3 class="section">6.2 Bash Startup Files</h3>
+<span id="index-startup-files"></span>
 
 <p>This section describes how Bash executes its startup files.
 If any of the files exist but cannot be read, Bash reports an error.
@@ -7614,8 +7806,7 @@ Tilde Expansion (see <a href="#Tilde-Expansion">Tilde Expansion</a>).
 </p>
 <p>Interactive shells are described in <a href="#Interactive-Shells">Interactive Shells</a>.
 </p>
-<a name="Invoked-as-an-interactive-login-shell_002c-or-with-_002d_002dlogin"></a>
-<h4 class="subsubheading">Invoked as an interactive login shell, or with <samp>--login</samp></h4>
+<span id="Invoked-as-an-interactive-login-shell_002c-or-with-_002d_002dlogin"></span><h4 class="subsubheading">Invoked as an interactive login shell, or with <samp>--login</samp></h4>
 
 <p>When Bash is invoked as an interactive login shell, or as a
 non-interactive shell with the <samp>--login</samp> option, it first reads and
@@ -7631,8 +7822,7 @@ or a non-interactive login shell executes the <code>exit</code> builtin command,
 Bash reads and executes commands from
 the file <samp>~/.bash_logout</samp>, if it exists.
 </p>
-<a name="Invoked-as-an-interactive-non_002dlogin-shell"></a>
-<h4 class="subsubheading">Invoked as an interactive non-login shell</h4>
+<span id="Invoked-as-an-interactive-non_002dlogin-shell"></span><h4 class="subsubheading">Invoked as an interactive non-login shell</h4>
 
 <p>When an interactive shell that is not a login shell is started, Bash
 reads and executes commands from <samp>~/.bashrc</samp>, if that file exists.
@@ -7646,8 +7836,7 @@ execute commands from <var>file</var> instead of <samp>~/.bashrc</samp>.
 </pre></div>
 <p>after (or before) any login-specific initializations.
 </p>
-<a name="Invoked-non_002dinteractively"></a>
-<h4 class="subsubheading">Invoked non-interactively</h4>
+<span id="Invoked-non_002dinteractively"></span><h4 class="subsubheading">Invoked non-interactively</h4>
 
 <p>When Bash is started non-interactively, to run a shell script,
 for example, it looks for the variable <code>BASH_ENV</code> in the environment,
@@ -7664,8 +7853,7 @@ filename.
 <samp>--login</samp> option, Bash attempts to read and execute commands from the
 login shell startup files. 
 </p>
-<a name="Invoked-with-name-sh"></a>
-<h4 class="subsubheading">Invoked with name <code>sh</code></h4>
+<span id="Invoked-with-name-sh"></span><h4 class="subsubheading">Invoked with name <code>sh</code></h4>
 
 <p>If Bash is invoked with the name <code>sh</code>, it tries to mimic the
 startup behavior of historical versions of <code>sh</code> as closely as
@@ -7688,8 +7876,7 @@ to read any other startup files.
 <p>When invoked as <code>sh</code>, Bash enters <small>POSIX</small> mode after
 the startup files are read.
 </p>
-<a name="Invoked-in-POSIX-mode"></a>
-<h4 class="subsubheading">Invoked in <small>POSIX</small> mode</h4>
+<span id="Invoked-in-POSIX-mode"></span><h4 class="subsubheading">Invoked in <small>POSIX</small> mode</h4>
 
 <p>When Bash is started in <small>POSIX</small> mode, as with the
 <samp>--posix</samp> command line option, it follows the <small>POSIX</small> standard
@@ -7699,8 +7886,7 @@ and commands are read and executed from the file whose name is the
 expanded value.
 No other startup files are read.
 </p>
-<a name="Invoked-by-remote-shell-daemon"></a>
-<h4 class="subsubheading">Invoked by remote shell daemon</h4>
+<span id="Invoked-by-remote-shell-daemon"></span><h4 class="subsubheading">Invoked by remote shell daemon</h4>
 
 <p>Bash attempts to determine when it is being run with its standard input
 connected to a network connection, as when executed by the remote shell
@@ -7714,8 +7900,7 @@ The <samp>--norc</samp> option may be used to inhibit this behavior, and the
 neither <code>rshd</code> nor <code>sshd</code> generally invoke the shell with those
 options or allow them to be specified.
 </p>
-<a name="Invoked-with-unequal-effective-and-real-UID_002fGIDs"></a>
-<h4 class="subsubheading">Invoked with unequal effective and real <small>UID/GID</small>s</h4>
+<span id="Invoked-with-unequal-effective-and-real-UID_002fGIDs"></span><h4 class="subsubheading">Invoked with unequal effective and real <small>UID/GID</small>s</h4>
 
 <p>If Bash is started with the effective user (group) id not equal to the
 real user (group) id, and the <samp>-p</samp> option is not supplied, no startup
@@ -7727,33 +7912,29 @@ If the <samp>-p</samp> option is supplied at invocation, the startup behavior is
 the same, but the effective user id is not reset.
 </p>
 <hr>
-<a name="Interactive-Shells"></a>
-<div class="header">
+<span id="Interactive-Shells"></span><div class="header">
 <p>
 Next: <a href="#Bash-Conditional-Expressions" accesskey="n" rel="next">Bash Conditional Expressions</a>, Previous: <a href="#Bash-Startup-Files" accesskey="p" rel="prev">Bash Startup Files</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Interactive-Shells-1"></a>
-<h3 class="section">6.3 Interactive Shells</h3>
-<a name="index-interactive-shell-1"></a>
-<a name="index-shell_002c-interactive"></a>
+<span id="Interactive-Shells-1"></span><h3 class="section">6.3 Interactive Shells</h3>
+<span id="index-interactive-shell-1"></span>
+<span id="index-shell_002c-interactive"></span>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#What-is-an-Interactive-Shell_003f" accesskey="1">What is an Interactive Shell?</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What determines whether a shell is Interactive.
+<tr><td align="left" valign="top">&bull; <a href="#What-is-an-Interactive-Shell_003f" accesskey="1">What is an Interactive Shell?</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What determines whether a shell is Interactive.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Is-this-Shell-Interactive_003f" accesskey="2">Is this Shell Interactive?</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to tell if a shell is interactive.
+<tr><td align="left" valign="top">&bull; <a href="#Is-this-Shell-Interactive_003f" accesskey="2">Is this Shell Interactive?</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to tell if a shell is interactive.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Interactive-Shell-Behavior" accesskey="3">Interactive Shell Behavior</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What changes in a interactive shell?
+<tr><td align="left" valign="top">&bull; <a href="#Interactive-Shell-Behavior" accesskey="3">Interactive Shell Behavior</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What changes in a interactive shell?
 </td></tr>
 </table>
 
 <hr>
-<a name="What-is-an-Interactive-Shell_003f"></a>
-<div class="header">
+<span id="What-is-an-Interactive-Shell_003f"></span><div class="header">
 <p>
 Next: <a href="#Is-this-Shell-Interactive_003f" accesskey="n" rel="next">Is this Shell Interactive?</a>, Up: <a href="#Interactive-Shells" accesskey="u" rel="up">Interactive Shells</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="What-is-an-Interactive-Shell_003f-1"></a>
-<h4 class="subsection">6.3.1 What is an Interactive Shell?</h4>
+<span id="What-is-an-Interactive-Shell_003f-1"></span><h4 class="subsection">6.3.1 What is an Interactive Shell?</h4>
 
 <p>An interactive shell
 is one started without non-option arguments, unless <samp>-s</samp> is
@@ -7769,13 +7950,11 @@ terminal.
 when an interactive shell is started.
 </p>
 <hr>
-<a name="Is-this-Shell-Interactive_003f"></a>
-<div class="header">
+<span id="Is-this-Shell-Interactive_003f"></span><div class="header">
 <p>
 Next: <a href="#Interactive-Shell-Behavior" accesskey="n" rel="next">Interactive Shell Behavior</a>, Previous: <a href="#What-is-an-Interactive-Shell_003f" accesskey="p" rel="prev">What is an Interactive Shell?</a>, Up: <a href="#Interactive-Shells" accesskey="u" rel="up">Interactive Shells</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Is-this-Shell-Interactive_003f-1"></a>
-<h4 class="subsection">6.3.2 Is this Shell Interactive?</h4>
+<span id="Is-this-Shell-Interactive_003f-1"></span><h4 class="subsection">6.3.2 Is this Shell Interactive?</h4>
 
 <p>To determine within a startup script whether or not Bash is
 running interactively,
@@ -7802,13 +7981,11 @@ fi
 </pre></div>
 
 <hr>
-<a name="Interactive-Shell-Behavior"></a>
-<div class="header">
+<span id="Interactive-Shell-Behavior"></span><div class="header">
 <p>
 Previous: <a href="#Is-this-Shell-Interactive_003f" accesskey="p" rel="prev">Is this Shell Interactive?</a>, Up: <a href="#Interactive-Shells" accesskey="u" rel="up">Interactive Shells</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Interactive-Shell-Behavior-1"></a>
-<h4 class="subsection">6.3.3 Interactive Shell Behavior</h4>
+<span id="Interactive-Shell-Behavior-1"></span><h4 class="subsection">6.3.3 Interactive Shell Behavior</h4>
 
 <p>When the shell is running interactively, it changes its behavior in
 several ways.
@@ -7823,10 +8000,13 @@ signals <code>SIGTTIN</code>, <code>SIGTTOU</code>, and <code>SIGTSTP</code>.
 </li><li> Bash expands and displays <code>PS1</code> before reading the first line
 of a command, and expands and displays <code>PS2</code> before reading the
 second and subsequent lines of a multi-line command.
-Bash displays <code>PS0</code> after it reads a command but before executing it.
+Bash expands and displays <code>PS0</code> after it reads a command but before
+executing it.
+See <a href="#Controlling-the-Prompt">Controlling the Prompt</a>, for a complete list of prompt
+string escape sequences.
 
-</li><li> Bash executes the value of the <code>PROMPT_COMMAND</code> variable as a command
-before printing the primary prompt, <code>$PS1</code>
+</li><li> Bash executes the values of the set elements of the <code>PROMPT_COMMANDS</code>
+array variable as commands before printing the primary prompt, <code>$PS1</code>
 (see <a href="#Bash-Variables">Bash Variables</a>).
 
 </li><li> Readline (see <a href="#Command-Line-Editing">Command Line Editing</a>) is used to read commands from
@@ -7848,7 +8028,7 @@ when a shell with history enabled exits.
 (see <a href="#Signals">Signals</a>).
 
 </li><li> In the absence of any traps, <code>SIGINT</code> is caught and handled
-((see <a href="#Signals">Signals</a>).
+(see <a href="#Signals">Signals</a>).
 <code>SIGINT</code> will interrupt some shell builtins.
 
 </li><li> An interactive login shell sends a <code>SIGHUP</code> to all jobs on exit
@@ -7891,19 +8071,21 @@ printing <code>$PS1</code> (see <a href="#Bash-Variables">Bash Variables</a>).
 </li></ol>
 
 <hr>
-<a name="Bash-Conditional-Expressions"></a>
-<div class="header">
+<span id="Bash-Conditional-Expressions"></span><div class="header">
 <p>
 Next: <a href="#Shell-Arithmetic" accesskey="n" rel="next">Shell Arithmetic</a>, Previous: <a href="#Interactive-Shells" accesskey="p" rel="prev">Interactive Shells</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-Conditional-Expressions-1"></a>
-<h3 class="section">6.4 Bash Conditional Expressions</h3>
-<a name="index-expressions_002c-conditional"></a>
+<span id="Bash-Conditional-Expressions-1"></span><h3 class="section">6.4 Bash Conditional Expressions</h3>
+<span id="index-expressions_002c-conditional"></span>
 
 <p>Conditional expressions are used by the <code>[[</code> compound command
-and the <code>test</code> and <code>[</code> builtin commands.
+and the <code>test</code> and <code>[</code> builtin commands. The <code>test</code>
+and <code>[</code> commands determine their behavior based on the number
+of arguments; see the descriptions of those commands for any other
+command-specific actions.
 </p>
-<p>Expressions may be unary or binary.
+<p>Expressions may be unary or binary,
+and are formed from the following primaries.
 Unary expressions are often used to examine the status of a file.
 There are string operators and numeric comparison operators as well.
 Bash handles several filenames specially when they are used in
@@ -8076,22 +8258,22 @@ is equal to, not equal to, less than, less than or equal to,
 greater than, or greater than or equal to <var>arg2</var>,
 respectively.  <var>Arg1</var> and <var>arg2</var>
 may be positive or negative integers.
+When used with the <code>[[</code> command, <var>Arg1</var> and <var>Arg2</var>
+are evaluated as arithmetic expressions (see <a href="#Shell-Arithmetic">Shell Arithmetic</a>).
 </p></dd>
 </dl>
 
 <hr>
-<a name="Shell-Arithmetic"></a>
-<div class="header">
+<span id="Shell-Arithmetic"></span><div class="header">
 <p>
 Next: <a href="#Aliases" accesskey="n" rel="next">Aliases</a>, Previous: <a href="#Bash-Conditional-Expressions" accesskey="p" rel="prev">Bash Conditional Expressions</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Shell-Arithmetic-1"></a>
-<h3 class="section">6.5 Shell Arithmetic</h3>
-<a name="index-arithmetic_002c-shell"></a>
-<a name="index-shell-arithmetic"></a>
-<a name="index-expressions_002c-arithmetic"></a>
-<a name="index-evaluation_002c-arithmetic"></a>
-<a name="index-arithmetic-evaluation"></a>
+<span id="Shell-Arithmetic-1"></span><h3 class="section">6.5 Shell Arithmetic</h3>
+<span id="index-arithmetic_002c-shell"></span>
+<span id="index-shell-arithmetic"></span>
+<span id="index-expressions_002c-arithmetic"></span>
+<span id="index-evaluation_002c-arithmetic"></span>
+<span id="index-arithmetic-evaluation"></span>
 
 <p>The shell allows arithmetic expressions to be evaluated, as one of
 the shell expansions or by using the <code>((</code> compound command, the
@@ -8192,13 +8374,16 @@ A null value evaluates to 0.
 A shell variable need not have its <var>integer</var> attribute turned on
 to be used in an expression.
 </p>
-<p>Constants with a leading 0 are interpreted as octal numbers.
+<p>Integer constants follow the C language definition, without suffixes or
+character constants.
+Constants with a leading 0 are interpreted as octal numbers.
 A leading &lsquo;<samp>0x</samp>&rsquo; or &lsquo;<samp>0X</samp>&rsquo; denotes hexadecimal.  Otherwise,
 numbers take the form [<var>base</var><code>#</code>]<var>n</var>, where the optional <var>base</var>
 is a decimal number between 2 and 64 representing the arithmetic
 base, and <var>n</var> is a number in that base.
 If <var>base</var><code>#</code> is omitted, then base 10 is used.
 When specifying <var>n</var>,
+if a non-digit is required,
 the digits greater than 9 are represented by the lowercase letters,
 the uppercase letters, &lsquo;<samp>@</samp>&rsquo;, and &lsquo;<samp>_</samp>&rsquo;, in that order.
 If <var>base</var> is less than or equal to 36, lowercase and uppercase
@@ -8210,14 +8395,12 @@ parentheses are evaluated first and may override the precedence
 rules above.
 </p>
 <hr>
-<a name="Aliases"></a>
-<div class="header">
+<span id="Aliases"></span><div class="header">
 <p>
 Next: <a href="#Arrays" accesskey="n" rel="next">Arrays</a>, Previous: <a href="#Shell-Arithmetic" accesskey="p" rel="prev">Shell Arithmetic</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Aliases-1"></a>
-<h3 class="section">6.6 Aliases</h3>
-<a name="index-alias-expansion"></a>
+<span id="Aliases-1"></span><h3 class="section">6.6 Aliases</h3>
+<span id="index-alias-expansion"></span>
 
 <p><var>Aliases</var> allow a string to be substituted for a word when it is used
 as the first word of a simple command.
@@ -8255,10 +8438,11 @@ unless the <code>expand_aliases</code> shell option is set using
 <code>shopt</code> (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>).
 </p>
 <p>The rules concerning the definition and use of aliases are
-somewhat confusing.  Bash
-always reads at least one complete line
-of input before executing any
-of the commands on that line.  Aliases are expanded when a
+somewhat confusing. Bash
+always reads at least one complete line of input,
+and all lines that make up a compound command,
+before executing any of the commands on that line or the compound command.
+Aliases are expanded when a
 command is read, not when it is executed.  Therefore, an
 alias definition appearing on the same line as another
 command does not take effect until the next line of input is read.
@@ -8276,14 +8460,12 @@ in compound commands.
 <p>For almost every purpose, shell functions are preferred over aliases.
 </p>
 <hr>
-<a name="Arrays"></a>
-<div class="header">
+<span id="Arrays"></span><div class="header">
 <p>
 Next: <a href="#The-Directory-Stack" accesskey="n" rel="next">The Directory Stack</a>, Previous: <a href="#Aliases" accesskey="p" rel="prev">Aliases</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Arrays-1"></a>
-<h3 class="section">6.7 Arrays</h3>
-<a name="index-arrays"></a>
+<span id="Arrays-1"></span><h3 class="section">6.7 Arrays</h3>
+<span id="index-arrays"></span>
 
 <p>Bash provides one-dimensional indexed and associative array variables.
 Any variable may be used as an indexed array;
@@ -8316,7 +8498,7 @@ To explicitly declare an array, use
 </p>
 <p>Associative arrays are created using
 </p><div class="example">
-<pre class="example">declare -A <var>name</var>.
+<pre class="example">declare -A <var>name</var>
 </pre></div>
 
 <p>Attributes may be
@@ -8329,14 +8511,27 @@ an array.
 <pre class="example"><var>name</var>=(<var>value1</var> <var>value2</var> &hellip; )
 </pre></div>
 <p>where each
-<var>value</var> is of the form <code>[<var>subscript</var>]=</code><var>string</var>.
+<var>value</var> may be of the form <code>[<var>subscript</var>]=</code><var>string</var>.
 Indexed array assignments do not require anything but <var>string</var>.
 When assigning to indexed arrays, if
 the optional subscript is supplied, that index is assigned to;
 otherwise the index of the element assigned is the last index assigned
 to by the statement plus one.  Indexing starts at zero.
 </p>
-<p>When assigning to an associative array, the subscript is required.
+<p>Each <var>value</var> in the list undergoes all the shell expansions
+described above (see <a href="#Shell-Expansions">Shell Expansions</a>).
+</p>
+<p>When assigning to an associative array, the words in a compound assignment
+may be either assignment statements, for which the subscript is required,
+or a list of words that is interpreted as a sequence of alternating keys
+and values:
+<var>name</var>=(<var>key1</var> <var>value1</var> <var>key2</var> <var>value2</var> &hellip; ).
+These are treated identically to
+<var>name</var>=( [<var>key1</var>]=<var>value1</var> [<var>key2</var>]=<var>value2</var> &hellip; ).
+The first word in the list determines how the remaining words
+are interpreted; all assignments in a list must be of the same type.
+When using key/value pairs, the keys may not be missing or empty;
+a final missing value is treated like the empty string.
 </p>
 <p>This syntax is also accepted by the <code>declare</code>
 builtin.  Individual array elements may be assigned to using the
@@ -8396,12 +8591,16 @@ special parameters &lsquo;<samp>@</samp>&rsquo; and &lsquo;<samp>*</samp>&rsquo;
 <code>unset <var>name</var>[<var>subscript</var>]</code>
 destroys the array element at index <var>subscript</var>.
 Negative subscripts to indexed arrays are interpreted as described above.
-Care must be taken to avoid unwanted side effects caused by filename
-expansion.
+Unsetting the last element of an array variable does not unset the variable.
 <code>unset <var>name</var></code>, where <var>name</var> is an array, removes the
 entire array.  A subscript of &lsquo;<samp>*</samp>&rsquo; or &lsquo;<samp>@</samp>&rsquo; also removes the
 entire array.
 </p>
+<p>When using a variable name with a subscript as an argument to a command,
+such as with <code>unset</code>, without using the word expansion syntax
+described above, the argument is subject to the shell&rsquo;s filename expansion.
+If filename expansion is not desired, the argument should be quoted.
+</p>
 <p>The <code>declare</code>, <code>local</code>, and <code>readonly</code>
 builtins each accept a <samp>-a</samp> option to specify an indexed
 array and a <samp>-A</samp> option to specify an associative array.
@@ -8414,17 +8613,15 @@ builtins display array values in a way that allows them to be
 reused as input.
 </p>
 <hr>
-<a name="The-Directory-Stack"></a>
-<div class="header">
+<span id="The-Directory-Stack"></span><div class="header">
 <p>
 Next: <a href="#Controlling-the-Prompt" accesskey="n" rel="next">Controlling the Prompt</a>, Previous: <a href="#Arrays" accesskey="p" rel="prev">Arrays</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="The-Directory-Stack-1"></a>
-<h3 class="section">6.8 The Directory Stack</h3>
-<a name="index-directory-stack"></a>
+<span id="The-Directory-Stack-1"></span><h3 class="section">6.8 The Directory Stack</h3>
+<span id="index-directory-stack"></span>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Directory-Stack-Builtins" accesskey="1">Directory Stack Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Bash builtin commands to manipulate
+<tr><td align="left" valign="top">&bull; <a href="#Directory-Stack-Builtins" accesskey="1">Directory Stack Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Bash builtin commands to manipulate
 					the directory stack.
 </td></tr>
 </table>
@@ -8441,17 +8638,15 @@ of the directory stack.
 as the value of the <code>DIRSTACK</code> shell variable.
 </p>
 <hr>
-<a name="Directory-Stack-Builtins"></a>
-<div class="header">
+<span id="Directory-Stack-Builtins"></span><div class="header">
 <p>
 Up: <a href="#The-Directory-Stack" accesskey="u" rel="up">The Directory Stack</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Directory-Stack-Builtins-1"></a>
-<h4 class="subsection">6.8.1 Directory Stack Builtins</h4>
+<span id="Directory-Stack-Builtins-1"></span><h4 class="subsection">6.8.1 Directory Stack Builtins</h4>
 
 <dl compact="compact">
 <dt><code>dirs</code></dt>
-<dd><a name="index-dirs"></a>
+<dd><span id="index-dirs"></span>
 <div class="example">
 <pre class="example">dirs [-clpv] [+<var>N</var> | -<var>N</var>]
 </pre></div>
@@ -8491,7 +8686,7 @@ with zero.
 
 </dd>
 <dt><code>popd</code></dt>
-<dd><a name="index-popd"></a>
+<dd><span id="index-popd"></span>
 <div class="example">
 <pre class="example">popd [-n] [+<var>N</var> | -<var>N</var>]
 </pre></div>
@@ -8517,7 +8712,7 @@ list printed by <code>dirs</code>), starting with zero.
 </p></dd>
 </dl>
 
-<a name="index-pushd"></a>
+<span id="index-pushd"></span>
 </dd>
 <dt><code>pushd</code></dt>
 <dd><div class="example">
@@ -8554,22 +8749,22 @@ to the <code>cd</code> builtin.
 </dl>
 
 <hr>
-<a name="Controlling-the-Prompt"></a>
-<div class="header">
+<span id="Controlling-the-Prompt"></span><div class="header">
 <p>
 Next: <a href="#The-Restricted-Shell" accesskey="n" rel="next">The Restricted Shell</a>, Previous: <a href="#The-Directory-Stack" accesskey="p" rel="prev">The Directory Stack</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Controlling-the-Prompt-1"></a>
-<h3 class="section">6.9 Controlling the Prompt</h3>
-<a name="index-prompting"></a>
+<span id="Controlling-the-Prompt-1"></span><h3 class="section">6.9 Controlling the Prompt</h3>
+<span id="index-prompting"></span>
 
-<p>The value of the variable <code>PROMPT_COMMAND</code> is examined just before
-Bash prints each primary prompt.  If <code>PROMPT_COMMAND</code> is set and
-has a non-null value, then the
-value is executed just as if it had been typed on the command line.
+<p>Bash examines the value of the array variable <code>PROMPT_COMMANDS</code> just before
+printing each primary prompt.
+If any elements in  <code>PROMPT_COMMANDS</code> are set and non-null, Bash
+executes each value, in numeric order,
+just as if it had been typed on the command line.
 </p>
 <p>In addition, the following table describes the special characters which
-can appear in the prompt variables <code>PS1</code> to <code>PS4</code>:
+can appear in the prompt variables <code>PS0</code>, <code>PS1</code>, <code>PS2</code>, and
+<code>PS4</code>:
 </p>
 <dl compact="compact">
 <dt><code>\a</code></dt>
@@ -8670,17 +8865,18 @@ shell session.
 <p>After the string is decoded, it is expanded via
 parameter expansion, command substitution, arithmetic
 expansion, and quote removal, subject to the value of the
-<code>promptvars</code> shell option (see <a href="#Bash-Builtins">Bash Builtins</a>).
+<code>promptvars</code> shell option (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>).
+This can have unwanted side effects if escaped portions of the string
+appear within command substitution or contain characters special to
+word expansion.
 </p>
 <hr>
-<a name="The-Restricted-Shell"></a>
-<div class="header">
+<span id="The-Restricted-Shell"></span><div class="header">
 <p>
 Next: <a href="#Bash-POSIX-Mode" accesskey="n" rel="next">Bash POSIX Mode</a>, Previous: <a href="#Controlling-the-Prompt" accesskey="p" rel="prev">Controlling the Prompt</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="The-Restricted-Shell-1"></a>
-<h3 class="section">6.10 The Restricted Shell</h3>
-<a name="index-restricted-shell"></a>
+<span id="The-Restricted-Shell-1"></span><h3 class="section">6.10 The Restricted Shell</h3>
+<span id="index-restricted-shell"></span>
 
 <p>If Bash is started with the name <code>rbash</code>, or the
 <samp>--restricted</samp>
@@ -8695,10 +8891,13 @@ with the exception that the following are disallowed or not performed:
 <ul>
 <li> Changing directories with the <code>cd</code> builtin.
 </li><li> Setting or unsetting the values of the <code>SHELL</code>, <code>PATH</code>,
+<code>HISTFILE</code>,
 <code>ENV</code>, or <code>BASH_ENV</code> variables.
 </li><li> Specifying command names containing slashes.
 </li><li> Specifying a filename containing a slash as an argument to the <code>.</code>
 builtin command.
+</li><li> Specifying a filename containing a slash as an argument to the <code>history</code>
+builtin command.
 </li><li> Specifying a filename containing a slash as an argument to the <samp>-p</samp>
 option to the <code>hash</code> builtin command.
 </li><li> Importing function definitions from the shell environment at startup.
@@ -8719,15 +8918,26 @@ option to the <code>hash</code> builtin command.
 (see <a href="#Shell-Scripts">Shell Scripts</a>), <code>rbash</code> turns off any restrictions in
 the shell spawned to execute the script.
 </p>
+<p>The restricted shell mode is only one component of a useful restricted
+environment. It should be accompanied by setting <code>PATH</code> to a value
+that allows execution of only a few verified commands (commands that
+allow shell escapes are particularly vulnerable), leaving the user
+in a non-writable directory other than his home directory after login,
+not allowing the restricted shell to execute shell scripts, and cleaning
+the environment of variables that cause some commands to modify their
+behavior (e.g., <code>VISUAL</code> or <code>PAGER</code>).
+</p>
+<p>Modern systems provide more secure ways to implement a restricted environment,
+such as <code>jails</code>, <code>zones</code>, or <code>containers</code>.
+</p>
+
 <hr>
-<a name="Bash-POSIX-Mode"></a>
-<div class="header">
+<span id="Bash-POSIX-Mode"></span><div class="header">
 <p>
-Previous: <a href="#The-Restricted-Shell" accesskey="p" rel="prev">The Restricted Shell</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Shell-Compatibility-Mode" accesskey="n" rel="next">Shell Compatibility Mode</a>, Previous: <a href="#The-Restricted-Shell" accesskey="p" rel="prev">The Restricted Shell</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-POSIX-Mode-1"></a>
-<h3 class="section">6.11 Bash POSIX Mode</h3>
-<a name="index-POSIX-Mode"></a>
+<span id="Bash-POSIX-Mode-1"></span><h3 class="section">6.11 Bash POSIX Mode</h3>
+<span id="index-POSIX-Mode"></span>
 
 <p>Starting Bash with the <samp>--posix</samp> command-line option or executing
 &lsquo;<samp>set -o posix</samp>&rsquo; while Bash is running will cause Bash to conform more
@@ -8740,10 +8950,16 @@ startup files.
 <p>The following list is what&rsquo;s changed when &lsquo;<small>POSIX</small> mode&rsquo; is in effect:
 </p>
 <ol>
-<li> When a command in the hash table no longer exists, Bash will re-search
+<li> Bash ensures that the <code>POSIXLY_CORRECT</code> variable is set.
+
+</li><li> When a command in the hash table no longer exists, Bash will re-search
 <code>$PATH</code> to find the new location.  This is also available with
 &lsquo;<samp>shopt -s checkhash</samp>&rsquo;.
 
+</li><li> Bash will not insert a command without the execute bit set into the
+command hash table, even if it returns it as a (last-ditch) result
+from a <code>$PATH</code> search.
+
 </li><li> The message printed by the job control code and builtins when a job
 exits with a non-zero status is &lsquo;Done(status)&rsquo;.
 
@@ -8808,6 +9024,7 @@ not have to appear as matched pairs.
 </li><li> The parser does not recognize <code>time</code> as a reserved word if the next
 token begins with a &lsquo;<samp>-</samp>&rsquo;.
 
+
 </li><li> The &lsquo;<samp>!</samp>&rsquo; character does not introduce history expansion within a
 double-quoted string, even if the <code>histexpand</code> option is enabled.
 
@@ -8843,8 +9060,6 @@ results in an invalid expression.
 with the <code>.</code> or <code>source</code> builtins, or in a string processed by
 the <code>eval</code> builtin.
 
-</li><li> Process substitution is not available.
-
 </li><li> While variable indirection is available, it may not be applied to the
 &lsquo;<samp>#</samp>&rsquo; and &lsquo;<samp>?</samp>&rsquo; special parameters.
 
@@ -8855,10 +9070,6 @@ double-quoted.
 </li><li> Assignment statements preceding <small>POSIX</small> special builtins
 persist in the shell environment after the builtin completes.
 
-</li><li> Assignment statements preceding shell function calls persist in the
-shell environment after the function returns, as if a <small>POSIX</small>
-special builtin command had been executed.
-
 </li><li> The <code>command</code> builtin does not prevent builtins that take assignment
 statements as arguments from expanding them as assignment statements;
 when not in <small>POSIX</small> mode, assignment builtins lose their assignment
@@ -8887,6 +9098,9 @@ is a valid signal number.  If users want to reset the handler for a given
 signal to the original disposition, they should use &lsquo;<samp>-</samp>&rsquo; as the
 first argument.
 
+</li><li> <code>trap -p</code> displays signals whose dispositions are set to SIG_DFL and
+those that were ignored when the shell started.
+
 </li><li> The <code>.</code> and <code>source</code> builtins do not search the current directory
 for the filename argument if it is not found by searching <code>PATH</code>.
 
@@ -8897,6 +9111,11 @@ the <samp>-e</samp> option from the parent shell.
 When the <code>inherit_errexit</code> option is not enabled,
 Bash clears the <samp>-e</samp> option in such subshells.
 
+</li><li> Enabling <small>POSIX</small> mode has the effect of setting the
+<code>shift_verbose</code> option, so numeric arguments to <code>shift</code>
+that exceed the number of positional parameters will result in an
+error message.
+
 </li><li> When the <code>alias</code> builtin displays alias definitions, it does not
 display them with a leading &lsquo;<samp>alias </samp>&rsquo; unless the <samp>-p</samp> option
 is supplied.
@@ -8913,6 +9132,12 @@ constructed from <code>$PWD</code> and the directory name supplied as an argumen
 does not refer to an existing directory, <code>cd</code> will fail instead of
 falling back to <var>physical</var> mode.
 
+</li><li> When the <code>cd</code> builtin cannot change a directory because the
+length of the pathname 
+constructed from <code>$PWD</code> and the directory name supplied as an argument
+exceeds <var>PATH_MAX</var> when all symbolic links are expanded, <code>cd</code> will
+fail instead of attempting to use only the supplied directory name.
+
 </li><li> The <code>pwd</code> builtin verifies that the value it prints is the same as the
 current directory, even if it is not asked to check the file system with the
 <samp>-P</samp> option.
@@ -8970,40 +9195,202 @@ the <samp>--enable-strict-posix-default</samp> to <code>configure</code> when bu
 (see <a href="#Optional-Features">Optional Features</a>).
 </p>
 <hr>
-<a name="Job-Control"></a>
-<div class="header">
+<span id="Shell-Compatibility-Mode"></span><div class="header">
+<p>
+Previous: <a href="#Bash-POSIX-Mode" accesskey="p" rel="prev">Bash POSIX Mode</a>, Up: <a href="#Bash-Features" accesskey="u" rel="up">Bash Features</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
+</div>
+<span id="Shell-Compatibility-Mode-1"></span><h3 class="section">6.12 Shell Compatibility Mode</h3>
+<span id="index-Compatibility-Level"></span>
+<span id="index-Compatibility-Mode"></span>
+
+<p>Bash-4.0 introduced the concept of a &lsquo;shell compatibility level&rsquo;, specified
+as a set of options to the shopt builtin
+(<code>compat31</code>,
+<code>compat32</code>,
+<code>compat40</code>,
+<code>compat41</code>,
+and so on).
+There is only one current
+compatibility level &ndash; each option is mutually exclusive.
+The compatibility level is intended to allow users to select behavior
+from previous versions that is incompatible with newer versions
+while they migrate scripts to use current features and
+behavior. It&rsquo;s intended to be a temporary solution.
+</p>
+<p>This section does not mention behavior that is standard for a particular
+version (e.g., setting <code>compat32</code> means that quoting the rhs of the regexp
+matching operator quotes special regexp characters in the word, which is
+default behavior in bash-3.2 and above). 
+</p>
+<p>If a user enables, say, <code>compat32</code>, it may affect the behavior of other
+compatibility levels up to and including the current compatibility level.
+The idea is that each compatibility level controls behavior that changed
+in that version of Bash,
+but that behavior may have been present in earlier versions.
+For instance, the change to use locale-based comparisons with the <code>[[</code>
+command came in bash-4.1, and earlier versions used ASCII-based comparisons,
+so enabling <code>compat32</code> will enable ASCII-based comparisons as well.
+That granularity may not be sufficient for
+all uses, and as a result users should employ compatibility levels carefully.
+Read the documentation for a particular feature to find out the
+current behavior.
+</p>
+<p>Bash-4.3 introduced a new shell variable: <code>BASH_COMPAT</code>.
+The value assigned
+to this variable (a decimal version number like 4.2, or an integer
+corresponding to the <code>compat</code><var>NN</var> option, like 42) determines the
+compatibility level.
+</p>
+<p>Starting with bash-4.4, Bash has begun deprecating older compatibility
+levels.
+Eventually, the options will be removed in favor of <code>BASH_COMPAT</code>.
+</p>
+<p>Bash-5.0 is the final version for which there will be an individual shopt
+option for the previous version. Users should use <code>BASH_COMPAT</code>
+on bash-5.0 and later versions.
+</p>
+<p>The following table describes the behavior changes controlled by each
+compatibility level setting.
+The <code>compat</code><var>NN</var> tag is used as shorthand for setting the
+compatibility level
+to <var>NN</var> using one of the following mechanisms.
+For versions prior to bash-5.0, the compatibility level may be set using
+the corresponding <code>compat</code><var>NN</var> shopt option.
+For bash-4.3 and later versions, the <code>BASH_COMPAT</code> variable is preferred,
+and it is required for bash-5.1 and later versions.
+</p>
+<dl compact="compact">
+<dt><code>compat31</code></dt>
+<dd><ul>
+<li> quoting the rhs of the <code>[[</code> command&rsquo;s regexp matching operator (=~)
+has no special effect
+</li></ul>
+
+</dd>
+<dt><code>compat32</code></dt>
+<dd><ul>
+<li> interrupting a command list such as &quot;a ; b ; c&quot; causes the execution
+of the next command in the list (in bash-4.0 and later versions,
+the shell acts as if it received the interrupt, so
+interrupting one command in a list aborts the execution of the
+entire list)
+</li></ul>
+
+</dd>
+<dt><code>compat40</code></dt>
+<dd><ul>
+<li> the &lsquo;<samp>&lt;</samp>&rsquo; and &lsquo;<samp>&gt;</samp>&rsquo; operators to the <code>[[</code> command do not
+consider the current locale when comparing strings; they use ASCII
+ordering.
+Bash versions prior to bash-4.1 use ASCII collation and strcmp(3);
+bash-4.1 and later use the current locale&rsquo;s collation sequence and
+strcoll(3).
+</li></ul>
+
+</dd>
+<dt><code>compat41</code></dt>
+<dd><ul>
+<li> in posix mode, <code>time</code> may be followed by options and still be
+recognized as a reserved word (this is <small>POSIX</small> interpretation 267)
+</li><li> in posix mode, the parser requires that an even number of single
+quotes occur in the <var>word</var> portion of a double-quoted ${&hellip;}
+parameter expansion and treats them specially, so that characters within
+the single quotes are considered quoted
+(this is <small>POSIX</small> interpretation 221)
+</li></ul>
+
+</dd>
+<dt><code>compat42</code></dt>
+<dd><ul>
+<li> the replacement string in double-quoted pattern substitution does not
+undergo quote removal, as it does in versions after bash-4.2
+</li><li> in posix mode, single quotes are considered special when expanding
+the <var>word</var> portion of a double-quoted ${&hellip;} parameter expansion
+and can be used to quote a closing brace or other special character
+(this is part of <small>POSIX</small> interpretation 221);
+in later versions, single quotes
+are not special within double-quoted word expansions
+</li></ul>
+
+</dd>
+<dt><code>compat43</code></dt>
+<dd><ul>
+<li> the shell does not print a warning message if an attempt is made to
+use a quoted compound assignment as an argument to declare
+(declare -a foo=&rsquo;(1 2)&rsquo;). Later versions warn that this usage is
+deprecated
+</li><li> word expansion errors are considered non-fatal errors that cause the
+current command to fail, even in posix mode
+(the default behavior is to make them fatal errors that cause the shell
+to exit)
+</li><li> when executing a shell function, the loop state (while/until/etc.)
+is not reset, so <code>break</code> or <code>continue</code> in that function will break
+or continue loops in the calling context. Bash-4.4 and later reset
+the loop state to prevent this
+</li></ul>
+
+</dd>
+<dt><code>compat44</code></dt>
+<dd><ul>
+<li> the shell sets up the values used by <code>BASH_ARGV</code> and <code>BASH_ARGC</code>
+so they can expand to the shell&rsquo;s positional parameters even if extended
+debugging mode is not enabled
+</li><li> a subshell inherits loops from its parent context, so <code>break</code>
+or <code>continue</code> will cause the subshell to exit.
+Bash-5.0 and later reset the loop state to prevent the exit
+</li><li> variable assignments preceding builtins like <code>export</code> and <code>readonly</code>
+that set attributes continue to affect variables with the same
+name in the calling environment even if the shell is not in posix
+mode
+</li></ul>
+
+</dd>
+<dt><code>compat50 (set using BASH_COMPAT)</code></dt>
+<dd><ul>
+<li> Bash-5.1 changed the way <code>$RANDOM</code> is generated to introduce slightly
+more randomness. If the shell compatibility level is set to 50 or
+lower, it reverts to the method from bash-5.0 and previous versions,
+so seeding the random number generator by assigning a value to
+<code>RANDOM</code> will produce the same sequence as in bash-5.0
+</li><li> If the command hash table is empty, Bash versions prior to bash-5.1
+printed an informational message to that effect, even when producing
+output that can be reused as input. Bash-5.1 suppresses that message
+when the <samp>-l</samp> option is supplied.
+</li></ul>
+</dd>
+</dl>
+
+<hr>
+<span id="Job-Control"></span><div class="header">
 <p>
 Next: <a href="#Command-Line-Editing" accesskey="n" rel="next">Command Line Editing</a>, Previous: <a href="#Bash-Features" accesskey="p" rel="prev">Bash Features</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Job-Control-1"></a>
-<h2 class="chapter">7 Job Control</h2>
+<span id="Job-Control-1"></span><h2 class="chapter">7 Job Control</h2>
 
 <p>This chapter discusses what job control is, how it works, and how
 Bash allows you to access its facilities.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Basics" accesskey="1">Job Control Basics</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How job control works.
+<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Basics" accesskey="1">Job Control Basics</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How job control works.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Builtins" accesskey="2">Job Control Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Bash builtin commands used to interact
+<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Builtins" accesskey="2">Job Control Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Bash builtin commands used to interact
 				with job control.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Variables" accesskey="3">Job Control Variables</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables Bash uses to customize job
+<tr><td align="left" valign="top">&bull; <a href="#Job-Control-Variables" accesskey="3">Job Control Variables</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Variables Bash uses to customize job
 				control.
 </td></tr>
 </table>
 
 <hr>
-<a name="Job-Control-Basics"></a>
-<div class="header">
+<span id="Job-Control-Basics"></span><div class="header">
 <p>
 Next: <a href="#Job-Control-Builtins" accesskey="n" rel="next">Job Control Builtins</a>, Up: <a href="#Job-Control" accesskey="u" rel="up">Job Control</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Job-Control-Basics-1"></a>
-<h3 class="section">7.1 Job Control Basics</h3>
-<a name="index-job-control-1"></a>
-<a name="index-foreground"></a>
-<a name="index-background"></a>
-<a name="index-suspending-jobs"></a>
+<span id="Job-Control-Basics-1"></span><h3 class="section">7.1 Job Control Basics</h3>
+<span id="index-job-control-1"></span>
+<span id="index-foreground"></span>
+<span id="index-background"></span>
+<span id="index-suspending-jobs"></span>
 
 <p>Job control
 refers to the ability to selectively stop (suspend)
@@ -9075,7 +9462,8 @@ previous job with a &lsquo;<samp>-</samp>&rsquo;.
 <p>A job may also be referred to
 using a prefix of the name used to start it, or using a substring
 that appears in its command line.  For example, &lsquo;<samp>%ce</samp>&rsquo; refers
-to a stopped <code>ce</code> job.  Using &lsquo;<samp>%?ce</samp>&rsquo;, on the
+to a stopped job whose command name begins with &lsquo;<samp>ce</samp>&rsquo;.
+Using &lsquo;<samp>%?ce</samp>&rsquo;, on the
 other hand, refers to any job containing the string &lsquo;<samp>ce</samp>&rsquo; in
 its command line.  If the prefix or substring matches more than one job,
 Bash reports an error.
@@ -9102,18 +9490,21 @@ The <code>jobs</code> command may then be used to inspect their status.
 If a second attempt to exit is made without an intervening command,
 Bash does not print another warning, and any stopped jobs are terminated.
 </p>
+<p>When the shell is waiting for a job or process using the <code>wait</code>
+builtin, and job control is enabled, <code>wait</code> will return when the
+job changes state. The <samp>-f</samp> option causes <code>wait</code> to wait
+until the job or process terminates before returning.
+</p>
 <hr>
-<a name="Job-Control-Builtins"></a>
-<div class="header">
+<span id="Job-Control-Builtins"></span><div class="header">
 <p>
 Next: <a href="#Job-Control-Variables" accesskey="n" rel="next">Job Control Variables</a>, Previous: <a href="#Job-Control-Basics" accesskey="p" rel="prev">Job Control Basics</a>, Up: <a href="#Job-Control" accesskey="u" rel="up">Job Control</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Job-Control-Builtins-1"></a>
-<h3 class="section">7.2 Job Control Builtins</h3>
+<span id="Job-Control-Builtins-1"></span><h3 class="section">7.2 Job Control Builtins</h3>
 
 <dl compact="compact">
 <dt><code>bg</code></dt>
-<dd><a name="index-bg"></a>
+<dd><span id="index-bg"></span>
 <div class="example">
 <pre class="example">bg [<var>jobspec</var> &hellip;]
 </pre></div>
@@ -9128,7 +9519,7 @@ that was started without job control.
 </p>
 </dd>
 <dt><code>fg</code></dt>
-<dd><a name="index-fg"></a>
+<dd><span id="index-fg"></span>
 <div class="example">
 <pre class="example">fg [<var>jobspec</var>]
 </pre></div>
@@ -9142,7 +9533,7 @@ job control enabled, <var>jobspec</var> does not specify a valid job or
 </p>
 </dd>
 <dt><code>jobs</code></dt>
-<dd><a name="index-jobs"></a>
+<dd><span id="index-jobs"></span>
 <div class="example">
 <pre class="example">jobs [-lnprs] [<var>jobspec</var>]
 jobs -x <var>command</var> [<var>arguments</var>]
@@ -9186,7 +9577,7 @@ passing it <var>argument</var>s, returning its exit status.
 </p>
 </dd>
 <dt><code>kill</code></dt>
-<dd><a name="index-kill"></a>
+<dd><span id="index-kill"></span>
 <div class="example">
 <pre class="example">kill [-s <var>sigspec</var>] [-n <var>signum</var>] [-<var>sigspec</var>] <var>jobspec</var> or <var>pid</var>
 kill -l|-L [<var>exit_status</var>]
@@ -9210,25 +9601,42 @@ or non-zero if an error occurs or an invalid option is encountered.
 </p>
 </dd>
 <dt><code>wait</code></dt>
-<dd><a name="index-wait"></a>
+<dd><span id="index-wait"></span>
 <div class="example">
-<pre class="example">wait [-n] [<var>jobspec</var> or <var>pid</var> &hellip;]
+<pre class="example">wait [-fn] [-p <var>varname</var>] [<var>jobspec</var> or <var>pid</var> &hellip;]
 </pre></div>
 
 <p>Wait until the child process specified by each process <small>ID</small> <var>pid</var>
 or job specification <var>jobspec</var> exits and return the exit status of the
 last command waited for.
 If a job spec is given, all processes in the job are waited for.
-If no arguments are given, all currently active child processes are
-waited for, and the return status is zero.
-If the <samp>-n</samp> option is supplied, <code>wait</code> waits for any job to
-terminate and returns its exit status.
+If no arguments are given,
+<code>wait</code> waits for all running background jobs and
+the last-executed process substitution, if its process id is the same as
+<var>$!</var>,
+and the return status is zero.
+If the <samp>-n</samp> option is supplied, <code>wait</code> waits for a single job
+from the list of <var>pids</var> or <var>jobspecs</var> or, if no arguments are
+supplied, any job, 
+to complete and returns its exit status.
+If none of the supplied arguments is a child of the shell, or if no arguments
+are supplied and the shell has no unwaited-for children, the exit status
+is 127.
+If the <samp>-p</samp> option is supplied, the process or job identifier of the job
+for which the exit status is returned is assigned to the variable
+<var>varname</var> named by the option argument.
+The variable will be unset initially, before any assignment.
+This is useful only when the <samp>-n</samp> option is supplied.
+Supplying the <samp>-f</samp> option, when job control is enabled,
+forces <code>wait</code> to wait for each <var>pid</var> or <var>jobspec</var> to
+terminate before returning its status, intead of returning when it changes
+status.
 If neither <var>jobspec</var> nor <var>pid</var> specifies an active child process
 of the shell, the return status is 127.
 </p>
 </dd>
 <dt><code>disown</code></dt>
-<dd><a name="index-disown"></a>
+<dd><span id="index-disown"></span>
 <div class="example">
 <pre class="example">disown [-ar] [-h] [<var>jobspec</var> &hellip; | <var>pid</var> &hellip; ]
 </pre></div>
@@ -9246,7 +9654,7 @@ argument restricts operation to running jobs.
 </p>
 </dd>
 <dt><code>suspend</code></dt>
-<dd><a name="index-suspend"></a>
+<dd><span id="index-suspend"></span>
 <div class="example">
 <pre class="example">suspend [-f]
 </pre></div>
@@ -9263,17 +9671,15 @@ builtins do not accept <var>jobspec</var> arguments.  They must be
 supplied process <small>ID</small>s.
 </p>
 <hr>
-<a name="Job-Control-Variables"></a>
-<div class="header">
+<span id="Job-Control-Variables"></span><div class="header">
 <p>
 Previous: <a href="#Job-Control-Builtins" accesskey="p" rel="prev">Job Control Builtins</a>, Up: <a href="#Job-Control" accesskey="u" rel="up">Job Control</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Job-Control-Variables-1"></a>
-<h3 class="section">7.3 Job Control Variables</h3>
+<span id="Job-Control-Variables-1"></span><h3 class="section">7.3 Job Control Variables</h3>
 
 <dl compact="compact">
 <dt><code>auto_resume</code>
-<a name="index-auto_005fresume"></a>
+<span id="index-auto_005fresume"></span>
 </dt>
 <dd><p>This variable controls how the shell interacts with the user and
 job control.  If this variable exists then single word simple
@@ -9295,19 +9701,17 @@ analogous to the &lsquo;<samp>%</samp>&rsquo; job <small>ID</small>.
 </dd>
 </dl>
 
-<a name="index-Readline_002c-how-to-use"></a>
+<span id="index-Readline_002c-how-to-use"></span>
 
 
 
 
 <hr>
-<a name="Command-Line-Editing"></a>
-<div class="header">
+<span id="Command-Line-Editing"></span><div class="header">
 <p>
 Next: <a href="#Using-History-Interactively" accesskey="n" rel="next">Using History Interactively</a>, Previous: <a href="#Job-Control" accesskey="p" rel="prev">Job Control</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Command-Line-Editing-1"></a>
-<h2 class="chapter">8 Command Line Editing</h2>
+<span id="Command-Line-Editing-1"></span><h2 class="chapter">8 Command Line Editing</h2>
 
 <p>This chapter describes the basic features of the <small>GNU</small>
 command line editing interface.
@@ -9325,37 +9729,35 @@ Line editing can be enabled at any time using the <samp>-o emacs</samp> or
 <samp>+o vi</samp> options to <code>set</code>.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Introduction-and-Notation" accesskey="1">Introduction and Notation</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Notation used in this text.
+<tr><td align="left" valign="top">&bull; <a href="#Introduction-and-Notation" accesskey="1">Introduction and Notation</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Notation used in this text.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Interaction" accesskey="2">Readline Interaction</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The minimum set of commands for editing a line.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Interaction" accesskey="2">Readline Interaction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The minimum set of commands for editing a line.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Init-File" accesskey="3">Readline Init File</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Customizing Readline from a user&rsquo;s view.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Init-File" accesskey="3">Readline Init File</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Customizing Readline from a user&rsquo;s view.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bindable-Readline-Commands" accesskey="4">Bindable Readline Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A description of most of the Readline commands
+<tr><td align="left" valign="top">&bull; <a href="#Bindable-Readline-Commands" accesskey="4">Bindable Readline Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A description of most of the Readline commands
 				available for binding
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-vi-Mode" accesskey="5">Readline vi Mode</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A short description of how to make Readline
+<tr><td align="left" valign="top">&bull; <a href="#Readline-vi-Mode" accesskey="5">Readline vi Mode</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">A short description of how to make Readline
 				behave like the vi editor.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Programmable-Completion" accesskey="6">Programmable Completion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify the possible completions for
+<tr><td align="left" valign="top">&bull; <a href="#Programmable-Completion" accesskey="6">Programmable Completion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify the possible completions for
 				a specific command.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Programmable-Completion-Builtins" accesskey="7">Programmable Completion Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands to specify how to
+<tr><td align="left" valign="top">&bull; <a href="#Programmable-Completion-Builtins" accesskey="7">Programmable Completion Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Builtin commands to specify how to
 				complete arguments for a particular command.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#A-Programmable-Completion-Example" accesskey="8">A Programmable Completion Example</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An example shell function for
+<tr><td align="left" valign="top">&bull; <a href="#A-Programmable-Completion-Example" accesskey="8">A Programmable Completion Example</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An example shell function for
 				generating possible completions.
 </td></tr>
 </table>
 
 <hr>
-<a name="Introduction-and-Notation"></a>
-<div class="header">
+<span id="Introduction-and-Notation"></span><div class="header">
 <p>
 Next: <a href="#Readline-Interaction" accesskey="n" rel="next">Readline Interaction</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Introduction-to-Line-Editing"></a>
-<h3 class="section">8.1 Introduction to Line Editing</h3>
+<span id="Introduction-to-Line-Editing"></span><h3 class="section">8.1 Introduction to Line Editing</h3>
 
 <p>The following paragraphs describe the notation used to represent
 keystrokes.
@@ -9393,14 +9795,12 @@ The <tt class="key">RET</tt> key may be labeled <tt class="key">Return</tt> or <
 some keyboards.
 </p>
 <hr>
-<a name="Readline-Interaction"></a>
-<div class="header">
+<span id="Readline-Interaction"></span><div class="header">
 <p>
 Next: <a href="#Readline-Init-File" accesskey="n" rel="next">Readline Init File</a>, Previous: <a href="#Introduction-and-Notation" accesskey="p" rel="prev">Introduction and Notation</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Interaction-1"></a>
-<h3 class="section">8.2 Readline Interaction</h3>
-<a name="index-interaction_002c-readline"></a>
+<span id="Readline-Interaction-1"></span><h3 class="section">8.2 Readline Interaction</h3>
+<span id="index-interaction_002c-readline"></span>
 
 <p>Often during an interactive session you type in a long line of text,
 only to notice that the first word on the line is misspelled.  The
@@ -9414,29 +9814,27 @@ end of the line to press <tt class="key">RET</tt>; the entire line is accepted
 regardless of the location of the cursor within the line.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Bare-Essentials" accesskey="1">Readline Bare Essentials</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The least you need to know about Readline.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Bare-Essentials" accesskey="1">Readline Bare Essentials</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The least you need to know about Readline.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Movement-Commands" accesskey="2">Readline Movement Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Moving about the input line.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Movement-Commands" accesskey="2">Readline Movement Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Moving about the input line.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Killing-Commands" accesskey="3">Readline Killing Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to delete text, and how to get it back!
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Killing-Commands" accesskey="3">Readline Killing Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to delete text, and how to get it back!
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Arguments" accesskey="4">Readline Arguments</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Giving numeric arguments to commands.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Arguments" accesskey="4">Readline Arguments</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Giving numeric arguments to commands.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Searching" accesskey="5">Searching</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Searching through previous lines.
+<tr><td align="left" valign="top">&bull; <a href="#Searching" accesskey="5">Searching</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Searching through previous lines.
 </td></tr>
 </table>
 
 <hr>
-<a name="Readline-Bare-Essentials"></a>
-<div class="header">
+<span id="Readline-Bare-Essentials"></span><div class="header">
 <p>
 Next: <a href="#Readline-Movement-Commands" accesskey="n" rel="next">Readline Movement Commands</a>, Up: <a href="#Readline-Interaction" accesskey="u" rel="up">Readline Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Bare-Essentials-1"></a>
-<h4 class="subsection">8.2.1 Readline Bare Essentials</h4>
-<a name="index-notation_002c-readline"></a>
-<a name="index-command-editing"></a>
-<a name="index-editing-command-lines"></a>
+<span id="Readline-Bare-Essentials-1"></span><h4 class="subsection">8.2.1 Readline Bare Essentials</h4>
+<span id="index-notation_002c-readline"></span>
+<span id="index-command-editing"></span>
+<span id="index-editing-command-lines"></span>
 
 <p>In order to enter characters into the line, simply type them.  The typed
 character appears where the cursor was, and then the cursor moves one
@@ -9484,13 +9882,11 @@ to delete the character underneath the cursor, like <kbd>C-d</kbd>, rather
 than the character to the left of the cursor.)
 </p>
 <hr>
-<a name="Readline-Movement-Commands"></a>
-<div class="header">
+<span id="Readline-Movement-Commands"></span><div class="header">
 <p>
 Next: <a href="#Readline-Killing-Commands" accesskey="n" rel="next">Readline Killing Commands</a>, Previous: <a href="#Readline-Bare-Essentials" accesskey="p" rel="prev">Readline Bare Essentials</a>, Up: <a href="#Readline-Interaction" accesskey="u" rel="up">Readline Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Movement-Commands-1"></a>
-<h4 class="subsection">8.2.2 Readline Movement Commands</h4>
+<span id="Readline-Movement-Commands-1"></span><h4 class="subsection">8.2.2 Readline Movement Commands</h4>
 
 
 <p>The above table describes the most basic keystrokes that you need
@@ -9522,16 +9918,14 @@ forward a word.  It is a loose convention that control keystrokes
 operate on characters while meta keystrokes operate on words.
 </p>
 <hr>
-<a name="Readline-Killing-Commands"></a>
-<div class="header">
+<span id="Readline-Killing-Commands"></span><div class="header">
 <p>
 Next: <a href="#Readline-Arguments" accesskey="n" rel="next">Readline Arguments</a>, Previous: <a href="#Readline-Movement-Commands" accesskey="p" rel="prev">Readline Movement Commands</a>, Up: <a href="#Readline-Interaction" accesskey="u" rel="up">Readline Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Killing-Commands-1"></a>
-<h4 class="subsection">8.2.3 Readline Killing Commands</h4>
+<span id="Readline-Killing-Commands-1"></span><h4 class="subsection">8.2.3 Readline Killing Commands</h4>
 
-<a name="index-killing-text"></a>
-<a name="index-yanking-text"></a>
+<span id="index-killing-text"></span>
+<span id="index-yanking-text"></span>
 
 <p><em>Killing</em> text means to delete the text from the line, but to save
 it away for later use, usually by <em>yanking</em> (re-inserting)
@@ -9548,7 +9942,7 @@ that when you yank it back, you get it all.  The kill
 ring is not line specific; the text that you killed on a previously
 typed line is available to be yanked back later, when you are typing
 another line.
-<a name="index-kill-ring"></a>
+<span id="index-kill-ring"></span>
 </p>
 <p>Here is the list of commands for killing text.
 </p>
@@ -9591,13 +9985,11 @@ the prior command is <kbd>C-y</kbd> or <kbd>M-y</kbd>.
 </dl>
 
 <hr>
-<a name="Readline-Arguments"></a>
-<div class="header">
+<span id="Readline-Arguments"></span><div class="header">
 <p>
 Next: <a href="#Searching" accesskey="n" rel="next">Searching</a>, Previous: <a href="#Readline-Killing-Commands" accesskey="p" rel="prev">Readline Killing Commands</a>, Up: <a href="#Readline-Interaction" accesskey="u" rel="up">Readline Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Arguments-1"></a>
-<h4 class="subsection">8.2.4 Readline Arguments</h4>
+<span id="Readline-Arguments-1"></span><h4 class="subsection">8.2.4 Readline Arguments</h4>
 
 <p>You can pass numeric arguments to Readline commands.  Sometimes the
 argument acts as a repeat count, other times it is the <i>sign</i> of the
@@ -9615,13 +10007,11 @@ the <kbd>C-d</kbd> command an argument of 10, you could type &lsquo;<samp>M-1 0
 which will delete the next ten characters on the input line.
 </p>
 <hr>
-<a name="Searching"></a>
-<div class="header">
+<span id="Searching"></span><div class="header">
 <p>
 Previous: <a href="#Readline-Arguments" accesskey="p" rel="prev">Readline Arguments</a>, Up: <a href="#Readline-Interaction" accesskey="u" rel="up">Readline Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Searching-for-Commands-in-the-History"></a>
-<h4 class="subsection">8.2.5 Searching for Commands in the History</h4>
+<span id="Searching-for-Commands-in-the-History"></span><h4 class="subsection">8.2.5 Searching for Commands in the History</h4>
 
 <p>Readline provides commands for searching through the command history
 (see <a href="#Bash-History-Facilities">Bash History Facilities</a>)
@@ -9664,14 +10054,12 @@ to search for matching history lines.  The search string may be
 typed by the user or be part of the contents of the current line.
 </p>
 <hr>
-<a name="Readline-Init-File"></a>
-<div class="header">
+<span id="Readline-Init-File"></span><div class="header">
 <p>
 Next: <a href="#Bindable-Readline-Commands" accesskey="n" rel="next">Bindable Readline Commands</a>, Previous: <a href="#Readline-Interaction" accesskey="p" rel="prev">Readline Interaction</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Init-File-1"></a>
-<h3 class="section">8.3 Readline Init File</h3>
-<a name="index-initialization-file_002c-readline"></a>
+<span id="Readline-Init-File-1"></span><h3 class="section">8.3 Readline Init File</h3>
+<span id="index-initialization-file_002c-readline"></span>
 
 <p>Although the Readline library comes with a set of Emacs-like
 keybindings installed by default, it is possible to use a different set
@@ -9683,6 +10071,9 @@ file is taken from the value of the shell variable <code>INPUTRC</code>.  If
 that variable is unset, the default is <samp>~/.inputrc</samp>.  If that
 file does not exist or cannot be read, the ultimate default is
 <samp>/etc/inputrc</samp>.
+The <code>bind</code><!-- /@w --> builtin command can also be used to set Readline
+keybindings and variables.
+See <a href="#Bash-Builtins">Bash Builtins</a>.
 </p>
 <p>When a program which uses the Readline library starts up, the
 init file is read, and the key bindings are set.
@@ -9691,26 +10082,24 @@ init file is read, and the key bindings are set.
 incorporating any changes that you might have made to it.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Readline-Init-File-Syntax" accesskey="1">Readline Init File Syntax</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Syntax for the commands in the inputrc file.
+<tr><td align="left" valign="top">&bull; <a href="#Readline-Init-File-Syntax" accesskey="1">Readline Init File Syntax</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Syntax for the commands in the inputrc file.
 </td></tr>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#Conditional-Init-Constructs" accesskey="2">Conditional Init Constructs</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Conditional key bindings in the inputrc file.
+</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#Conditional-Init-Constructs" accesskey="2">Conditional Init Constructs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Conditional key bindings in the inputrc file.
 </td></tr>
 <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
 
-</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#Sample-Init-File" accesskey="3">Sample Init File</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An example inputrc file.
+</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#Sample-Init-File" accesskey="3">Sample Init File</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">An example inputrc file.
 </td></tr>
 </table>
 
 <hr>
-<a name="Readline-Init-File-Syntax"></a>
-<div class="header">
+<span id="Readline-Init-File-Syntax"></span><div class="header">
 <p>
 Next: <a href="#Conditional-Init-Constructs" accesskey="n" rel="next">Conditional Init Constructs</a>, Up: <a href="#Readline-Init-File" accesskey="u" rel="up">Readline Init File</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-Init-File-Syntax-1"></a>
-<h4 class="subsection">8.3.1 Readline Init File Syntax</h4>
+<span id="Readline-Init-File-Syntax-1"></span><h4 class="subsection">8.3.1 Readline Init File Syntax</h4>
 
 <p>There are only a few basic constructs allowed in the
 Readline init file.  Blank lines are ignored.
@@ -9751,10 +10140,10 @@ and values.  See <a href="#Bash-Builtins">Bash Builtins</a>.
 <p>A great deal of run-time behavior is changeable with the following
 variables.
 </p>
-<a name="index-variables_002c-readline"></a>
+<span id="index-variables_002c-readline"></span>
 <dl compact="compact">
 <dt><code>bell-style</code></dt>
-<dd><a name="index-bell_002dstyle"></a>
+<dd><span id="index-bell_002dstyle"></span>
 <p>Controls what happens when Readline wants to ring the terminal bell.
 If set to &lsquo;<samp>none</samp>&rsquo;, Readline never rings the bell.  If set to
 &lsquo;<samp>visible</samp>&rsquo;, Readline uses a visible bell if one is available.
@@ -9763,21 +10152,21 @@ the terminal&rsquo;s bell.
 </p>
 </dd>
 <dt><code>bind-tty-special-chars</code></dt>
-<dd><a name="index-bind_002dtty_002dspecial_002dchars"></a>
+<dd><span id="index-bind_002dtty_002dspecial_002dchars"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo; (the default), Readline attempts to bind the control
 characters   treated specially by the kernel&rsquo;s terminal driver to their
 Readline equivalents.
 </p>
 </dd>
 <dt><code>blink-matching-paren</code></dt>
-<dd><a name="index-blink_002dmatching_002dparen"></a>
+<dd><span id="index-blink_002dmatching_002dparen"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline attempts to briefly move the cursor to an
 opening parenthesis when a closing parenthesis is inserted.  The default
 is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>colored-completion-prefix</code></dt>
-<dd><a name="index-colored_002dcompletion_002dprefix"></a>
+<dd><span id="index-colored_002dcompletion_002dprefix"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, when listing completions, Readline displays the
 common prefix of the set of possible completions using a different color.
 The color definitions are taken from the value of the <code>LS_COLORS</code>
@@ -9786,7 +10175,7 @@ The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>colored-stats</code></dt>
-<dd><a name="index-colored_002dstats"></a>
+<dd><span id="index-colored_002dstats"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline displays possible completions using different
 colors to indicate their file type.
 The color definitions are taken from the value of the <code>LS_COLORS</code>
@@ -9795,14 +10184,14 @@ The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>comment-begin</code></dt>
-<dd><a name="index-comment_002dbegin"></a>
+<dd><span id="index-comment_002dbegin"></span>
 <p>The string to insert at the beginning of the line when the
 <code>insert-comment</code> command is executed.  The default value
 is <code>&quot;#&quot;</code>.
 </p>
 </dd>
 <dt><code>completion-display-width</code></dt>
-<dd><a name="index-completion_002ddisplay_002dwidth"></a>
+<dd><span id="index-completion_002ddisplay_002dwidth"></span>
 <p>The number of screen columns used to display possible matches
 when performing completion.
 The value is ignored if it is less than 0 or greater than the terminal
@@ -9812,21 +10201,22 @@ The default value is -1.
 </p>
 </dd>
 <dt><code>completion-ignore-case</code></dt>
-<dd><a name="index-completion_002dignore_002dcase"></a>
+<dd><span id="index-completion_002dignore_002dcase"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline performs filename matching and completion
 in a case-insensitive fashion.
 The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>completion-map-case</code></dt>
-<dd><a name="index-completion_002dmap_002dcase"></a>
+<dd><span id="index-completion_002dmap_002dcase"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, and <var>completion-ignore-case</var> is enabled, Readline
 treats hyphens (&lsquo;<samp>-</samp>&rsquo;) and underscores (&lsquo;<samp>_</samp>&rsquo;) as equivalent when
 performing case-insensitive filename matching and completion.
+The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>completion-prefix-display-length</code></dt>
-<dd><a name="index-completion_002dprefix_002ddisplay_002dlength"></a>
+<dd><span id="index-completion_002dprefix_002ddisplay_002dlength"></span>
 <p>The length in characters of the common prefix of a list of possible
 completions that is displayed without modification.  When set to a
 value greater than zero, common prefixes longer than this value are
@@ -9834,19 +10224,19 @@ replaced with an ellipsis when displaying possible completions.
 </p>
 </dd>
 <dt><code>completion-query-items</code></dt>
-<dd><a name="index-completion_002dquery_002ditems"></a>
+<dd><span id="index-completion_002dquery_002ditems"></span>
 <p>The number of possible completions that determines when the user is
 asked whether the list of possibilities should be displayed.
-If the number of possible completions is greater than this value,
-Readline will ask the user whether or not he wishes to view
-them; otherwise, they are simply listed.
+If the number of possible completions is greater than or equal to this value,
+Readline will ask whether or not the user wishes to view them;
+otherwise, they are simply listed.
 This variable must be set to an integer value greater than or equal to 0.
 A negative value means Readline should never ask.
 The default limit is <code>100</code>.
 </p>
 </dd>
 <dt><code>convert-meta</code></dt>
-<dd><a name="index-convert_002dmeta"></a>
+<dd><span id="index-convert_002dmeta"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline will convert characters with the
 eighth bit set to an <small>ASCII</small> key sequence by stripping the eighth
 bit and prefixing an <tt class="key">ESC</tt> character, converting them to a
@@ -9856,21 +10246,21 @@ eight-bit characters.
 </p>
 </dd>
 <dt><code>disable-completion</code></dt>
-<dd><a name="index-disable_002dcompletion"></a>
+<dd><span id="index-disable_002dcompletion"></span>
 <p>If set to &lsquo;<samp>On</samp>&rsquo;, Readline will inhibit word completion.
 Completion  characters will be inserted into the line as if they had
 been mapped to <code>self-insert</code>.  The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>echo-control-characters</code></dt>
-<dd><a name="index-echo_002dcontrol_002dcharacters"></a>
+<dd><span id="index-echo_002dcontrol_002dcharacters"></span>
 <p>When set to &lsquo;<samp>on</samp>&rsquo;, on operating systems that indicate they support it,
 readline echoes a character corresponding to a signal generated from the
 keyboard.  The default is &lsquo;<samp>on</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>editing-mode</code></dt>
-<dd><a name="index-editing_002dmode"></a>
+<dd><span id="index-editing_002dmode"></span>
 <p>The <code>editing-mode</code> variable controls which default set of
 key bindings is used.  By default, Readline starts up in Emacs editing
 mode, where the keystrokes are most similar to Emacs.  This variable can be
@@ -9878,8 +10268,9 @@ set to either &lsquo;<samp>emacs</samp>&rsquo; or &lsquo;<samp>vi</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>emacs-mode-string</code></dt>
-<dd><a name="index-emacs_002dmode_002dstring"></a>
-<p>This string is displayed immediately before the last line of the primary
+<dd><span id="index-emacs_002dmode_002dstring"></span>
+<p>If the <var>show-mode-in-prompt</var> variable is enabled,
+this string is displayed immediately before the last line of the primary
 prompt when emacs editing mode is active.  The value is expanded like a
 key binding, so the standard set of meta- and control prefixes and
 backslash escape sequences is available.
@@ -9890,16 +10281,16 @@ The default is &lsquo;<samp>@</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>enable-bracketed-paste</code></dt>
-<dd><a name="index-enable_002dbracketed_002dpaste"></a>
+<dd><span id="index-enable_002dbracketed_002dpaste"></span>
 <p>When set to &lsquo;<samp>On</samp>&rsquo;, Readline will configure the terminal in a way
 that will enable it to insert each paste into the editing buffer as a
 single string of characters, instead of treating each character as if
 it had been read from the keyboard.  This can prevent pasted characters
-from being interpreted as editing commands.  The default is &lsquo;<samp>off</samp>&rsquo;.
+from being interpreted as editing commands.  The default is &lsquo;<samp>On</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>enable-keypad</code></dt>
-<dd><a name="index-enable_002dkeypad"></a>
+<dd><span id="index-enable_002dkeypad"></span>
 <p>When set to &lsquo;<samp>on</samp>&rsquo;, Readline will try to enable the application
 keypad when it is called.  Some systems need this to enable the
 arrow keys.  The default is &lsquo;<samp>off</samp>&rsquo;.
@@ -9913,13 +10304,13 @@ The default is &lsquo;<samp>on</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>expand-tilde</code></dt>
-<dd><a name="index-expand_002dtilde"></a>
+<dd><span id="index-expand_002dtilde"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, tilde expansion is performed when Readline
 attempts word completion.  The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>history-preserve-point</code></dt>
-<dd><a name="index-history_002dpreserve_002dpoint"></a>
+<dd><span id="index-history_002dpreserve_002dpoint"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, the history code attempts to place the point (the
 current cursor position) at the
 same location on each history line retrieved with <code>previous-history</code>
@@ -9927,7 +10318,7 @@ or <code>next-history</code>.  The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>history-size</code></dt>
-<dd><a name="index-history_002dsize"></a>
+<dd><span id="index-history_002dsize"></span>
 <p>Set the maximum number of history entries saved in the history list.
 If set to zero, any existing history entries are deleted and no new entries
 are saved.
@@ -9939,17 +10330,18 @@ the maximum number of history entries will be set to 500.
 </p>
 </dd>
 <dt><code>horizontal-scroll-mode</code></dt>
-<dd><a name="index-horizontal_002dscroll_002dmode"></a>
+<dd><span id="index-horizontal_002dscroll_002dmode"></span>
 <p>This variable can be set to either &lsquo;<samp>on</samp>&rsquo; or &lsquo;<samp>off</samp>&rsquo;.  Setting it
 to &lsquo;<samp>on</samp>&rsquo; means that the text of the lines being edited will scroll
 horizontally on a single screen line when they are longer than the width
-of the screen, instead of wrapping onto a new screen line.  By default,
-this variable is set to &lsquo;<samp>off</samp>&rsquo;.
+of the screen, instead of wrapping onto a new screen line.
+This variable is automatically set to &lsquo;<samp>on</samp>&rsquo; for terminals of height 1.
+By default, this variable is set to &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>input-meta</code></dt>
-<dd><a name="index-input_002dmeta"></a>
-<a name="index-meta_002dflag"></a>
+<dd><span id="index-input_002dmeta"></span>
+<span id="index-meta_002dflag"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline will enable eight-bit input (it
 will not clear the eighth bit in the characters it reads),
 regardless of what the terminal claims it can support.  The
@@ -9959,7 +10351,7 @@ The name <code>meta-flag</code> is a synonym for this variable.
 </p>
 </dd>
 <dt><code>isearch-terminators</code></dt>
-<dd><a name="index-isearch_002dterminators"></a>
+<dd><span id="index-isearch_002dterminators"></span>
 <p>The string of characters that should terminate an incremental search without
 subsequently executing the character as a command (see <a href="#Searching">Searching</a>).
 If this variable has not been given a value, the characters <tt class="key">ESC</tt> and
@@ -9967,9 +10359,9 @@ If this variable has not been given a value, the characters <tt class="key">ESC<
 </p>
 </dd>
 <dt><code>keymap</code></dt>
-<dd><a name="index-keymap"></a>
+<dd><span id="index-keymap"></span>
 <p>Sets Readline&rsquo;s idea of the current keymap for key binding commands.
-Acceptable <code>keymap</code> names are
+Built-in <code>keymap</code> names are
 <code>emacs</code>,
 <code>emacs-standard</code>,
 <code>emacs-meta</code>,
@@ -9980,6 +10372,7 @@ Acceptable <code>keymap</code> names are
 <code>vi-insert</code>.
 <code>vi</code> is equivalent to <code>vi-command</code> (<code>vi-move</code> is also a
 synonym); <code>emacs</code> is equivalent to <code>emacs-standard</code>.
+Applications may add additional names.
 The default value is <code>emacs</code>.
 The value of the <code>editing-mode</code> variable also affects the
 default keymap.
@@ -10008,14 +10401,14 @@ appended.  The default is &lsquo;<samp>on</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>mark-modified-lines</code></dt>
-<dd><a name="index-mark_002dmodified_002dlines"></a>
+<dd><span id="index-mark_002dmodified_002dlines"></span>
 <p>This variable, when set to &lsquo;<samp>on</samp>&rsquo;, causes Readline to display an
 asterisk (&lsquo;<samp>*</samp>&rsquo;) at the start of history lines which have been modified.
 This variable is &lsquo;<samp>off</samp>&rsquo; by default.
 </p>
 </dd>
 <dt><code>mark-symlinked-directories</code></dt>
-<dd><a name="index-mark_002dsymlinked_002ddirectories"></a>
+<dd><span id="index-mark_002dsymlinked_002ddirectories"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, completed names which are symbolic links
 to directories have a slash appended (subject to the value of
 <code>mark-directories</code>).
@@ -10023,7 +10416,7 @@ The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>match-hidden-files</code></dt>
-<dd><a name="index-match_002dhidden_002dfiles"></a>
+<dd><span id="index-match_002dhidden_002dfiles"></span>
 <p>This variable, when set to &lsquo;<samp>on</samp>&rsquo;, causes Readline to match files whose
 names begin with a &lsquo;<samp>.</samp>&rsquo; (hidden files) when performing filename
 completion.
@@ -10033,14 +10426,14 @@ This variable is &lsquo;<samp>on</samp>&rsquo; by default.
 </p>
 </dd>
 <dt><code>menu-complete-display-prefix</code></dt>
-<dd><a name="index-menu_002dcomplete_002ddisplay_002dprefix"></a>
+<dd><span id="index-menu_002dcomplete_002ddisplay_002dprefix"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, menu completion displays the common prefix of the
 list of possible completions (which may be empty) before cycling through
 the list.  The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>output-meta</code></dt>
-<dd><a name="index-output_002dmeta"></a>
+<dd><span id="index-output_002dmeta"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline will display characters with the
 eighth bit set directly rather than as a meta-prefixed escape
 sequence.
@@ -10049,7 +10442,7 @@ locale contains eight-bit characters.
 </p>
 </dd>
 <dt><code>page-completions</code></dt>
-<dd><a name="index-page_002dcompletions"></a>
+<dd><span id="index-page_002dcompletions"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline uses an internal <code>more</code>-like pager
 to display a screenful of possible completions at a time.
 This variable is &lsquo;<samp>on</samp>&rsquo; by default.
@@ -10062,7 +10455,7 @@ The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>revert-all-at-newline</code></dt>
-<dd><a name="index-revert_002dall_002dat_002dnewline"></a>
+<dd><span id="index-revert_002dall_002dat_002dnewline"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, Readline will undo all changes to history lines
 before returning when <code>accept-line</code> is executed.  By default,
 history lines may be modified and retain individual undo lists across
@@ -10070,7 +10463,7 @@ calls to <code>readline</code>.  The default is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>show-all-if-ambiguous</code></dt>
-<dd><a name="index-show_002dall_002dif_002dambiguous"></a>
+<dd><span id="index-show_002dall_002dif_002dambiguous"></span>
 <p>This alters the default behavior of the completion functions.  If
 set to &lsquo;<samp>on</samp>&rsquo;, 
 words which have more than one possible completion cause the
@@ -10079,7 +10472,7 @@ The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>show-all-if-unmodified</code></dt>
-<dd><a name="index-show_002dall_002dif_002dunmodified"></a>
+<dd><span id="index-show_002dall_002dif_002dunmodified"></span>
 <p>This alters the default behavior of the completion functions in
 a fashion similar to <var>show-all-if-ambiguous</var>.
 If set to &lsquo;<samp>on</samp>&rsquo;, 
@@ -10091,15 +10484,15 @@ The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>show-mode-in-prompt</code></dt>
-<dd><a name="index-show_002dmode_002din_002dprompt"></a>
-<p>If set to &lsquo;<samp>on</samp>&rsquo;, add a character to the beginning of the prompt
+<dd><span id="index-show_002dmode_002din_002dprompt"></span>
+<p>If set to &lsquo;<samp>on</samp>&rsquo;, add a string to the beginning of the prompt
 indicating the editing mode: emacs, vi command, or vi insertion.
-The mode strings are user-settable.
+The mode strings are user-settable (e.g., <var>emacs-mode-string</var>).
 The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>skip-completed-text</code></dt>
-<dd><a name="index-skip_002dcompleted_002dtext"></a>
+<dd><span id="index-skip_002dcompleted_002dtext"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, this alters the default completion behavior when
 inserting a single match into the line.  It&rsquo;s only active when
 performing completion in the middle of a word.  If enabled, readline
@@ -10114,8 +10507,9 @@ The default value is &lsquo;<samp>off</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>vi-cmd-mode-string</code></dt>
-<dd><a name="index-vi_002dcmd_002dmode_002dstring"></a>
-<p>This string is displayed immediately before the last line of the primary
+<dd><span id="index-vi_002dcmd_002dmode_002dstring"></span>
+<p>If the <var>show-mode-in-prompt</var> variable is enabled,
+this string is displayed immediately before the last line of the primary
 prompt when vi editing mode is active and in command mode.
 The value is expanded like a
 key binding, so the standard set of meta- and control prefixes and
@@ -10127,8 +10521,9 @@ The default is &lsquo;<samp>(cmd)</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>vi-ins-mode-string</code></dt>
-<dd><a name="index-vi_002dins_002dmode_002dstring"></a>
-<p>This string is displayed immediately before the last line of the primary
+<dd><span id="index-vi_002dins_002dmode_002dstring"></span>
+<p>If the <var>show-mode-in-prompt</var> variable is enabled,
+this string is displayed immediately before the last line of the primary
 prompt when vi editing mode is active and in insertion mode.
 The value is expanded like a
 key binding, so the standard set of meta- and control prefixes and
@@ -10140,7 +10535,7 @@ The default is &lsquo;<samp>(ins)</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>visible-stats</code></dt>
-<dd><a name="index-visible_002dstats"></a>
+<dd><span id="index-visible_002dstats"></span>
 <p>If set to &lsquo;<samp>on</samp>&rsquo;, a character denoting a file&rsquo;s type
 is appended to the filename when listing possible
 completions.  The default is &lsquo;<samp>off</samp>&rsquo;.
@@ -10181,7 +10576,7 @@ Meta-Rubout: backward-kill-word
 Control-o: &quot;&gt; output&quot;
 </pre></div>
 
-<p>In the above example, <kbd>C-u</kbd> is bound to the function
+<p>In the example above, <kbd>C-u</kbd> is bound to the function
 <code>universal-argument</code>,
 <kbd>M-DEL</kbd> is bound to the function <code>backward-kill-word</code>, and
 <kbd>C-o</kbd> is bound to run the macro
@@ -10304,13 +10699,11 @@ insert a single &lsquo;<samp>\</samp>&rsquo; into the line:
 </dl>
 
 <hr>
-<a name="Conditional-Init-Constructs"></a>
-<div class="header">
+<span id="Conditional-Init-Constructs"></span><div class="header">
 <p>
 Next: <a href="#Sample-Init-File" accesskey="n" rel="next">Sample Init File</a>, Previous: <a href="#Readline-Init-File-Syntax" accesskey="p" rel="prev">Readline Init File Syntax</a>, Up: <a href="#Readline-Init-File" accesskey="u" rel="up">Readline Init File</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Conditional-Init-Constructs-1"></a>
-<h4 class="subsection">8.3.2 Conditional Init Constructs</h4>
+<span id="Conditional-Init-Constructs-1"></span><h4 class="subsection">8.3.2 Conditional Init Constructs</h4>
 
 <p>Readline implements a facility similar in spirit to the conditional
 compilation features of the C preprocessor which allows key
@@ -10321,8 +10714,9 @@ of tests.  There are four parser directives used.
 <dt><code>$if</code></dt>
 <dd><p>The <code>$if</code> construct allows bindings to be made based on the
 editing mode, the terminal being used, or the application using
-Readline.  The text of the test extends to the end of the line;
-no characters are required to isolate it.
+Readline.  The text of the test, after any comparison operator,
+extends to the end of the line;
+unless otherwise noted, no characters are required to isolate it.
 </p>
 <dl compact="compact">
 <dt><code>mode</code></dt>
@@ -10343,6 +10737,28 @@ the portion of the terminal name before the first &lsquo;<samp>-</samp>&rsquo;.
 allows <code>sun</code> to match both <code>sun</code> and <code>sun-cmd</code>,
 for instance.
 </p>
+</dd>
+<dt><code>version</code></dt>
+<dd><p>The <code>version</code> test may be used to perform comparisons against
+specific Readline versions.
+The <code>version</code> expands to the current Readline version.
+The set of comparison operators includes
+&lsquo;<samp>=</samp>&rsquo; (and &lsquo;<samp>==</samp>&rsquo;), &lsquo;<samp>!=</samp>&rsquo;, &lsquo;<samp>&lt;=</samp>&rsquo;, &lsquo;<samp>&gt;=</samp>&rsquo;, &lsquo;<samp>&lt;</samp>&rsquo;,
+and &lsquo;<samp>&gt;</samp>&rsquo;.
+The version number supplied on the right side of the operator consists
+of a major version number, an optional decimal point, and an optional
+minor version (e.g., &lsquo;<samp>7.1</samp>&rsquo;). If the minor version is omitted, it
+is assumed to be &lsquo;<samp>0</samp>&rsquo;.
+The operator may be separated from the string <code>version</code> and
+from the version number argument by whitespace.
+The following example sets a variable if the Readline version being used
+is 7.0 or newer:
+</p><div class="example">
+<pre class="example">$if version &gt;= 7.0
+set show-mode-in-prompt on
+$endif
+</pre></div>
+
 </dd>
 <dt><code>application</code></dt>
 <dd><p>The <var>application</var> construct is used to include
@@ -10358,6 +10774,24 @@ key sequence that quotes the current or previous word in Bash:
 &quot;\C-xq&quot;: &quot;\eb\&quot;\ef\&quot;&quot;
 $endif
 </pre></div>
+
+</dd>
+<dt><code>variable</code></dt>
+<dd><p>The <var>variable</var> construct provides simple equality tests for Readline
+variables and values.
+The permitted comparison operators are &lsquo;<samp>=</samp>&rsquo;, &lsquo;<samp>==</samp>&rsquo;, and &lsquo;<samp>!=</samp>&rsquo;.
+The variable name must be separated from the comparison operator by
+whitespace; the operator may be separated from the value on the right hand
+side by whitespace.
+Both string and boolean variables may be tested. Boolean variables must be
+tested against the values <var>on</var> and <var>off</var>.
+The following example is equivalent to the <code>mode=emacs</code> test described
+above:
+</p><div class="example">
+<pre class="example">$if editing-mode == emacs
+set show-mode-in-prompt on
+$endif
+</pre></div>
 </dd>
 </dl>
 
@@ -10383,13 +10817,11 @@ For example, the following directive reads from <samp>/etc/inputrc</samp>:
 </dl>
 
 <hr>
-<a name="Sample-Init-File"></a>
-<div class="header">
+<span id="Sample-Init-File"></span><div class="header">
 <p>
 Previous: <a href="#Conditional-Init-Constructs" accesskey="p" rel="prev">Conditional Init Constructs</a>, Up: <a href="#Readline-Init-File" accesskey="u" rel="up">Readline Init File</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Sample-Init-File-1"></a>
-<h4 class="subsection">8.3.3 Sample Init File</h4>
+<span id="Sample-Init-File-1"></span><h4 class="subsection">8.3.3 Sample Init File</h4>
 
 <p>Here is an example of an <var>inputrc</var> file.  This illustrates key
 binding, variable assignment, and conditional syntax.
@@ -10484,8 +10916,8 @@ set convert-meta off
 # rather than as meta-prefixed characters
 set output-meta on
 
-# if there are more than 150 possible completions for
-# a word, ask the user if he wants to see all of them
+# if there are 150 or more possible completions for a word,
+# ask whether or not the user wants to see all of them
 set completion-query-items 150
 
 # For FTP
@@ -10497,30 +10929,28 @@ $endif
 </pre></div>
 
 <hr>
-<a name="Bindable-Readline-Commands"></a>
-<div class="header">
+<span id="Bindable-Readline-Commands"></span><div class="header">
 <p>
 Next: <a href="#Readline-vi-Mode" accesskey="n" rel="next">Readline vi Mode</a>, Previous: <a href="#Readline-Init-File" accesskey="p" rel="prev">Readline Init File</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bindable-Readline-Commands-1"></a>
-<h3 class="section">8.4 Bindable Readline Commands</h3>
+<span id="Bindable-Readline-Commands-1"></span><h3 class="section">8.4 Bindable Readline Commands</h3>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Moving" accesskey="1">Commands For Moving</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Moving about the line.
+<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Moving" accesskey="1">Commands For Moving</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Moving about the line.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Commands-For-History" accesskey="2">Commands For History</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Getting at previous lines.
+<tr><td align="left" valign="top">&bull; <a href="#Commands-For-History" accesskey="2">Commands For History</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Getting at previous lines.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Text" accesskey="3">Commands For Text</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands for changing text.
+<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Text" accesskey="3">Commands For Text</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands for changing text.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Killing" accesskey="4">Commands For Killing</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands for killing and yanking.
+<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Killing" accesskey="4">Commands For Killing</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Commands for killing and yanking.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Numeric-Arguments" accesskey="5">Numeric Arguments</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Specifying numeric arguments, repeat counts.
+<tr><td align="left" valign="top">&bull; <a href="#Numeric-Arguments" accesskey="5">Numeric Arguments</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Specifying numeric arguments, repeat counts.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Completion" accesskey="6">Commands For Completion</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Getting Readline to do the typing for you.
+<tr><td align="left" valign="top">&bull; <a href="#Commands-For-Completion" accesskey="6">Commands For Completion</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Getting Readline to do the typing for you.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Keyboard-Macros" accesskey="7">Keyboard Macros</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Saving and re-executing typed characters
+<tr><td align="left" valign="top">&bull; <a href="#Keyboard-Macros" accesskey="7">Keyboard Macros</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Saving and re-executing typed characters
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Miscellaneous-Commands" accesskey="8">Miscellaneous Commands</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Other miscellaneous commands.
+<tr><td align="left" valign="top">&bull; <a href="#Miscellaneous-Commands" accesskey="8">Miscellaneous Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Other miscellaneous commands.
 </td></tr>
 </table>
 
@@ -10537,75 +10967,101 @@ position, and <em>mark</em> refers to a cursor position saved by the
 The text between the point and mark is referred to as the <em>region</em>.
 </p>
 <hr>
-<a name="Commands-For-Moving"></a>
-<div class="header">
+<span id="Commands-For-Moving"></span><div class="header">
 <p>
 Next: <a href="#Commands-For-History" accesskey="n" rel="next">Commands For History</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Commands-For-Moving-1"></a>
-<h4 class="subsection">8.4.1 Commands For Moving</h4>
+<span id="Commands-For-Moving-1"></span><h4 class="subsection">8.4.1 Commands For Moving</h4>
 <dl compact="compact">
 <dt><code>beginning-of-line (C-a)</code>
-<a name="index-beginning_002dof_002dline-_0028C_002da_0029"></a>
+<span id="index-beginning_002dof_002dline-_0028C_002da_0029"></span>
 </dt>
 <dd><p>Move to the start of the current line.
 </p>
 </dd>
 <dt><code>end-of-line (C-e)</code>
-<a name="index-end_002dof_002dline-_0028C_002de_0029"></a>
+<span id="index-end_002dof_002dline-_0028C_002de_0029"></span>
 </dt>
 <dd><p>Move to the end of the line.
 </p>
 </dd>
 <dt><code>forward-char (C-f)</code>
-<a name="index-forward_002dchar-_0028C_002df_0029"></a>
+<span id="index-forward_002dchar-_0028C_002df_0029"></span>
 </dt>
 <dd><p>Move forward a character.
 </p>
 </dd>
 <dt><code>backward-char (C-b)</code>
-<a name="index-backward_002dchar-_0028C_002db_0029"></a>
+<span id="index-backward_002dchar-_0028C_002db_0029"></span>
 </dt>
 <dd><p>Move back a character.
 </p>
 </dd>
 <dt><code>forward-word (M-f)</code>
-<a name="index-forward_002dword-_0028M_002df_0029"></a>
+<span id="index-forward_002dword-_0028M_002df_0029"></span>
 </dt>
 <dd><p>Move forward to the end of the next word.
 Words are composed of letters and digits.
 </p>
 </dd>
 <dt><code>backward-word (M-b)</code>
-<a name="index-backward_002dword-_0028M_002db_0029"></a>
+<span id="index-backward_002dword-_0028M_002db_0029"></span>
 </dt>
 <dd><p>Move back to the start of the current or previous word.
 Words are composed of letters and digits.
 </p>
 </dd>
-<dt><code>shell-forward-word ()</code>
-<a name="index-shell_002dforward_002dword-_0028_0029"></a>
+<dt><code>shell-forward-word (M-C-f)</code>
+<span id="index-shell_002dforward_002dword-_0028M_002dC_002df_0029"></span>
 </dt>
 <dd><p>Move forward to the end of the next word.
 Words are delimited by non-quoted shell metacharacters.
 </p>
 </dd>
-<dt><code>shell-backward-word ()</code>
-<a name="index-shell_002dbackward_002dword-_0028_0029"></a>
+<dt><code>shell-backward-word (M-C-b)</code>
+<span id="index-shell_002dbackward_002dword-_0028M_002dC_002db_0029"></span>
 </dt>
 <dd><p>Move back to the start of the current or previous word.
 Words are delimited by non-quoted shell metacharacters.
 </p>
 </dd>
-<dt><code>clear-screen (C-l)</code>
-<a name="index-clear_002dscreen-_0028C_002dl_0029"></a>
+<dt><code>previous-screen-line ()</code>
+<span id="index-previous_002dscreen_002dline-_0028_0029"></span>
 </dt>
-<dd><p>Clear the screen and redraw the current line,
+<dd><p>Attempt to move point to the same physical screen column on the previous
+physical screen line. This will not have the desired effect if the current
+Readline line does not take up more than one physical line or if point is not
+greater than the length of the prompt plus the screen width.
+</p>
+</dd>
+<dt><code>next-screen-line ()</code>
+<span id="index-next_002dscreen_002dline-_0028_0029"></span>
+</dt>
+<dd><p>Attempt to move point to the same physical screen column on the next
+physical screen line. This will not have the desired effect if the current
+Readline line does not take up more than one physical line or if the length
+of the current Readline line is not greater than the length of the prompt
+plus the screen width.
+</p>
+</dd>
+<dt><code>clear-display (M-C-l)</code>
+<span id="index-clear_002ddisplay-_0028M_002dC_002dl_0029"></span>
+</dt>
+<dd><p>Clear the screen and, if possible, the terminal&rsquo;s scrollback buffer,
+then redraw the current line,
+leaving the current line at the top of the screen.
+</p>
+</dd>
+<dt><code>clear-screen (C-l)</code>
+<span id="index-clear_002dscreen-_0028C_002dl_0029"></span>
+</dt>
+<dd><p>Clear the screen,
+then redraw the current line,
 leaving the current line at the top of the screen.
 </p>
 </dd>
 <dt><code>redraw-current-line ()</code>
-<a name="index-redraw_002dcurrent_002dline-_0028_0029"></a>
+<span id="index-redraw_002dcurrent_002dline-_0028_0029"></span>
 </dt>
 <dd><p>Refresh the current line.  By default, this is unbound.
 </p>
@@ -10613,17 +11069,15 @@ leaving the current line at the top of the screen.
 </dl>
 
 <hr>
-<a name="Commands-For-History"></a>
-<div class="header">
+<span id="Commands-For-History"></span><div class="header">
 <p>
 Next: <a href="#Commands-For-Text" accesskey="n" rel="next">Commands For Text</a>, Previous: <a href="#Commands-For-Moving" accesskey="p" rel="prev">Commands For Moving</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Commands-For-Manipulating-The-History"></a>
-<h4 class="subsection">8.4.2 Commands For Manipulating The History</h4>
+<span id="Commands-For-Manipulating-The-History"></span><h4 class="subsection">8.4.2 Commands For Manipulating The History</h4>
 
 <dl compact="compact">
 <dt><code>accept-line (Newline or Return)</code>
-<a name="index-accept_002dline-_0028Newline-or-Return_0029"></a>
+<span id="index-accept_002dline-_0028Newline-or-Return_0029"></span>
 </dt>
 <dd><p>Accept the line regardless of where the cursor is.
 If this line is
@@ -10634,46 +11088,48 @@ to its original state.
 </p>
 </dd>
 <dt><code>previous-history (C-p)</code>
-<a name="index-previous_002dhistory-_0028C_002dp_0029"></a>
+<span id="index-previous_002dhistory-_0028C_002dp_0029"></span>
 </dt>
 <dd><p>Move &lsquo;back&rsquo; through the history list, fetching the previous command.
 </p>
 </dd>
 <dt><code>next-history (C-n)</code>
-<a name="index-next_002dhistory-_0028C_002dn_0029"></a>
+<span id="index-next_002dhistory-_0028C_002dn_0029"></span>
 </dt>
 <dd><p>Move &lsquo;forward&rsquo; through the history list, fetching the next command.
 </p>
 </dd>
 <dt><code>beginning-of-history (M-&lt;)</code>
-<a name="index-beginning_002dof_002dhistory-_0028M_002d_003c_0029"></a>
+<span id="index-beginning_002dof_002dhistory-_0028M_002d_003c_0029"></span>
 </dt>
 <dd><p>Move to the first line in the history.
 </p>
 </dd>
 <dt><code>end-of-history (M-&gt;)</code>
-<a name="index-end_002dof_002dhistory-_0028M_002d_003e_0029"></a>
+<span id="index-end_002dof_002dhistory-_0028M_002d_003e_0029"></span>
 </dt>
 <dd><p>Move to the end of the input history, i.e., the line currently
 being entered.
 </p>
 </dd>
 <dt><code>reverse-search-history (C-r)</code>
-<a name="index-reverse_002dsearch_002dhistory-_0028C_002dr_0029"></a>
+<span id="index-reverse_002dsearch_002dhistory-_0028C_002dr_0029"></span>
 </dt>
 <dd><p>Search backward starting at the current line and moving &lsquo;up&rsquo; through
 the history as necessary.  This is an incremental search.
+This command sets the region to the matched text and activates the mark.
 </p>
 </dd>
 <dt><code>forward-search-history (C-s)</code>
-<a name="index-forward_002dsearch_002dhistory-_0028C_002ds_0029"></a>
+<span id="index-forward_002dsearch_002dhistory-_0028C_002ds_0029"></span>
 </dt>
 <dd><p>Search forward starting at the current line and moving &lsquo;down&rsquo; through
 the history as necessary.  This is an incremental search.
+This command sets the region to the matched text and activates the mark.
 </p>
 </dd>
 <dt><code>non-incremental-reverse-search-history (M-p)</code>
-<a name="index-non_002dincremental_002dreverse_002dsearch_002dhistory-_0028M_002dp_0029"></a>
+<span id="index-non_002dincremental_002dreverse_002dsearch_002dhistory-_0028M_002dp_0029"></span>
 </dt>
 <dd><p>Search backward starting at the current line and moving &lsquo;up&rsquo;
 through the history as necessary using a non-incremental search
@@ -10682,7 +11138,7 @@ The search string may match anywhere in a history line.
 </p>
 </dd>
 <dt><code>non-incremental-forward-search-history (M-n)</code>
-<a name="index-non_002dincremental_002dforward_002dsearch_002dhistory-_0028M_002dn_0029"></a>
+<span id="index-non_002dincremental_002dforward_002dsearch_002dhistory-_0028M_002dn_0029"></span>
 </dt>
 <dd><p>Search forward starting at the current line and moving &lsquo;down&rsquo;
 through the history as necessary using a non-incremental search
@@ -10691,7 +11147,7 @@ The search string may match anywhere in a history line.
 </p>
 </dd>
 <dt><code>history-search-forward ()</code>
-<a name="index-history_002dsearch_002dforward-_0028_0029"></a>
+<span id="index-history_002dsearch_002dforward-_0028_0029"></span>
 </dt>
 <dd><p>Search forward through the history for the string of characters
 between the start of the current line and the point.
@@ -10701,7 +11157,7 @@ By default, this command is unbound.
 </p>
 </dd>
 <dt><code>history-search-backward ()</code>
-<a name="index-history_002dsearch_002dbackward-_0028_0029"></a>
+<span id="index-history_002dsearch_002dbackward-_0028_0029"></span>
 </dt>
 <dd><p>Search backward through the history for the string of characters
 between the start of the current line and the point.
@@ -10710,8 +11166,8 @@ This is a non-incremental search.
 By default, this command is unbound.
 </p>
 </dd>
-<dt><code>history-substr-search-forward ()</code>
-<a name="index-history_002dsubstr_002dsearch_002dforward-_0028_0029"></a>
+<dt><code>history-substring-search-forward ()</code>
+<span id="index-history_002dsubstring_002dsearch_002dforward-_0028_0029"></span>
 </dt>
 <dd><p>Search forward through the history for the string of characters
 between the start of the current line and the point.
@@ -10720,8 +11176,8 @@ This is a non-incremental search.
 By default, this command is unbound.
 </p>
 </dd>
-<dt><code>history-substr-search-backward ()</code>
-<a name="index-history_002dsubstr_002dsearch_002dbackward-_0028_0029"></a>
+<dt><code>history-substring-search-backward ()</code>
+<span id="index-history_002dsubstring_002dsearch_002dbackward-_0028_0029"></span>
 </dt>
 <dd><p>Search backward through the history for the string of characters
 between the start of the current line and the point.
@@ -10731,7 +11187,7 @@ By default, this command is unbound.
 </p>
 </dd>
 <dt><code>yank-nth-arg (M-C-y)</code>
-<a name="index-yank_002dnth_002darg-_0028M_002dC_002dy_0029"></a>
+<span id="index-yank_002dnth_002darg-_0028M_002dC_002dy_0029"></span>
 </dt>
 <dd><p>Insert the first argument to the previous command (usually
 the second word on the previous line) at point.
@@ -10744,7 +11200,7 @@ as if the &lsquo;<samp>!<var>n</var></samp>&rsquo; history expansion had been sp
 </p>
 </dd>
 <dt><code>yank-last-arg (M-. or M-_)</code>
-<a name="index-yank_002dlast_002darg-_0028M_002d_002e-or-M_002d_005f_0029"></a>
+<span id="index-yank_002dlast_002darg-_0028M_002d_002e-or-M_002d_005f_0029"></span>
 </dt>
 <dd><p>Insert last argument to the previous command (the last word of the
 previous history entry).
@@ -10759,20 +11215,29 @@ The history expansion facilities are used to extract the last argument,
 as if the &lsquo;<samp>!$</samp>&rsquo; history expansion had been specified.
 </p>
 </dd>
+<dt><code>operate-and-get-next (C-o)</code>
+<span id="index-operate_002dand_002dget_002dnext-_0028C_002do_0029"></span>
+</dt>
+<dd><p>Accept the current line for return to the calling application as if a
+newline had been entered,
+and fetch the next line relative to the current line from the history
+for editing.
+A numeric argument, if supplied, specifies the history entry to use instead
+of the current line.
+</p>
+</dd>
 </dl>
 
 <hr>
-<a name="Commands-For-Text"></a>
-<div class="header">
+<span id="Commands-For-Text"></span><div class="header">
 <p>
 Next: <a href="#Commands-For-Killing" accesskey="n" rel="next">Commands For Killing</a>, Previous: <a href="#Commands-For-History" accesskey="p" rel="prev">Commands For History</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Commands-For-Changing-Text"></a>
-<h4 class="subsection">8.4.3 Commands For Changing Text</h4>
+<span id="Commands-For-Changing-Text"></span><h4 class="subsection">8.4.3 Commands For Changing Text</h4>
 
 <dl compact="compact">
 <dt><code><i>end-of-file</i> (usually C-d)</code>
-<a name="index-end_002dof_002dfile-_0028usually-C_002dd_0029"></a>
+<span id="index-end_002dof_002dfile-_0028usually-C_002dd_0029"></span>
 </dt>
 <dd><p>The character indicating end-of-file as set, for example, by
 <code>stty</code>.  If this character is read when there are no characters
@@ -10781,7 +11246,7 @@ interprets it as the end of input and returns <small>EOF</small>.
 </p>
 </dd>
 <dt><code>delete-char (C-d)</code>
-<a name="index-delete_002dchar-_0028C_002dd_0029"></a>
+<span id="index-delete_002dchar-_0028C_002dd_0029"></span>
 </dt>
 <dd><p>Delete the character at point.  If this function is bound to the
 same character as the tty <small>EOF</small> character, as <kbd>C-d</kbd>
@@ -10789,14 +11254,14 @@ commonly is, see above for the effects.
 </p>
 </dd>
 <dt><code>backward-delete-char (Rubout)</code>
-<a name="index-backward_002ddelete_002dchar-_0028Rubout_0029"></a>
+<span id="index-backward_002ddelete_002dchar-_0028Rubout_0029"></span>
 </dt>
 <dd><p>Delete the character behind the cursor.  A numeric argument means
 to kill the characters instead of deleting them.
 </p>
 </dd>
 <dt><code>forward-backward-delete-char ()</code>
-<a name="index-forward_002dbackward_002ddelete_002dchar-_0028_0029"></a>
+<span id="index-forward_002dbackward_002ddelete_002dchar-_0028_0029"></span>
 </dt>
 <dd><p>Delete the character under the cursor, unless the cursor is at the
 end of the line, in which case the character behind the cursor is
@@ -10804,7 +11269,7 @@ deleted.  By default, this is not bound to a key.
 </p>
 </dd>
 <dt><code>quoted-insert (C-q or C-v)</code>
-<a name="index-quoted_002dinsert-_0028C_002dq-or-C_002dv_0029"></a>
+<span id="index-quoted_002dinsert-_0028C_002dq-or-C_002dv_0029"></span>
 </dt>
 <dd><p>Add the next character typed to the line verbatim.  This is
 how to insert key sequences like <kbd>C-q</kbd>, for example.
@@ -10812,24 +11277,29 @@ how to insert key sequences like <kbd>C-q</kbd>, for example.
 
 </dd>
 <dt><code>self-insert (a, b, A, 1, !, &hellip;)</code>
-<a name="index-self_002dinsert-_0028a_002c-b_002c-A_002c-1_002c-_0021_002c-_2026_0029"></a>
+<span id="index-self_002dinsert-_0028a_002c-b_002c-A_002c-1_002c-_0021_002c-_2026_0029"></span>
 </dt>
 <dd><p>Insert yourself.
 </p>
 </dd>
 <dt><code>bracketed-paste-begin ()</code>
-<a name="index-bracketed_002dpaste_002dbegin-_0028_0029"></a>
+<span id="index-bracketed_002dpaste_002dbegin-_0028_0029"></span>
 </dt>
 <dd><p>This function is intended to be bound to the &quot;bracketed paste&quot; escape
 sequence sent by some terminals, and such a binding is assigned by default.
 It allows Readline to insert the pasted text as a single unit without treating
 each character as if it had been read from the keyboard.  The characters
-are inserted as if each one was bound to <code>self-insert</code>) instead of
+are inserted as if each one was bound to <code>self-insert</code> instead of
 executing any editing commands.
 </p>
+<p>Bracketed paste sets the region (the characters between point and the mark)
+to the inserted text. It uses the concept of an <em>active mark</em>: when the
+mark is active, Readline redisplay uses the terminal&rsquo;s standout mode to
+denote the region.
+</p>
 </dd>
 <dt><code>transpose-chars (C-t)</code>
-<a name="index-transpose_002dchars-_0028C_002dt_0029"></a>
+<span id="index-transpose_002dchars-_0028C_002dt_0029"></span>
 </dt>
 <dd><p>Drag the character before the cursor forward over
 the character at the cursor, moving the
@@ -10840,7 +11310,7 @@ Negative arguments have no effect.
 </p>
 </dd>
 <dt><code>transpose-words (M-t)</code>
-<a name="index-transpose_002dwords-_0028M_002dt_0029"></a>
+<span id="index-transpose_002dwords-_0028M_002dt_0029"></span>
 </dt>
 <dd><p>Drag the word before point past the word after point,
 moving point past that word as well.
@@ -10849,28 +11319,28 @@ the last two words on the line.
 </p>
 </dd>
 <dt><code>upcase-word (M-u)</code>
-<a name="index-upcase_002dword-_0028M_002du_0029"></a>
+<span id="index-upcase_002dword-_0028M_002du_0029"></span>
 </dt>
 <dd><p>Uppercase the current (or following) word.  With a negative argument,
 uppercase the previous word, but do not move the cursor.
 </p>
 </dd>
 <dt><code>downcase-word (M-l)</code>
-<a name="index-downcase_002dword-_0028M_002dl_0029"></a>
+<span id="index-downcase_002dword-_0028M_002dl_0029"></span>
 </dt>
 <dd><p>Lowercase the current (or following) word.  With a negative argument,
 lowercase the previous word, but do not move the cursor.
 </p>
 </dd>
 <dt><code>capitalize-word (M-c)</code>
-<a name="index-capitalize_002dword-_0028M_002dc_0029"></a>
+<span id="index-capitalize_002dword-_0028M_002dc_0029"></span>
 </dt>
 <dd><p>Capitalize the current (or following) word.  With a negative argument,
 capitalize the previous word, but do not move the cursor.
 </p>
 </dd>
 <dt><code>overwrite-mode ()</code>
-<a name="index-overwrite_002dmode-_0028_0029"></a>
+<span id="index-overwrite_002dmode-_0028_0029"></span>
 </dt>
 <dd><p>Toggle overwrite mode.  With an explicit positive numeric argument,
 switches to overwrite mode.  With an explicit non-positive numeric
@@ -10889,42 +11359,44 @@ before point with a space.
 </dl>
 
 <hr>
-<a name="Commands-For-Killing"></a>
-<div class="header">
+<span id="Commands-For-Killing"></span><div class="header">
 <p>
 Next: <a href="#Numeric-Arguments" accesskey="n" rel="next">Numeric Arguments</a>, Previous: <a href="#Commands-For-Text" accesskey="p" rel="prev">Commands For Text</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Killing-And-Yanking"></a>
-<h4 class="subsection">8.4.4 Killing And Yanking</h4>
+<span id="Killing-And-Yanking"></span><h4 class="subsection">8.4.4 Killing And Yanking</h4>
 
 <dl compact="compact">
 <dt><code>kill-line (C-k)</code>
-<a name="index-kill_002dline-_0028C_002dk_0029"></a>
+<span id="index-kill_002dline-_0028C_002dk_0029"></span>
 </dt>
 <dd><p>Kill the text from point to the end of the line.
+With a negative numeric argument, kill backward from the cursor to the
+beginning of the current line.
 </p>
 </dd>
 <dt><code>backward-kill-line (C-x Rubout)</code>
-<a name="index-backward_002dkill_002dline-_0028C_002dx-Rubout_0029"></a>
+<span id="index-backward_002dkill_002dline-_0028C_002dx-Rubout_0029"></span>
 </dt>
 <dd><p>Kill backward from the cursor to the beginning of the current line.
+With a negative numeric argument, kill forward from the cursor to the
+end of the current line.
 </p>
 </dd>
 <dt><code>unix-line-discard (C-u)</code>
-<a name="index-unix_002dline_002ddiscard-_0028C_002du_0029"></a>
+<span id="index-unix_002dline_002ddiscard-_0028C_002du_0029"></span>
 </dt>
 <dd><p>Kill backward from the cursor to the beginning of the current line.
 </p>
 </dd>
 <dt><code>kill-whole-line ()</code>
-<a name="index-kill_002dwhole_002dline-_0028_0029"></a>
+<span id="index-kill_002dwhole_002dline-_0028_0029"></span>
 </dt>
 <dd><p>Kill all characters on the current line, no matter where point is.
 By default, this is unbound.
 </p>
 </dd>
 <dt><code>kill-word (M-d)</code>
-<a name="index-kill_002dword-_0028M_002dd_0029"></a>
+<span id="index-kill_002dword-_0028M_002dd_0029"></span>
 </dt>
 <dd><p>Kill from point to the end of the current word, or if between
 words, to the end of the next word.
@@ -10932,14 +11404,14 @@ Word boundaries are the same as <code>forward-word</code>.
 </p>
 </dd>
 <dt><code>backward-kill-word (M-<span class="key">DEL</span>)</code>
-<a name="index-backward_002dkill_002dword-_0028M_002dDEL_0029"></a>
+<span id="index-backward_002dkill_002dword-_0028M_002dDEL_0029"></span>
 </dt>
 <dd><p>Kill the word behind point.
 Word boundaries are the same as <code>backward-word</code>.
 </p>
 </dd>
-<dt><code>shell-kill-word ()</code>
-<a name="index-shell_002dkill_002dword-_0028_0029"></a>
+<dt><code>shell-kill-word (M-C-d)</code>
+<span id="index-shell_002dkill_002dword-_0028M_002dC_002dd_0029"></span>
 </dt>
 <dd><p>Kill from point to the end of the current word, or if between
 words, to the end of the next word.
@@ -10947,21 +11419,32 @@ Word boundaries are the same as <code>shell-forward-word</code>.
 </p>
 </dd>
 <dt><code>shell-backward-kill-word ()</code>
-<a name="index-shell_002dbackward_002dkill_002dword-_0028_0029"></a>
+<span id="index-shell_002dbackward_002dkill_002dword-_0028_0029"></span>
 </dt>
 <dd><p>Kill the word behind point.
 Word boundaries are the same as <code>shell-backward-word</code>.
 </p>
 </dd>
+<dt><code>shell-transpose-words (M-C-t)</code>
+<span id="index-shell_002dtranspose_002dwords-_0028M_002dC_002dt_0029"></span>
+</dt>
+<dd><p>Drag the word before point past the word after point,
+moving point past that word as well.
+If the insertion point is at the end of the line, this transposes
+the last two words on the line.
+Word boundaries are the same as <code>shell-forward-word</code> and
+<code>shell-backward-word</code>.
+</p>
+</dd>
 <dt><code>unix-word-rubout (C-w)</code>
-<a name="index-unix_002dword_002drubout-_0028C_002dw_0029"></a>
+<span id="index-unix_002dword_002drubout-_0028C_002dw_0029"></span>
 </dt>
 <dd><p>Kill the word behind point, using white space as a word boundary.
 The killed text is saved on the kill-ring.
 </p>
 </dd>
 <dt><code>unix-filename-rubout ()</code>
-<a name="index-unix_002dfilename_002drubout-_0028_0029"></a>
+<span id="index-unix_002dfilename_002drubout-_0028_0029"></span>
 </dt>
 <dd><p>Kill the word behind point, using white space and the slash character
 as the word boundaries.
@@ -10969,27 +11452,27 @@ The killed text is saved on the kill-ring.
 </p>
 </dd>
 <dt><code>delete-horizontal-space ()</code>
-<a name="index-delete_002dhorizontal_002dspace-_0028_0029"></a>
+<span id="index-delete_002dhorizontal_002dspace-_0028_0029"></span>
 </dt>
 <dd><p>Delete all spaces and tabs around point.  By default, this is unbound.
 </p>
 </dd>
 <dt><code>kill-region ()</code>
-<a name="index-kill_002dregion-_0028_0029"></a>
+<span id="index-kill_002dregion-_0028_0029"></span>
 </dt>
 <dd><p>Kill the text in the current region.
 By default, this command is unbound.
 </p>
 </dd>
 <dt><code>copy-region-as-kill ()</code>
-<a name="index-copy_002dregion_002das_002dkill-_0028_0029"></a>
+<span id="index-copy_002dregion_002das_002dkill-_0028_0029"></span>
 </dt>
 <dd><p>Copy the text in the region to the kill buffer, so it can be yanked
 right away.  By default, this command is unbound.
 </p>
 </dd>
 <dt><code>copy-backward-word ()</code>
-<a name="index-copy_002dbackward_002dword-_0028_0029"></a>
+<span id="index-copy_002dbackward_002dword-_0028_0029"></span>
 </dt>
 <dd><p>Copy the word before point to the kill buffer.
 The word boundaries are the same as <code>backward-word</code>.
@@ -10997,7 +11480,7 @@ By default, this command is unbound.
 </p>
 </dd>
 <dt><code>copy-forward-word ()</code>
-<a name="index-copy_002dforward_002dword-_0028_0029"></a>
+<span id="index-copy_002dforward_002dword-_0028_0029"></span>
 </dt>
 <dd><p>Copy the word following point to the kill buffer.
 The word boundaries are the same as <code>forward-word</code>.
@@ -11005,13 +11488,13 @@ By default, this command is unbound.
 </p>
 </dd>
 <dt><code>yank (C-y)</code>
-<a name="index-yank-_0028C_002dy_0029"></a>
+<span id="index-yank-_0028C_002dy_0029"></span>
 </dt>
 <dd><p>Yank the top of the kill ring into the buffer at point.
 </p>
 </dd>
 <dt><code>yank-pop (M-y)</code>
-<a name="index-yank_002dpop-_0028M_002dy_0029"></a>
+<span id="index-yank_002dpop-_0028M_002dy_0029"></span>
 </dt>
 <dd><p>Rotate the kill-ring, and yank the new top.  You can only do this if
 the prior command is <code>yank</code> or <code>yank-pop</code>.
@@ -11019,23 +11502,21 @@ the prior command is <code>yank</code> or <code>yank-pop</code>.
 </dl>
 
 <hr>
-<a name="Numeric-Arguments"></a>
-<div class="header">
+<span id="Numeric-Arguments"></span><div class="header">
 <p>
 Next: <a href="#Commands-For-Completion" accesskey="n" rel="next">Commands For Completion</a>, Previous: <a href="#Commands-For-Killing" accesskey="p" rel="prev">Commands For Killing</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Specifying-Numeric-Arguments"></a>
-<h4 class="subsection">8.4.5 Specifying Numeric Arguments</h4>
+<span id="Specifying-Numeric-Arguments"></span><h4 class="subsection">8.4.5 Specifying Numeric Arguments</h4>
 <dl compact="compact">
 <dt><code>digit-argument (<kbd>M-0</kbd>, <kbd>M-1</kbd>, &hellip; <kbd>M--</kbd>)</code>
-<a name="index-digit_002dargument-_0028M_002d0_002c-M_002d1_002c-_2026-M_002d_002d_0029"></a>
+<span id="index-digit_002dargument-_0028M_002d0_002c-M_002d1_002c-_2026-M_002d_002d_0029"></span>
 </dt>
 <dd><p>Add this digit to the argument already accumulating, or start a new
 argument.  <kbd>M--</kbd> starts a negative argument.
 </p>
 </dd>
 <dt><code>universal-argument ()</code>
-<a name="index-universal_002dargument-_0028_0029"></a>
+<span id="index-universal_002dargument-_0028_0029"></span>
 </dt>
 <dd><p>This is another way to specify an argument.
 If this command is followed by one or more digits, optionally with a
@@ -11053,17 +11534,15 @@ By default, this is not bound to a key.
 </dl>
 
 <hr>
-<a name="Commands-For-Completion"></a>
-<div class="header">
+<span id="Commands-For-Completion"></span><div class="header">
 <p>
 Next: <a href="#Keyboard-Macros" accesskey="n" rel="next">Keyboard Macros</a>, Previous: <a href="#Numeric-Arguments" accesskey="p" rel="prev">Numeric Arguments</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Letting-Readline-Type-For-You"></a>
-<h4 class="subsection">8.4.6 Letting Readline Type For You</h4>
+<span id="Letting-Readline-Type-For-You"></span><h4 class="subsection">8.4.6 Letting Readline Type For You</h4>
 
 <dl compact="compact">
 <dt><code>complete (<span class="key">TAB</span>)</code>
-<a name="index-complete-_0028TAB_0029"></a>
+<span id="index-complete-_0028TAB_0029"></span>
 </dt>
 <dd><p>Attempt to perform completion on the text before point.
 The actual completion performed is application-specific.
@@ -11075,7 +11554,7 @@ of these produces a match, filename completion is attempted.
 </p>
 </dd>
 <dt><code>possible-completions (M-?)</code>
-<a name="index-possible_002dcompletions-_0028M_002d_003f_0029"></a>
+<span id="index-possible_002dcompletions-_0028M_002d_003f_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point.
 When displaying completions, Readline sets the number of columns used
@@ -11084,14 +11563,14 @@ the environment variable <code>COLUMNS</code>, or the screen width, in that orde
 </p>
 </dd>
 <dt><code>insert-completions (M-*)</code>
-<a name="index-insert_002dcompletions-_0028M_002d_002a_0029"></a>
+<span id="index-insert_002dcompletions-_0028M_002d_002a_0029"></span>
 </dt>
 <dd><p>Insert all completions of the text before point that would have
 been generated by <code>possible-completions</code>.
 </p>
 </dd>
 <dt><code>menu-complete ()</code>
-<a name="index-menu_002dcomplete-_0028_0029"></a>
+<span id="index-menu_002dcomplete-_0028_0029"></span>
 </dt>
 <dd><p>Similar to <code>complete</code>, but replaces the word to be completed
 with a single match from the list of possible completions.
@@ -11108,7 +11587,7 @@ by default.
 </p>
 </dd>
 <dt><code>menu-complete-backward ()</code>
-<a name="index-menu_002dcomplete_002dbackward-_0028_0029"></a>
+<span id="index-menu_002dcomplete_002dbackward-_0028_0029"></span>
 </dt>
 <dd><p>Identical to <code>menu-complete</code>, but moves backward through the list
 of possible completions, as if <code>menu-complete</code> had been given a
@@ -11116,7 +11595,7 @@ negative argument.
 </p>
 </dd>
 <dt><code>delete-char-or-list ()</code>
-<a name="index-delete_002dchar_002dor_002dlist-_0028_0029"></a>
+<span id="index-delete_002dchar_002dor_002dlist-_0028_0029"></span>
 </dt>
 <dd><p>Deletes the character under the cursor if not at the beginning or
 end of the line (like <code>delete-char</code>).
@@ -11126,62 +11605,62 @@ This command is unbound by default.
 </p>
 </dd>
 <dt><code>complete-filename (M-/)</code>
-<a name="index-complete_002dfilename-_0028M_002d_002f_0029"></a>
+<span id="index-complete_002dfilename-_0028M_002d_002f_0029"></span>
 </dt>
 <dd><p>Attempt filename completion on the text before point.
 </p>
 </dd>
 <dt><code>possible-filename-completions (C-x /)</code>
-<a name="index-possible_002dfilename_002dcompletions-_0028C_002dx-_002f_0029"></a>
+<span id="index-possible_002dfilename_002dcompletions-_0028C_002dx-_002f_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point,
 treating it as a filename.
 </p>
 </dd>
 <dt><code>complete-username (M-~)</code>
-<a name="index-complete_002dusername-_0028M_002d_007e_0029"></a>
+<span id="index-complete_002dusername-_0028M_002d_007e_0029"></span>
 </dt>
 <dd><p>Attempt completion on the text before point, treating
 it as a username.
 </p>
 </dd>
 <dt><code>possible-username-completions (C-x ~)</code>
-<a name="index-possible_002dusername_002dcompletions-_0028C_002dx-_007e_0029"></a>
+<span id="index-possible_002dusername_002dcompletions-_0028C_002dx-_007e_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point,
 treating it as a username.
 </p>
 </dd>
 <dt><code>complete-variable (M-$)</code>
-<a name="index-complete_002dvariable-_0028M_002d_0024_0029"></a>
+<span id="index-complete_002dvariable-_0028M_002d_0024_0029"></span>
 </dt>
 <dd><p>Attempt completion on the text before point, treating
 it as a shell variable.
 </p>
 </dd>
 <dt><code>possible-variable-completions (C-x $)</code>
-<a name="index-possible_002dvariable_002dcompletions-_0028C_002dx-_0024_0029"></a>
+<span id="index-possible_002dvariable_002dcompletions-_0028C_002dx-_0024_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point,
 treating it as a shell variable.
 </p>
 </dd>
 <dt><code>complete-hostname (M-@)</code>
-<a name="index-complete_002dhostname-_0028M_002d_0040_0029"></a>
+<span id="index-complete_002dhostname-_0028M_002d_0040_0029"></span>
 </dt>
 <dd><p>Attempt completion on the text before point, treating
 it as a hostname.
 </p>
 </dd>
 <dt><code>possible-hostname-completions (C-x @)</code>
-<a name="index-possible_002dhostname_002dcompletions-_0028C_002dx-_0040_0029"></a>
+<span id="index-possible_002dhostname_002dcompletions-_0028C_002dx-_0040_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point,
 treating it as a hostname.
 </p>
 </dd>
 <dt><code>complete-command (M-!)</code>
-<a name="index-complete_002dcommand-_0028M_002d_0021_0029"></a>
+<span id="index-complete_002dcommand-_0028M_002d_0021_0029"></span>
 </dt>
 <dd><p>Attempt completion on the text before point, treating
 it as a command name.  Command completion attempts to
@@ -11191,14 +11670,14 @@ in that order.
 </p>
 </dd>
 <dt><code>possible-command-completions (C-x !)</code>
-<a name="index-possible_002dcommand_002dcompletions-_0028C_002dx-_0021_0029"></a>
+<span id="index-possible_002dcommand_002dcompletions-_0028C_002dx-_0021_0029"></span>
 </dt>
 <dd><p>List the possible completions of the text before point,
 treating it as a command name.
 </p>
 </dd>
 <dt><code>dynamic-complete-history (M-<span class="key">TAB</span>)</code>
-<a name="index-dynamic_002dcomplete_002dhistory-_0028M_002dTAB_0029"></a>
+<span id="index-dynamic_002dcomplete_002dhistory-_0028M_002dTAB_0029"></span>
 </dt>
 <dd><p>Attempt completion on the text before point, comparing
 the text against lines from the history list for possible
@@ -11206,7 +11685,7 @@ completion matches.
 </p>
 </dd>
 <dt><code>dabbrev-expand ()</code>
-<a name="index-dabbrev_002dexpand-_0028_0029"></a>
+<span id="index-dabbrev_002dexpand-_0028_0029"></span>
 </dt>
 <dd><p>Attempt menu completion on the text before point, comparing
 the text against lines from the history list for possible
@@ -11214,7 +11693,7 @@ completion matches.
 </p>
 </dd>
 <dt><code>complete-into-braces (M-{)</code>
-<a name="index-complete_002dinto_002dbraces-_0028M_002d_007b_0029"></a>
+<span id="index-complete_002dinto_002dbraces-_0028M_002d_007b_0029"></span>
 </dt>
 <dd><p>Perform filename completion and insert the list of possible completions
 enclosed within braces so the list is available to the shell
@@ -11224,36 +11703,34 @@ enclosed within braces so the list is available to the shell
 </dl>
 
 <hr>
-<a name="Keyboard-Macros"></a>
-<div class="header">
+<span id="Keyboard-Macros"></span><div class="header">
 <p>
 Next: <a href="#Miscellaneous-Commands" accesskey="n" rel="next">Miscellaneous Commands</a>, Previous: <a href="#Commands-For-Completion" accesskey="p" rel="prev">Commands For Completion</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Keyboard-Macros-1"></a>
-<h4 class="subsection">8.4.7 Keyboard Macros</h4>
+<span id="Keyboard-Macros-1"></span><h4 class="subsection">8.4.7 Keyboard Macros</h4>
 <dl compact="compact">
 <dt><code>start-kbd-macro (C-x ()</code>
-<a name="index-start_002dkbd_002dmacro-_0028C_002dx-_0028_0029"></a>
+<span id="index-start_002dkbd_002dmacro-_0028C_002dx-_0028_0029"></span>
 </dt>
 <dd><p>Begin saving the characters typed into the current keyboard macro.
 </p>
 </dd>
 <dt><code>end-kbd-macro (C-x ))</code>
-<a name="index-end_002dkbd_002dmacro-_0028C_002dx-_0029_0029"></a>
+<span id="index-end_002dkbd_002dmacro-_0028C_002dx-_0029_0029"></span>
 </dt>
 <dd><p>Stop saving the characters typed into the current keyboard macro
 and save the definition.
 </p>
 </dd>
 <dt><code>call-last-kbd-macro (C-x e)</code>
-<a name="index-call_002dlast_002dkbd_002dmacro-_0028C_002dx-e_0029"></a>
+<span id="index-call_002dlast_002dkbd_002dmacro-_0028C_002dx-e_0029"></span>
 </dt>
 <dd><p>Re-execute the last keyboard macro defined, by making the characters
 in the macro appear as if typed at the keyboard.
 </p>
 </dd>
 <dt><code>print-last-kbd-macro ()</code>
-<a name="index-print_002dlast_002dkbd_002dmacro-_0028_0029"></a>
+<span id="index-print_002dlast_002dkbd_002dmacro-_0028_0029"></span>
 </dt>
 <dd><p>Print the last keboard macro defined in a format suitable for the
 <var>inputrc</var> file.
@@ -11262,38 +11739,37 @@ in the macro appear as if typed at the keyboard.
 </dl>
 
 <hr>
-<a name="Miscellaneous-Commands"></a>
-<div class="header">
+<span id="Miscellaneous-Commands"></span><div class="header">
 <p>
 Previous: <a href="#Keyboard-Macros" accesskey="p" rel="prev">Keyboard Macros</a>, Up: <a href="#Bindable-Readline-Commands" accesskey="u" rel="up">Bindable Readline Commands</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Some-Miscellaneous-Commands"></a>
-<h4 class="subsection">8.4.8 Some Miscellaneous Commands</h4>
+<span id="Some-Miscellaneous-Commands"></span><h4 class="subsection">8.4.8 Some Miscellaneous Commands</h4>
 <dl compact="compact">
 <dt><code>re-read-init-file (C-x C-r)</code>
-<a name="index-re_002dread_002dinit_002dfile-_0028C_002dx-C_002dr_0029"></a>
+<span id="index-re_002dread_002dinit_002dfile-_0028C_002dx-C_002dr_0029"></span>
 </dt>
 <dd><p>Read in the contents of the <var>inputrc</var> file, and incorporate
 any bindings or variable assignments found there.
 </p>
 </dd>
 <dt><code>abort (C-g)</code>
-<a name="index-abort-_0028C_002dg_0029"></a>
+<span id="index-abort-_0028C_002dg_0029"></span>
 </dt>
 <dd><p>Abort the current editing command and
 ring the terminal&rsquo;s bell (subject to the setting of
 <code>bell-style</code>).
 </p>
 </dd>
-<dt><code>do-uppercase-version (M-a, M-b, M-<var>x</var>, &hellip;)</code>
-<a name="index-do_002duppercase_002dversion-_0028M_002da_002c-M_002db_002c-M_002dx_002c-_2026_0029"></a>
+<dt><code>do-lowercase-version (M-A, M-B, M-<var>x</var>, &hellip;)</code>
+<span id="index-do_002dlowercase_002dversion-_0028M_002dA_002c-M_002dB_002c-M_002dx_002c-_2026_0029"></span>
 </dt>
-<dd><p>If the metafied character <var>x</var> is lowercase, run the command
-that is bound to the corresponding uppercase character.
+<dd><p>If the metafied character <var>x</var> is upper case, run the command
+that is bound to the corresponding metafied lower case character.
+The behavior is undefined if <var>x</var> is already lower case.
 </p>
 </dd>
 <dt><code>prefix-meta (<span class="key">ESC</span>)</code>
-<a name="index-prefix_002dmeta-_0028ESC_0029"></a>
+<span id="index-prefix_002dmeta-_0028ESC_0029"></span>
 </dt>
 <dd><p>Metafy the next character typed.  This is for keyboards
 without a meta key.  Typing &lsquo;<samp><span class="key">ESC</span> f</samp>&rsquo; is equivalent to typing
@@ -11301,47 +11777,47 @@ without a meta key.  Typing &lsquo;<samp><span class="key">ESC</span> f</samp>&r
 </p>
 </dd>
 <dt><code>undo (C-_ or C-x C-u)</code>
-<a name="index-undo-_0028C_002d_005f-or-C_002dx-C_002du_0029"></a>
+<span id="index-undo-_0028C_002d_005f-or-C_002dx-C_002du_0029"></span>
 </dt>
 <dd><p>Incremental undo, separately remembered for each line.
 </p>
 </dd>
 <dt><code>revert-line (M-r)</code>
-<a name="index-revert_002dline-_0028M_002dr_0029"></a>
+<span id="index-revert_002dline-_0028M_002dr_0029"></span>
 </dt>
 <dd><p>Undo all changes made to this line.  This is like executing the <code>undo</code>
 command enough times to get back to the beginning.
 </p>
 </dd>
 <dt><code>tilde-expand (M-&amp;)</code>
-<a name="index-tilde_002dexpand-_0028M_002d_0026_0029"></a>
+<span id="index-tilde_002dexpand-_0028M_002d_0026_0029"></span>
 </dt>
 <dd><p>Perform tilde expansion on the current word.
 </p>
 </dd>
 <dt><code>set-mark (C-@)</code>
-<a name="index-set_002dmark-_0028C_002d_0040_0029"></a>
+<span id="index-set_002dmark-_0028C_002d_0040_0029"></span>
 </dt>
 <dd><p>Set the mark to the point.  If a
 numeric argument is supplied, the mark is set to that position.
 </p>
 </dd>
 <dt><code>exchange-point-and-mark (C-x C-x)</code>
-<a name="index-exchange_002dpoint_002dand_002dmark-_0028C_002dx-C_002dx_0029"></a>
+<span id="index-exchange_002dpoint_002dand_002dmark-_0028C_002dx-C_002dx_0029"></span>
 </dt>
 <dd><p>Swap the point with the mark.  The current cursor position is set to
 the saved position, and the old cursor position is saved as the mark.
 </p>
 </dd>
 <dt><code>character-search (C-])</code>
-<a name="index-character_002dsearch-_0028C_002d_005d_0029"></a>
+<span id="index-character_002dsearch-_0028C_002d_005d_0029"></span>
 </dt>
 <dd><p>A character is read and point is moved to the next occurrence of that
 character.  A negative count searches for previous occurrences.
 </p>
 </dd>
 <dt><code>character-search-backward (M-C-])</code>
-<a name="index-character_002dsearch_002dbackward-_0028M_002dC_002d_005d_0029"></a>
+<span id="index-character_002dsearch_002dbackward-_0028M_002dC_002d_005d_0029"></span>
 </dt>
 <dd><p>A character is read and point is moved to the previous occurrence
 of that character.  A negative count searches for subsequent
@@ -11349,7 +11825,7 @@ occurrences.
 </p>
 </dd>
 <dt><code>skip-csi-sequence ()</code>
-<a name="index-skip_002dcsi_002dsequence-_0028_0029"></a>
+<span id="index-skip_002dcsi_002dsequence-_0028_0029"></span>
 </dt>
 <dd><p>Read enough characters to consume a multi-key sequence such as those
 defined for keys like Home and End.  Such sequences begin with a
@@ -11361,7 +11837,7 @@ but usually bound to ESC-[.
 </p>
 </dd>
 <dt><code>insert-comment (M-#)</code>
-<a name="index-insert_002dcomment-_0028M_002d_0023_0029"></a>
+<span id="index-insert_002dcomment-_0028M_002d_0023_0029"></span>
 </dt>
 <dd><p>Without a numeric argument, the value of the <code>comment-begin</code>
 variable is inserted at the beginning of the current line.
@@ -11378,7 +11854,7 @@ will be executed by the shell.
 </p>
 </dd>
 <dt><code>dump-functions ()</code>
-<a name="index-dump_002dfunctions-_0028_0029"></a>
+<span id="index-dump_002dfunctions-_0028_0029"></span>
 </dt>
 <dd><p>Print all of the functions and their key bindings to the
 Readline output stream.  If a numeric argument is supplied,
@@ -11387,7 +11863,7 @@ of an <var>inputrc</var> file.  This command is unbound by default.
 </p>
 </dd>
 <dt><code>dump-variables ()</code>
-<a name="index-dump_002dvariables-_0028_0029"></a>
+<span id="index-dump_002dvariables-_0028_0029"></span>
 </dt>
 <dd><p>Print all of the settable variables and their values to the
 Readline output stream.  If a numeric argument is supplied,
@@ -11396,7 +11872,7 @@ of an <var>inputrc</var> file.  This command is unbound by default.
 </p>
 </dd>
 <dt><code>dump-macros ()</code>
-<a name="index-dump_002dmacros-_0028_0029"></a>
+<span id="index-dump_002dmacros-_0028_0029"></span>
 </dt>
 <dd><p>Print all of the Readline key sequences bound to macros and the
 strings they output.  If a numeric argument is supplied,
@@ -11405,7 +11881,7 @@ of an <var>inputrc</var> file.  This command is unbound by default.
 </p>
 </dd>
 <dt><code>glob-complete-word (M-g)</code>
-<a name="index-glob_002dcomplete_002dword-_0028M_002dg_0029"></a>
+<span id="index-glob_002dcomplete_002dword-_0028M_002dg_0029"></span>
 </dt>
 <dd><p>The word before point is treated as a pattern for pathname expansion,
 with an asterisk implicitly appended.  This pattern is used to
@@ -11413,7 +11889,7 @@ generate a list of matching file names for possible completions.
 </p>
 </dd>
 <dt><code>glob-expand-word (C-x *)</code>
-<a name="index-glob_002dexpand_002dword-_0028C_002dx-_002a_0029"></a>
+<span id="index-glob_002dexpand_002dword-_0028C_002dx-_002a_0029"></span>
 </dt>
 <dd><p>The word before point is treated as a pattern for pathname expansion,
 and the list of matching file names is inserted, replacing the word.
@@ -11422,7 +11898,7 @@ pathname expansion.
 </p>
 </dd>
 <dt><code>glob-list-expansions (C-x g)</code>
-<a name="index-glob_002dlist_002dexpansions-_0028C_002dx-g_0029"></a>
+<span id="index-glob_002dlist_002dexpansions-_0028C_002dx-g_0029"></span>
 </dt>
 <dd><p>The list of expansions that would have been generated by
 <code>glob-expand-word</code> is displayed, and the line is redrawn.
@@ -11431,13 +11907,13 @@ pathname expansion.
 </p>
 </dd>
 <dt><code>display-shell-version (C-x C-v)</code>
-<a name="index-display_002dshell_002dversion-_0028C_002dx-C_002dv_0029"></a>
+<span id="index-display_002dshell_002dversion-_0028C_002dx-C_002dv_0029"></span>
 </dt>
 <dd><p>Display version information about the current instance of Bash.
 </p>
 </dd>
 <dt><code>shell-expand-line (M-C-e)</code>
-<a name="index-shell_002dexpand_002dline-_0028M_002dC_002de_0029"></a>
+<span id="index-shell_002dexpand_002dline-_0028M_002dC_002de_0029"></span>
 </dt>
 <dd><p>Expand the line as the shell does.
 This performs alias and history expansion as well as all of the shell
@@ -11445,46 +11921,38 @@ word expansions (see <a href="#Shell-Expansions">Shell Expansions</a>).
 </p>
 </dd>
 <dt><code>history-expand-line (M-^)</code>
-<a name="index-history_002dexpand_002dline-_0028M_002d_005e_0029"></a>
+<span id="index-history_002dexpand_002dline-_0028M_002d_005e_0029"></span>
 </dt>
 <dd><p>Perform history expansion on the current line.
 </p>
 </dd>
 <dt><code>magic-space ()</code>
-<a name="index-magic_002dspace-_0028_0029"></a>
+<span id="index-magic_002dspace-_0028_0029"></span>
 </dt>
 <dd><p>Perform history expansion on the current line and insert a space
 (see <a href="#History-Interaction">History Interaction</a>).
 </p>
 </dd>
 <dt><code>alias-expand-line ()</code>
-<a name="index-alias_002dexpand_002dline-_0028_0029"></a>
+<span id="index-alias_002dexpand_002dline-_0028_0029"></span>
 </dt>
 <dd><p>Perform alias expansion on the current line (see <a href="#Aliases">Aliases</a>).
 </p>
 </dd>
 <dt><code>history-and-alias-expand-line ()</code>
-<a name="index-history_002dand_002dalias_002dexpand_002dline-_0028_0029"></a>
+<span id="index-history_002dand_002dalias_002dexpand_002dline-_0028_0029"></span>
 </dt>
 <dd><p>Perform history and alias expansion on the current line.
 </p>
 </dd>
 <dt><code>insert-last-argument (M-. or M-_)</code>
-<a name="index-insert_002dlast_002dargument-_0028M_002d_002e-or-M_002d_005f_0029"></a>
+<span id="index-insert_002dlast_002dargument-_0028M_002d_002e-or-M_002d_005f_0029"></span>
 </dt>
 <dd><p>A synonym for <code>yank-last-arg</code>.
 </p>
 </dd>
-<dt><code>operate-and-get-next (C-o)</code>
-<a name="index-operate_002dand_002dget_002dnext-_0028C_002do_0029"></a>
-</dt>
-<dd><p>Accept the current line for execution and fetch the next line
-relative to the current line from the history for editing.  Any
-argument is ignored.
-</p>
-</dd>
-<dt><code>edit-and-execute-command (C-xC-e)</code>
-<a name="index-edit_002dand_002dexecute_002dcommand-_0028C_002dxC_002de_0029"></a>
+<dt><code>edit-and-execute-command (C-x C-e)</code>
+<span id="index-edit_002dand_002dexecute_002dcommand-_0028C_002dx-C_002de_0029"></span>
 </dt>
 <dd><p>Invoke an editor on the current command line, and execute the result as shell
 commands.
@@ -11498,13 +11966,11 @@ as the editor, in that order.
 </dl>
 
 <hr>
-<a name="Readline-vi-Mode"></a>
-<div class="header">
+<span id="Readline-vi-Mode"></span><div class="header">
 <p>
 Next: <a href="#Programmable-Completion" accesskey="n" rel="next">Programmable Completion</a>, Previous: <a href="#Bindable-Readline-Commands" accesskey="p" rel="prev">Bindable Readline Commands</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Readline-vi-Mode-1"></a>
-<h3 class="section">8.5 Readline vi Mode</h3>
+<span id="Readline-vi-Mode-1"></span><h3 class="section">8.5 Readline vi Mode</h3>
 
 <p>While the Readline library does not have a full set of <code>vi</code>
 editing functions, it does contain enough to allow simple editing
@@ -11524,14 +11990,12 @@ history lines with &lsquo;<samp>k</samp>&rsquo; and subsequent lines with &lsquo
 so forth.
 </p>
 <hr>
-<a name="Programmable-Completion"></a>
-<div class="header">
+<span id="Programmable-Completion"></span><div class="header">
 <p>
 Next: <a href="#Programmable-Completion-Builtins" accesskey="n" rel="next">Programmable Completion Builtins</a>, Previous: <a href="#Readline-vi-Mode" accesskey="p" rel="prev">Readline vi Mode</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Programmable-Completion-1"></a>
-<h3 class="section">8.6 Programmable Completion</h3>
-<a name="index-programmable-completion"></a>
+<span id="Programmable-Completion-1"></span><h3 class="section">8.6 Programmable Completion</h3>
+<span id="index-programmable-completion"></span>
 
 <p>When word completion is attempted for an argument to a command for
 which a completion specification (a <var>compspec</var>) has been defined
@@ -11550,6 +12014,9 @@ If no compspec is found for the full pathname, an attempt is made to
 find a compspec for the portion following the final slash.
 If those searches do not result in a compspec, any compspec defined with
 the <samp>-D</samp> option to <code>complete</code> is used as the default.
+If there is no default compspec, Bash attempts alias expansion
+on the command word as a final resort, and attempts to find a compspec
+for the command word from any successful expansion 
 </p>
 <p>Once a compspec has been found, it is used to generate the list of
 matching words.
@@ -11574,7 +12041,9 @@ but the <code>FIGNORE</code> shell variable is used.
 is considered.
 The string is first split using the characters in the <code>IFS</code>
 special variable as delimiters.
-Shell quoting is honored.
+Shell quoting is honored within the string, in order to provide a
+mechanism for the words to contain shell metacharacters or characters
+in the value of <code>IFS</code>.
 Each word is then expanded using
 brace expansion, tilde expansion, parameter and variable expansion,
 command substitution, and arithmetic expansion,
@@ -11683,14 +12152,12 @@ complete -D -F _completion_loader -o bashdefault -o default
 </pre></div>
 
 <hr>
-<a name="Programmable-Completion-Builtins"></a>
-<div class="header">
+<span id="Programmable-Completion-Builtins"></span><div class="header">
 <p>
 Next: <a href="#A-Programmable-Completion-Example" accesskey="n" rel="next">A Programmable Completion Example</a>, Previous: <a href="#Programmable-Completion" accesskey="p" rel="prev">Programmable Completion</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Programmable-Completion-Builtins-1"></a>
-<h3 class="section">8.7 Programmable Completion Builtins</h3>
-<a name="index-completion-builtins"></a>
+<span id="Programmable-Completion-Builtins-1"></span><h3 class="section">8.7 Programmable Completion Builtins</h3>
+<span id="index-completion-builtins"></span>
 
 <p>Three builtin commands are available to manipulate the programmable completion
 facilities: one to specify how the arguments to a particular command are to
@@ -11698,7 +12165,7 @@ be completed, and two to modify the completion as it is happening.
 </p>
 <dl compact="compact">
 <dt><code>compgen</code></dt>
-<dd><a name="index-compgen"></a>
+<dd><span id="index-compgen"></span>
 <div class="example">
 <pre class="example"><code>compgen [<var>option</var>] [<var>word</var>]</code>
 </pre></div>
@@ -11723,12 +12190,12 @@ matches were generated.
 </p>
 </dd>
 <dt><code>complete</code></dt>
-<dd><a name="index-complete"></a>
+<dd><span id="index-complete"></span>
 <div class="example">
-<pre class="example"><code>complete [-abcdefgjksuv] [-o <var>comp-option</var>] [-DE] [-A <var>action</var>] [-G <var>globpat</var>] [-W <var>wordlist</var>]
-[-F <var>function</var>] [-C <var>command</var>] [-X <var>filterpat</var>]
+<pre class="example"><code>complete [-abcdefgjksuv] [-o <var>comp-option</var>] [-DEI] [-A <var>action</var>] [-G <var>globpat</var>]
+[-W <var>wordlist</var>] [-F <var>function</var>] [-C <var>command</var>] [-X <var>filterpat</var>]
 [-P <var>prefix</var>] [-S <var>suffix</var>] <var>name</var> [<var>name</var> &hellip;]</code>
-<code>complete -pr [-DE] [<var>name</var> &hellip;]</code>
+<code>complete -pr [-DEI] [<var>name</var> &hellip;]</code>
 </pre></div>
 
 <p>Specify how arguments to each <var>name</var> should be completed.
@@ -11738,16 +12205,24 @@ reused as input.
 The <samp>-r</samp> option removes a completion specification for
 each <var>name</var>, or, if no <var>name</var>s are supplied, all
 completion specifications.
-The <samp>-D</samp> option indicates that the remaining options and actions should
+The <samp>-D</samp> option indicates that other supplied options and actions should
 apply to the &ldquo;default&rdquo; command completion; that is, completion attempted
 on a command for which no completion has previously been defined.
-The <samp>-E</samp> option indicates that the remaining options and actions should
+The <samp>-E</samp> option indicates that other supplied options and actions should
 apply to &ldquo;empty&rdquo; command completion; that is, completion attempted on a 
 blank line.
+The <samp>-I</samp> option indicates that other supplied options and actions should
+apply to completion on the initial non-assignment word on the line, or after a
+command delimiter such as &lsquo;<samp>;</samp>&rsquo; or &lsquo;<samp>|</samp>&rsquo;, which is usually command
+name completion.
+If multiple options are supplied, the <samp>-D</samp> option takes precedence
+over <samp>-E</samp>, and both take precedence over <samp>-I</samp>.
+If any of <samp>-D</samp>, <samp>-E</samp>, or <samp>-I</samp> are supplied, any other
+<var>name</var> arguments are ignored; these completions only apply to the case
+specified by the option.
 </p>
 <p>The process of applying these completion specifications when word completion
-is attempted is described above (see <a href="#Programmable-Completion">Programmable Completion</a>).  The
-<samp>-D</samp> option takes precedence over <samp>-E</samp>.
+is attempted is described above (see <a href="#Programmable-Completion">Programmable Completion</a>).
 </p>
 <p>Other options, if specified, have the following meanings.
 The arguments to the <samp>-G</samp>, <samp>-W</samp>, and <samp>-X</samp> options
@@ -11779,7 +12254,7 @@ no matches.
 </dd>
 <dt><code>filenames</code></dt>
 <dd><p>Tell Readline that the compspec generates filenames, so it can perform any
-filename-specific processing (like adding a slash to directory names
+filename-specific processing (like adding a slash to directory names,
 quoting special characters, or suppressing trailing spaces).
 This option is intended to be used with shell functions specified
 with <samp>-F</samp>.
@@ -11971,9 +12446,9 @@ an error occurs adding a completion specification.
 </p>
 </dd>
 <dt><code>compopt</code></dt>
-<dd><a name="index-compopt"></a>
+<dd><span id="index-compopt"></span>
 <div class="example">
-<pre class="example"><code>compopt</code> [-o <var>option</var>] [-DE] [+o <var>option</var>] [<var>name</var>]
+<pre class="example"><code>compopt</code> [-o <var>option</var>] [-DEI] [+o <var>option</var>] [<var>name</var>]
 </pre></div>
 <p>Modify completion options for each <var>name</var> according to the
 <var>option</var>s, or for the currently-executing completion if no <var>name</var>s
@@ -11982,14 +12457,19 @@ If no <var>option</var>s are given, display the completion options for each
 <var>name</var> or the current completion.
 The possible values of <var>option</var> are those valid for the <code>complete</code>
 builtin described above.
-The <samp>-D</samp> option indicates that the remaining options should
+The <samp>-D</samp> option indicates that other supplied options should
 apply to the &ldquo;default&rdquo; command completion; that is, completion attempted
 on a command for which no completion has previously been defined.
-The <samp>-E</samp> option indicates that the remaining options should
+The <samp>-E</samp> option indicates that other supplied options should
 apply to &ldquo;empty&rdquo; command completion; that is, completion attempted on a 
 blank line.
+The <samp>-I</samp> option indicates that other supplied options should
+apply to completion on the initial non-assignment word on the line, or after a
+command delimiter such as &lsquo;<samp>;</samp>&rsquo; or &lsquo;<samp>|</samp>&rsquo;, which is usually command
+name completion.
 </p>
-<p>The <samp>-D</samp> option takes precedence over <samp>-E</samp>.
+<p>If multiple options are supplied, the <samp>-D</samp> option takes precedence
+over <samp>-E</samp>, and both take precedence over <samp>-I</samp>
 </p>
 <p>The return value is true unless an invalid option is supplied, an attempt
 is made to modify the options for a <var>name</var> for which no completion
@@ -11999,13 +12479,11 @@ specification exists, or an output error occurs.
 </dl>
 
 <hr>
-<a name="A-Programmable-Completion-Example"></a>
-<div class="header">
+<span id="A-Programmable-Completion-Example"></span><div class="header">
 <p>
 Previous: <a href="#Programmable-Completion-Builtins" accesskey="p" rel="prev">Programmable Completion Builtins</a>, Up: <a href="#Command-Line-Editing" accesskey="u" rel="up">Command Line Editing</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="A-Programmable-Completion-Example-1"></a>
-<h3 class="section">8.8 A Programmable Completion Example</h3>
+<span id="A-Programmable-Completion-Example-1"></span><h3 class="section">8.8 A Programmable Completion Example</h3>
 
 <p>The most common way to obtain additional completion functionality beyond
 the default actions <code>complete</code> and <code>compgen</code> provide is to use
@@ -12013,7 +12491,7 @@ a shell function and bind it to a particular command using <code>complete -F</co
 </p>
 <p>The following function provides completions for the <code>cd</code> builtin.
 It is a reasonably good example of what shell functions must do when
-used for completion.  This function uses the word passsed as <code>$2</code>
+used for completion.  This function uses the word passed as <code>$2</code>
 to determine the directory name to complete.  You can also use the
 <code>COMP_WORDS</code> array variable; the current word is indexed by the
 <code>COMP_CWORD</code> variable.
@@ -12043,7 +12521,7 @@ _comp_cd()
     local cur _skipdot _cdpath
     local i j k
 
-    # Tilde expansion, with side effect of expanding tilde to full pathname
+    # Tilde expansion, which also expands tilde to full pathname
     case &quot;$2&quot; in
     \~*)    eval cur=&quot;$2&quot; ;;
     *)      cur=$2 ;;
@@ -12105,7 +12583,7 @@ character to the directory name, in case we want to append to it.
 The <samp>-o bashdefault</samp> option brings in the rest of the &quot;Bash default&quot;
 completions &ndash; possible completion that Bash adds to the default Readline
 set.  These include things like command name completion, variable completion
-for words beginning with &lsquo;<samp>{</samp>&rsquo;, completions containing pathname
+for words beginning with &lsquo;<samp>$</samp>&rsquo; or &lsquo;<samp>${</samp>&rsquo;, completions containing pathname
 expansion patterns (see <a href="#Filename-Expansion">Filename Expansion</a>), and so on.
 </p>
 <p>Once installed using <code>complete</code>, <code>_comp_cd</code> will be called every
@@ -12115,22 +12593,20 @@ time we attempt word completion for a <code>cd</code> command.
 the common GNU, Unix, and Linux commands &ndash; are available as part of the
 bash_completion project.  This is installed by default on many GNU/Linux
 distributions.  Originally written by Ian Macdonald, the project now lives
-at <a href="http://bash-completion.alioth.debian.org/">http://bash-completion.alioth.debian.org/</a>.  There are ports for
+at <a href="https://github.com/scop/bash-completion/">https://github.com/scop/bash-completion/</a>.  There are ports for
 other systems such as Solaris and Mac OS X.
 </p>
 <p>An older version of the bash_completion package is distributed with bash
 in the <samp>examples/complete</samp> subdirectory.
 </p>
-<a name="index-History_002c-how-to-use"></a>
+<span id="index-History_002c-how-to-use"></span>
 
 <hr>
-<a name="Using-History-Interactively"></a>
-<div class="header">
+<span id="Using-History-Interactively"></span><div class="header">
 <p>
 Next: <a href="#Installing-Bash" accesskey="n" rel="next">Installing Bash</a>, Previous: <a href="#Command-Line-Editing" accesskey="p" rel="prev">Command Line Editing</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Using-History-Interactively-1"></a>
-<h2 class="chapter">9 Using History Interactively</h2>
+<span id="Using-History-Interactively-1"></span><h2 class="chapter">9 Using History Interactively</h2>
 
 
 <p>This chapter describes how to use the <small>GNU</small> History Library
@@ -12140,26 +12616,24 @@ For information on using the <small>GNU</small> History Library in other program
 see the <small>GNU</small> Readline Library Manual.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Bash-History-Facilities" accesskey="1">Bash History Facilities</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash lets you manipulate your command
+<tr><td align="left" valign="top">&bull; <a href="#Bash-History-Facilities" accesskey="1">Bash History Facilities</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How Bash lets you manipulate your command
 				history.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Bash-History-Builtins" accesskey="2">Bash History Builtins</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The Bash builtin commands that manipulate
+<tr><td align="left" valign="top">&bull; <a href="#Bash-History-Builtins" accesskey="2">Bash History Builtins</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">The Bash builtin commands that manipulate
 				the command history.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#History-Interaction" accesskey="3">History Interaction</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What it feels like using History as a user.
+<tr><td align="left" valign="top">&bull; <a href="#History-Interaction" accesskey="3">History Interaction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">What it feels like using History as a user.
 </td></tr>
 </table>
 
 <hr>
-<a name="Bash-History-Facilities"></a>
-<div class="header">
+<span id="Bash-History-Facilities"></span><div class="header">
 <p>
 Next: <a href="#Bash-History-Builtins" accesskey="n" rel="next">Bash History Builtins</a>, Up: <a href="#Using-History-Interactively" accesskey="u" rel="up">Using History Interactively</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-History-Facilities-1"></a>
-<h3 class="section">9.1 Bash History Facilities</h3>
-<a name="index-command-history"></a>
-<a name="index-history-list"></a>
+<span id="Bash-History-Facilities-1"></span><h3 class="section">9.1 Bash History Facilities</h3>
+<span id="index-command-history"></span>
+<span id="index-history-list"></span>
 
 <p>When the <samp>-o history</samp> option to the <code>set</code> builtin
 is enabled (see <a href="#The-Set-Builtin">The Set Builtin</a>),
@@ -12220,24 +12694,22 @@ The <code>lithist</code>
 shell option causes the shell to save the command with embedded newlines
 instead of semicolons.
 The <code>shopt</code> builtin is used to set these options.
-See <a href="#Bash-Builtins">Bash Builtins</a>, for a description of <code>shopt</code>.
+See <a href="#The-Shopt-Builtin">The Shopt Builtin</a>, for a description of <code>shopt</code>.
 </p>
 <hr>
-<a name="Bash-History-Builtins"></a>
-<div class="header">
+<span id="Bash-History-Builtins"></span><div class="header">
 <p>
 Next: <a href="#History-Interaction" accesskey="n" rel="next">History Interaction</a>, Previous: <a href="#Bash-History-Facilities" accesskey="p" rel="prev">Bash History Facilities</a>, Up: <a href="#Using-History-Interactively" accesskey="u" rel="up">Using History Interactively</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Bash-History-Builtins-1"></a>
-<h3 class="section">9.2 Bash History Builtins</h3>
-<a name="index-history-builtins"></a>
+<span id="Bash-History-Builtins-1"></span><h3 class="section">9.2 Bash History Builtins</h3>
+<span id="index-history-builtins"></span>
 
 <p>Bash provides two builtin commands which manipulate the
 history list and history file.
 </p>
 <dl compact="compact">
 <dt><code>fc</code></dt>
-<dd><a name="index-fc"></a>
+<dd><span id="index-fc"></span>
 <div class="example">
 <pre class="example"><code>fc [-e <var>ename</var>] [-lnr] [<var>first</var>] [<var>last</var>]</code>
 <code>fc -s [<var>pat</var>=<var>rep</var>] [<var>command</var>]</code>
@@ -12250,8 +12722,15 @@ Both <var>first</var> and
 <var>last</var> may be specified as a string (to locate the most recent
 command beginning with that string) or as a number (an index into the
 history list, where a negative number is used as an offset from the
-current command number).  If <var>last</var> is not specified it is set to
-<var>first</var>.  If <var>first</var> is not specified it is set to the previous
+current command number).
+</p>
+<p>When listing, a <var>first</var> or <var>last</var> of 0 is equivalent to -1
+and -0 is equivalent to the current command (usually the <code>fc</code>
+command);
+otherwise 0 is equivalent to -1 and -0 is invalid.
+</p>
+<p>If <var>last</var> is not specified, it is set to
+<var>first</var>.  If <var>first</var> is not specified, it is set to the previous
 command for editing and -16 for listing.  If the <samp>-l</samp> flag is
 given, the commands are listed on standard output.  The <samp>-n</samp> flag
 suppresses the command numbers when listing.  The <samp>-r</samp> flag
@@ -12265,7 +12744,7 @@ When editing is complete, the edited commands are echoed and executed.
 </p>
 <p>In the second form, <var>command</var> is re-executed after each instance
 of <var>pat</var> in the selected command is replaced by <var>rep</var>.
-<var>command</var> is intepreted the same as <var>first</var> above.
+<var>command</var> is interpreted the same as <var>first</var> above.
 </p>
 <p>A useful alias to use with the <code>fc</code> command is <code>r='fc -s'</code>, so
 that typing &lsquo;<samp>r cc</samp>&rsquo; runs the last command beginning with <code>cc</code>
@@ -12273,11 +12752,12 @@ and typing &lsquo;<samp>r</samp>&rsquo; re-executes the last command (see <a hre
 </p>
 </dd>
 <dt><code>history</code></dt>
-<dd><a name="index-history"></a>
+<dd><span id="index-history"></span>
 <div class="example">
 <pre class="example">history [<var>n</var>]
 history -c
 history -d <var>offset</var>
+history -d <var>start</var>-<var>end</var>
 history [-anrw] [<var>filename</var>]
 history -ps <var>arg</var>
 </pre></div>
@@ -12301,8 +12781,18 @@ with the other options to replace the history list completely.
 </dd>
 <dt><code>-d <var>offset</var></code></dt>
 <dd><p>Delete the history entry at position <var>offset</var>.
-<var>offset</var> should be specified as it appears when the history is
-displayed.
+If <var>offset</var> is positive, it should be specified as it appears when
+the history is displayed.
+If <var>offset</var> is negative, it is interpreted as relative to one greater
+than the last history position, so negative indices count back from the
+end of the history, and an index of &lsquo;<samp>-1</samp>&rsquo; refers to the current
+<code>history -d</code> command.
+</p>
+</dd>
+<dt><code>-d <var>start</var>-<var>end</var></code></dt>
+<dd><p>Delete the history entries between positions <var>start</var> and <var>end</var>,
+inclusive.  Positive and negative values for <var>start</var> and <var>end</var>
+are interpreted as described above.
 </p>
 </dd>
 <dt><code>-a</code></dt>
@@ -12347,14 +12837,12 @@ the value of the <code>HISTFILE</code> variable is used.
 </dl>
 
 <hr>
-<a name="History-Interaction"></a>
-<div class="header">
+<span id="History-Interaction"></span><div class="header">
 <p>
 Previous: <a href="#Bash-History-Builtins" accesskey="p" rel="prev">Bash History Builtins</a>, Up: <a href="#Using-History-Interactively" accesskey="u" rel="up">Using History Interactively</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="History-Expansion"></a>
-<h3 class="section">9.3 History Expansion</h3>
-<a name="index-history-expansion"></a>
+<span id="History-Expansion"></span><h3 class="section">9.3 History Expansion</h3>
+<span id="index-history-expansion"></span>
 
 <p>The History library provides a history expansion feature that is similar
 to the history expansion provided by <code>csh</code>.  This section
@@ -12366,7 +12854,9 @@ arguments to a previous command into the current input line, or
 fix errors in previous commands quickly.
 </p>
 <p>History expansion is performed immediately after a complete line
-is read, before the shell breaks it into words.
+is read, before the shell breaks it into words, and is performed
+on each line individually.  Bash attempts to inform the history
+expansion functions about quoting still in effect from previous lines.
 </p>
 <p>History expansion takes place in two parts.  The first is to determine
 which line from the history list should be used during substitution.
@@ -12379,13 +12869,23 @@ that Bash does, so that several words
 surrounded by quotes are considered one word.
 History expansions are introduced by the appearance of the
 history expansion character, which is &lsquo;<samp>!</samp>&rsquo; by default.
-Only &lsquo;<samp>\</samp>&rsquo; and &lsquo;<samp>'</samp>&rsquo; may be used to escape the history expansion
-character, but the history expansion character is
+</p>
+<p>History expansion implements shell-like quoting conventions:
+a backslash can be used to remove the special handling for the next character;
+single quotes enclose verbatim sequences of characters, and can be used to
+inhibit history expansion;
+and characters enclosed within double quotes may be subject to history
+expansion, since backslash can escape the history expansion character,
+but single quotes may not, since they are not treated specially within
+double quotes.
+</p>
+<p>When using the shell, only &lsquo;<samp>\</samp>&rsquo; and &lsquo;<samp>'</samp>&rsquo; may be used to escape the
+history expansion character, but the history expansion character is
 also treated as quoted if it immediately precedes the closing double quote
 in a double-quoted string. 
 </p>
 <p>Several shell options settable with the <code>shopt</code>
-builtin (see <a href="#Bash-Builtins">Bash Builtins</a>) may be used to tailor
+builtin (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>) may be used to tailor
 the behavior of history expansion.  If the
 <code>histverify</code> shell option is enabled, and Readline
 is being used, history substitutions are not immediately passed to
@@ -12409,29 +12909,27 @@ the history comment character to mark history timestamps when
 writing the history file.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Event-Designators" accesskey="1">Event Designators</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify which history line to use.
+<tr><td align="left" valign="top">&bull; <a href="#Event-Designators" accesskey="1">Event Designators</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to specify which history line to use.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Word-Designators" accesskey="2">Word Designators</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Specifying which words are of interest.
+<tr><td align="left" valign="top">&bull; <a href="#Word-Designators" accesskey="2">Word Designators</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Specifying which words are of interest.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Modifiers" accesskey="3">Modifiers</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Modifying the results of substitution.
+<tr><td align="left" valign="top">&bull; <a href="#Modifiers" accesskey="3">Modifiers</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Modifying the results of substitution.
 </td></tr>
 </table>
 
 <hr>
-<a name="Event-Designators"></a>
-<div class="header">
+<span id="Event-Designators"></span><div class="header">
 <p>
 Next: <a href="#Word-Designators" accesskey="n" rel="next">Word Designators</a>, Up: <a href="#History-Interaction" accesskey="u" rel="up">History Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Event-Designators-1"></a>
-<h4 class="subsection">9.3.1 Event Designators</h4>
-<a name="index-event-designators"></a>
+<span id="Event-Designators-1"></span><h4 class="subsection">9.3.1 Event Designators</h4>
+<span id="index-event-designators"></span>
 
 <p>An event designator is a reference to a command line entry in the
 history list.
 Unless the reference is absolute, events are relative to the current
 position in the history list.
-<a name="index-history-events"></a>
+<span id="index-history-events"></span>
 </p>
 <dl compact="compact">
 <dt><code>!</code></dt>
@@ -12465,12 +12963,14 @@ containing <var>string</var>.
 The trailing
 &lsquo;<samp>?</samp>&rsquo; may be omitted if the <var>string</var> is followed immediately by
 a newline.
+If <var>string</var> is missing, the string from the most recent search is used;
+it is an error if there is no previous search string.
 </p>
 </dd>
 <dt><code>^<var>string1</var>^<var>string2</var>^</code></dt>
 <dd><p>Quick Substitution.  Repeat the last command, replacing <var>string1</var>
 with <var>string2</var>.  Equivalent to
-<code>!!:s/<var>string1</var>/<var>string2</var>/</code>.
+<code>!!:s^<var>string1</var>^<var>string2</var>^</code>.
 </p>
 </dd>
 <dt><code>!#</code></dt>
@@ -12480,13 +12980,11 @@ with <var>string2</var>.  Equivalent to
 </dl>
 
 <hr>
-<a name="Word-Designators"></a>
-<div class="header">
+<span id="Word-Designators"></span><div class="header">
 <p>
 Next: <a href="#Modifiers" accesskey="n" rel="next">Modifiers</a>, Previous: <a href="#Event-Designators" accesskey="p" rel="prev">Event Designators</a>, Up: <a href="#History-Interaction" accesskey="u" rel="up">History Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Word-Designators-1"></a>
-<h4 class="subsection">9.3.2 Word Designators</h4>
+<span id="Word-Designators-1"></span><h4 class="subsection">9.3.2 Word Designators</h4>
 
 <p>Word designators are used to select desired words from the event.
 A &lsquo;<samp>:</samp>&rsquo; separates the event specification from the word designator.  It
@@ -12534,7 +13032,8 @@ the letters <code>fi</code>.
 </p>
 </dd>
 <dt><code>%</code></dt>
-<dd><p>The word matched by the most recent &lsquo;<samp>?<var>string</var>?</samp>&rsquo; search.
+<dd><p>The first word matched by the most recent &lsquo;<samp>?<var>string</var>?</samp>&rsquo; search,
+if the search string begins with a character that is part of a word.
 </p>
 </dd>
 <dt><code><var>x</var>-<var>y</var></code></dt>
@@ -12553,6 +13052,7 @@ the empty string is returned in that case.
 </dd>
 <dt><code><var>x</var>-</code></dt>
 <dd><p>Abbreviates &lsquo;<samp><var>x</var>-$</samp>&rsquo; like &lsquo;<samp><var>x</var>*</samp>&rsquo;, but omits the last word.
+If &lsquo;<samp>x</samp>&rsquo; is missing, it defaults to 0.
 </p>
 </dd>
 </dl>
@@ -12561,16 +13061,15 @@ the empty string is returned in that case.
 previous command is used as the event.
 </p>
 <hr>
-<a name="Modifiers"></a>
-<div class="header">
+<span id="Modifiers"></span><div class="header">
 <p>
 Previous: <a href="#Word-Designators" accesskey="p" rel="prev">Word Designators</a>, Up: <a href="#History-Interaction" accesskey="u" rel="up">History Interaction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Modifiers-1"></a>
-<h4 class="subsection">9.3.3 Modifiers</h4>
+<span id="Modifiers-1"></span><h4 class="subsection">9.3.3 Modifiers</h4>
 
 <p>After the optional word designator, you can add a sequence of one or more
 of the following modifiers, each preceded by a &lsquo;<samp>:</samp>&rsquo;.
+These modify, or edit, the word or words selected from the history event.
 </p>
 <dl compact="compact">
 <dt><code>h</code></dt>
@@ -12601,15 +13100,25 @@ the basename.
 <dt><code>x</code></dt>
 <dd><p>Quote the substituted words as with &lsquo;<samp>q</samp>&rsquo;,
 but break into words at spaces, tabs, and newlines.
+The &lsquo;<samp>q</samp>&rsquo; and &lsquo;<samp>x</samp>&rsquo; modifiers are mutually exclusive; the last one
+supplied is used.
 </p>
 </dd>
 <dt><code>s/<var>old</var>/<var>new</var>/</code></dt>
 <dd><p>Substitute <var>new</var> for the first occurrence of <var>old</var> in the
-event line.  Any delimiter may be used in place of &lsquo;<samp>/</samp>&rsquo;.
+event line.
+Any character may be used as the delimiter in place of &lsquo;<samp>/</samp>&rsquo;.
 The delimiter may be quoted in <var>old</var> and <var>new</var>
 with a single backslash.  If &lsquo;<samp>&amp;</samp>&rsquo; appears in <var>new</var>,
 it is replaced by <var>old</var>.  A single backslash will quote
-the &lsquo;<samp>&amp;</samp>&rsquo;.  The final delimiter is optional if it is the last
+the &lsquo;<samp>&amp;</samp>&rsquo;.
+If <var>old</var> is null, it is set to the last <var>old</var>
+substituted, or, if no previous history substitutions took place,
+the last <var>string</var>
+in a !?<var>string</var><code>[?]</code>
+search.
+If <var>new</var> is is null, each matching <var>old</var> is deleted.
+The final delimiter is optional if it is the last
 character on the input line.
 </p>
 </dd>
@@ -12625,19 +13134,18 @@ or with &lsquo;<samp>&amp;</samp>&rsquo;.
 </p>
 </dd>
 <dt><code>G</code></dt>
-<dd><p>Apply the following &lsquo;<samp>s</samp>&rsquo; modifier once to each word in the event.
+<dd><p>Apply the following &lsquo;<samp>s</samp>&rsquo; or &lsquo;<samp>&amp;</samp>&rsquo; modifier once to each word
+in the event.
 </p>
 </dd>
 </dl>
 
 <hr>
-<a name="Installing-Bash"></a>
-<div class="header">
+<span id="Installing-Bash"></span><div class="header">
 <p>
 Next: <a href="#Reporting-Bugs" accesskey="n" rel="next">Reporting Bugs</a>, Previous: <a href="#Using-History-Interactively" accesskey="p" rel="prev">Using History Interactively</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Installing-Bash-1"></a>
-<h2 class="chapter">10 Installing Bash</h2>
+<span id="Installing-Bash-1"></span><h2 class="chapter">10 Installing Bash</h2>
 
 <p>This chapter provides basic instructions for installing Bash on
 the various supported platforms.  The distribution supports the
@@ -12647,41 +13155,39 @@ Other independent ports exist for
 <small>MS-DOS</small>, <small>OS/2</small>, and Windows platforms.
 </p>
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Basic-Installation" accesskey="1">Basic Installation</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Installation instructions.
+<tr><td align="left" valign="top">&bull; <a href="#Basic-Installation" accesskey="1">Basic Installation</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Installation instructions.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Compilers-and-Options" accesskey="2">Compilers and Options</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to set special options for various
+<tr><td align="left" valign="top">&bull; <a href="#Compilers-and-Options" accesskey="2">Compilers and Options</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to set special options for various
 				systems.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Compiling-For-Multiple-Architectures" accesskey="3">Compiling For Multiple Architectures</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to compile Bash for more
+<tr><td align="left" valign="top">&bull; <a href="#Compiling-For-Multiple-Architectures" accesskey="3">Compiling For Multiple Architectures</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to compile Bash for more
 						than one kind of system from
 						the same source tree.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Installation-Names" accesskey="4">Installation Names</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to set the various paths used by the installation.
+<tr><td align="left" valign="top">&bull; <a href="#Installation-Names" accesskey="4">Installation Names</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to set the various paths used by the installation.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Specifying-the-System-Type" accesskey="5">Specifying the System Type</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to configure Bash for a particular system.
+<tr><td align="left" valign="top">&bull; <a href="#Specifying-the-System-Type" accesskey="5">Specifying the System Type</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to configure Bash for a particular system.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Sharing-Defaults" accesskey="6">Sharing Defaults</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to share default configuration values among GNU
+<tr><td align="left" valign="top">&bull; <a href="#Sharing-Defaults" accesskey="6">Sharing Defaults</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to share default configuration values among GNU
 			programs.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Operation-Controls" accesskey="7">Operation Controls</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Options recognized by the configuration program.
+<tr><td align="left" valign="top">&bull; <a href="#Operation-Controls" accesskey="7">Operation Controls</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Options recognized by the configuration program.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Optional-Features" accesskey="8">Optional Features</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to enable and disable optional features when
+<tr><td align="left" valign="top">&bull; <a href="#Optional-Features" accesskey="8">Optional Features</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">How to enable and disable optional features when
 			building Bash.
 </td></tr>
 </table>
 
 <hr>
-<a name="Basic-Installation"></a>
-<div class="header">
+<span id="Basic-Installation"></span><div class="header">
 <p>
 Next: <a href="#Compilers-and-Options" accesskey="n" rel="next">Compilers and Options</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Basic-Installation-1"></a>
-<h3 class="section">10.1 Basic Installation</h3>
-<a name="index-installation"></a>
-<a name="index-configuration"></a>
-<a name="index-Bash-installation"></a>
-<a name="index-Bash-configuration"></a>
+<span id="Basic-Installation-1"></span><h3 class="section">10.1 Basic Installation</h3>
+<span id="index-installation"></span>
+<span id="index-configuration"></span>
+<span id="index-Bash-installation"></span>
+<span id="index-Bash-configuration"></span>
 
 <p>These are installation instructions for Bash.
 </p>
@@ -12728,11 +13234,27 @@ may remove or edit it.
 <code>configure</code> script understands, type 
 </p>
 <div class="example">
-<pre class="example">bash-2.04$ ./configure --help
+<pre class="example">bash-4.2$ ./configure --help
 </pre></div>
 
 <p>at the Bash prompt in your Bash source directory.
 </p>
+<p>If you want to build Bash in a directory separate from the source
+directory &ndash; to build for multiple architectures, for example &ndash;
+just use the full path to the configure script. The following commands
+will build bash in a directory under <samp>/usr/local/build</samp> from
+the source code in <samp>/usr/local/src/bash-4.4</samp>:
+</p>
+<div class="example">
+<pre class="example">mkdir /usr/local/build/bash-4.4
+cd /usr/local/build/bash-4.4
+bash /usr/local/src/bash-4.4/configure
+make
+</pre></div>
+
+<p>See <a href="#Compiling-For-Multiple-Architectures">Compiling For Multiple Architectures</a> for more information
+about building in a directory separate from the source.
+</p>
 <p>If you need to do unusual things to compile Bash, please
 try to figure out how <code>configure</code> could check whether or not
 to do them, and mail diffs or instructions to
@@ -12752,13 +13274,11 @@ files that <code>configure</code> created (so you can compile Bash for
 a different kind of computer), type &lsquo;<samp>make distclean</samp>&rsquo;.
 </p>
 <hr>
-<a name="Compilers-and-Options"></a>
-<div class="header">
+<span id="Compilers-and-Options"></span><div class="header">
 <p>
 Next: <a href="#Compiling-For-Multiple-Architectures" accesskey="n" rel="next">Compiling For Multiple Architectures</a>, Previous: <a href="#Basic-Installation" accesskey="p" rel="prev">Basic Installation</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Compilers-and-Options-1"></a>
-<h3 class="section">10.2 Compilers and Options</h3>
+<span id="Compilers-and-Options-1"></span><h3 class="section">10.2 Compilers and Options</h3>
 
 <p>Some systems require unusual options for compilation or linking
 that the <code>configure</code> script does not know about.  You can
@@ -12780,13 +13300,11 @@ can do that on the command line like this:
 is available.
 </p>
 <hr>
-<a name="Compiling-For-Multiple-Architectures"></a>
-<div class="header">
+<span id="Compiling-For-Multiple-Architectures"></span><div class="header">
 <p>
 Next: <a href="#Installation-Names" accesskey="n" rel="next">Installation Names</a>, Previous: <a href="#Compilers-and-Options" accesskey="p" rel="prev">Compilers and Options</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Compiling-For-Multiple-Architectures-1"></a>
-<h3 class="section">10.3 Compiling For Multiple Architectures</h3>
+<span id="Compiling-For-Multiple-Architectures-1"></span><h3 class="section">10.3 Compiling For Multiple Architectures</h3>
 
 <p>You can compile Bash for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
@@ -12794,7 +13312,9 @@ own directory.  To do this, you must use a version of <code>make</code> that
 supports the <code>VPATH</code> variable, such as GNU <code>make</code>.
 <code>cd</code> to the
 directory where you want the object files and executables to go and run
-the <code>configure</code> script from the source directory.  You may need to
+the <code>configure</code> script from the source directory
+(see <a href="#Basic-Installation">Basic Installation</a>).
+You may need to
 supply the <samp>--srcdir=PATH</samp> argument to tell <code>configure</code> where the
 source files are.  <code>configure</code> automatically checks for the
 source code in the directory that <code>configure</code> is in and in &lsquo;..&rsquo;.
@@ -12820,13 +13340,11 @@ Bash for at least one architecture before you can create build
 directories for other architectures.
 </p>
 <hr>
-<a name="Installation-Names"></a>
-<div class="header">
+<span id="Installation-Names"></span><div class="header">
 <p>
 Next: <a href="#Specifying-the-System-Type" accesskey="n" rel="next">Specifying the System Type</a>, Previous: <a href="#Compiling-For-Multiple-Architectures" accesskey="p" rel="prev">Compiling For Multiple Architectures</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Installation-Names-1"></a>
-<h3 class="section">10.4 Installation Names</h3>
+<span id="Installation-Names-1"></span><h3 class="section">10.4 Installation Names</h3>
 
 <p>By default, &lsquo;<samp>make install</samp>&rsquo; will install into
 <samp>/usr/local/bin</samp>, <samp>/usr/local/man</samp>, etc.  You can
@@ -12843,13 +13361,11 @@ If you give <code>configure</code> the option
 Documentation and other data files will still use the regular prefix. 
 </p>
 <hr>
-<a name="Specifying-the-System-Type"></a>
-<div class="header">
+<span id="Specifying-the-System-Type"></span><div class="header">
 <p>
 Next: <a href="#Sharing-Defaults" accesskey="n" rel="next">Sharing Defaults</a>, Previous: <a href="#Installation-Names" accesskey="p" rel="prev">Installation Names</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Specifying-the-System-Type-1"></a>
-<h3 class="section">10.5 Specifying the System Type</h3>
+<span id="Specifying-the-System-Type-1"></span><h3 class="section">10.5 Specifying the System Type</h3>
 
 <p>There may be some features <code>configure</code> can not figure out
 automatically, but need to determine by the type of host Bash
@@ -12864,13 +13380,11 @@ or a canonical name with three fields: &lsquo;<samp>CPU-COMPANY-SYSTEM</samp>&rs
 values of each field. 
 </p>
 <hr>
-<a name="Sharing-Defaults"></a>
-<div class="header">
+<span id="Sharing-Defaults"></span><div class="header">
 <p>
 Next: <a href="#Operation-Controls" accesskey="n" rel="next">Operation Controls</a>, Previous: <a href="#Specifying-the-System-Type" accesskey="p" rel="prev">Specifying the System Type</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Sharing-Defaults-1"></a>
-<h3 class="section">10.6 Sharing Defaults</h3>
+<span id="Sharing-Defaults-1"></span><h3 class="section">10.6 Sharing Defaults</h3>
 
 <p>If you want to set default values for <code>configure</code> scripts to
 share, you can create a site shell script called
@@ -12883,13 +13397,11 @@ script.  A warning: the Bash <code>configure</code> looks for a site script,
 but not all <code>configure</code> scripts do.
 </p>
 <hr>
-<a name="Operation-Controls"></a>
-<div class="header">
+<span id="Operation-Controls"></span><div class="header">
 <p>
 Next: <a href="#Optional-Features" accesskey="n" rel="next">Optional Features</a>, Previous: <a href="#Sharing-Defaults" accesskey="p" rel="prev">Sharing Defaults</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Operation-Controls-1"></a>
-<h3 class="section">10.7 Operation Controls</h3>
+<span id="Operation-Controls-1"></span><h3 class="section">10.7 Operation Controls</h3>
 
 <p><code>configure</code> recognizes the following options to control how it
 operates.
@@ -12927,13 +13439,11 @@ script, and exit.
 options.  &lsquo;<samp>configure --help</samp>&rsquo; prints the complete list.
 </p>
 <hr>
-<a name="Optional-Features"></a>
-<div class="header">
+<span id="Optional-Features"></span><div class="header">
 <p>
 Previous: <a href="#Operation-Controls" accesskey="p" rel="prev">Operation Controls</a>, Up: <a href="#Installing-Bash" accesskey="u" rel="up">Installing Bash</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Optional-Features-1"></a>
-<h3 class="section">10.8 Optional Features</h3>
+<span id="Optional-Features-1"></span><h3 class="section">10.8 Optional Features</h3>
 
 <p>The Bash <code>configure</code> has a number of <samp>--enable-<var>feature</var></samp>
 options, where <var>feature</var> indicates an optional part of Bash.
@@ -13006,7 +13516,7 @@ compiled and linked, rather than changing run-time features.
 </p>
 <dl compact="compact">
 <dt><code>--enable-largefile</code></dt>
-<dd><p>Enable support for <a href="http://www.sas.com/standards/large_file/x_open.20Mar96.html">large files</a> if the operating system requires special compiler options
+<dd><p>Enable support for <a href="http://www.unix.org/version2/whatsnew/lfs20mar.html">large files</a> if the operating system requires special compiler options
 to build programs which can access large files.  This is enabled by
 default, if the operating system provides large file support.
 </p>
@@ -13097,6 +13607,13 @@ This allows pipelines as well as shell builtins and functions to be timed.
 <dd><p>Include support for the bash debugger (distributed separately).
 </p>
 </dd>
+<dt><code>--enable-dev-fd-stat-broken</code></dt>
+<dd><p>If calling <code>stat</code> on /dev/fd/<var>N</var> returns different results than
+calling <code>fstat</code> on file descriptor <var>N</var>, supply this option to
+enable a workaround.
+This has implications for conditional commands that test file attributes.
+</p>
+</dd>
 <dt><code>--enable-direxpand-default</code></dt>
 <dd><p>Cause the <code>direxpand</code> shell option (see <a href="#The-Shopt-Builtin">The Shopt Builtin</a>)
 to be enabled by default when the shell starts.
@@ -13184,7 +13701,7 @@ If Readline is not enabled, this option has no effect.
 </dd>
 <dt><code>--enable-prompt-string-decoding</code></dt>
 <dd><p>Turn on the interpretation of a number of backslash-escaped characters
-in the <code>$PS1</code>, <code>$PS2</code>, <code>$PS3</code>, and <code>$PS4</code> prompt
+in the <code>$PS0</code>, <code>$PS1</code>, <code>$PS2</code>, and <code>$PS4</code> prompt
 strings.  See <a href="#Controlling-the-Prompt">Controlling the Prompt</a>, for a complete list of prompt
 string escape sequences.
 </p>
@@ -13245,13 +13762,11 @@ Read the comments associated with each definition for more
 information about its effect.
 </p>
 <hr>
-<a name="Reporting-Bugs"></a>
-<div class="header">
+<span id="Reporting-Bugs"></span><div class="header">
 <p>
 Next: <a href="#Major-Differences-From-The-Bourne-Shell" accesskey="n" rel="next">Major Differences From The Bourne Shell</a>, Previous: <a href="#Installing-Bash" accesskey="p" rel="prev">Installing Bash</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Reporting-Bugs-1"></a>
-<h2 class="appendix">Appendix A Reporting Bugs</h2>
+<span id="Reporting-Bugs-1"></span><h2 class="appendix">Appendix A Reporting Bugs</h2>
 
 <p>Please report all bugs you find in Bash.
 But first, you should
@@ -13284,13 +13799,11 @@ the template it provides for filing a bug report.
 <a href="mailto:bug-bash@gnu.org">bug-bash@gnu.org</a>.
 </p>
 <hr>
-<a name="Major-Differences-From-The-Bourne-Shell"></a>
-<div class="header">
+<span id="Major-Differences-From-The-Bourne-Shell"></span><div class="header">
 <p>
 Next: <a href="#GNU-Free-Documentation-License" accesskey="n" rel="next">GNU Free Documentation License</a>, Previous: <a href="#Reporting-Bugs" accesskey="p" rel="prev">Reporting Bugs</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Major-Differences-From-The-Bourne-Shell-1"></a>
-<h2 class="appendix">Appendix B Major Differences From The Bourne Shell</h2>
+<span id="Major-Differences-From-The-Bourne-Shell-1"></span><h2 class="appendix">Appendix B Major Differences From The Bourne Shell</h2>
 
 <p>Bash implements essentially the same grammar, parameter and
 variable expansion, redirection, and quoting as the Bourne Shell. 
@@ -13624,8 +14137,7 @@ shell scripts.
 <p>More features unique to Bash may be found in <a href="#Bash-Features">Bash Features</a>.
 </p>
 
-<a name="Implementation-Differences-From-The-SVR4_002e2-Shell"></a>
-<h3 class="appendixsec">B.1 Implementation Differences From The SVR4.2 Shell</h3>
+<span id="Implementation-Differences-From-The-SVR4_002e2-Shell"></span><h3 class="appendixsec">B.1 Implementation Differences From The SVR4.2 Shell</h3>
 
 <p>Since Bash is a completely new implementation, it does not suffer from
 many of the limitations of the SVR4.2 shell.  For instance:
@@ -13673,13 +14185,11 @@ only for certain failures, as enumerated in the <small>POSIX</small> standard.
 </li></ul>
 
 <hr>
-<a name="GNU-Free-Documentation-License"></a>
-<div class="header">
+<span id="GNU-Free-Documentation-License"></span><div class="header">
 <p>
 Next: <a href="#Indexes" accesskey="n" rel="next">Indexes</a>, Previous: <a href="#Major-Differences-From-The-Bourne-Shell" accesskey="p" rel="prev">Major Differences From The Bourne Shell</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="GNU-Free-Documentation-License-1"></a>
-<h2 class="appendix">Appendix C GNU Free Documentation License</h2>
+<span id="GNU-Free-Documentation-License-1"></span><h2 class="appendix">Appendix C GNU Free Documentation License</h2>
 
 <div align="center">Version 1.3, 3 November 2008
 </div>
@@ -13692,7 +14202,7 @@ Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 </pre></div>
 
-<ol>
+<ol start="0">
 <li> PREAMBLE
 
 <p>The purpose of this License is to make a manual, textbook, or other
@@ -13868,7 +14378,7 @@ Version filling the role of the Document, thus licensing distribution
 and modification of the Modified Version to whoever possesses a copy
 of it.  In addition, you must do these things in the Modified Version:
 </p>
-<ol>
+<ol type="A" start="1">
 <li> Use in the Title Page (and on the covers, if any) a title distinct
 from that of the Document, and from those of previous versions
 (which should, if there were any, be listed in the History section
@@ -14114,15 +14624,14 @@ provided the MMC is eligible for relicensing.
 </p>
 </li></ol>
 
-<a name="ADDENDUM_003a-How-to-use-this-License-for-your-documents"></a>
-<h3 class="heading">ADDENDUM: How to use this License for your documents</h3>
+<span id="ADDENDUM_003a-How-to-use-this-License-for-your-documents"></span><h3 class="heading">ADDENDUM: How to use this License for your documents</h3>
 
 <p>To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
 license notices just after the title page:
 </p>
-<div class="smallexample">
-<pre class="smallexample">  Copyright (C)  <var>year</var>  <var>your name</var>.
+<div class="example">
+<pre class="example">  Copyright (C)  <var>year</var>  <var>your name</var>.
   Permission is granted to copy, distribute and/or modify this document
   under the terms of the GNU Free Documentation License, Version 1.3
   or any later version published by the Free Software Foundation;
@@ -14134,8 +14643,8 @@ license notices just after the title page:
 <p>If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
 replace the &ldquo;with&hellip;Texts.&rdquo; line with this:
 </p>
-<div class="smallexample">
-<pre class="smallexample">    with the Invariant Sections being <var>list their titles</var>, with
+<div class="example">
+<pre class="example">    with the Invariant Sections being <var>list their titles</var>, with
     the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
     being <var>list</var>.
 </pre></div>
@@ -14152,37 +14661,33 @@ to permit their use in free software.
 
 
 <hr>
-<a name="Indexes"></a>
-<div class="header">
+<span id="Indexes"></span><div class="header">
 <p>
 Previous: <a href="#GNU-Free-Documentation-License" accesskey="p" rel="prev">GNU Free Documentation License</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Indexes-1"></a>
-<h2 class="appendix">Appendix D Indexes</h2>
+<span id="Indexes-1"></span><h2 class="appendix">Appendix D Indexes</h2>
 
 <table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Builtin-Index" accesskey="1">Builtin Index</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of Bash builtin commands.
+<tr><td align="left" valign="top">&bull; <a href="#Builtin-Index" rel="index" accesskey="1">Builtin Index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of Bash builtin commands.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Reserved-Word-Index" accesskey="2">Reserved Word Index</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of Bash reserved words.
+<tr><td align="left" valign="top">&bull; <a href="#Reserved-Word-Index" rel="index" accesskey="2">Reserved Word Index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of Bash reserved words.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Variable-Index" accesskey="3">Variable Index</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Quick reference helps you find the
+<tr><td align="left" valign="top">&bull; <a href="#Variable-Index" rel="index" accesskey="3">Variable Index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Quick reference helps you find the
 				variable you want.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Function-Index" accesskey="4">Function Index</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of bindable Readline functions.
+<tr><td align="left" valign="top">&bull; <a href="#Function-Index" rel="index" accesskey="4">Function Index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Index of bindable Readline functions.
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#Concept-Index" accesskey="5">Concept Index</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">General index for concepts described in
+<tr><td align="left" valign="top">&bull; <a href="#Concept-Index" rel="index" accesskey="5">Concept Index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">General index for concepts described in
 				this manual.
 </td></tr>
 </table>
 
 <hr>
-<a name="Builtin-Index"></a>
-<div class="header">
+<span id="Builtin-Index"></span><div class="header">
 <p>
 Next: <a href="#Reserved-Word-Index" accesskey="n" rel="next">Reserved Word Index</a>, Up: <a href="#Indexes" accesskey="u" rel="up">Indexes</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Index-of-Shell-Builtin-Commands"></a>
-<h3 class="appendixsec">D.1 Index of Shell Builtin Commands</h3>
+<span id="Index-of-Shell-Builtin-Commands"></span><h3 class="appendixsec">D.1 Index of Shell Builtin Commands</h3>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Builtin-Index_bt_symbol-1"><b>.</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Builtin-Index_bt_symbol-2"><b>:</b></a>
@@ -14230,25 +14735,25 @@ Next: <a href="#Reserved-Word-Index" accesskey="n" rel="next">Reserved Word Inde
 <table class="index-bt" border="0">
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_symbol-1">.</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_symbol-1">.</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_002e"><code>.</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_symbol-2">:</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_symbol-2">:</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_003a"><code>:</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_symbol-3">[</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_symbol-3">[</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_005b"><code>[</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-A">A</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-alias"><code>alias</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-B">B</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-bg"><code>bg</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-bind"><code>bind</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-break"><code>break</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-builtin"><code>builtin</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-C">C</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-caller"><code>caller</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-cd"><code>cd</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-command"><code>command</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
@@ -14257,12 +14762,12 @@ Next: <a href="#Reserved-Word-Index" accesskey="n" rel="next">Reserved Word Inde
 <tr><td></td><td valign="top"><a href="#index-compopt"><code>compopt</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Programmable-Completion-Builtins">Programmable Completion Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-continue"><code>continue</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-D">D</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-declare"><code>declare</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dirs"><code>dirs</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Directory-Stack-Builtins">Directory Stack Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-disown"><code>disown</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-E">E</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-E">E</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-echo"><code>echo</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-enable"><code>enable</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-eval"><code>eval</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
@@ -14270,65 +14775,65 @@ Next: <a href="#Reserved-Word-Index" accesskey="n" rel="next">Reserved Word Inde
 <tr><td></td><td valign="top"><a href="#index-exit"><code>exit</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-export"><code>export</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-F">F</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-fc"><code>fc</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-History-Builtins">Bash History Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-fg"><code>fg</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-G">G</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-G">G</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-getopts"><code>getopts</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-H">H</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-H">H</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-hash"><code>hash</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-help"><code>help</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history"><code>history</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-History-Builtins">Bash History Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-J">J</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-J">J</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-jobs"><code>jobs</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-K">K</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-K">K</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill"><code>kill</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-L">L</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-L">L</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-let"><code>let</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-local"><code>local</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-logout"><code>logout</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-M">M</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-M">M</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-mapfile"><code>mapfile</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-P">P</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-P">P</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-popd"><code>popd</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Directory-Stack-Builtins">Directory Stack Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-printf"><code>printf</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-pushd"><code>pushd</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Directory-Stack-Builtins">Directory Stack Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-pwd"><code>pwd</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-R">R</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-R">R</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-read"><code>read</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-readarray"><code>readarray</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-readonly"><code>readonly</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-return"><code>return</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-S">S</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-set"><code>set</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#The-Set-Builtin">The Set Builtin</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shift"><code>shift</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shopt"><code>shopt</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#The-Shopt-Builtin">The Shopt Builtin</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-source"><code>source</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-suspend"><code>suspend</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-T">T</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-test"><code>test</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-times"><code>times</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-trap"><code>trap</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-type"><code>type</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-typeset"><code>typeset</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-U">U</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-U">U</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-ulimit"><code>ulimit</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-umask"><code>umask</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-unalias"><code>unalias</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Builtins">Bash Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-unset"><code>unset</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Builtins">Bourne Shell Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Builtin-Index_bt_letter-W">W</a></th><td></td><td></td></tr>
+<tr><th id="Builtin-Index_bt_letter-W">W</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-wait"><code>wait</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Builtins">Job Control Builtins</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
@@ -14378,13 +14883,11 @@ Next: <a href="#Reserved-Word-Index" accesskey="n" rel="next">Reserved Word Inde
 </td></tr></table>
 
 <hr>
-<a name="Reserved-Word-Index"></a>
-<div class="header">
+<span id="Reserved-Word-Index"></span><div class="header">
 <p>
 Next: <a href="#Variable-Index" accesskey="n" rel="next">Variable Index</a>, Previous: <a href="#Builtin-Index" accesskey="p" rel="prev">Builtin Index</a>, Up: <a href="#Indexes" accesskey="u" rel="up">Indexes</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Index-of-Shell-Reserved-Words"></a>
-<h3 class="appendixsec">D.2 Index of Shell Reserved Words</h3>
+<span id="Index-of-Shell-Reserved-Words"></span><h3 class="appendixsec">D.2 Index of Shell Reserved Words</h3>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Reserved-Word-Index_rw_symbol-1"><b>!</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Reserved-Word-Index_rw_symbol-2"><b>[</b></a>
@@ -14418,53 +14921,53 @@ Next: <a href="#Variable-Index" accesskey="n" rel="next">Variable Index</a>, Pre
 <table class="index-rw" border="0">
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_symbol-1">!</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_symbol-1">!</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0021"><code>!</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Pipelines">Pipelines</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_symbol-2">[</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_symbol-2">[</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_005b_005b"><code>[[</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_symbol-3">]</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_symbol-3">]</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_005d_005d"><code>]]</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_symbol-4">{</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_symbol-4">{</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_007b"><code>{</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Command-Grouping">Command Grouping</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_symbol-5">}</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_symbol-5">}</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_007d"><code>}</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Command-Grouping">Command Grouping</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-C">C</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-case"><code>case</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-D">D</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-do"><code>do</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Looping-Constructs">Looping Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-done"><code>done</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Looping-Constructs">Looping Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-E">E</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-E">E</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-elif"><code>elif</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-else"><code>else</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-esac"><code>esac</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-F">F</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-fi"><code>fi</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-for"><code>for</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Looping-Constructs">Looping Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-function"><code>function</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Functions">Shell Functions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-if"><code>if</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-in"><code>in</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-S">S</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-select"><code>select</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-T">T</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-then"><code>then</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Conditional-Constructs">Conditional Constructs</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-time"><code>time</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Pipelines">Pipelines</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-U">U</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-U">U</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-until"><code>until</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Looping-Constructs">Looping Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Reserved-Word-Index_rw_letter-W">W</a></th><td></td><td></td></tr>
+<tr><th id="Reserved-Word-Index_rw_letter-W">W</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-while"><code>while</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Looping-Constructs">Looping Constructs</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
@@ -14500,13 +15003,11 @@ Next: <a href="#Variable-Index" accesskey="n" rel="next">Variable Index</a>, Pre
 </td></tr></table>
 
 <hr>
-<a name="Variable-Index"></a>
-<div class="header">
+<span id="Variable-Index"></span><div class="header">
 <p>
 Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Previous: <a href="#Reserved-Word-Index" accesskey="p" rel="prev">Reserved Word Index</a>, Up: <a href="#Indexes" accesskey="u" rel="up">Indexes</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Parameter-and-Variable-Index"></a>
-<h3 class="appendixsec">D.3 Parameter and Variable Index</h3>
+<span id="Parameter-and-Variable-Index"></span><h3 class="appendixsec">D.3 Parameter and Variable Index</h3>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Variable-Index_vr_symbol-1"><b>!</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Variable-Index_vr_symbol-2"><b>#</b></a>
@@ -14568,13 +15069,13 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <table class="index-vr" border="0">
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-1">!</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-1">!</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0021-1"><code>!</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-2">#</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-2">#</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0023"><code>#</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-3">$</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-3">$</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0024"><code>$</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0024_0021"><code>$!</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0024_0023"><code>$#</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
@@ -14584,36 +15085,37 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-_00240"><code>$0</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0024_003f"><code>$?</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0024_0040"><code>$@</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-_0024_005f"><code>$_</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_0024_005f"><code>$_</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-4">*</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-4">*</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_002a"><code>*</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-5">-</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-5">-</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_002d"><code>-</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-6">0</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-6">0</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-0"><code>0</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-7">?</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-7">?</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_003f"><code>?</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-8">@</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_symbol-8">@</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-_0040"><code>@</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_symbol-9">_</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-_005f"><code>_</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Special-Parameters">Special Parameters</a></td></tr>
+<tr><th id="Variable-Index_vr_symbol-9">_</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_005f"><code>_</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-A">A</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-auto_005fresume"><code>auto_resume</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Variables">Job Control Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-B">B</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH"><code>BASH</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASHOPTS"><code>BASHOPTS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASHPID"><code>BASHPID</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fALIASES"><code>BASH_ALIASES</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fARGC"><code>BASH_ARGC</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fARGV"><code>BASH_ARGV</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-BASH_005fARGV0"><code>BASH_ARGV0</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fCMDS"><code>BASH_CMDS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fCOMMAND"><code>BASH_COMMAND</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-BASH_005fCOMPAT"><code>BASH_COMPAT</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14631,7 +15133,7 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-bind_002dtty_002dspecial_002dchars"><code>bind-tty-special-chars</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-blink_002dmatching_002dparen"><code>blink-matching-paren</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-C">C</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-CDPATH"><code>CDPATH</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Variables">Bourne Shell Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-CHILD_005fMAX"><code>CHILD_MAX</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-colored_002dcompletion_002dprefix"><code>colored-completion-prefix</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
@@ -14654,11 +15156,11 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-convert_002dmeta"><code>convert-meta</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-COPROC"><code>COPROC</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-D">D</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-DIRSTACK"><code>DIRSTACK</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-disable_002dcompletion"><code>disable-completion</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-E">E</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-E">E</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-echo_002dcontrol_002dcharacters"><code>echo-control-characters</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-editing_002dmode"><code>editing-mode</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-EMACS"><code>EMACS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14666,21 +15168,23 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-enable_002dbracketed_002dpaste"><code>enable-bracketed-paste</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-enable_002dkeypad"><code>enable-keypad</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-ENV"><code>ENV</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-EPOCHREALTIME"><code>EPOCHREALTIME</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-EPOCHSECONDS"><code>EPOCHSECONDS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-EUID"><code>EUID</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-EXECIGNORE"><code>EXECIGNORE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-expand_002dtilde"><code>expand-tilde</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-F">F</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-FCEDIT"><code>FCEDIT</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-FIGNORE"><code>FIGNORE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-FUNCNAME"><code>FUNCNAME</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-FUNCNEST"><code>FUNCNEST</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-G">G</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-G">G</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-GLOBIGNORE"><code>GLOBIGNORE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-GROUPS"><code>GROUPS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-H">H</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-H">H</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-histchars"><code>histchars</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-HISTCMD"><code>HISTCMD</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-HISTCONTROL"><code>HISTCONTROL</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14697,17 +15201,18 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-HOSTNAME"><code>HOSTNAME</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-HOSTTYPE"><code>HOSTTYPE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-IFS"><code>IFS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Variables">Bourne Shell Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-IGNOREEOF"><code>IGNOREEOF</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-input_002dmeta"><code>input-meta</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-INPUTRC"><code>INPUTRC</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-INSIDE_005fEMACS"><code>INSIDE_EMACS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-isearch_002dterminators"><code>isearch-terminators</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-K">K</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-K">K</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-keymap"><code>keymap</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-L">L</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-L">L</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-LANG"><code>LANG</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-LC_005fALL"><code>LC_ALL</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-LC_005fCOLLATE"><code>LC_COLLATE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14719,7 +15224,7 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-LINENO"><code>LINENO</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-LINES"><code>LINES</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-M">M</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-M">M</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-MACHTYPE"><code>MACHTYPE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-MAIL"><code>MAIL</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Variables">Bourne Shell Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-MAILCHECK"><code>MAILCHECK</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14731,7 +15236,7 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-menu_002dcomplete_002ddisplay_002dprefix"><code>menu-complete-display-prefix</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-meta_002dflag"><code>meta-flag</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-O">O</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-O">O</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OLDPWD"><code>OLDPWD</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OPTARG"><code>OPTARG</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Variables">Bourne Shell Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-OPTERR"><code>OPTERR</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14739,7 +15244,7 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-OSTYPE"><code>OSTYPE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-output_002dmeta"><code>output-meta</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-P">P</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-P">P</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-page_002dcompletions"><code>page-completions</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-PATH"><code>PATH</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bourne-Shell-Variables">Bourne Shell Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-PIPESTATUS"><code>PIPESTATUS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14754,14 +15259,15 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-PS4"><code>PS4</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-PWD"><code>PWD</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-R">R</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-R">R</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-RANDOM"><code>RANDOM</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-READLINE_005fLINE"><code>READLINE_LINE</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-READLINE_005fMARK"><code>READLINE_MARK</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-READLINE_005fPOINT"><code>READLINE_POINT</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-REPLY"><code>REPLY</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-revert_002dall_002dat_002dnewline"><code>revert-all-at-newline</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-S">S</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-SECONDS"><code>SECONDS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-SHELL"><code>SHELL</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-SHELLOPTS"><code>SHELLOPTS</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
@@ -14770,18 +15276,19 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 <tr><td></td><td valign="top"><a href="#index-show_002dall_002dif_002dunmodified"><code>show-all-if-unmodified</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-show_002dmode_002din_002dprompt"><code>show-mode-in-prompt</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-skip_002dcompleted_002dtext"><code>skip-completed-text</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-SRANDOM"><code>SRANDOM</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-T">T</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-TEXTDOMAIN"><code>TEXTDOMAIN</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-TEXTDOMAINDIR"><code>TEXTDOMAINDIR</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-TIMEFORMAT"><code>TIMEFORMAT</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-TMOUT"><code>TMOUT</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-TMPDIR"><code>TMPDIR</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-U">U</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-U">U</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-UID"><code>UID</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Variables">Bash Variables</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Variable-Index_vr_letter-V">V</a></th><td></td><td></td></tr>
+<tr><th id="Variable-Index_vr_letter-V">V</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-vi_002dcmd_002dmode_002dstring"><code>vi-cmd-mode-string</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-vi_002dins_002dmode_002dstring"><code>vi-ins-mode-string</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-visible_002dstats"><code>visible-stats</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
@@ -14847,13 +15354,11 @@ Next: <a href="#Function-Index" accesskey="n" rel="next">Function Index</a>, Pre
 </td></tr></table>
 
 <hr>
-<a name="Function-Index"></a>
-<div class="header">
+<span id="Function-Index"></span><div class="header">
 <p>
 Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previous: <a href="#Variable-Index" accesskey="p" rel="prev">Variable Index</a>, Up: <a href="#Indexes" accesskey="u" rel="up">Indexes</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Function-Index-1"></a>
-<h3 class="appendixsec">D.4 Function Index</h3>
+<span id="Function-Index-1"></span><h3 class="appendixsec">D.4 Function Index</h3>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Function-Index_fn_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Function-Index_fn_letter-B"><b>B</b></a>
@@ -14898,12 +15403,12 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 <table class="index-fn" border="0">
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-A">A</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-abort-_0028C_002dg_0029"><code>abort (C-g)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-accept_002dline-_0028Newline-or-Return_0029"><code>accept-line (Newline or Return)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-alias_002dexpand_002dline-_0028_0029"><code>alias-expand-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-B">B</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-backward_002dchar-_0028C_002db_0029"><code>backward-char (C-b)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-backward_002ddelete_002dchar-_0028Rubout_0029"><code>backward-delete-char (Rubout)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-backward_002dkill_002dline-_0028C_002dx-Rubout_0029"><code>backward-kill-line (C-x Rubout)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
@@ -14913,11 +15418,12 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 <tr><td></td><td valign="top"><a href="#index-beginning_002dof_002dline-_0028C_002da_0029"><code>beginning-of-line (C-a)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-bracketed_002dpaste_002dbegin-_0028_0029"><code>bracketed-paste-begin ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-C">C</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-call_002dlast_002dkbd_002dmacro-_0028C_002dx-e_0029"><code>call-last-kbd-macro (C-x e)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Keyboard-Macros">Keyboard Macros</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-capitalize_002dword-_0028M_002dc_0029"><code>capitalize-word (M-c)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-character_002dsearch-_0028C_002d_005d_0029"><code>character-search (C-])</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-character_002dsearch_002dbackward-_0028M_002dC_002d_005d_0029"><code>character-search-backward (M-C-])</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-clear_002ddisplay-_0028M_002dC_002dl_0029"><code>clear-display (M-C-l)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-clear_002dscreen-_0028C_002dl_0029"><code>clear-screen (C-l)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-complete-_0028TAB_0029"><code>complete (<span class="key">TAB</span>)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-complete_002dcommand-_0028M_002d_0021_0029"><code>complete-command (M-!)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
@@ -14930,73 +15436,74 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 <tr><td></td><td valign="top"><a href="#index-copy_002dforward_002dword-_0028_0029"><code>copy-forward-word ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-copy_002dregion_002das_002dkill-_0028_0029"><code>copy-region-as-kill ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-D">D</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dabbrev_002dexpand-_0028_0029"><code>dabbrev-expand ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-delete_002dchar-_0028C_002dd_0029"><code>delete-char (C-d)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-delete_002dchar_002dor_002dlist-_0028_0029"><code>delete-char-or-list ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-delete_002dhorizontal_002dspace-_0028_0029"><code>delete-horizontal-space ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-digit_002dargument-_0028M_002d0_002c-M_002d1_002c-_2026-M_002d_002d_0029"><code>digit-argument (<kbd>M-0</kbd>, <kbd>M-1</kbd>, &hellip; <kbd>M--</kbd>)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Numeric-Arguments">Numeric Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-display_002dshell_002dversion-_0028C_002dx-C_002dv_0029"><code>display-shell-version (C-x C-v)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-do_002duppercase_002dversion-_0028M_002da_002c-M_002db_002c-M_002dx_002c-_2026_0029"><code>do-uppercase-version (M-a, M-b, M-<var>x</var>, &hellip;)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-do_002dlowercase_002dversion-_0028M_002dA_002c-M_002dB_002c-M_002dx_002c-_2026_0029"><code>do-lowercase-version (M-A, M-B, M-<var>x</var>, &hellip;)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-downcase_002dword-_0028M_002dl_0029"><code>downcase-word (M-l)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dump_002dfunctions-_0028_0029"><code>dump-functions ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dump_002dmacros-_0028_0029"><code>dump-macros ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dump_002dvariables-_0028_0029"><code>dump-variables ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-dynamic_002dcomplete_002dhistory-_0028M_002dTAB_0029"><code>dynamic-complete-history (M-<span class="key">TAB</span>)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-E">E</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-edit_002dand_002dexecute_002dcommand-_0028C_002dxC_002de_0029"><code>edit-and-execute-command (C-xC-e)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
+<tr><th id="Function-Index_fn_letter-E">E</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-edit_002dand_002dexecute_002dcommand-_0028C_002dx-C_002de_0029"><code>edit-and-execute-command (C-x C-e)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-end_002dkbd_002dmacro-_0028C_002dx-_0029_0029"><code>end-kbd-macro (C-x ))</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Keyboard-Macros">Keyboard Macros</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-end_002dof_002dfile-_0028usually-C_002dd_0029"><code><i>end-of-file</i> (usually C-d)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-end_002dof_002dhistory-_0028M_002d_003e_0029"><code>end-of-history (M-&gt;)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-end_002dof_002dline-_0028C_002de_0029"><code>end-of-line (C-e)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-exchange_002dpoint_002dand_002dmark-_0028C_002dx-C_002dx_0029"><code>exchange-point-and-mark (C-x C-x)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-F">F</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-forward_002dbackward_002ddelete_002dchar-_0028_0029"><code>forward-backward-delete-char ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-forward_002dchar-_0028C_002df_0029"><code>forward-char (C-f)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-forward_002dsearch_002dhistory-_0028C_002ds_0029"><code>forward-search-history (C-s)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-forward_002dword-_0028M_002df_0029"><code>forward-word (M-f)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-G">G</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-G">G</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-glob_002dcomplete_002dword-_0028M_002dg_0029"><code>glob-complete-word (M-g)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-glob_002dexpand_002dword-_0028C_002dx-_002a_0029"><code>glob-expand-word (C-x *)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-glob_002dlist_002dexpansions-_0028C_002dx-g_0029"><code>glob-list-expansions (C-x g)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-H">H</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-H">H</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history_002dand_002dalias_002dexpand_002dline-_0028_0029"><code>history-and-alias-expand-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history_002dexpand_002dline-_0028M_002d_005e_0029"><code>history-expand-line (M-^)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history_002dsearch_002dbackward-_0028_0029"><code>history-search-backward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history_002dsearch_002dforward-_0028_0029"><code>history-search-forward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-history_002dsubstr_002dsearch_002dbackward-_0028_0029"><code>history-substr-search-backward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-history_002dsubstr_002dsearch_002dforward-_0028_0029"><code>history-substr-search-forward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-history_002dsubstring_002dsearch_002dbackward-_0028_0029"><code>history-substring-search-backward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-history_002dsubstring_002dsearch_002dforward-_0028_0029"><code>history-substring-search-forward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-insert_002dcomment-_0028M_002d_0023_0029"><code>insert-comment (M-#)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-insert_002dcompletions-_0028M_002d_002a_0029"><code>insert-completions (M-*)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-insert_002dlast_002dargument-_0028M_002d_002e-or-M_002d_005f_0029"><code>insert-last-argument (M-. or M-_)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-K">K</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-K">K</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill_002dline-_0028C_002dk_0029"><code>kill-line (C-k)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill_002dregion-_0028_0029"><code>kill-region ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill_002dwhole_002dline-_0028_0029"><code>kill-whole-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill_002dword-_0028M_002dd_0029"><code>kill-word (M-d)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-M">M</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-M">M</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-magic_002dspace-_0028_0029"><code>magic-space ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-menu_002dcomplete-_0028_0029"><code>menu-complete ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-menu_002dcomplete_002dbackward-_0028_0029"><code>menu-complete-backward ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-N">N</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-N">N</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-next_002dhistory-_0028C_002dn_0029"><code>next-history (C-n)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-next_002dscreen_002dline-_0028_0029"><code>next-screen-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-non_002dincremental_002dforward_002dsearch_002dhistory-_0028M_002dn_0029"><code>non-incremental-forward-search-history (M-n)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-non_002dincremental_002dreverse_002dsearch_002dhistory-_0028M_002dp_0029"><code>non-incremental-reverse-search-history (M-p)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-operate_002dand_002dget_002dnext-_0028C_002do_0029"><code>operate-and-get-next (C-o)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
+<tr><th id="Function-Index_fn_letter-O">O</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-operate_002dand_002dget_002dnext-_0028C_002do_0029"><code>operate-and-get-next (C-o)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-overwrite_002dmode-_0028_0029"><code>overwrite-mode ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-P">P</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-P">P</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-possible_002dcommand_002dcompletions-_0028C_002dx-_0021_0029"><code>possible-command-completions (C-x !)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-possible_002dcompletions-_0028M_002d_003f_0029"><code>possible-completions (M-?)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-possible_002dfilename_002dcompletions-_0028C_002dx-_002f_0029"><code>possible-filename-completions (C-x /)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
@@ -15005,34 +15512,36 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 <tr><td></td><td valign="top"><a href="#index-possible_002dvariable_002dcompletions-_0028C_002dx-_0024_0029"><code>possible-variable-completions (C-x $)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Completion">Commands For Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-prefix_002dmeta-_0028ESC_0029"><code>prefix-meta (<span class="key">ESC</span>)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-previous_002dhistory-_0028C_002dp_0029"><code>previous-history (C-p)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-previous_002dscreen_002dline-_0028_0029"><code>previous-screen-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-print_002dlast_002dkbd_002dmacro-_0028_0029"><code>print-last-kbd-macro ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Keyboard-Macros">Keyboard Macros</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-Q">Q</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-Q">Q</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-quoted_002dinsert-_0028C_002dq-or-C_002dv_0029"><code>quoted-insert (C-q or C-v)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-R">R</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-R">R</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-re_002dread_002dinit_002dfile-_0028C_002dx-C_002dr_0029"><code>re-read-init-file (C-x C-r)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-redraw_002dcurrent_002dline-_0028_0029"><code>redraw-current-line ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-reverse_002dsearch_002dhistory-_0028C_002dr_0029"><code>reverse-search-history (C-r)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-revert_002dline-_0028M_002dr_0029"><code>revert-line (M-r)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-S">S</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-self_002dinsert-_0028a_002c-b_002c-A_002c-1_002c-_0021_002c-_2026_0029"><code>self-insert (a, b, A, 1, !, &hellip;)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-set_002dmark-_0028C_002d_0040_0029"><code>set-mark (C-@)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shell_002dbackward_002dkill_002dword-_0028_0029"><code>shell-backward-kill-word ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-shell_002dbackward_002dword-_0028_0029"><code>shell-backward-word ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-shell_002dbackward_002dword-_0028M_002dC_002db_0029"><code>shell-backward-word (M-C-b)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shell_002dexpand_002dline-_0028M_002dC_002de_0029"><code>shell-expand-line (M-C-e)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-shell_002dforward_002dword-_0028_0029"><code>shell-forward-word ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-shell_002dkill_002dword-_0028_0029"><code>shell-kill-word ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-shell_002dforward_002dword-_0028M_002dC_002df_0029"><code>shell-forward-word (M-C-f)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Moving">Commands For Moving</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-shell_002dkill_002dword-_0028M_002dC_002dd_0029"><code>shell-kill-word (M-C-d)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-shell_002dtranspose_002dwords-_0028M_002dC_002dt_0029"><code>shell-transpose-words (M-C-t)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-skip_002dcsi_002dsequence-_0028_0029"><code>skip-csi-sequence ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-start_002dkbd_002dmacro-_0028C_002dx-_0028_0029"><code>start-kbd-macro (C-x ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Keyboard-Macros">Keyboard Macros</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-T">T</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-tilde_002dexpand-_0028M_002d_0026_0029"><code>tilde-expand (M-&amp;)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-transpose_002dchars-_0028C_002dt_0029"><code>transpose-chars (C-t)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-transpose_002dwords-_0028M_002dt_0029"><code>transpose-words (M-t)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-U">U</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-U">U</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-undo-_0028C_002d_005f-or-C_002dx-C_002du_0029"><code>undo (C-_ or C-x C-u)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Miscellaneous-Commands">Miscellaneous Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-universal_002dargument-_0028_0029"><code>universal-argument ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Numeric-Arguments">Numeric Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-unix_002dfilename_002drubout-_0028_0029"><code>unix-filename-rubout ()</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
@@ -15040,7 +15549,7 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 <tr><td></td><td valign="top"><a href="#index-unix_002dword_002drubout-_0028C_002dw_0029"><code>unix-word-rubout (C-w)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-upcase_002dword-_0028M_002du_0029"><code>upcase-word (M-u)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Text">Commands For Text</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Function-Index_fn_letter-Y">Y</a></th><td></td><td></td></tr>
+<tr><th id="Function-Index_fn_letter-Y">Y</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-yank-_0028C_002dy_0029"><code>yank (C-y)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-Killing">Commands For Killing</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-yank_002dlast_002darg-_0028M_002d_002e-or-M_002d_005f_0029"><code>yank-last-arg (M-. or M-_)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-yank_002dnth_002darg-_0028M_002dC_002dy_0029"><code>yank-nth-arg (M-C-y)</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Commands-For-History">Commands For History</a></td></tr>
@@ -15090,13 +15599,11 @@ Next: <a href="#Concept-Index" accesskey="n" rel="next">Concept Index</a>, Previ
 </td></tr></table>
 
 <hr>
-<a name="Concept-Index"></a>
-<div class="header">
+<span id="Concept-Index"></span><div class="header">
 <p>
 Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>, Up: <a href="#Indexes" accesskey="u" rel="up">Indexes</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Indexes" title="Index" rel="index">Index</a>]</p>
 </div>
-<a name="Concept-Index-1"></a>
-<h3 class="appendixsec">D.5 Concept Index</h3>
+<span id="Concept-Index-1"></span><h3 class="appendixsec">D.5 Concept Index</h3>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Concept-Index_cp_letter-A"><b>A</b></a>
  &nbsp; 
 <a class="summary-letter" href="#Concept-Index_cp_letter-B"><b>B</b></a>
@@ -15145,14 +15652,14 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <table class="index-cp" border="0">
 <tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-A">A</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-alias-expansion">alias expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Aliases">Aliases</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-arithmetic-evaluation">arithmetic evaluation</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Arithmetic">Shell Arithmetic</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-arithmetic-expansion">arithmetic expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Arithmetic-Expansion">Arithmetic Expansion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-arithmetic_002c-shell">arithmetic, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Arithmetic">Shell Arithmetic</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-arrays">arrays</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Arrays">Arrays</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-B">B</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-background">background</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Basics">Job Control Basics</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Bash-configuration">Bash configuration</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Basic-Installation">Basic Installation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Bash-installation">Bash installation</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Basic-Installation">Basic Installation</a></td></tr>
@@ -15160,7 +15667,7 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-brace-expansion">brace expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Brace-Expansion">Brace Expansion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-builtin-1">builtin</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-C">C</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-command-editing">command editing</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Bare-Essentials">Readline Bare Essentials</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-command-execution">command execution</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Command-Search-and-Execution">Command Search and Execution</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-command-expansion">command expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Simple-Command-Expansion">Simple Command Expansion</a></td></tr>
@@ -15177,15 +15684,17 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-commands_002c-shell">commands, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Commands">Shell Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-commands_002c-simple">commands, simple</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Simple-Commands">Simple Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-comments_002c-shell">comments, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Comments">Comments</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-Compatibility-Level">Compatibility Level</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-Compatibility-Mode">Compatibility Mode</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Compatibility-Mode">Shell Compatibility Mode</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-completion-builtins">completion builtins</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Programmable-Completion-Builtins">Programmable Completion Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-configuration">configuration</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Basic-Installation">Basic Installation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-control-operator">control operator</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-coprocess">coprocess</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Coprocesses">Coprocesses</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-D">D</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-directory-stack">directory stack</a>:</td><td>&nbsp;</td><td valign="top"><a href="#The-Directory-Stack">The Directory Stack</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-E">E</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-E">E</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-editing-command-lines">editing command lines</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Bare-Essentials">Readline Bare Essentials</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-environment">environment</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Environment">Environment</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-evaluation_002c-arithmetic">evaluation, arithmetic</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Arithmetic">Shell Arithmetic</a></td></tr>
@@ -15203,21 +15712,21 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-expressions_002c-arithmetic">expressions, arithmetic</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Arithmetic">Shell Arithmetic</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-expressions_002c-conditional">expressions, conditional</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Conditional-Expressions">Bash Conditional Expressions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-F">F</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-field">field</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-filename">filename</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-filename-expansion">filename expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Filename-Expansion">Filename Expansion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-foreground">foreground</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Basics">Job Control Basics</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-functions_002c-shell">functions, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Functions">Shell Functions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-H">H</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-H">H</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history-builtins">history builtins</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-History-Builtins">Bash History Builtins</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history-events">history events</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Event-Designators">Event Designators</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history-expansion">history expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#History-Interaction">History Interaction</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-history-list">history list</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-History-Facilities">Bash History Facilities</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-History_002c-how-to-use">History, how to use</a>:</td><td>&nbsp;</td><td valign="top"><a href="#A-Programmable-Completion-Example">A Programmable Completion Example</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-I">I</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-identifier">identifier</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-initialization-file_002c-readline">initialization file, readline</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File">Readline Init File</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-installation">installation</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Basic-Installation">Basic Installation</a></td></tr>
@@ -15226,32 +15735,32 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-interactive-shell-1">interactive shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Interactive-Shells">Interactive Shells</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-internationalization">internationalization</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-J">J</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-J">J</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-job">job</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-job-control">job control</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-job-control-1">job control</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Basics">Job Control Basics</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-K">K</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-K">K</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-kill-ring">kill ring</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Killing-Commands">Readline Killing Commands</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-killing-text">killing text</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Killing-Commands">Readline Killing Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-L">L</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-L">L</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-localization">localization</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-login-shell">login shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Invoking-Bash">Invoking Bash</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-M">M</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-M">M</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-matching_002c-pattern">matching, pattern</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Pattern-Matching">Pattern Matching</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-metacharacter">metacharacter</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-N">N</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-N">N</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-name">name</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-native-languages">native languages</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-notation_002c-readline">notation, readline</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Bare-Essentials">Readline Bare Essentials</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-O">O</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-O">O</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-operator_002c-shell">operator, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-P">P</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-P">P</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-parameter-expansion">parameter expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Parameter-Expansion">Shell Parameter Expansion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-parameters">parameters</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Parameters">Shell Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-parameters_002c-positional">parameters, positional</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Positional-Parameters">Positional Parameters</a></td></tr>
@@ -15267,18 +15776,19 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-programmable-completion">programmable completion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Programmable-Completion">Programmable Completion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-prompting">prompting</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Controlling-the-Prompt">Controlling the Prompt</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-Q">Q</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-Q">Q</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-quoting">quoting</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Quoting">Quoting</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-quoting_002c-ANSI">quoting, ANSI</a>:</td><td>&nbsp;</td><td valign="top"><a href="#ANSI_002dC-Quoting">ANSI-C Quoting</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-R">R</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-R">R</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Readline_002c-how-to-use">Readline, how to use</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Variables">Job Control Variables</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-redirection">redirection</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Redirections">Redirections</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-reserved-word">reserved word</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-reserved-words">reserved words</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Reserved-Words">Reserved Words</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-restricted-shell">restricted shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#The-Restricted-Shell">The Restricted Shell</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-return-status">return status</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-S">S</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shell-arithmetic">shell arithmetic</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Arithmetic">Shell Arithmetic</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shell-function">shell function</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Functions">Shell Functions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-shell-script">shell script</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Scripts">Shell Scripts</a></td></tr>
@@ -15291,20 +15801,20 @@ Previous: <a href="#Function-Index" accesskey="p" rel="prev">Function Index</a>,
 <tr><td></td><td valign="top"><a href="#index-startup-files">startup files</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Bash-Startup-Files">Bash Startup Files</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-suspending-jobs">suspending jobs</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Job-Control-Basics">Job Control Basics</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-T">T</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-tilde-expansion">tilde expansion</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Tilde-Expansion">Tilde Expansion</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-token">token</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-translation_002c-native-languages">translation, native languages</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Locale-Translation">Locale Translation</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-V">V</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-V">V</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-variable_002c-shell">variable, shell</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Shell-Parameters">Shell Parameters</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-variables_002c-readline">variables, readline</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Init-File-Syntax">Readline Init File Syntax</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-W">W</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-W">W</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-word">word</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Definitions">Definitions</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-word-splitting">word splitting</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Word-Splitting">Word Splitting</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Concept-Index_cp_letter-Y">Y</a></th><td></td><td></td></tr>
+<tr><th id="Concept-Index_cp_letter-Y">Y</th><td></td><td></td></tr>
 <tr><td></td><td valign="top"><a href="#index-yanking-text">yanking text</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Readline-Killing-Commands">Readline Killing Commands</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
diff --git a/msys2/usr/share/doc/gnupg/DETAILS b/msys2/usr/share/doc/gnupg/DETAILS
index acca24215..a02ba3597 100644
--- a/msys2/usr/share/doc/gnupg/DETAILS
+++ b/msys2/usr/share/doc/gnupg/DETAILS
@@ -61,6 +61,7 @@ described here.
     - rev :: Revocation signature
     - rvs :: Recocation signature (standalone) [since 2.2.9]
     - fpr :: Fingerprint (fingerprint is in field 10)
+    - fp2 :: SHA-256 fingerprint (fingerprint is in field 10)
     - pkd :: Public key data [*]
     - grp :: Keygrip
     - rvk :: Revocation key
@@ -168,8 +169,8 @@ described here.
     (the colon is quoted =\x3a=).  For a "pub" record this field is
     not used on --fixed-list-mode.  A UAT record puts the attribute
     subpacket count here, a space, and then the total attribute
-    subpacket size.  In gpgsm the issuer name comes here.  A FPR
-    record stores the fingerprint here.  The fingerprint of a
+    subpacket size.  In gpgsm the issuer name comes here.  The FPR and FP2
+    records store the fingerprints here.  The fingerprint of a
     revocation key is stored here.
 
 *** Field 11 - Signature class
@@ -1102,6 +1103,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
            - learncard :: Send by the agent and gpgsm while learing
                           the data of a smartcard.
            - card_busy :: A smartcard is still working
+           - scd_locked :: Waiting for other clients to unlock the scdaemon
 
     When <what> refers to a file path, it may be truncated.
 
@@ -1426,7 +1428,7 @@ CREATE TABLE signatures (
                - 5 :: Import from a trusted URL.
                - 6 :: Import from a trusted file.
                - 7 :: Self generated.
-  - 4 octets :: Time of last update.  This is a a four-octet scalar
+  - 4 octets :: Time of last update.  This is a four-octet scalar
                 with the seconds since Epoch.
   - 1 octet  :: Scalar with the length of the following field.
   - N octets :: String with the URL of the source.  This may be a
diff --git a/msys2/usr/share/doc/gnupg/README b/msys2/usr/share/doc/gnupg/README
index c039e2dc7..c394c91ec 100644
--- a/msys2/usr/share/doc/gnupg/README
+++ b/msys2/usr/share/doc/gnupg/README
@@ -3,8 +3,8 @@
                              Version 2.2
 
           Copyright 1997-2019 Werner Koch
-          Copyright 1998-2020 Free Software Foundation, Inc.
-          Copyright 2003-2020 g10 Code GmbH
+          Copyright 1998-2021 Free Software Foundation, Inc.
+          Copyright 2003-2021 g10 Code GmbH
 
 
 * INTRODUCTION
diff --git a/msys2/usr/share/doc/gnupg/examples/Automatic.prf b/msys2/usr/share/doc/gnupg/examples/Automatic.prf
new file mode 100644
index 000000000..41f9bea0c
--- /dev/null
+++ b/msys2/usr/share/doc/gnupg/examples/Automatic.prf
@@ -0,0 +1,15 @@
+# Automatic.prf - Configure options for a more automatic mode  -*- conf -*-
+#
+# The options for each tool are configured in a section ("[TOOL]");
+# see the respective man page for a description of these options and
+# the gpgconf manpage for a description of this file's syntax.
+
+[gpg]
+auto-key-locate local,wkd,dane
+auto-key-retrieve
+trust-model tofu+pgp$\r$\n'
+
+[gpg-agent]
+default-cache-ttl 900
+max-cache-ttl 3600
+min-passphrase-nonalpha 0
diff --git a/msys2/usr/share/doc/gnupg/examples/vsnfd.prf b/msys2/usr/share/doc/gnupg/examples/VS-NfD.prf
similarity index 75%
rename from msys2/usr/share/doc/gnupg/examples/vsnfd.prf
rename to msys2/usr/share/doc/gnupg/examples/VS-NfD.prf
index 2884fe71e..edb9e018e 100644
--- a/msys2/usr/share/doc/gnupg/examples/vsnfd.prf
+++ b/msys2/usr/share/doc/gnupg/examples/VS-NfD.prf
@@ -1,4 +1,4 @@
-# vsnfd.prf - Configure options for the VS-NfD mode           -*- conf -*-
+# VS-NfD.prf - Configure options for the VS-NfD mode           -*- conf -*-
 #
 # The options for each tool are configured in a section ("[TOOL]");
 # see the respective man page for a description of these options and
@@ -6,14 +6,12 @@
 
 [gpg]
 compliance de-vs
-default-new-key-algo rsa3072/cert,sign+rsa3072/encr
 
 [gpgsm]
 compliance de-vs
 enable-crl-checks
 
 [gpg-agent]
-enable-extended-key-format
 default-cache-ttl 900
 max-cache-ttl 3600
 no-allow-mark-trusted
diff --git a/msys2/usr/share/doc/nano/faq.html b/msys2/usr/share/doc/nano/faq.html
new file mode 100644
index 000000000..6d8a324ae
--- /dev/null
+++ b/msys2/usr/share/doc/nano/faq.html
@@ -0,0 +1,277 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+<head>
+  <title>The GNU nano editor FAQ</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="description" content="The genesis story of the nano editor, plus the solution to some common problems.">
+</head>
+
+<body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
+
+<h1>The GNU nano editor FAQ</h1>
+<h3>Table of Contents</h3>
+<h3><a href="#1">1. General</a></h3>
+<blockquote><p>
+  <a href="#1.1">1.1. What is GNU nano?</a><br>
+  <a href="#1.2">1.2. What is the history behind nano?</a><br>
+  <a href="#1.3">1.3. Why the name change from TIP?</a><br>
+  <a href="#1.4">1.4. What is the current version of nano?</a><br>
+  <a href="#1.5">1.5. I want to read the manpage without having to download the program!</a>
+</p></blockquote>
+<h3><a href="#2">2. Where to get GNU nano.</a></h3>
+<blockquote><p>
+  <a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
+  <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
+  <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
+  <a href="#2.4">2.4. By GIT (for the brave).</a>
+</p></blockquote>
+<h3><a href="#3">3. Installation and Configuration</a></h3>
+<blockquote><p>
+  <a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
+  <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
+  <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
+  <a href="#3.4">3.4. nano should automatically run strip on the binary when installing it!</a><br>
+  <a href="#3.5">3.5. How can I make the executable smaller? This is too bloated!</a><br>
+  <a href="#3.6">3.6. Tell me more about this multibuffer stuff!</a><br>
+  <a href="#3.7">3.7. Tell me more about this verbatim input stuff!</a><br>
+  <a href="#3.8">3.8. How do I make a .nanorc file that nano will read when I start it?</a><br>
+  <a href="#3.9">3.9. Why does my self-compiled nano not read /etc/nanorc?</a><br>
+</p></blockquote>
+<h3><a href="#4">4. Running</a></h3>
+<blockquote><p>
+  <a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
+  <a href="#4.2">4.2. How can I make Ctrl+Shift+Left/Right select words on urxvt?</a><br>
+  <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
+  <a href="#4.4">4.4. With what keystroke can I paste text from the clipboard into nano?</a><br>
+  <a href="#4.5">4.5. How do I select text for or paste text from the clipboard when nano's mouse support is turned on?</a><br>
+  <a href="#4.6">4.6. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</a><br>
+  <a href="#4.7">4.7. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</a><br>
+  <a href="#4.8">4.8. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
+  <a href="#4.9">4.9. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+</p></blockquote>
+<h3><a href="#5">5. Internationalization</a></h3>
+<blockquote><p>
+  <a href="#5.1">5.1. There's no translation for my language!</a><br>
+  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
+  <a href="#5.3">5.3. What is the status of Unicode support?</a>
+</p></blockquote>
+<h3><a href="#6">6. Advocacy and Licensing</a></h3>
+<blockquote><p>
+  <a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
+  <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
+  <a href="#6.3">6.3. What is so bad about the older Pine license?</a><br>
+  <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a>
+</p></blockquote>
+<h3><a href="#7">7. Miscellaneous</a></h3>
+<blockquote><p>
+  <a href="#7.1">7.1. Where can I ask questions or send suggestions?</a><br>
+  <a href="#7.2">7.2. How do I submit a bug report or patch?</a><br>
+  <a href="#7.3">7.3. I want to send the development team a big load of cash (or just a thank you).</a><br>
+  <a href="#7.4">7.4. How do I join the development team?</a><br>
+  <a href="#7.5">7.5. Can I have write access to the GIT tree?</a>
+</p></blockquote>
+<hr width="100%">
+
+<h1><a name="1"></a>1. General</h1>
+<h3><a name="1.1"></a>1.1. What is GNU nano?</h3>
+<blockquote><p>GNU nano was designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aimed to &quot;emulate Pico as closely as is reasonable and then include extra functionality&quot;.</p></blockquote>
+<h3><a name="1.2"></a>1.2. What is the history behind nano?</h3>
+<blockquote><p>Funny you should ask!</p>
+  <p><b>In the beginning...</b></p>
+  <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
+  <p><b>Then came Debian...</b></p>
+  <p>The <a href="https://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="https://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
+  <p><b>The event...</b></p>
+  <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
+  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is in today.</p>
+  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
+<h3><a name="1.3"></a>1.3. Why the name change from TIP?</h3>
+<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
+<h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
+<blockquote><p>The current version of nano <i>should</i> be <b>5.4</b>.  Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<h3><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h3>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/nano.1.html">here</a>.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="2"></a>2. Where to get GNU nano.</h1>
+<h3><a name="2.1"></a>2.1. Web sites that carry nano.</h3>
+<blockquote><p>The nano source tarballs can be downloaded from the following web sites:</p>
+  <ul>
+    <li><a href="https://nano-editor.org/dist/latest/">https://nano-editor.org/dist/latest/</a></li>
+    <li><a href="https://ftpmirror.gnu.org/gnu/nano/">https://ftpmirror.gnu.org/gnu/nano/</a></li>
+  </ul>
+</blockquote>
+<h3><a name="2.2"></a>2.2. RPM packages (RedHat, OpenSuse, and derivatives).</h3>
+<blockquote>
+  <ul>
+    <li><a href="https://kojipkgs.fedoraproject.org//packages/nano/">https://kojipkgs.fedoraproject.org//packages/nano/</a></li>
+    <li><a href="https://software.opensuse.org/package/nano">https://software.opensuse.org/package/nano</a></li>
+  </ul>
+</blockquote>
+<h3><a name="2.3"></a>2.3. Deb packages (Debian and derivatives):</h3>
+<blockquote><p>Debian users can check out the current nano packages for:</p>
+  <ul>
+    <li><a href="https://packages.debian.org/stable/editors/nano">stable</a></li>
+    <li><a href="https://packages.debian.org/testing/editors/nano">testing</a></li>
+    <li><a href="https://packages.debian.org/unstable/editors/nano">unstable</a></li>
+  </ul>
+  <p>You can also have a look at the <a href="http://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
+</blockquote>
+<h3><a name="2.4"></a>2.4. By GIT (for the brave).</h3>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use GIT to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://git.savannah.gnu.org/cgit/nano.git/tree/README.GIT">the nano GIT document</a> for info on anonymous GIT access to the nano source.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="3"></a>3. Installation and Configuration</h1>
+<h3><a name="3.1"></a>3.1. How do I install the RPM or DEB package?</h3>
+<blockquote><p>It's simple really! As root, type <b>rpm -Uvh nano-x.y-1*.rpm</b> if you have a RedHat-ish system or <b>dpkg -i nano_x.y-1*.deb</b> if you have a Debian-ish system, where <b>x.y</b> is the version number of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.</p></blockquote>
+<h3><a name="3.2"></a>3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</h3>
+<blockquote><p>Okay, take a deep breath, this really isn't hard. Unpack the nano source with a command like:</p>
+  <p><b>tar -xvf nano-x.y.tar.gz</b></p>
+  <p>Then you need to run <b>configure</b> with any options you might want (if any).</p>
+  <p>The average case is this:</p>
+  <p><b>cd nano-x.y/</b><br>
+  <b>./configure</b><br>
+  <b>make</b><br>
+  <b>make install</b> (as root, of course)</p></blockquote>
+<h3><a name="3.3"></a>3.3. Why does everything go into /usr/local?</h3>
+<blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
+  <p><b>./configure --prefix=/usr</b></p>
+  <p>This will put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
+<h3><a name="3.4"></a>3.4. nano should automatically run strip on the binary when installing it!</h3>
+<blockquote><p>It does when you use <b>make install-strip</b>. The default <b>make install</b> does not, and will not, run strip automatically.</p></blockquote>
+<h3><a name="3.5"></a>3.5. How can I make the executable smaller? This is too bloated!</h3>
+<blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
+  <pre>
+  <b>--disable-browser</b>       Disable the built-in file browser
+  <b>--disable-color</b>         Disable color and syntax highlighting
+  <b>--disable-comment</b>       Disable the comment/uncomment function
+  <b>--disable-extra</b>         Disable the easter egg
+  <b>--disable-help</b>          Disable the built-in help texts
+  <b>--disable-histories</b>     Disable the saving of search strings and cursor positions
+  <b>--disable-justify</b>       Disable the justify/unjustify functions
+  <b>--disable-libmagic</b>      Disable the use of libmagic for determining a file's syntax
+  <b>--disable-linenumbers</b>   Disable line numbering
+  <b>--disable-mouse</b>         Disable mouse support
+  <b>--disable-multibuffer</b>   Disable the opening of multiple file buffers
+  <b>--disable-nanorc</b>        Disable the use of .nanorc files
+  <b>--disable-operatingdir</b>  Disable the setting of an operating directory
+  <b>--disable-speller</b>       Disable the spell-checker functions
+  <b>--disable-tabcomp</b>       Disable the tab-completion functions
+  <b>--disable-wordcomp</b>      Disable the word-completion function
+  <b>--disable-wrapping</b>      Disable all hard-wrapping of text</pre>
+  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the undo/redo code and the code for selecting text). Also, if you know you don't need other languages, you can use <b>--disable-nls</b> to disable internationalization and save a few kilobytes. And finally, there's always good old <b>strip</b> to remove all unneeded symbols.</p>
+</blockquote>
+<h3><a name="3.6"></a>3.6. Tell me more about this multibuffer stuff!</h3>
+<blockquote><p>To use multiple file buffers, you must not have configured nano with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b> after typing <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>-F</b> or <b>--multibuffer</b> flag when you invoke nano, or add <b>set multibuffer</b> to your .nanorc file.</p>
+  <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily without holding Shift: <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one buffer open, the ^X shortcut will say &quot;Close&quot;, instead of &quot;Exit&quot;.</p></blockquote>
+<h3><a name="3.7"></a>3.7. Tell me more about this verbatim input stuff!</h3>
+<blockquote><p>When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot; on the status bar), then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if Unicode support is enabled (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted. The status bar will change to &quot;Unicode Input: ......&quot; when you do this.</p></blockquote>
+<h3><a name="3.8"></a>3.8. How do I make a .nanorc file that will be read when I start nano?</h3>
+<blockquote><p>It's not hard at all! Simply copy the <b>sample.nanorc</b> from the doc/ directory in the nano source package (or from /usr/doc/nano on your system) to <b>.nanorc</b> in your home directory, and then edit it. If you didn't get a sample nanorc, the syntax of the file is simple: features are turned on and off by using the words <b>set</b> and <b>unset</b> followed by the long option name of the feature (see <b>man nanorc</b> for the full list of options). For example, &quot;set quickblank&quot; or &quot;set smarthome&quot;. Of course, for this to work, your nano must <b>not</b> have been compiled with <b>--disable-nanorc</b>.</p></blockquote>
+<h3><a name="3.9"></a>3.9. Why does my self-compiled nano not read /etc/nanorc?</h3>
+<blockquote><p>By default (see <a href="#3.3">3.3</a>), nano gets installed into /usr/local. This also means that, at startup, nano will read <b>/usr/local/etc/nanorc</b> instead of <b>/etc/nanorc</b>. You can make a symlink from the former to the latter if you want your self-compiled nano to read the same nanorc as the system-installed nano. Or you can configure your nano to overwrite the system nano (again, see <a href="#3.3">3.3</a>).</p></blockquote>
+<hr width="100%">
+
+<h1><a name="4"></a>4. Running</h1>
+<h3><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h3>
+<blockquote><p>If a command-line argument that begins with '+' is followed by another argument, the former is always treated as a starting line (plus column number), and the latter always as a filename. If a command-line argument that begins with '+' isn't followed by another argument, it's treated as a filename. Examples:</p>
+  <p>To open '+filename.txt': <b>nano +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40: <b>nano +1 +filename.txt +40 filename.txt</b></p></blockquote>
+<h3><a name="4.2"></a>4.2. How can I make Ctrl+Shift+Left/Right select words on urxvt?</h3>
+<blockquote><p>The urxvt terminal emulator produces non-standard escape sequences for the modified cursor keys.  These deviant sequences are not listed in the terminfo database, which means that ncurses does not recognize them.  The easiest way around this is to tell urxvt to produce xterm-compatible escape sequences for the relevant keystrokes.  To achieve this, add the following lines to your ~/.Xresources file:</p>
+<pre>
+    URxvt.iso14755_52: False
+
+    URxvt.keysym.C-S-Up: \033[1;6A
+    URxvt.keysym.C-S-Down: \033[1;6B
+    URxvt.keysym.C-S-Right: \033[1;6C
+    URxvt.keysym.C-S-Left: \033[1;6D
+
+    URxvt.keysym.M-Up: \033[1;3A
+    URxvt.keysym.M-Down: \033[1;3B
+    URxvt.keysym.M-Right: \033[1;3C
+    URxvt.keysym.M-Left: \033[1;3D
+
+    URxvt.keysym.M-Insert: \033[2;3~
+    URxvt.keysym.M-Delete: \033[3;3~
+
+    URxvt.keysym.M-Page_Up: \033[5;3~
+    URxvt.keysym.M-Page_Down: \033[6;3~</pre>
+<p>Then run <b>xrdb ~/.Xresources</b> and restart your urxvt terminal.  Now <b>Ctrl+Shift+Left</b> and <b>Ctrl+Shift+Right</b> will select words, <b>Alt+Up</b> and <b>Alt+Down</b> will scroll the text without moving the cursor, and several such things more.</p></blockquote>
+<h3><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h3>
+<blockquote><p>You can use the <b>-K</b> or <b>--rawsequences</b> option on the command line, or add the line <b>set rawsequences</b> to your .nanorc. However, nano's mouse support will be disabled if you do any of these things.</p></blockquote>
+<h3><a name="4.4"></a>4.4. With what keystroke can I paste text from the clipboard into nano?</h3>
+<blockquote><p>In most desktop environments <b>Shift+Insert</b> will paste the contents of the clipboard.</p></blockquote>
+<h3><a name="4.5"></a>4.5. How do I select text for or paste text from the clipboard when nano's mouse support is turned on?</h3>
+<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
+<h3><a name="4.6"></a>4.6. When I paste text into a document, each line gets indented further than the last. Why? And how can I stop this?</h3>
+<blockquote><p>You have the <i>autoindent</i> feature turned on. Hit <b>Meta-I</b> to turn it off, paste your text, and then hit <b>Meta-I</b> again to turn it back on.</p>
+  <p><i>Update:</i> Since version 4.8, nano will suppress auto-indentation during a paste, so you no longer need to toggle it off and on manually.</p></blockquote>
+<h3><a name="4.7"></a>4.7. When I paste from Windows into a remote nano, nano rewraps the lines. What gives?</h3>
+<blockquote><p>When pasting from Windows, in some situations linefeeds are sent instead of carriage returns (Enters). And linefeeds are <b>^J</b>s, which make nano justify (rewrap) the current paragraph. To prevent these linefeeds from causing these unwanted justifications, add this line to your .nanorc on the remote Linux box: <b>unbind ^J main</b> or <b>bind ^J enter main</b>, depending on whether the paste contains CR + LF or only LF.</p>
+  <p><i>Update:</i> Since version 4.8, nano will ignore linefeed characters in a paste, so you no longer need the above workaround.</p></blockquote>
+<h3><a name="4.8"></a>4.8. I've compiled nano with color support, but I don't see any color when I run it!</h3>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>syntax/</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano/</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9">3.9</a>.</p></blockquote>
+<h3><a name="4.9"></a>4.9. How do I make nano my default editor (in Pine, mutt, etc.)?</h3>
+<blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
+  <p><b>export EDITOR=/usr/local/bin/nano</b></p>
+  <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
+  <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
+  <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you log in. So log out and back in again.</p>
+  <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
+  <p><b>[ ] enable-alternate-editor-cmd</b><br>
+  <b>[ ] enable-alternate-editor-implicitly</b></p>
+  <p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).</p>
+  <p>If you're a mutt user, you should see an effect immediately the next time you log in. No further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
+  <p><b>my_hdr X-Composer: nano-x.y</b></p>
+  <p>Again, replace x.y with the version of nano you use.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="5"></a>5. Internationalization</h1>
+<h3><a name="5.1"></a>5.1. There's no translation for my language!</h3>
+<blockquote><p>In June 2001, GNU nano entered the <a href="https://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="https://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="https://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+  <p>In any case, translating nano is easy. Just grab the latest <b>nano.pot</b> file listed on <a href="https://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central PO-file repository.</p></blockquote>
+<h3><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h3>
+<blockquote><p>The best way is to send an e-mail with your suggested corrections to the team's mailing list. The address is mentioned in the <code>Language-Team:</code> field in the relevant PO file. The team leader or the assigned translator can then make the changes reach the nano-devel list.</p></blockquote>
+<h3><a name="5.3"></a>5.3. What is the status of Unicode support?</h3>
+<blockquote><p>Unicode should be fully usable nowadays. When the encoding of your terminal is set to UTF-8, and your locale (mainly the LANG environment variable) is UTF-8 too, then you should be able to read, enter and save Unicode text.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="6"></a>6. Advocacy and Licensing</h1>
+<h3><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h3>
+<blockquote><p>If you want features like undo/redo, syntax highlighting, line numbers, soft-wrapping, opening multiple files at once, an interface localized to your language, or search and replace with support for regular expressions, then you want nano.</p></blockquote>
+<h3><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h3>
+<blockquote><p>If you use your editor only to write emails or other texts and have no need for the above-mentioned features, then Pico will do fine for you.</p></blockquote>
+<h3><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h3>
+<blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="https://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
+<h3><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h3>
+<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.</p>
+<p>Of course, due to the license change you can now use the <a href="http://www.washington.edu/alpine/">Alpine distribution</a> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
+<hr width="100%">
+
+<h1><a name="7"></a>7. Miscellaneous</h1>
+<h3><a name="7.1"></a>7.1. Where can I ask questions or send suggestions?</h3>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="https://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+  <p>info-nano - <a href="https://lists.gnu.org/mailman/listinfo/info-nano/">https://lists.gnu.org/mailman/listinfo/info-nano/</a><br>
+  help-nano - <a href="https://lists.gnu.org/mailman/listinfo/help-nano/">https://lists.gnu.org/mailman/listinfo/help-nano/</a><br>
+  nano-devel - <a href="https://lists.gnu.org/mailman/listinfo/nano-devel/">https://lists.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
+<h3><a name="7.2"></a>7.3. How do I submit a bug report or patch?</h3>
+<blockquote>
+  <p>The best way to submit bugs is through the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a>, as you can check whether the bug you are reporting has already been submitted, and it makes it easier for the maintainers to keep track of them.
+  <p>You can submit patches for nano via <a href="https://savannah.gnu.org/patch/?group=nano">Savannah's patch manager</a>.</p></blockquote>
+<h3><a name="7.3"></a>7.3. I want to send the development team a big load of cash (or just a thank you).</h3>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="https://nano-editor.org/dist/latest/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<h3><a name="7.4"></a>7.4. How do I join the development team?</h3>
+<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
+<h3><a name="7.5"></a>7.5. Can I have write access to the git tree?</h3>
+<blockquote><p>Re-read section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
+<hr width="100%">
+
+</body>
+</html>
diff --git a/msys2/usr/share/doc/nano/nano.1.html b/msys2/usr/share/doc/nano/nano.1.html
new file mode 100644
index 000000000..778eb4ae9
--- /dev/null
+++ b/msys2/usr/share/doc/nano/nano.1.html
@@ -0,0 +1,706 @@
+<!-- Creator     : groff version 1.22.4 -->
+<!-- CreationDate: Wed Dec  2 11:30:13 2020 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<meta name="Content-Style" content="text/css">
+<style type="text/css">
+       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       h1      { text-align: center }
+</style>
+<title>NANO</title>
+
+</head>
+<body>
+
+<h1 align="center">NANO</h1>
+
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#NOTICE">NOTICE</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#EDITING">EDITING</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#TOGGLES">TOGGLES</a><br>
+<a href="#FILES">FILES</a><br>
+<a href="#NOTES">NOTES</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#HOMEPAGE">HOMEPAGE</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+
+
+<h2>NAME
+<a name="NAME"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">nano &minus;
+Nano&rsquo;s ANOther editor, inspired by Pico</p>
+
+<h2>SYNOPSIS
+<a name="SYNOPSIS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>nano</b>
+[<i>options</i>]
+[[<b>+</b><i>line</i>[<b>,</b><i>column</i>]]
+<i>file</i>]...</p>
+
+<p style="margin-left:11%; margin-top: 1em"><b>nano</b>
+[<i>options</i>]
+[[<b>+</b>[<b>crCR</b>](<b>/</b>|<b>?</b>)<i>string</i>]
+<i>file</i>]...</p>
+
+<h2>NOTICE
+<a name="NOTICE"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Since version
+4.0, <b>nano</b> by default:</p>
+
+<p style="margin-left:17%; margin-top: 1em">&bull; does not
+automatically hard-wrap lines that become overlong, <br>
+&bull; includes the line below the title bar in the editing
+area, <br>
+&bull; does linewise (smooth) scrolling.</p>
+
+<p style="margin-left:11%; margin-top: 1em">If you want the
+old, Pico behavior back, you can use
+<b>&minus;&minus;breaklonglines</b>,
+<b>&minus;&minus;emptyline</b>, and
+<b>&minus;&minus;jumpyscrolling</b> (or <b>&minus;bej</b>
+for short).</p>
+
+<h2>DESCRIPTION
+<a name="DESCRIPTION"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>nano</b> is
+a small and friendly editor. It copies the look and feel of
+Pico, but is free software, and implements several features
+that Pico lacks, such as: opening multiple files, scrolling
+per line, undo/redo, syntax coloring, line numbering, and
+soft-wrapping overlong lines.</p>
+
+<p style="margin-left:11%; margin-top: 1em">When giving a
+filename on the command line, the cursor can be put on a
+specific line by adding the line number with a plus sign
+(<b>+</b>) before the filename, and even in a specific
+column by adding it with a comma. (Negative numbers count
+from the end of the file or line.) The cursor can be put on
+the first or last occurrence of a specific string by
+specifying that string after <b>+/</b> or <b>+?</b> before
+the filename. The string can be made case sensitive and/or
+caused to be interpreted as a regular expression by
+inserting <b>c</b> and/or <b>r</b> after the <b>+</b> sign.
+These search modes can be explicitly disabled by using the
+uppercase variant of those letters: <b>C</b> and/or
+<b>R</b>. When the string contains spaces, it needs to be
+enclosed in quotes. To give an example: to open a file at
+the first occurrence of the word &quot;Foo&quot;, one would
+do:</p>
+
+<p style="margin-left:17%; margin-top: 1em"><b>nano
++c/Foo</b> <i>file</i></p>
+
+<p style="margin-left:11%; margin-top: 1em">As a special
+case: if instead of a filename a dash (<b>&minus;</b>) is
+given, <b>nano</b> will read data from standard input.</p>
+
+<h2>EDITING
+<a name="EDITING"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Entering text
+and moving around in a file is straightforward: typing the
+letters and using the normal cursor movement keys. Commands
+are entered by using the Control (^) and the Alt or Meta
+(M&minus;) keys. Typing <b>^K</b> deletes the current line
+and puts it in the cutbuffer. Consecutive <b>^K</b>s will
+put all deleted lines together in the cutbuffer. Any cursor
+movement or executing any other command will cause the next
+<b>^K</b> to overwrite the cutbuffer. A <b>^U</b> will paste
+the current contents of the cutbuffer at the current cursor
+position.</p>
+
+<p style="margin-left:11%; margin-top: 1em">When a more
+precise piece of text needs to be cut or copied, one can
+mark its start with <b>^6</b>, move the cursor to its end
+(the marked text will be highlighted), and then use
+<b>^K</b> to cut it, or <b>M&minus;6</b> to copy it to the
+cutbuffer. One can also save the marked text to a file with
+<b>^O</b>, or spell check it with <b>^T</b>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">On some
+terminals, text can be selected also by holding down Shift
+while using the arrow keys. Holding down the Ctrl or Alt key
+too will increase the stride. Any cursor movement without
+Shift being held will cancel such a selection.</p>
+
+<p style="margin-left:11%; margin-top: 1em">The two lines
+at the bottom of the screen show some important commands;
+the built-in help (<b>^G</b>) lists all the available ones.
+The default key bindings can be changed via a <i>nanorc</i>
+file -- see <b>nanorc</b>(5).</p>
+
+<h2>OPTIONS
+<a name="OPTIONS"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>&minus;A</b>,
+<b>&minus;&minus;smarthome</b></p>
+
+<p style="margin-left:22%;">Make the Home key smarter. When
+Home is pressed anywhere but at the very beginning of
+non-whitespace characters on a line, the cursor will jump to
+that beginning (either forwards or backwards). If the cursor
+is already at that position, it will jump to the true
+beginning of the line.</p>
+
+<p style="margin-left:11%;"><b>&minus;B</b>,
+<b>&minus;&minus;backup</b></p>
+
+<p style="margin-left:22%;">When saving a file, back up the
+previous version of it, using the current filename suffixed
+with a tilde (<b>~</b>).</p>
+
+
+<p style="margin-left:11%;"><b>&minus;C&nbsp;</b><i>directory</i>,
+<b>&minus;&minus;backupdir=</b><i>directory</i></p>
+
+<p style="margin-left:22%;">Make and keep not just one
+backup file, but make and keep a uniquely numbered one every
+time a file is saved -- when backups are enabled
+(<b>&minus;B</b>). The uniquely numbered files are stored in
+the specified <i>directory</i>.</p>
+
+<p style="margin-left:11%;"><b>&minus;D</b>,
+<b>&minus;&minus;boldtext</b></p>
+
+<p style="margin-left:22%;">For the interface, use bold
+instead of reverse video. This will be overridden by setting
+the options <b>titlecolor</b>, <b>statuscolor</b>,
+<b>keycolor</b>, <b>functioncolor</b>, <b>numbercolor</b>,
+and/or <b>selectedcolor</b> in your nanorc file. See
+<b>nanorc</b>(5).</p>
+
+<p style="margin-left:11%;"><b>&minus;E</b>,
+<b>&minus;&minus;tabstospaces</b></p>
+
+<p style="margin-left:22%;">Convert typed tabs to
+spaces.</p>
+
+<p style="margin-left:11%;"><b>&minus;F</b>,
+<b>&minus;&minus;multibuffer</b></p>
+
+<p style="margin-left:22%;">Read a file into a new buffer
+by default.</p>
+
+<p style="margin-left:11%;"><b>&minus;G</b>,
+<b>&minus;&minus;locking</b></p>
+
+<p style="margin-left:22%;">Use vim-style file locking when
+editing files.</p>
+
+<p style="margin-left:11%;"><b>&minus;H</b>,
+<b>&minus;&minus;historylog</b></p>
+
+<p style="margin-left:22%;">Save the last hundred search
+strings and replacement strings and executed commands, so
+they can be easily reused in later sessions.</p>
+
+<p style="margin-left:11%;"><b>&minus;I</b>,
+<b>&minus;&minus;ignorercfiles</b></p>
+
+<p style="margin-left:22%;">Don&rsquo;t look at the
+system&rsquo;s <i>nanorc</i> nor at the user&rsquo;s
+<i>nanorc</i>.</p>
+
+
+<p style="margin-left:11%;"><b>&minus;J&nbsp;</b><i>number</i>,
+<b>&minus;&minus;guidestripe=</b><i>number</i></p>
+
+<p style="margin-left:22%;">Draw a vertical stripe at the
+given column, to help judge the width of the text. (The
+color of the stripe can be changed with <b>set
+stripecolor</b> in your <i>nanorc</i> file.)</p>
+
+<p style="margin-left:11%;"><b>&minus;K</b>,
+<b>&minus;&minus;rawsequences</b></p>
+
+<p style="margin-left:22%;">Interpret escape sequences
+directly (instead of asking <b>ncurses</b> to translate
+them). If you need this option to get your keyboard to work
+properly, please report a bug. Using this option disables
+<b>nano</b>&rsquo;s mouse support.</p>
+
+<p style="margin-left:11%;"><b>&minus;L</b>,
+<b>&minus;&minus;nonewlines</b></p>
+
+<p style="margin-left:22%;">Don&rsquo;t automatically add a
+newline when a text does not end with one. (This can cause
+you to save non-POSIX text files.)</p>
+
+<p style="margin-left:11%;"><b>&minus;M</b>,
+<b>&minus;&minus;trimblanks</b></p>
+
+<p style="margin-left:22%;">Snip trailing whitespace from
+the wrapped line when automatic hard-wrapping occurs or when
+text is justified.</p>
+
+<p style="margin-left:11%;"><b>&minus;N</b>,
+<b>&minus;&minus;noconvert</b></p>
+
+<p style="margin-left:22%;">Disable automatic conversion of
+files from DOS/Mac format.</p>
+
+<p style="margin-left:11%;"><b>&minus;O</b>,
+<b>&minus;&minus;bookstyle</b></p>
+
+<p style="margin-left:22%;">When justifying, treat any line
+that starts with whitespace as the beginning of a paragraph
+(unless auto-indenting is on).</p>
+
+<p style="margin-left:11%;"><b>&minus;P</b>,
+<b>&minus;&minus;positionlog</b></p>
+
+<p style="margin-left:22%;">For the 200 most recent files,
+log the last position of the cursor, and place it at that
+position again upon reopening such a file.</p>
+
+<p style="margin-left:11%;"><b>&minus;Q
+&quot;</b><i>regex</i><b>&quot;</b>,
+<b>&minus;&minus;quotestr=&quot;</b><i>regex</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Set the regular expression for
+matching the quoting part of a line. The default value is
+&quot;<b>^([&nbsp;\t]*([!#%:;&gt;|}]|//))+</b>&quot;. (Note
+that <b>\t</b> stands for an actual Tab.) This makes it
+possible to rejustify blocks of quoted text when composing
+email, and to rewrap blocks of line comments when writing
+source code.</p>
+
+<p style="margin-left:11%;"><b>&minus;R</b>,
+<b>&minus;&minus;restricted</b></p>
+
+<p style="margin-left:22%;">Restricted mode: don&rsquo;t
+read or write to any file not specified on the command line.
+This means: don&rsquo;t read or write history files;
+don&rsquo;t allow suspending; don&rsquo;t allow spell
+checking; don&rsquo;t allow a file to be appended to,
+prepended to, or saved under a different name if it already
+has one; and don&rsquo;t make backup files. Restricted mode
+can also be activated by invoking <b>nano</b> with any name
+beginning with &rsquo;r&rsquo; (e.g. &quot;rnano&quot;).</p>
+
+<p style="margin-left:11%;"><b>&minus;S</b>,
+<b>&minus;&minus;softwrap</b></p>
+
+<p style="margin-left:22%;">Display over multiple screen
+rows lines that exceed the screen&rsquo;s width. (You can
+make this soft-wrapping occur at whitespace instead of
+rudely at the screen&rsquo;s edge, by using also
+<b>&minus;&minus;atblanks</b>.) (The old short option,
+<b>&minus;$</b>, is deprecated.)</p>
+
+
+<p style="margin-left:11%;"><b>&minus;T&nbsp;</b><i>number</i>,
+<b>&minus;&minus;tabsize=</b><i>number</i></p>
+
+<p style="margin-left:22%;">Set the size (width) of a tab
+to <i>number</i> columns. The value of <i>number</i> must be
+greater than 0. The default value is <b>8</b>.</p>
+
+<p style="margin-left:11%;"><b>&minus;U</b>,
+<b>&minus;&minus;quickblank</b></p>
+
+<p style="margin-left:22%;">Do quick status-bar blanking:
+status-bar messages will disappear after 1 keystroke instead
+of 25. Note that option <b>&minus;c</b>
+(<b>&minus;&minus;constantshow</b>) overrides this.</p>
+
+<p style="margin-left:11%;"><b>&minus;V</b>,
+<b>&minus;&minus;version</b></p>
+
+<p style="margin-left:22%;">Show the current version number
+and exit.</p>
+
+<p style="margin-left:11%;"><b>&minus;W</b>,
+<b>&minus;&minus;wordbounds</b></p>
+
+<p style="margin-left:22%;">Detect word boundaries
+differently by treating punctuation characters as part of a
+word.</p>
+
+<p style="margin-left:11%;"><b>&minus;X
+&quot;</b><i>characters</i><b>&quot;</b>,
+<b>&minus;&minus;wordchars=&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Specify which other characters
+(besides the normal alphanumeric ones) should be considered
+as part of a word. When using this option, you probably want
+to omit <b>&minus;W</b>
+(<b>&minus;&minus;wordbounds</b>).</p>
+
+
+<p style="margin-left:11%;"><b>&minus;Y&nbsp;</b><i>name</i>,
+<b>&minus;&minus;syntax=</b><i>name</i></p>
+
+<p style="margin-left:22%;">Specify the name of the syntax
+highlighting to use from among the ones defined in the
+<i>nanorc</i> files.</p>
+
+<p style="margin-left:11%;"><b>&minus;Z</b>,
+<b>&minus;&minus;zap</b></p>
+
+<p style="margin-left:22%;">Let an unmodified Backspace or
+Delete erase the marked region (instead of a single
+character, and without affecting the cutbuffer).</p>
+
+<p style="margin-left:11%;"><b>&minus;a</b>,
+<b>&minus;&minus;atblanks</b></p>
+
+<p style="margin-left:22%;">When doing soft line wrapping,
+wrap lines at whitespace instead of always at the edge of
+the screen.</p>
+
+<p style="margin-left:11%;"><b>&minus;b</b>,
+<b>&minus;&minus;breaklonglines</b></p>
+
+<p style="margin-left:22%;">Automatically hard-wrap the
+current line when it becomes overlong. (This option is the
+opposite of <b>&minus;w</b> (<b>&minus;&minus;nowrap</b>) --
+the last one given takes effect.)</p>
+
+<p style="margin-left:11%;"><b>&minus;c</b>,
+<b>&minus;&minus;constantshow</b></p>
+
+<p style="margin-left:22%;">Constantly show the cursor
+position on the status bar. Note that this overrides option
+<b>&minus;U</b> (<b>&minus;&minus;quickblank</b>).</p>
+
+<p style="margin-left:11%;"><b>&minus;d</b>,
+<b>&minus;&minus;rebinddelete</b></p>
+
+<p style="margin-left:22%;">Interpret the Delete and
+Backspace keys differently so that both Backspace and Delete
+work properly. You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like
+Backspace.</p>
+
+<p style="margin-left:11%;"><b>&minus;e</b>,
+<b>&minus;&minus;emptyline</b></p>
+
+<p style="margin-left:22%;">Do not use the line below the
+title bar, leaving it entirely blank.</p>
+
+
+<p style="margin-left:11%;"><b>&minus;f&nbsp;</b><i>file</i>,
+<b>&minus;&minus;rcfile=</b><i>file</i></p>
+
+<p style="margin-left:22%;">Read only this <i>file</i> for
+setting nano&rsquo;s options, instead of reading both the
+system-wide and the user&rsquo;s nanorc files.</p>
+
+<p style="margin-left:11%;"><b>&minus;g</b>,
+<b>&minus;&minus;showcursor</b></p>
+
+<p style="margin-left:22%;">Make the cursor visible in the
+file browser (putting it on the highlighted item) and in the
+help viewer. Useful for braille users and people with poor
+vision.</p>
+
+<p style="margin-left:11%;"><b>&minus;h</b>,
+<b>&minus;&minus;help</b></p>
+
+<p style="margin-left:22%;">Show a summary of the available
+command-line options and exit.</p>
+
+<p style="margin-left:11%;"><b>&minus;i</b>,
+<b>&minus;&minus;autoindent</b></p>
+
+<p style="margin-left:22%;">Automatically indent a newly
+created line to the same number of tabs and/or spaces as the
+previous line (or as the next line if the previous line is
+the beginning of a paragraph).</p>
+
+<p style="margin-left:11%;"><b>&minus;j</b>,
+<b>&minus;&minus;jumpyscrolling</b></p>
+
+<p style="margin-left:22%;">Scroll the buffer contents per
+half-screen instead of per line.</p>
+
+<p style="margin-left:11%;"><b>&minus;k</b>,
+<b>&minus;&minus;cutfromcursor</b></p>
+
+<p style="margin-left:22%;">Make the &rsquo;Cut Text&rsquo;
+command (normally <b>^K</b>) cut from the current cursor
+position to the end of the line, instead of cutting the
+entire line.</p>
+
+<p style="margin-left:11%;"><b>&minus;l</b>,
+<b>&minus;&minus;linenumbers</b></p>
+
+<p style="margin-left:22%;">Display line numbers to the
+left of the text area. (Any line with an anchor additionally
+gets a mark in the margin.)</p>
+
+<p style="margin-left:11%;"><b>&minus;m</b>,
+<b>&minus;&minus;mouse</b></p>
+
+<p style="margin-left:22%;">Enable mouse support, if
+available for your system. When enabled, mouse clicks can be
+used to place the cursor, set the mark (with a double
+click), and execute shortcuts. The mouse will work in the X
+Window System, and on the console when gpm is running. Text
+can still be selected through dragging by holding down the
+Shift key.</p>
+
+<p style="margin-left:11%;"><b>&minus;n</b>,
+<b>&minus;&minus;noread</b></p>
+
+<p style="margin-left:22%;">Treat any name given on the
+command line as a new file. This allows <b>nano</b> to write
+to named pipes: it will start with a blank buffer, and will
+write to the pipe when the user saves the &quot;file&quot;.
+This way <b>nano</b> can be used as an editor in combination
+with for instance <b>gpg</b> without having to write
+sensitive data to disk first.</p>
+
+
+<p style="margin-left:11%;"><b>&minus;o&nbsp;</b><i>directory</i>,
+<b>&minus;&minus;operatingdir=</b><i>directory</i></p>
+
+<p style="margin-left:22%;">Set the operating directory.
+This makes <b>nano</b> set up something similar to a
+chroot.</p>
+
+<p style="margin-left:11%;"><b>&minus;p</b>,
+<b>&minus;&minus;preserve</b></p>
+
+<p style="margin-left:22%;">Preserve the XON and XOFF
+sequences (<b>^Q</b> and <b>^S</b>) so they will be caught
+by the terminal.</p>
+
+<p style="margin-left:11%;"><b>&minus;q</b>,
+<b>&minus;&minus;indicator</b></p>
+
+<p style="margin-left:22%;">Display a &quot;scrollbar&quot;
+on the righthand side of the edit window. It shows the
+position of the viewport in the buffer and how much of the
+buffer is covered by the viewport.</p>
+
+
+<p style="margin-left:11%;"><b>&minus;r&nbsp;</b><i>number</i>,
+<b>&minus;&minus;fill=</b><i>number</i></p>
+
+<p style="margin-left:22%;">Set the target width for
+justifying and automatic hard-wrapping at this <i>number</i>
+of columns. If the value is 0 or less, wrapping will occur
+at the width of the screen minus <i>number</i> columns,
+allowing the wrap point to vary along with the width of the
+screen if the screen is resized. The default value is
+<b>&minus;8</b>.</p>
+
+<p style="margin-left:11%;"><b>&minus;s
+&quot;</b><i>program</i> [<i>argument</i> ...]<b>&quot;</b>,
+<b>&minus;&minus;speller=&quot;</b><i>program</i>
+[<i>argument</i> ...]<b>&quot;</b></p>
+
+<p style="margin-left:22%;">Use this command to perform
+spell checking and correcting, instead of using the built-in
+corrector that calls <b>hunspell</b>(1) or
+<b>spell</b>(1).</p>
+
+<p style="margin-left:11%;"><b>&minus;t</b>,
+<b>&minus;&minus;saveonexit</b></p>
+
+<p style="margin-left:22%;">Save a changed buffer without
+prompting (when exiting with <b>^X</b>). (The old form of
+the long option, <b>&minus;&minus;tempfile</b>, is
+deprecated.)</p>
+
+<p style="margin-left:11%;"><b>&minus;u</b>,
+<b>&minus;&minus;unix</b></p>
+
+<p style="margin-left:22%;">Save a file by default in Unix
+format. This overrides nano&rsquo;s default behavior of
+saving a file in the format that it had. (This option has no
+effect when you also use
+<b>&minus;&minus;noconvert</b>.)</p>
+
+<p style="margin-left:11%;"><b>&minus;v</b>,
+<b>&minus;&minus;view</b></p>
+
+<p style="margin-left:22%;">Just view the file and disallow
+editing: read-only mode. This mode allows the user to open
+also other files for viewing, unless
+<b>&minus;&minus;restricted</b> is given too.</p>
+
+<p style="margin-left:11%;"><b>&minus;w</b>,
+<b>&minus;&minus;nowrap</b></p>
+
+<p style="margin-left:22%;">Do not automatically hard-wrap
+the current line when it becomes overlong. This is the
+default. (This option is the opposite of <b>&minus;b</b>
+(<b>&minus;&minus;breaklonglines</b>) -- the last one given
+takes effect.)</p>
+
+<p style="margin-left:11%;"><b>&minus;x</b>,
+<b>&minus;&minus;nohelp</b></p>
+
+<p style="margin-left:22%;">Don&rsquo;t show the two help
+lines at the bottom of the screen.</p>
+
+<p style="margin-left:11%;"><b>&minus;y</b>,
+<b>&minus;&minus;afterends</b></p>
+
+<p style="margin-left:22%;">Make Ctrl+Right and Ctrl+Delete
+stop at word ends instead of beginnings.</p>
+
+<p style="margin-left:11%;"><b>&minus;z</b>,
+<b>&minus;&minus;suspendable</b></p>
+
+<p style="margin-left:22%;">Allow the user to suspend the
+editor (with <b>^Z</b> by default).</p>
+
+<p style="margin-left:11%;"><b>&minus;%</b>,
+<b>&minus;&minus;stateflags</b></p>
+
+<p style="margin-left:22%;">Use the top-right corner of the
+screen for showing some state flags: <b>I</b> when
+auto-indenting, <b>M</b> when the mark is on, <b>L</b> when
+hard-wrapping (breaking long lines), <b>R</b> when recording
+a macro, and <b>S</b> when soft-wrapping. When the buffer is
+modified, a star (<b>*</b>) is shown after the filename in
+the center of the title bar.</p>
+
+<p style="margin-left:11%;"><b>&minus;!</b>,
+<b>&minus;&minus;magic</b></p>
+
+<p style="margin-left:22%;">When neither the file&rsquo;s
+name nor its first line give a clue, try using libmagic to
+determine the applicable syntax.</p>
+
+<h2>TOGGLES
+<a name="TOGGLES"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Several of the
+above options can be switched on and off also while
+<b>nano</b> is running. For example, <b>M&minus;L</b>
+toggles the hard-wrapping of long lines, <b>M&minus;S</b>
+toggles soft-wrapping, <b>M&minus;N</b> toggles line
+numbers, <b>M&minus;M</b> toggles the mouse,
+<b>M&minus;I</b> auto-indentation, and <b>M&minus;X</b> the
+help lines. See at the end of the <b>^G</b> help text for a
+complete list.</p>
+
+<p style="margin-left:11%; margin-top: 1em">The
+<b>M&minus;X</b> toggle is special: it works in all menus
+except the help viewer and the linter. All other toggles
+work in the main menu only.</p>
+
+<h2>FILES
+<a name="FILES"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">When
+<b>&minus;&minus;rcfile</b> is given, <b>nano</b> will read
+just the specified file for setting its options and syntaxes
+and key bindings. Without that option, <b>nano</b> will read
+two configuration files: first the system&rsquo;s
+<i>nanorc</i> (if it exists), and then the user&rsquo;s
+<i>nanorc</i> (if it exists), either <i>~/.nanorc</i> or
+<i>$XDG_CONFIG_HOME/nano/nanorc</i> or
+<i>~/.config/nano/nanorc</i>, whichever is encountered
+first. See <b>nanorc</b>(5) for more information on the
+possible contents of those files.</p>
+
+<p style="margin-left:11%; margin-top: 1em">See
+<i>/usr/share/nano/</i> and <i>/usr/share/nano/extra/</i>
+for available syntax-coloring definitions.</p>
+
+<h2>NOTES
+<a name="NOTES"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">If no
+alternative spell checker command is specified on the
+command line nor in one of the <i>nanorc</i> files,
+<b>nano</b> will check the <b>SPELL</b> environment variable
+for one.</p>
+
+<p style="margin-left:11%; margin-top: 1em">In some cases
+<b>nano</b> will try to dump the buffer into an emergency
+file. This will happen mainly if <b>nano</b> receives a
+SIGHUP or SIGTERM or runs out of memory. It will write the
+buffer into a file named <i>nano.save</i> if the buffer
+didn&rsquo;t have a name already, or will add a
+&quot;.save&quot; suffix to the current filename. If an
+emergency file with that name already exists in the current
+directory, it will add &quot;.save&quot; plus a number (e.g.
+&quot;.save.1&quot;) to the current filename in order to
+make it unique. In multibuffer mode, <b>nano</b> will write
+all the open buffers to their respective emergency
+files.</p>
+
+<h2>BUGS
+<a name="BUGS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">The recording
+and playback of keyboard macros works correctly only on a
+terminal emulator, not on a Linux console (VT), because the
+latter does not by default distinguish modified from
+unmodified arrow keys.</p>
+
+<p style="margin-left:11%; margin-top: 1em">Please report
+any other bugs that you encounter via: <i><br>
+https://savannah.gnu.org/bugs/?group=nano</i>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">When nano
+crashes, it will save any modified buffers to emergency
+.save files. If you are able to reproduce the crash and you
+want to get a backtrace, define the environment variable
+<b>NANO_NOCATCH</b>.</p>
+
+<h2>HOMEPAGE
+<a name="HOMEPAGE"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><i>https://nano&minus;editor.org/</i></p>
+
+<h2>SEE ALSO
+<a name="SEE ALSO"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><i><b>nanorc</b></i>(5)</p>
+
+
+<p style="margin-left:11%; margin-top: 1em"><i>/usr/share/doc/nano/</i>
+(or equivalent on your system)</p>
+<hr>
+</body>
+</html>
diff --git a/msys2/usr/share/doc/nano/nano.html b/msys2/usr/share/doc/nano/nano.html
new file mode 100644
index 000000000..c64a762c1
--- /dev/null
+++ b/msys2/usr/share/doc/nano/nano.html
@@ -0,0 +1,2245 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.7, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>nano</title>
+
+<meta name="description" content="nano">
+<meta name="keywords" content="nano">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<h1 class="settitle" align="center">nano</h1>
+
+
+
+
+
+
+
+
+<span id="Top"></span><span id="SEC_Top"></span>
+<p>This manual documents the GNU <code>nano</code> editor, version 5.4.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Introduction" accesskey="1">Introduction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Invoking" accesskey="2">Invoking</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Command_002dline-Options" accesskey="3">Command-line Options</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Editor-Basics" accesskey="4">Editor Basics</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Built_002din-Help" accesskey="5">Built-in Help</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-File-Browser" accesskey="6">The File Browser</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Feature-Toggles" accesskey="7">Feature Toggles</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Nanorc-Files" accesskey="8">Nanorc Files</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Pico-Compatibility" accesskey="9">Pico Compatibility</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Building-and-Configure-Options">Building and Configure Options</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+
+
+<hr>
+<span id="Introduction"></span><span id="Introduction-1"></span><h2 class="chapter">1 Introduction</h2>
+
+<p>GNU <code>nano</code> is a small and friendly text editor.  Besides
+basic text editing, <code>nano</code> offers features like undo/redo,
+syntax coloring, interactive search-and-replace, auto-indentation,
+line numbers, word completion, file locking, backup files, and
+internationalization support.
+</p>
+<p>The original goal for <code>nano</code> was to be a complete bug-for-bug
+emulation of Pico.  But currently the goal is to be as compatible
+as is reasonable while offering a superset of Pico&rsquo;s functionality.
+See <a href="#Pico-Compatibility">Pico Compatibility</a> for more details on how <code>nano</code> and
+Pico differ.
+</p>
+<p>Starting with version 4.0, <code>nano</code> no longer hard-wraps an overlong
+line by default.  It further uses linewise scrolling by default, and by
+default includes the line below the title bar into the editing area.
+If you want the old, Pico behavior back, you can use the
+following options: <samp>--breaklonglines</samp>,
+<samp>--jumpyscrolling</samp>, and <samp>--emptyline</samp>
+(or <samp>-bje</samp>).
+</p>
+<p>Please report bugs via <a href="https://savannah.gnu.org/bugs/?group=nano">https://savannah.gnu.org/bugs/?group=nano</a>.
+</p>
+<p>For background information see <a href="https://nano-editor.org/">https://nano-editor.org/</a>.
+</p>
+<hr>
+<span id="Invoking"></span><span id="Invoking-1"></span><h2 class="chapter">2 Invoking</h2>
+
+<p>The usual way to invoke <code>nano</code> is:
+</p>
+<div class="example">
+<pre class="example"><code>nano [FILE]</code>
+</pre></div>
+
+<p>But it is also possible to specify one or more options (see the next
+section), and to edit several files in a row.  Additionally, the cursor
+can be put on a specific line of a file by adding the line number
+with a plus sign before the filename, and even in a specific column by
+adding it with a comma.
+(Negative numbers count from the end of the file or line.)
+The cursor can also be put on the first or last occurrence of a specific string
+by specifying that string after <code>+/</code> or <code>+?</code> before the filename.
+The string can be made case sensitive and/or caused to be interpreted as a
+regular expression by inserting a <code>c</code> and/or <code>r</code> after the plus sign.
+These search modes can be explicitly disabled by using the uppercase variant
+of those letters: <code>C</code> and/or <code>R</code>.  When the string contains spaces,
+it needs to be enclosed in quotes.
+A more complete command synopsis thus is:
+</p>
+<div class="example">
+<pre class="example"><code>nano [OPTION]&hellip; [[+LINE[,COLUMN]|+[crCR](/|?)STRING] FILE]&hellip;</code>
+</pre></div>
+
+<p>Normally, however, you set your preferred options in a <samp>nanorc</samp>
+file (see <a href="#Nanorc-Files">Nanorc Files</a>).  And when using <code>set positionlog</code>
+(making <code>nano</code> remember the cursor position when you close a file),
+you will rarely need to specify a line number.
+</p>
+<p>As a special case: when instead of a filename a dash is given, <code>nano</code>
+will read data from standard input.  This means you can pipe the output of
+a command straight into a buffer, and then edit it.
+</p>
+
+<hr>
+<span id="Command_002dline-Options"></span><span id="Command_002dline-Options-1"></span><h2 class="chapter">3 Command-line Options</h2>
+
+<p><code>nano</code> takes the following options from the command line:
+</p>
+<dl compact="compact">
+<dt><samp>-A</samp></dt>
+<dt><samp>--smarthome</samp></dt>
+<dd><p>Make the Home key smarter.  When Home is pressed anywhere but at the
+very beginning of non-whitespace characters on a line, the cursor will
+jump to that beginning (either forwards or backwards).  If the cursor is
+already at that position, it will jump to the true beginning of the
+line.
+</p>
+</dd>
+<dt><samp>-B</samp></dt>
+<dt><samp>--backup</samp></dt>
+<dd><p>When saving a file, back up the previous version of it, using the current
+filename suffixed with a tilde (<code>~</code>).
+</p>
+</dd>
+<dt><samp>-C <var>directory</var></samp></dt>
+<dt><samp>--backupdir=<var>directory</var></samp></dt>
+<dd><p>Make and keep not just one backup file, but make and keep a uniquely
+numbered one every time a file is saved &mdash; when backups are enabled.
+The uniquely numbered files are stored in the specified directory.
+</p>
+</dd>
+<dt><samp>-D</samp></dt>
+<dt><samp>--boldtext</samp></dt>
+<dd><p>For the interface, use bold instead of reverse video.  This will be overridden
+by setting the options <code>titlecolor</code>, <code>statuscolor</code>, <code>keycolor</code>,
+<code>functioncolor</code>, <code>numbercolor</code>, and/or <code>selectedcolor</code> in your
+nanorc file.  See <a href="#set-functioncolor"><code>set functioncolor</code></a> for details.
+</p>
+</dd>
+<dt><samp>-E</samp></dt>
+<dt><samp>--tabstospaces</samp></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><samp>-F</samp></dt>
+<dt><samp>--multibuffer</samp></dt>
+<dd><p>Read a file into a new buffer by default.
+</p>
+</dd>
+<dt><samp>-G</samp></dt>
+<dt><samp>--locking</samp></dt>
+<dd><p>Enable vim-style file locking when editing files.
+</p>
+</dd>
+<dt><samp>-H</samp></dt>
+<dt><samp>--historylog</samp></dt>
+<dd><p>Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
+</p>
+</dd>
+<dt><samp>-I</samp></dt>
+<dt><samp>--ignorercfiles</samp></dt>
+<dd><p>Don&rsquo;t look at the system&rsquo;s nanorc file nor at the user&rsquo;s nanorc.
+</p>
+</dd>
+<dt><samp>-J</samp></dt>
+<dt><samp>--guidestripe</samp></dt>
+<dd><p>Draw a vertical stripe at the given column, to help judge the width of the
+text.  (The color of the stripe can be changed with <code>set stripecolor</code>
+in your nanorc file.)
+</p>
+</dd>
+<dt><samp>-K</samp></dt>
+<dt><samp>--rawsequences</samp></dt>
+<dd><p>Interpret escape sequences directly (instead of asking <code>ncurses</code> to
+translate them).  If you need this option to get your keyboard to work
+properly, please report a bug.  Using this option disables <code>nano</code>&rsquo;s
+mouse support.
+</p>
+</dd>
+<dt><samp>-L</samp></dt>
+<dt><samp>--nonewlines</samp></dt>
+<dd><p>Don&rsquo;t automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
+</p>
+</dd>
+<dt><samp>-M</samp></dt>
+<dt><samp>--trimblanks</samp></dt>
+<dd><p>Snip trailing whitespace from the wrapped line when automatic
+hard-wrapping occurs or when text is justified.
+</p>
+</dd>
+<dt><samp>-N</samp></dt>
+<dt><samp>--noconvert</samp></dt>
+<dd><p>Disable automatic conversion of files from DOS/Mac format.
+</p>
+</dd>
+<dt><samp>-O</samp></dt>
+<dt><samp>--bookstyle</samp></dt>
+<dd><p>When justifying, treat any line that starts with whitespace as the
+beginning of a paragraph (unless auto-indenting is on).
+</p>
+</dd>
+<dt><samp>-P</samp></dt>
+<dt><samp>--positionlog</samp></dt>
+<dd><p>For the 200 most recent files, log the last position of the cursor,
+and place it at that position again upon reopening such a file.
+</p>
+</dd>
+<dt><samp>-Q &quot;<var>regex</var>&quot;</samp></dt>
+<dt><samp>--quotestr=&quot;<var>regex</var>&quot;</samp></dt>
+<dd><p>Set the regular expression for matching the quoting part of a line.
+The default value is &quot;<tt>^([&nbsp;<!-- /@w -->\t]*([!#%:;&gt;|}]|//))+</tt>&quot;.
+(Note that <code>\t</code> stands for a literal Tab character.)
+This makes it possible to rejustify blocks of quoted text when composing
+email, and to rewrap blocks of line comments when writing source code.
+</p>
+</dd>
+<dt><samp>-R</samp></dt>
+<dt><samp>--restricted</samp></dt>
+<dd><p>Restricted mode: don&rsquo;t read or write to any file not specified on the
+command line.  This means: don&rsquo;t read or write history files; don&rsquo;t allow
+suspending; don&rsquo;t allow spell checking; don&rsquo;t
+allow a file to be appended to, prepended to, or saved under a different
+name if it already has one; and don&rsquo;t make backup files.
+Restricted mode can also be activated by invoking <code>nano</code> with
+any name beginning with <code>r</code> (e.g. <code>rnano</code>).
+</p>
+</dd>
+<dt><samp>-S</samp></dt>
+<dt><samp>--softwrap</samp></dt>
+<dd><p>Display over multiple screen rows lines that exceed the screen&rsquo;s width.
+(You can make this soft-wrapping occur at whitespace instead of rudely at
+the screen&rsquo;s edge, by using also <code>--atblanks</code>.)
+(The old short option, <code>-$</code>, is deprecated.)
+</p>
+</dd>
+<dt><samp>-T <var>number</var></samp></dt>
+<dt><samp>--tabsize=<var>number</var></samp></dt>
+<dd><p>Set the displayed tab length to <var>number</var> columns.  The value of
+<var>number</var> must be greater than 0.  The default value is <tt>8</tt>.
+</p>
+</dd>
+<dt><samp>-U</samp></dt>
+<dt><samp>--quickblank</samp></dt>
+<dd><p>Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  Note that option <samp>-c</samp>
+(<samp>--constantshow</samp>) overrides this.
+</p>
+</dd>
+<dt><samp>-V</samp></dt>
+<dt><samp>--version</samp></dt>
+<dd><p>Show the current version number and exit.
+</p>
+</dd>
+<dt><samp>-W</samp></dt>
+<dt><samp>--wordbounds</samp></dt>
+<dd><p>Detect word boundaries differently by treating punctuation
+characters as parts of words.
+</p>
+</dd>
+<dt><samp>-X &quot;<var>characters</var>&quot;</samp></dt>
+<dt><samp>--wordchars=&quot;<var>characters</var>&quot;</samp></dt>
+<dd><p>Specify which other characters (besides the normal alphanumeric ones)
+should be considered as parts of words.  When using this option, you
+probably want to omit <samp>-W</samp> (<samp>--wordbounds</samp>).
+</p>
+</dd>
+<dt><samp>-Y <var>name</var></samp></dt>
+<dt><samp>--syntax=<var>name</var></samp></dt>
+<dd><p>Specify the syntax to be used for highlighting.
+See <a href="#Syntax-Highlighting">Syntax Highlighting</a> for more info.
+</p>
+</dd>
+<dt><samp>-Z</samp></dt>
+<dt><samp>--zap</samp></dt>
+<dd><p>Let an unmodified <tt class="key">Backspace</tt> or <tt class="key">Delete</tt> erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+</p>
+</dd>
+<dt><samp>-a</samp></dt>
+<dt><samp>--atblanks</samp></dt>
+<dd><p>When doing soft line wrapping, wrap lines at whitespace
+instead of always at the edge of the screen.
+</p>
+</dd>
+<dt><samp>-b</samp></dt>
+<dt><samp>--breaklonglines</samp></dt>
+<dd><p>Automatically hard-wrap the current line when it becomes overlong.
+(This option is the opposite of <samp>-w</samp> (<samp>--nowrap</samp>) &mdash;
+the last one given takes effect.)
+</p>
+</dd>
+<dt><samp>-c</samp></dt>
+<dt><samp>--constantshow</samp></dt>
+<dd><p>Constantly display the cursor position (line number, column number,
+and character number) on the status bar.
+Note that this overrides option <samp>-U</samp> (<samp>--quickblank</samp>).
+</p>
+</dd>
+<dt><samp>-d</samp></dt>
+<dt><samp>--rebinddelete</samp></dt>
+<dd><p>Interpret the Delete and Backspace keys differently so that both Backspace
+and Delete work properly.  You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like Backspace.
+</p>
+</dd>
+<dt><samp>-e</samp></dt>
+<dt><samp>--emptyline</samp></dt>
+<dd><p>Do not use the line below the title bar, leaving it entirely blank.
+</p>
+</dd>
+<dt><samp>-f <var>file</var></samp></dt>
+<dt><samp>--rcfile=<var>file</var></samp></dt>
+<dd><p>Read only this <var>file</var> for setting nano&rsquo;s options, instead of reading
+both the system-wide and the user&rsquo;s nanorc files.
+</p>
+</dd>
+<dt><samp>-g</samp></dt>
+<dt><samp>--showcursor</samp></dt>
+<dd><p>Make the cursor visible in the file browser (putting it on the
+highlighted item) and in the help viewer.  Useful for braille users
+and people with poor vision.
+</p>
+</dd>
+<dt><samp>-h</samp></dt>
+<dt><samp>--help</samp></dt>
+<dd><p>Show a summary of command-line options and exit.
+</p>
+</dd>
+<dt><samp>-i</samp></dt>
+<dt><samp>--autoindent</samp></dt>
+<dd><p>Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
+</p>
+</dd>
+<dt><samp>-j</samp></dt>
+<dt><samp>--jumpyscrolling</samp></dt>
+<dd><p>Scroll the buffer contents per half-screen instead of per line.
+</p>
+</dd>
+<dt><samp>-k</samp></dt>
+<dt><samp>--cutfromcursor</samp></dt>
+<dd><p>Make the &rsquo;Cut Text&rsquo; command (normally <kbd>^K</kbd>) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
+</p>
+</dd>
+<dt><samp>-l</samp></dt>
+<dt><samp>--linenumbers</samp></dt>
+<dd><p>Display line numbers to the left of the text area.
+(Any line with an anchor additionally gets a mark in the margin.)
+</p>
+</dd>
+<dt><samp>-m</samp></dt>
+<dt><samp>--mouse</samp></dt>
+<dd><p>Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
+</p>
+</dd>
+<dt><samp>-n</samp></dt>
+<dt><samp>--noread</samp></dt>
+<dd><p>Treat any name given on the command line as a new file.  This allows
+<code>nano</code> to write to named pipes: it will start with a blank buffer,
+and will write to the pipe when the user saves the &quot;file&quot;.  This way
+<code>nano</code> can be used as an editor in combination with for instance
+<code>gpg</code> without having to write sensitive data to disk first.
+</p>
+</dd>
+<dt><samp>-o <var>directory</var></samp></dt>
+<dt><samp>--operatingdir=<var>directory</var></samp></dt>
+<dd><p>Set the operating directory.  This makes <code>nano</code> set up something
+similar to a chroot.
+</p>
+</dd>
+<dt><samp>-p</samp></dt>
+<dt><samp>--preserve</samp></dt>
+<dd><p>Preserve the <kbd>^Q</kbd> (XON) and <kbd>^S</kbd> (XOFF) sequences so data being
+sent to the editor can be stopped and started.
+</p>
+</dd>
+<dt><samp>-q</samp></dt>
+<dt><samp>--indicator</samp></dt>
+<dd><p>Display a &quot;scrollbar&quot; on the righthand side of the edit window.
+It shows the position of the viewport in the buffer
+and how much of the buffer is covered by the viewport.
+</p>
+</dd>
+<dt><samp>-r <var>number</var></samp></dt>
+<dt><samp>--fill=<var>number</var></samp></dt>
+<dd><p>Set the target width for justifying and automatic hard-wrapping at this
+<var>number</var> of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus <var>number</var> columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is <tt>-8</tt>.
+</p>
+<span id="g_t_002d_002dspeller"></span></dd>
+<dt><samp>-s &quot;<var>program</var> [<var>argument</var> &hellip;]&quot;</samp></dt>
+<dt><samp>--speller=&quot;<var>program</var> [<var>argument</var> &hellip;]&quot;</samp></dt>
+<dd><p>Use the given program to do spell checking and correcting.  By default,
+<code>nano</code> uses the command specified in the <code>SPELL</code> environment
+variable.  If <code>SPELL</code> is not set, and <samp>--speller</samp> is
+not specified either, then <code>nano</code> uses its own interactive spell
+corrector, which requires either <code>hunspell</code> or GNU <code>spell</code>
+to be installed.
+</p>
+</dd>
+<dt><samp>-t</samp></dt>
+<dt><samp>--saveonexit</samp></dt>
+<dd><p>Save a changed buffer without prompting (when exiting with <kbd>^X</kbd>).
+This can be handy when <code>nano</code> is used as the composer of an
+email program.
+(The old form of the long option, <code>--tempfile</code>, is deprecated.)
+</p>
+</dd>
+<dt><samp>-u</samp></dt>
+<dt><samp>--unix</samp></dt>
+<dd><p>Save a file by default in Unix format.  This overrides nano&rsquo;s
+default behavior of saving a file in the format that it had.
+(This option has no effect when you also use <samp>--noconvert</samp>.)
+</p>
+</dd>
+<dt><samp>-v</samp></dt>
+<dt><samp>--view</samp></dt>
+<dd><p>Don&rsquo;t allow the contents of the file to be altered: read-only mode.
+This mode allows the user to open also other files for viewing,
+unless <samp>--restricted</samp> is given too.
+(Note that this option should NOT be used in place of correct
+file permissions to implement a read-only file.)
+</p>
+</dd>
+<dt><samp>-w</samp></dt>
+<dt><samp>--nowrap</samp></dt>
+<dd><p>Do not automatically hard-wrap the current line when it becomes overlong.
+This is the default.  (This option is the opposite of <samp>-b</samp>
+(<samp>--breaklonglines</samp>) &mdash; the last one given takes effect.)
+</p>
+
+</dd>
+<dt><samp>-x</samp></dt>
+<dt><samp>--nohelp</samp></dt>
+<dd><p>Expert Mode: don&rsquo;t show the Shortcut List at the bottom of the screen.
+This affects the location of the status bar as well, as in Expert Mode it
+is located at the very bottom of the editor.
+</p>
+<p>Note: When accessing the help system, Expert Mode is temporarily
+disabled to display the help-system navigation keys.
+</p>
+</dd>
+<dt><samp>-y</samp></dt>
+<dt><samp>--afterends</samp></dt>
+<dd><p>Make Ctrl+Right and Ctrl+Delete stop at word ends instead of beginnings.
+</p>
+</dd>
+<dt><samp>-z</samp></dt>
+<dt><samp>--suspendable</samp></dt>
+<dd><p>Enable the ability to suspend <code>nano</code> using the system&rsquo;s suspend
+keystroke (usually <kbd>^Z</kbd>).
+</p>
+</dd>
+<dt><samp>-%</samp></dt>
+<dt><samp>--stateflags</samp></dt>
+<dd><p>Use the top-right corner of the screen for showing some state flags:
+<code>I</code> when auto-indenting, <code>M</code> when the mark is on, <code>L</code> when
+hard-wrapping (breaking long lines), <code>R</code> when recording a macro,
+and <code>S</code> when soft-wrapping.
+When the buffer is modified, a star (<code>*</code>) is shown after the
+filename in the center of the title bar.
+</p>
+</dd>
+<dt><samp>-!</samp></dt>
+<dt><samp>--magic</samp></dt>
+<dd><p>When neither the file&rsquo;s name nor its first line give a clue,
+try using libmagic to determine the applicable syntax.
+</p>
+</dd>
+</dl>
+
+
+<hr>
+<span id="Editor-Basics"></span><span id="Editor-Basics-1"></span><h2 class="chapter">4 Editor Basics</h2>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Entering-Text" accesskey="1">Entering Text</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Commands" accesskey="2">Commands</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Cutbuffer" accesskey="3">The Cutbuffer</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Mark" accesskey="4">The Mark</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Screen-Layout" accesskey="5">Screen Layout</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Search-and-Replace" accesskey="6">Search and Replace</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Using-the-Mouse" accesskey="7">Using the Mouse</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Anchors" accesskey="8">Anchors</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Limitations" accesskey="9">Limitations</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<span id="Entering-Text"></span><span id="Entering-Text-1"></span><h3 class="section">4.1 Entering Text</h3>
+
+<p><code>nano</code> is a &quot;modeless&quot; editor.  This means that all keystrokes,
+with the exception of Control and Meta sequences, enter text into the
+file being edited.
+</p>
+<p>Characters not present on the keyboard can be entered in two ways:
+</p>
+<ul>
+<li> For characters with a single-byte code,
+pressing the Esc key twice and then typing a three-digit decimal number
+(from <kbd>000</kbd> to <kbd>255</kbd>) will make <code>nano</code> behave as if you
+typed the key with that value.
+
+</li><li> For any possible character, pressing <kbd>M-V</kbd> (Alt+V) and then typing a
+six-digit hexadecimal number (starting with <kbd>0</kbd> or <kbd>1</kbd>) will enter the
+corresponding Unicode character into the buffer.
+</li></ul>
+
+<p>For example, typing <kbd>Esc Esc 2 3 4</kbd> will enter the character &quot;ê&quot; &mdash;
+useful when writing about a French party.  Typing <kbd>M-V 0 0 2 2 c 4</kbd>
+will enter the symbol &quot;⋄&quot;, a little diamond.
+</p>
+<hr>
+<span id="Commands"></span><span id="Commands-1"></span><h3 class="section">4.2 Commands</h3>
+
+<p>Commands are given by using the Control key (Ctrl, shown as <kbd>^</kbd>)
+or the Meta key (Alt or Cmd, shown as <kbd>M-</kbd>).
+</p>
+<ul>
+<li> A control-key sequence is entered by holding down the Ctrl key and
+pressing the desired key.
+
+</li><li> A meta-key sequence is entered by holding down the Meta key (normally
+the Alt key) and pressing the desired key.
+</li></ul>
+
+<p>If for some reason on your system the combinations with Ctrl or Alt do
+not work, you can generate them by using the Esc key.  A control-key
+sequence is generated by pressing the Esc key twice and then pressing
+the desired key, and a meta-key sequence by pressing the Esc key once
+and then pressing the desired key.
+</p>
+<hr>
+<span id="The-Cutbuffer"></span><span id="The-Cutbuffer-1"></span><h3 class="section">4.3 The Cutbuffer</h3>
+
+<p>Text can be cut from a file a whole line at a time with <kbd>^K</kbd>.
+The cut line is stored in the cutbuffer.  Consecutive strokes of <kbd>^K</kbd>
+will add each cut line to this buffer, but a <kbd>^K</kbd>
+after any other keystroke will overwrite the entire cutbuffer.
+</p>
+<p>The contents of the cutbuffer can be pasted at the current cursor position
+with <kbd>^U</kbd>.
+</p>
+<p>A line of text can be copied into the cutbuffer (without cutting it)
+with <kbd>M-6</kbd>.
+</p>
+<hr>
+<span id="The-Mark"></span><span id="The-Mark-1"></span><h3 class="section">4.4 The Mark</h3>
+
+<p>Text can be selected by first &rsquo;setting the Mark&rsquo; with <kbd>^6</kbd>
+or <kbd>M-A</kbd> and then moving the cursor to the other end of the portion
+to be selected.  The selected portion of text will be highlighted.
+This selection can now be cut or copied in its entirety with a single
+<kbd>^K</kbd> or <kbd>M-6</kbd>.  Or the selection can be used to limit the scope of
+a search-and-replace (<kbd>^\</kbd>) or spell-checking session (<kbd>^T</kbd>).
+</p>
+<p>On some terminals, text can be selected also by holding down <kbd>Shift</kbd>
+while using the cursor keys.  Holding down the <kbd>Ctrl</kbd> or <kbd>Alt</kbd>
+key too will increase the stride.  Such a selection is cancelled
+upon any cursor movement where <kbd>Shift</kbd> isn&rsquo;t held.
+</p>
+<p>Cutting or copying selected text toggles off the mark automatically.
+If needed, it can be toggled off manually with another <kbd>^6</kbd> or <kbd>M-A</kbd>.
+</p>
+<hr>
+<span id="Screen-Layout"></span><span id="Screen-Layout-1"></span><h3 class="section">4.5 Screen Layout</h3>
+
+<p>The default screen of nano consists of five areas.  From top to bottom
+these are: the title bar, a blank line, the edit window, the status bar,
+and two help lines.
+</p>
+<p>The title bar consists of
+three sections: left, center and right.  The section on the left
+displays the version of <code>nano</code> being used.  The center section
+displays the current filename, or &quot;New Buffer&quot; if the file has not yet
+been named.  The section on the right displays &quot;Modified&quot; if the
+file has been modified since it was last saved or opened.
+</p>
+<p>The status bar is the third line from the bottom of the screen.  It
+shows important and informational messages.  Any error messages that
+occur from using the editor will appear on the status bar.  Any questions
+that are asked of the user will be asked on the status bar, and any user
+input (search strings, filenames, etc.) will be input on the status bar.
+</p>
+<p>The two help lines at the bottom of the screen show some of the most
+essential functions of the editor.  These two lines are called the
+Shortcut List.
+</p>
+<hr>
+<span id="Search-and-Replace"></span><span id="Search-and-Replace-1"></span><h3 class="section">4.6 Search and Replace</h3>
+
+<p>One can search the current buffer for the occurrence of any string
+with the Search command (default key binding: <kbd>^W</kbd>).  The default search
+mode is forward, case-insensitive, and for literal strings.  But one
+can search backwards by pressing <kbd>M-B</kbd>, search case sensitively with <kbd>M-C</kbd>,
+and interpret regular expressions in the search string with <kbd>M-R</kbd>.
+</p>
+<p>A regular expression in a search string always covers just one line;
+it cannot span multiple lines.  And when replacing (with <kbd>^\</kbd> or <kbd>M-R</kbd>)
+the replacement string cannot contain a newline (LF).
+</p>
+<hr>
+<span id="Using-the-Mouse"></span><span id="Using-the-Mouse-1"></span><h3 class="section">4.7 Using the Mouse</h3>
+
+<p>When mouse support has been configured and enabled, a single mouse click
+places the cursor at the indicated position.  Clicking a second time in
+the same position toggles the mark.  Clicking in the shortcut list
+executes the selected shortcut.  To be able to select text with the
+left button, or paste text with the middle button, hold down the
+Shift key during those actions.
+</p>
+<p>The mouse will work in the X Window System, and on the console when gpm
+is running.
+</p>
+<hr>
+<span id="Anchors"></span><span id="Anchors-1"></span><h3 class="section">4.8 Anchors</h3>
+
+<p>With <kbd>M-Ins</kbd> you can place an anchor (a kind of temporary bookmark)
+at the current line.  With <kbd>M-PgUp</kbd> and <kbd>M-PgDn</kbd> you can jump
+to an anchor in the backward/forward direction.  This jumping wraps
+around at the top and bottom.
+</p>
+<p>When a line with an anchor is removed, the line where the cursor ends up
+inherits the anchor.  After performing an operation on the entire buffer
+(like formatting it, piping it through a command, or doing an external
+spell check on it), any anchors that were present are gone.  And when
+you close the buffer, all its anchors simply disappear; they are not saved.
+</p>
+<p>Anchors are visualized in the margin when line numbers are activated.
+</p>
+<hr>
+<span id="Limitations"></span><span id="Limitations-1"></span><h3 class="section">4.9 Limitations</h3>
+
+<p>The recording and playback of keyboard macros works correctly only on a
+terminal emulator, not on a Linux console (VT), because the latter does
+not by default distinguish modified from unmodified arrow keys.
+</p>
+
+<hr>
+<span id="Built_002din-Help"></span><span id="Built_002din-Help-1"></span><h2 class="chapter">5 Built-in Help</h2>
+
+<p>The built-in help system in <code>nano</code> is available by pressing <kbd>^G</kbd>.
+It is fairly self-explanatory.  It documents the various parts of the
+editor and the available keystrokes.  Navigation is via the <kbd>^Y</kbd> (Page Up)
+and <kbd>^V</kbd> (Page Down) keys.  <kbd>^X</kbd> exits from the help system.
+</p>
+
+<hr>
+<span id="The-File-Browser"></span><span id="The-File-Browser-1"></span><h2 class="chapter">6 The File Browser</h2>
+
+<p>When in the Read-File (<kbd>^R</kbd>) or Write-Out menu (<kbd>^O</kbd>),
+pressing <kbd>^T</kbd> will invoke the file browser.
+Here, one can navigate directories in a graphical manner in order to
+find the desired file.
+</p>
+<p>Basic movement in the file browser is accomplished with the arrow and
+other cursor-movement keys.  More targeted movement is accomplished by
+searching, via <kbd>^W</kbd> or <kbd>w</kbd>, or by changing directory, via
+<kbd>^_</kbd> or <kbd>g</kbd>.  The behavior of the <kbd>Enter</kbd> key (or <kbd>s</kbd>)
+varies by what is currently selected.
+If the currently selected object is a directory, the file browser will
+enter and display the contents of the directory.  If the object is a
+file, this filename and path are copied to the status bar, and the file
+browser exits.
+</p>
+
+<hr>
+<span id="Feature-Toggles"></span><span id="Feature-Toggles-1"></span><h2 class="chapter">7 Feature Toggles</h2>
+
+<p>Toggles allow you to change on-the-fly certain aspects of the editor
+which would normally be specified via command-line options.  They are
+invoked via Meta-key sequences (see <a href="#Commands">Commands</a> for more info).
+The following global toggles are available:
+</p>
+<dl compact="compact">
+<dt><code>Constant Cursor Position Display</code></dt>
+<dd><p><kbd>Meta-C</kbd> toggles the <samp>-c</samp> (<samp>--constantshow</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Smart Home Key</code></dt>
+<dd><p><kbd>Meta-H</kbd> toggles the <samp>-A</samp> (<samp>--smarthome</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Auto Indent</code></dt>
+<dd><p><kbd>Meta-I</kbd> toggles the <samp>-i</samp> (<samp>--autoindent</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Cut From Cursor To End-of-Line</code></dt>
+<dd><p><kbd>Meta-K</kbd> toggles the <samp>-k</samp> (<samp>--cutfromcursor</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Long-Line Wrapping</code></dt>
+<dd><p><kbd>Meta-L</kbd> toggles the <samp>-b</samp> (<samp>--breaklonglines</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Mouse Support</code></dt>
+<dd><p><kbd>Meta-M</kbd> toggles the <samp>-m</samp> (<samp>--mouse</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Line Numbers</code></dt>
+<dd><p><kbd>Meta-N</kbd> toggles the <samp>-l</samp> (<samp>--linenumbers</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Tabs To Spaces</code></dt>
+<dd><p><kbd>Meta-O</kbd> toggles the <samp>-E</samp> (<samp>--tabstospaces</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Whitespace Display</code></dt>
+<dd><p><kbd>Meta-P</kbd> toggles the displaying of whitespace (see <a href="#Whitespace">Whitespace</a>).
+</p>
+</dd>
+<dt><code>Soft Wrapping</code></dt>
+<dd><p><kbd>Meta-S</kbd> toggles the <samp>-S</samp> (<samp>--softwrap</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Expert/No Help</code></dt>
+<dd><p><kbd>Meta-X</kbd> toggles the <samp>-x</samp> (<samp>--nohelp</samp>) command-line option.
+</p>
+</dd>
+<dt><code>Color Syntax Highlighting</code></dt>
+<dd><p><kbd>Meta-Y</kbd> toggles color syntax highlighting (if your nanorc defines syntaxes
+&mdash; see <a href="#Syntax-Highlighting">Syntax Highlighting</a>).
+</p>
+</dd>
+<dt><code>Suspension</code></dt>
+<dd><p><kbd>Meta-Z</kbd> toggles the <samp>-z</samp> (<samp>--suspendable</samp>) command-line option.
+</p>
+</dd>
+</dl>
+
+
+<hr>
+<span id="Nanorc-Files"></span><span id="Nanorc-Files-1"></span><h2 class="chapter">8 Nanorc Files</h2>
+
+<p>The nanorc files contain the default settings for <code>nano</code>.  During
+startup, if <samp>--rcfile</samp> is not given, <code>nano</code> will read two files:
+first the system-wide settings, from <samp>/etc/nanorc</samp> (the exact path
+might be different on your system), and then the user-specific settings,
+either from <samp>~/.nanorc</samp> or from <samp>$XDG_CONFIG_HOME/nano/nanorc</samp>
+or from <samp>.config/nano/nanorc</samp>, whichever exists first.
+If <samp>--rcfile</samp> is given, <code>nano</code> will read just the
+specified settings file.
+</p>
+<p>A nanorc file accepts a series of &quot;set&quot; and &quot;unset&quot; commands, which can
+be used to configure <code>nano</code> on startup without using command-line
+options.  Additionally, there are some commands to define syntax highlighting
+and to rebind keys &mdash; see <a href="#Syntax-Highlighting">Syntax Highlighting</a> and <a href="#Rebinding-Keys">Rebinding Keys</a>.
+<code>nano</code> will read one command per line.
+All commands and keywords should be written in lowercase.
+</p>
+<p>Options in nanorc files take precedence over <code>nano</code>&rsquo;s defaults, and
+command-line options override nanorc settings.  Also, options that do not
+take an argument are unset by default.  So using the <code>unset</code> command
+is only needed when wanting to override a setting of the system&rsquo;s nanorc
+file in your own nanorc.  Options that take an argument cannot be unset.
+</p>
+<p>Quotes inside the <var>characters</var> parameters below should not be escaped.
+The last double quote on the line will be seen as the closing quote.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Settings" accesskey="1">Settings</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Syntax-Highlighting" accesskey="2">Syntax Highlighting</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Rebinding-Keys" accesskey="3">Rebinding Keys</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<span id="Settings"></span><span id="Settings-1"></span><h3 class="section">8.1 Settings</h3>
+
+<p>The supported settings in a nanorc file are:
+</p>
+<dl compact="compact">
+<dt><code>set afterends</code></dt>
+<dd><p>Make Ctrl+Right and Ctrl+Delete stop at word ends instead of beginnings.
+</p>
+</dd>
+<dt><code>set allow_insecure_backup</code></dt>
+<dd><p>When backing up files, allow the backup to succeed even if its
+permissions can&rsquo;t be (re)set due to special OS considerations.
+You should NOT enable this option unless you are sure you need it.
+</p>
+</dd>
+<dt><code>set atblanks</code></dt>
+<dd><p>When soft line wrapping is enabled, make it wrap lines at blank characters
+(tabs and spaces) instead of always at the edge of the screen.
+</p>
+</dd>
+<dt><code>set autoindent</code></dt>
+<dd><p>Automatically indent a newly created line to the same number of tabs
+and/or spaces as the previous line (or as the next line if the previous
+line is the beginning of a paragraph).
+</p>
+</dd>
+<dt><code>set backup</code></dt>
+<dd><p>When saving a file, back up the previous version of it, using the current
+filename suffixed with a tilde (<code>~</code>).
+</p>
+</dd>
+<dt><code>set backupdir &quot;<var>directory</var>&quot;</code></dt>
+<dd><p>Make and keep not just one backup file, but make and keep a uniquely
+numbered one every time a file is saved &mdash; when backups are enabled
+with <code>set backup</code> or <samp>--backup</samp> or <samp>-B</samp>.
+The uniquely numbered files are stored in the specified directory.
+</p>
+</dd>
+<dt><code>set boldtext</code></dt>
+<dd><p>Use bold instead of reverse video for the title bar, status bar, key combos,
+function tags, line numbers, and selected text.  This is overridden by
+setting the options <code>titlecolor</code>, <code>statuscolor</code>, <code>keycolor</code>,
+<code>functioncolor</code>, <code>numbercolor</code>, and/or <code>selectedcolor</code>.
+</p>
+</dd>
+<dt><code>set bookstyle</code></dt>
+<dd><p>When justifying, treat any line that starts with whitespace as the
+beginning of a paragraph (unless auto-indenting is on).
+</p>
+</dd>
+<dt><code>set brackets &quot;<var>characters</var>&quot;</code></dt>
+<dd><p>Set the characters treated as closing brackets when justifying
+paragraphs.  This may not include blank characters.  Only closing
+punctuation (see <code>set punct</code>), optionally followed by the specified
+closing brackets, can end sentences.  The default value is
+&quot;<tt>&quot;')&gt;]}</tt>&quot;.
+</p>
+</dd>
+<dt><code>set breaklonglines</code></dt>
+<dd><p>Automatically hard-wrap the current line when it becomes overlong.
+</p>
+</dd>
+<dt><code>set casesensitive</code></dt>
+<dd><p>Do case-sensitive searches by default.
+</p>
+</dd>
+<dt><code>set constantshow</code></dt>
+<dd><p>Constantly display the cursor position on the status bar.
+Note that this overrides <samp>quickblank</samp>.
+</p>
+</dd>
+<dt><code>set cutfromcursor</code></dt>
+<dd><p>Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
+</p>
+</dd>
+<dt><code>set emptyline</code></dt>
+<dd><p>Do not use the line below the title bar, leaving it entirely blank.
+</p>
+</dd>
+<dt><code>set errorcolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the status bar when an error message is displayed.
+The default value is <tt>brightwhite,red</tt>.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set fill <var>number</var></code></dt>
+<dd><p>Set the target width for justifying and automatic hard-wrapping at this
+<var>number</var> of columns.  If the value is 0 or less, wrapping will occur
+at the width of the screen minus <var>number</var> columns, allowing the wrap
+point to vary along with the width of the screen if the screen is resized.
+The default value is <tt>-8</tt>.
+</p>
+<span id="set-functioncolor"></span></dd>
+<dt><code>set functioncolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the concise function descriptions
+in the two help lines at the bottom of the screen.
+Valid names for the foreground and background colors are:
+<code>red</code>, <code>green</code>, <code>blue</code>,
+<code>magenta</code>, <code>yellow</code>, <code>cyan</code>,
+<code>white</code>, and <code>black</code>.
+Each of these eight names may be prefixed with the word
+<code>light</code> to get a brighter version of that color.
+</p>
+<p>On terminal emulators that can do at least 256 colors,
+other valid (but unprefixable) color names are:
+<code>pink</code>, <code>purple</code>, <code>mauve</code>,
+<code>lagoon</code>, <code>mint</code>, <code>lime</code>,
+<code>peach</code>, <code>orange</code>, <code>latte</code>, and <code>normal</code>
+&mdash; where <code>normal</code> means the default foreground or background color.
+Either <var>fgcolor</var> or ,<var>bgcolor</var> may be left out,
+and the pair may be preceded by <code>bold</code> and/or <code>italic</code>
+(separated by commas) to get a bold and/or slanting typeface,
+if your terminal can do those.
+</p>
+</dd>
+<dt><code>set guidestripe <var>number</var></code></dt>
+<dd><p>Draw a vertical stripe at the given column, to help judge the width of the
+text.  (The color of the stripe can be changed with <code>set stripecolor</code>.)
+</p>
+</dd>
+<dt><code>set historylog</code></dt>
+<dd><p>Save the last hundred search strings and replacement strings and
+executed commands, so they can be easily reused in later sessions.
+</p>
+</dd>
+<dt><code>set jumpyscrolling</code></dt>
+<dd><p>Scroll the buffer contents per half-screen instead of per line.
+</p>
+</dd>
+<dt><code>set keycolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the shortcut key combos
+in the two help lines at the bottom of the screen.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set linenumbers</code></dt>
+<dd><p>Display line numbers to the left of the text area.
+(Any line with an anchor additionally gets a mark in the margin.)
+</p>
+</dd>
+<dt><code>set locking</code></dt>
+<dd><p>Enable vim-style lock-files for when editing files.
+</p>
+</dd>
+<dt><code>set magic</code></dt>
+<dd><p>When neither the file&rsquo;s name nor its first line give a clue,
+try using libmagic to determine the applicable syntax.
+(Calling libmagic can be relatively time consuming.
+It is therefore not done by default.)
+</p>
+<span id="set-matchbrackets"></span></dd>
+<dt><code>set matchbrackets &quot;<var>characters</var>&quot;</code></dt>
+<dd><p>Specify the opening and closing brackets that can be found by bracket
+searches.  This may not include blank characters.  The opening set must
+come before the closing set, and the two sets must be in the same order.
+The default value is &quot;<tt>(&lt;[{)&gt;]}</tt>&quot;.
+</p>
+</dd>
+<dt><code>set morespace</code></dt>
+<dd><p>Deprecated option since it has become the default setting.
+When needed, use <code>unset emptyline</code> instead.
+</p>
+</dd>
+<dt><code>set mouse</code></dt>
+<dd><p>Enable mouse support, so that mouse clicks can be used to place the
+cursor, set the mark (with a double click), or execute shortcuts.
+</p>
+</dd>
+<dt><code>set multibuffer</code></dt>
+<dd><p>When reading in a file with <kbd>^R</kbd>, insert it into a new buffer by default.
+</p>
+</dd>
+<dt><code>set noconvert</code></dt>
+<dd><p>Don&rsquo;t convert files from DOS/Mac format.
+</p>
+</dd>
+<dt><code>set nohelp</code></dt>
+<dd><p>Don&rsquo;t display the help lists at the bottom of the screen.
+</p>
+</dd>
+<dt><code>set nonewlines</code></dt>
+<dd><p>Don&rsquo;t automatically add a newline when a text does not end with one.
+(This can cause you to save non-POSIX text files.)
+</p>
+</dd>
+<dt><code>set nopauses</code></dt>
+<dd><p>Obsolete option.  Ignored.
+</p>
+</dd>
+<dt><code>set nowrap</code></dt>
+<dd><p>Deprecated option since it has become the default setting.
+When needed, use <code>unset breaklonglines</code> instead.
+</p>
+</dd>
+<dt><code>set numbercolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for line numbers.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set operatingdir &quot;<var>directory</var>&quot;</code></dt>
+<dd><p><code>nano</code> will only read and write files inside &quot;directory&quot; and its
+subdirectories.  Also, the current directory is changed to here, so
+files are inserted from this directory.  By default, the operating
+directory feature is turned off.
+</p>
+</dd>
+<dt><code>set positionlog</code></dt>
+<dd><p>Save the cursor position of files between editing sessions.
+The cursor position is remembered for the 200 most-recently edited files.
+</p>
+</dd>
+<dt><code>set preserve</code></dt>
+<dd><p>Preserve the XON and XOFF keys (<kbd>^Q</kbd> and <kbd>^S</kbd>).
+</p>
+</dd>
+<dt><code>set indicator</code></dt>
+<dd><p>Display a &quot;scrollbar&quot; on the righthand side of the edit window.
+It shows the position of the viewport in the buffer
+and how much of the buffer is covered by the viewport.
+</p>
+</dd>
+<dt><code>set punct &quot;<var>characters</var>&quot;</code></dt>
+<dd><p>Set the characters treated as closing punctuation when justifying
+paragraphs.  This may not include blank characters.  Only the
+specified closing punctuation, optionally followed by closing brackets
+(see <code>set brackets</code>), can end sentences.
+The default value is &quot;<tt>!.?</tt>&quot;.
+</p>
+</dd>
+<dt><code>set quickblank</code></dt>
+<dd><p>Do quick status-bar blanking: status-bar messages will disappear after 1
+keystroke instead of 25.  Note that <samp>constantshow</samp> overrides this.
+</p>
+</dd>
+<dt><code>set quotestr &quot;<var>regex</var>&quot;</code></dt>
+<dd><p>Set the regular expression for matching the quoting part of a line.
+The default value is &quot;<tt>^([&nbsp;<!-- /@w -->\t]*([!#%:;&gt;|}]|//))+</tt>&quot;.
+(Note that <code>\t</code> stands for a literal Tab character.)
+This makes it possible to rejustify blocks of quoted text when composing
+email, and to rewrap blocks of line comments when writing source code.
+</p>
+</dd>
+<dt><code>set rawsequences</code></dt>
+<dd><p>Interpret escape sequences directly (instead of asking <code>ncurses</code> to
+translate them).  If you need this option to get your keyboard to work
+properly, please report a bug.  Using this option disables <code>nano</code>&rsquo;s
+mouse support.
+</p>
+</dd>
+<dt><code>set rebinddelete</code></dt>
+<dd><p>Interpret the Delete and Backspace keys differently so that both Backspace
+and Delete work properly.  You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like Backspace.
+</p>
+</dd>
+<dt><code>set regexp</code></dt>
+<dd><p>Do regular-expression searches by default.
+Regular expressions in <code>nano</code> are of the extended type (ERE).
+</p>
+</dd>
+<dt><code>set saveonexit</code></dt>
+<dd><p>Save a changed buffer automatically on exit (<kbd>^X</kbd>); don&rsquo;t prompt.
+(The old form of this option, <code>set tempfile</code>, is deprecated.)
+</p>
+</dd>
+<dt><code>set scrollercolor <var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the indicator alias &quot;scrollbar&quot;.
+(On terminal emulators that link to a libvte older than version 0.55,
+using a background color here does not work correctly.)
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set selectedcolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for selected text.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set showcursor</code></dt>
+<dd><p>Put the cursor on the highlighted item in the file browser, and show
+the cursor in the help viewer, to aid braille users and people with
+poor vision.
+</p>
+</dd>
+<dt><code>set smarthome</code></dt>
+<dd><p>Make the Home key smarter.  When Home is pressed anywhere but at the
+very beginning of non-whitespace characters on a line, the cursor will
+jump to that beginning (either forwards or backwards).  If the cursor is
+already at that position, it will jump to the true beginning of the
+line.
+</p>
+</dd>
+<dt><code>set smooth</code></dt>
+<dd><p>Deprecated option since it has become the default setting.
+When needed, use <code>unset jumpyscrolling</code> instead.
+</p>
+</dd>
+<dt><code>set softwrap</code></dt>
+<dd><p>Display lines that exceed the screen&rsquo;s width over multiple screen lines.
+(You can make this soft-wrapping occur at whitespace instead of rudely at
+the screen&rsquo;s edge, by using also <code>set atblanks</code>.)
+</p>
+</dd>
+<dt><code>set speller &quot;<var>program</var> [<var>argument</var> &hellip;]&quot;</code></dt>
+<dd><p>Use the given program to do spell checking and correcting.
+See <a href="#g_t_002d_002dspeller"><samp>--speller</samp></a> for details.
+</p>
+</dd>
+<dt><code>set stateflags</code></dt>
+<dd><p>Use the top-right corner of the screen for showing some state flags:
+<code>I</code> when auto-indenting, <code>M</code> when the mark is on, <code>L</code> when
+hard-wrapping (breaking long lines), <code>R</code> when recording a macro,
+and <code>S</code> when soft-wrapping.
+When the buffer is modified, a star (<code>*</code>) is shown after the
+filename in the center of the title bar.
+</p>
+</dd>
+<dt><code>set statuscolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the status bar.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set stripecolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the vertical guiding stripe.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set suspendable</code></dt>
+<dd><p>Allow <code>nano</code> to be suspended (with <kbd>^Z</kbd> by default).
+</p>
+</dd>
+<dt><code>set tabsize <var>number</var></code></dt>
+<dd><p>Use a tab size of <var>number</var> columns.  The value of <var>number</var> must be
+greater than 0.  The default value is <tt>8</tt>.
+</p>
+</dd>
+<dt><code>set tabstospaces</code></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><code>set titlecolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Use this color combination for the title bar.
+See <a href="#set-functioncolor"><code>set functioncolor</code></a> for valid color names.
+</p>
+</dd>
+<dt><code>set trimblanks</code></dt>
+<dd><p>Remove trailing whitespace from wrapped lines when automatic
+hard-wrapping occurs or when text is justified.
+</p>
+</dd>
+<dt><code>set unix</code></dt>
+<dd><p>Save a file by default in Unix format.  This overrides nano&rsquo;s
+default behavior of saving a file in the format that it had.
+(This option has no effect when you also use <code>set noconvert</code>.)
+</p>
+<span id="Whitespace"></span></dd>
+<dt><code>set whitespace &quot;<var>characters</var>&quot;</code></dt>
+<dd><p>Set the two characters used to indicate the presence of tabs and
+spaces.  They must be single-column characters.  The default pair
+for a UTF-8 locale is <tt>&quot;»·&quot;</tt>, and for other locales <tt>&quot;&gt;.&quot;</tt>.
+</p>
+</dd>
+<dt><code>set wordbounds</code></dt>
+<dd><p>Detect word boundaries differently by treating punctuation
+characters as part of a word.
+</p>
+</dd>
+<dt><code>set wordchars &quot;<var>characters</var>&quot;</code></dt>
+<dd><p>Specify which other characters (besides the normal alphanumeric ones)
+should be considered as parts of words.  When using this option, you
+probably want to unset <code>wordbounds</code>.
+</p>
+</dd>
+<dt><code>set zap</code></dt>
+<dd><p>Let an unmodified <tt class="key">Backspace</tt> or <tt class="key">Delete</tt> erase the marked region
+(instead of a single character, and without affecting the cutbuffer).
+</p>
+</dd>
+</dl>
+
+<hr>
+<span id="Syntax-Highlighting"></span><span id="Syntax-Highlighting-1"></span><h3 class="section">8.2 Syntax Highlighting</h3>
+
+<p>Coloring the different syntactic elements of a file
+is done via regular expressions (see the <code>color</code> command below).
+This is inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file.  Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like <code>nano</code>.
+</p>
+<p>See <samp>/usr/share/nano/</samp> and <samp>/usr/share/nano/extra/</samp>
+for the syntax-coloring definitions that are available out of the box.
+</p>
+<p>All regular expressions in <code>nano</code> are POSIX extended regular expressions
+(ERE).  This means that <code>.</code>, <code>?</code>, <code>*</code>, <code>+</code>, <code>^</code>,
+<code>$</code>, and several other characters are special.
+The period <code>.</code> matches any single character,
+<code>?</code> means the preceding item is optional,
+<code>*</code> means the preceding item may be matched zero or more times,
+<code>+</code> means the preceding item must be matched one or more times,
+<code>^</code> matches the beginning of a line, and <code>$</code> the end,
+<code>\&lt;</code> matches the start of a word, and <code>\&gt;</code> the end,
+and <code>\s</code> matches a blank.
+It also means that lookahead and lookbehind are not possible.
+A complete explanation can be found in the manual of GNU grep:
+<code>info grep regular</code>.
+</p>
+<p>A separate syntax can be defined for each kind of file
+via the following commands in a nanorc file:
+</p>
+<dl compact="compact">
+<dt><code>syntax <var>name</var> [&quot;<var>fileregex</var>&quot; &hellip;]</code></dt>
+<dd><p>Start the definition of a syntax with this <var>name</var>.
+All subsequent <code>color</code> and other such commands
+will be added to this syntax, until a new <code>syntax</code>
+command is encountered.
+</p>
+<p>When <code>nano</code> is run, this syntax will be automatically
+activated if the current filename matches the extended regular
+expression <var>fileregex</var>.  Or the syntax can be explicitly
+activated by using the <samp>-Y</samp> or <samp>--syntax</samp>
+command-line option followed by the <var>name</var>.
+</p>
+<p>The <code>default</code> syntax is special: it takes no <var>fileregex</var>,
+and applies to files that don&rsquo;t match any syntax&rsquo;s regexes.
+The <code>none</code> syntax is reserved; specifying it on the
+command line is the same as not having a syntax at all.
+</p>
+</dd>
+<dt><code>header &quot;<var>regex</var>&quot; &hellip;</code></dt>
+<dd><p>If from all defined syntaxes no <var>fileregex</var> matched, then compare
+this <var>regex</var> (or regexes) against the first line of the current file,
+to determine whether this syntax should be used for it.
+</p>
+</dd>
+<dt><code>magic &quot;<var>regex</var>&quot; &hellip;</code></dt>
+<dd><p>If no <var>fileregex</var> matched and no <code>header</code> regex matched
+either, then compare this <var>regex</var> (or regexes) against the
+result of querying the <code>magic</code> database about the current
+file, to determine whether this syntax should be used for it.
+(This functionality only works when <code>libmagic</code> is installed
+on the system and will be silently ignored otherwise.)
+</p>
+</dd>
+<dt><code>formatter <var>program</var> [<var>argument</var> &hellip;]</code></dt>
+<dd><p>Run the given <var>program</var> on the full contents of the current buffer.
+(The current buffer is written out to a temporary file, the program is
+run on it, and then the temporary file is read back in, replacing the
+contents of the buffer.)
+</p>
+</dd>
+<dt><code>linter <var>program</var> [<var>argument</var> &hellip;]</code></dt>
+<dd><p>Use the given <var>program</var> to do a syntax check on the current buffer.
+</p>
+</dd>
+<dt><code>comment &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Use the given string for commenting and uncommenting lines.
+If the string contains a vertical bar or pipe character (<tt>|</tt>),
+this designates bracket-style comments; for example, <tt>&quot;/*|*/&quot;</tt> for
+CSS files.  The characters before the pipe are prepended to the line and the
+characters after the pipe are appended at the end of the line.  If no pipe
+character is present, the full string is prepended; for example, <tt>&quot;#&quot;</tt> for
+Python files.  If empty double quotes are specified, the comment/uncomment
+functions are disabled; for example, <tt>&quot;&quot;</tt> for JSON.
+The default value is &quot;<tt>#</tt>&quot;.
+</p>
+</dd>
+<dt><code>tabgives &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Make the &lt;Tab&gt; key produce the given <var>string</var>.  Useful for languages like
+Python that want to see only spaces for indentation.
+This overrides the setting of the <code>tabstospaces</code> option.
+</p>
+</dd>
+<dt><code>color [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var> &quot;<var>regex</var>&quot; &hellip;</code></dt>
+<dd><p>Paint all pieces of text that match the extended regular expression &quot;regex&quot;
+with the given foreground and background colors, at least one of which must
+be specified.  Valid color names are:
+<code>red</code>, <code>green</code>, <code>blue</code>,
+<code>magenta</code>, <code>yellow</code>, <code>cyan</code>,
+<code>white</code>, and <code>black</code>.
+Each of these eight names may be prefixed with the word
+<code>light</code> to get a brighter version of that color.
+</p>
+<p>On terminal emulators that can do at least 256 colors,
+other valid (but unprefixable) color names are:
+<code>pink</code>, <code>purple</code>, <code>mauve</code>,
+<code>lagoon</code>, <code>mint</code>, <code>lime</code>,
+<code>peach</code>, <code>orange</code>, <code>latte</code>, and <code>normal</code>
+&mdash; where <code>normal</code> means the default foreground or background color.
+The color pair may be preceded by <code>bold</code> and/or <code>italic</code>
+(separated by commas) to get a bold and/or slanting typeface,
+if your terminal can do those.
+</p>
+<p>All coloring commands are applied in the order in which they are specified,
+which means that later commands can recolor stuff that was colored earlier.
+</p>
+</dd>
+<dt><code>icolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var> &quot;<var>regex</var>&quot; &hellip;</code></dt>
+<dd><p>Same as above, except that the matching is case insensitive.
+</p>
+</dd>
+<dt><code>color [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var> start=&quot;<var>fromrx</var>&quot; end=&quot;<var>torx</var>&quot;</code></dt>
+<dd><p>Paint all pieces of text whose start matches extended regular expression
+&quot;fromrx&quot; and whose end matches extended regular expression &quot;torx&quot; with
+the given foreground and background colors, at least one of
+which must be specified.  This means that, after an initial instance of
+&quot;fromrx&quot;, all text until the first instance of &quot;torx&quot; will be colored.
+This allows syntax highlighting to span multiple lines.
+</p>
+</dd>
+<dt><code>icolor [bold,][italic,]<var>fgcolor</var>,<var>bgcolor</var> start=&quot;<var>fromrx</var>&quot; end=&quot;<var>torx</var>&quot;</code></dt>
+<dd><p>Same as above, except that the matching is case insensitive.
+</p>
+</dd>
+<dt><code>include &quot;<var>syntaxfile</var>&quot;</code></dt>
+<dd><p>Read in self-contained color syntaxes from &quot;syntaxfile&quot;.  Note that
+&quot;syntaxfile&quot; may contain only the above commands, from <code>syntax</code>
+to <code>icolor</code>.
+</p>
+</dd>
+<dt><code>extendsyntax <var>name</var> <var>command</var> <var>argument</var> &hellip;</code></dt>
+<dd><p>Extend the syntax previously defined as &quot;<var>name</var>&quot; with another <var>command</var>.
+This allows you to add a new <code>color</code>, <code>icolor</code>, <code>header</code>,
+<code>magic</code>, <code>formatter</code>, <code>linter</code>, <code>comment</code>,
+or <code>tabgives</code> command to an already
+defined syntax &mdash; useful when you want to slightly improve a syntax defined
+in one of the system-installed files (which normally are not writable).
+</p>
+</dd>
+</dl>
+
+<hr>
+<span id="Rebinding-Keys"></span><span id="Rebinding-Keys-1"></span><h3 class="section">8.3 Rebinding Keys</h3>
+
+<p>Key bindings can be changed via the following three commands in a
+nanorc file:
+</p>
+<dl compact="compact">
+<dt><code>bind key function menu</code></dt>
+<dd><p>Rebinds <code>key</code> to <code>function</code> in the context of <code>menu</code>
+(or in all menus where the function exists when <code>all</code> is used).
+</p>
+</dd>
+<dt><code>bind key &quot;string&quot; menu</code></dt>
+<dd><p>Makes <code>key</code> produce <code>string</code> in the context of <code>menu</code>
+(or in all menus where the key exists when <code>all</code> is used).
+The <code>string</code> can consist of text or commands or a mix of them.
+(To enter a command into the <code>string</code>, precede its keystroke
+with <kbd>M-V</kbd>.)
+</p>
+</dd>
+<dt><code>unbind key menu</code></dt>
+<dd><p>Unbinds <code>key</code> from <code>menu</code>
+(or from all menus where the key exists when <code>all</code> is used).
+</p>
+</dd>
+</dl>
+
+<br>
+<p>The format of <code>key</code> should be one of:
+</p>
+<ul class="no-bullet">
+<li><!-- /@w --> <code>^<var>X</var></code> &mdash;&mdash; where <var>X</var> is a Latin letter, or one of several
+ASCII characters (@, ], \, ^, _), or the word &quot;Space&quot;.
+Example: <code>^C</code>.
+
+</li><li><!-- /@w --> <code>M-<var>X</var></code> &mdash;&mdash; where <var>X</var> is any ASCII character except [,
+or the word &quot;Space&quot;.
+Example: <code>M-8</code>.
+
+</li><li><!-- /@w --> <code>Sh-M-<var>X</var></code> &mdash;&mdash; where <var>X</var> is a Latin letter.
+Example: <code>Sh-M-U</code>.
+By default, each Meta+letter keystroke does the same as the corresponding
+Shift+Meta+letter.  But when any Shift+Meta bind is made, that will
+no longer be the case, for all letters.
+
+</li><li><!-- /@w --> <code>F<var>n</var></code> &mdash;&mdash; where <var>n</var> is a numeric value from 1 to 24.
+Example: <code>F10</code>.
+(Often, <code>F13</code> to <code>F24</code> can be typed as <code>F1</code> to <code>F12</code>
+with Shift.)
+
+</li><li><!-- /@w --> <code>Ins</code> or <code>Del</code>.
+</li></ul>
+
+<p>Rebinding <code>^M</code> (Enter) or <code>^I</code> (Tab) is probably not a good idea.
+Rebinding <code>^[</code> (Esc) is not possible, because its keycode
+is the starter byte of Meta keystrokes and escape sequences.
+Rebinding any of the dedicated cursor-moving keys (the arrows, Home, End,
+PageUp and PageDown) is not possible.
+On some terminals it&rsquo;s not possible to rebind <code>^H</code> (unless <code>--raw</code>
+is used) because its keycode is identical to that of the Backspace key.
+</p>
+<br>
+<p>Valid names for the <code>function</code> to be bound are:
+</p>
+<dl compact="compact">
+<dt><code>help</code></dt>
+<dd><p>Invokes the help viewer.
+</p>
+</dd>
+<dt><code>cancel</code></dt>
+<dd><p>Cancels the current command.
+</p>
+</dd>
+<dt><code>exit</code></dt>
+<dd><p>Exits from the program (or from the help viewer or file browser).
+</p>
+</dd>
+<dt><code>writeout</code></dt>
+<dd><p>Writes the current buffer to disk, asking for a name.
+</p>
+</dd>
+<dt><code>savefile</code></dt>
+<dd><p>Writes the current file to disk without prompting.
+</p>
+</dd>
+<dt><code>insert</code></dt>
+<dd><p>Inserts a file into the current buffer (at the current cursor position),
+or into a new buffer when option <code>multibuffer</code> is set.
+</p>
+</dd>
+<dt><code>whereis</code></dt>
+<dd><p>Starts a forward search for text in the current buffer &mdash; or for filenames
+matching a string in the current list in the file browser.
+</p>
+</dd>
+<dt><code>wherewas</code></dt>
+<dd><p>Starts a backward search for text in the current buffer &mdash; or for filenames
+matching a string in the current list in the file browser.
+</p>
+</dd>
+<dt><code>findprevious</code></dt>
+<dd><p>Searches the next occurrence in the backward direction.
+</p>
+</dd>
+<dt><code>findnext</code></dt>
+<dd><p>Searches the next occurrence in the forward direction.
+</p>
+</dd>
+<dt><code>replace</code></dt>
+<dd><p>Interactively replaces text within the current buffer.
+</p>
+</dd>
+<dt><code>cut</code></dt>
+<dd><p>Cuts and stores the current line (or the marked region).
+</p>
+</dd>
+<dt><code>copy</code></dt>
+<dd><p>Copies the current line (or the marked region) without deleting it.
+</p>
+</dd>
+<dt><code>paste</code></dt>
+<dd><p>Pastes the currently stored text into the current buffer at the
+current cursor position.
+</p>
+</dd>
+<dt><code>zap</code></dt>
+<dd><p>Throws away the current line (or the marked region).
+(This function is bound by default to &lt;Meta+Delete&gt;.)
+</p>
+</dd>
+<dt><code>chopwordleft</code></dt>
+<dd><p>Deletes from the cursor position to the beginning of the preceding word.
+(This function is bound by default to &lt;Shift+Ctrl+Delete&gt;.  If your terminal
+produces <code>^H</code> for &lt;Ctrl+Backspace&gt;, you can make &lt;Ctrl+Backspace&gt; delete
+the word to the left of the cursor by rebinding <kbd>^H</kbd> to this function.)
+</p>
+</dd>
+<dt><code>chopwordright</code></dt>
+<dd><p>Deletes from the cursor position to the beginning of the next word.
+(This function is bound by default to &lt;Ctrl+Delete&gt;.)
+</p>
+</dd>
+<dt><code>cutrestoffile</code></dt>
+<dd><p>Cuts all text from the cursor position till the end of the buffer.
+</p>
+</dd>
+<dt><code>mark</code></dt>
+<dd><p>Sets the mark at the current position, to start selecting text.
+Or, when it is set, unsets the mark.
+</p>
+</dd>
+<dt><code>location</code></dt>
+<dd><p>Reports the current position of the cursor in the buffer:
+the line, column, and character positions.
+(The old name of this function, &rsquo;curpos&rsquo;, is deprecated.)
+</p>
+</dd>
+<dt><code>wordcount</code></dt>
+<dd><p>Counts the number of words, lines and characters in the current buffer.
+</p>
+</dd>
+<dt><code>execute</code></dt>
+<dd><p>Prompts for a program to execute.  The program&rsquo;s output will be inserted
+into the current buffer (or into a new buffer when <kbd>M-F</kbd> is toggled).
+</p>
+</dd>
+<dt><code>speller</code></dt>
+<dd><p>Invokes a spell-checking program, either the default <code>hunspell</code>
+or GNU <code>spell</code>, or the one defined by <samp>--speller</samp> or
+<code>set speller</code>.
+</p>
+</dd>
+<dt><code>formatter</code></dt>
+<dd><p>Invokes a full-buffer-processing program (if the active syntax defines one).
+</p>
+</dd>
+<dt><code>linter</code></dt>
+<dd><p>Invokes a syntax-checking program (if the active syntax defines one).
+</p>
+</dd>
+<dt><code>justify</code></dt>
+<dd><p>Justifies the current paragraph.  A paragraph is a group of contiguous lines
+that, apart from possibly the first line, all have the same indentation.  The
+beginning of a paragraph is detected by either this lone line with a differing
+indentation or by a preceding blank line.
+</p>
+</dd>
+<dt><code>fulljustify</code></dt>
+<dd><p>Justifies the entire current buffer.
+</p>
+</dd>
+<dt><code>indent</code></dt>
+<dd><p>Indents (shifts to the right) the currently marked text.
+</p>
+</dd>
+<dt><code>unindent</code></dt>
+<dd><p>Unindents (shifts to the left) the currently marked text.
+</p>
+</dd>
+<dt><code>comment</code></dt>
+<dd><p>Comments or uncomments the current line or marked lines, using the comment
+style specified in the active syntax.
+</p>
+</dd>
+<dt><code>complete</code></dt>
+<dd><p>Completes the fragment before the cursor to a full word found elsewhere
+in the current buffer.
+</p>
+</dd>
+<dt><code>left</code></dt>
+<dd><p>Goes left one position (in the editor or browser).
+</p>
+</dd>
+<dt><code>right</code></dt>
+<dd><p>Goes right one position (in the editor or browser).
+</p>
+</dd>
+<dt><code>up</code></dt>
+<dd><p>Goes one line up (in the editor or browser).
+</p>
+</dd>
+<dt><code>down</code></dt>
+<dd><p>Goes one line down (in the editor or browser).
+</p>
+</dd>
+<dt><code>scrollup</code></dt>
+<dd><p>Scrolls the viewport up one row (meaning that the text slides down)
+while keeping the cursor in the same text position, if possible.
+</p>
+</dd>
+<dt><code>scrolldown</code></dt>
+<dd><p>Scrolls the viewport down one row (meaning that the text slides up)
+while keeping the cursor in the same text position, if possible.
+</p>
+</dd>
+<dt><code>center</code></dt>
+<dd><p>Scrolls the line with the cursor to the middle of the screen.
+</p>
+</dd>
+<dt><code>prevword</code></dt>
+<dd><p>Moves the cursor to the beginning of the previous word.
+</p>
+</dd>
+<dt><code>nextword</code></dt>
+<dd><p>Moves the cursor to the beginning of the next word.
+</p>
+</dd>
+<dt><code>home</code></dt>
+<dd><p>Moves the cursor to the beginning of the current line.
+</p>
+</dd>
+<dt><code>end</code></dt>
+<dd><p>Moves the cursor to the end of the current line.
+</p>
+</dd>
+<dt><code>beginpara</code></dt>
+<dd><p>Moves the cursor to the beginning of the current paragraph.
+</p>
+</dd>
+<dt><code>endpara</code></dt>
+<dd><p>Moves the cursor to the end of the current paragraph.
+</p>
+</dd>
+<dt><code>prevblock</code></dt>
+<dd><p>Moves the cursor to the beginning of the current or preceding block of text.
+(Blocks are separated by one or more blank lines.)
+</p>
+</dd>
+<dt><code>nextblock</code></dt>
+<dd><p>Moves the cursor to the beginning of the next block of text.
+</p>
+</dd>
+<dt><code>pageup</code></dt>
+<dd><p>Goes up one screenful.
+</p>
+</dd>
+<dt><code>pagedown</code></dt>
+<dd><p>Goes down one screenful.
+</p>
+</dd>
+<dt><code>firstline</code></dt>
+<dd><p>Goes to the first line of the file.
+</p>
+</dd>
+<dt><code>lastline</code></dt>
+<dd><p>Goes to the last line of the file.
+</p>
+</dd>
+<dt><code>gotoline</code></dt>
+<dd><p>Goes to a specific line (and column if specified).  Negative numbers count
+from the end of the file (and end of the line).
+</p>
+</dd>
+<dt><code>findbracket</code></dt>
+<dd><p>Moves the cursor to the bracket (or brace or parenthesis, etc.) that matches
+(pairs) with the one under the cursor.  See <a href="#set-matchbrackets"><code>set matchbrackets</code></a>.
+</p>
+</dd>
+<dt><code>anchor</code></dt>
+<dd><p>Places an anchor at the current line, or removes it when already present.
+(An anchor is visible when line numbers are activated.)
+</p>
+</dd>
+<dt><code>prevanchor</code></dt>
+<dd><p>Goes to the first anchor before the current line.
+</p>
+</dd>
+<dt><code>nextanchor</code></dt>
+<dd><p>Goes to the first anchor after the current line.
+</p>
+</dd>
+<dt><code>prevbuf</code></dt>
+<dd><p>Switches to editing/viewing the previous buffer when multiple buffers are open.
+</p>
+</dd>
+<dt><code>nextbuf</code></dt>
+<dd><p>Switches to editing/viewing the next buffer when multiple buffers are open.
+</p>
+</dd>
+<dt><code>verbatim</code></dt>
+<dd><p>Inserts the next keystroke verbatim into the file.
+</p>
+</dd>
+<dt><code>tab</code></dt>
+<dd><p>Inserts a tab at the current cursor location.
+</p>
+</dd>
+<dt><code>enter</code></dt>
+<dd><p>Inserts a new line below the current one.
+</p>
+</dd>
+<dt><code>delete</code></dt>
+<dd><p>Deletes the character under the cursor.
+</p>
+</dd>
+<dt><code>backspace</code></dt>
+<dd><p>Deletes the character before the cursor.
+</p>
+</dd>
+<dt><code>recordmacro</code></dt>
+<dd><p>Starts the recording of keystrokes &mdash; the keystrokes are stored
+as a macro.  When already recording, the recording is stopped.
+</p>
+</dd>
+<dt><code>runmacro</code></dt>
+<dd><p>Replays the keystrokes of the last recorded macro.
+</p>
+</dd>
+<dt><code>undo</code></dt>
+<dd><p>Undoes the last performed text action (add text, delete text, etc).
+</p>
+</dd>
+<dt><code>redo</code></dt>
+<dd><p>Redoes the last undone action (i.e., it undoes an undo).
+</p>
+</dd>
+<dt><code>refresh</code></dt>
+<dd><p>Refreshes the screen.
+</p>
+</dd>
+<dt><code>suspend</code></dt>
+<dd><p>Suspends the editor (if the suspending function is enabled, see the
+<code>suspendable</code> toggle item below).
+</p>
+</dd>
+<dt><code>casesens</code></dt>
+<dd><p>Toggles whether searching/replacing ignores or respects the case of
+the given characters.
+</p>
+</dd>
+<dt><code>regexp</code></dt>
+<dd><p>Toggles whether searching/replacing uses literal strings or regular expressions.
+</p>
+</dd>
+<dt><code>backwards</code></dt>
+<dd><p>Toggles whether searching/replacing goes forward or backward.
+</p>
+</dd>
+<dt><code>older</code></dt>
+<dd><p>Retrieves the previous (earlier) entry at a prompt.
+</p>
+</dd>
+<dt><code>newer</code></dt>
+<dd><p>Retrieves the next (later) entry at a prompt.
+</p>
+</dd>
+<dt><code>flipreplace</code></dt>
+<dd><p>Toggles between searching for something and replacing something.
+</p>
+</dd>
+<dt><code>flipgoto</code></dt>
+<dd><p>Toggles between searching for text and targeting a line number.
+</p>
+</dd>
+<dt><code>flipexecute</code></dt>
+<dd><p>Toggles between inserting a file and executing a command.
+</p>
+</dd>
+<dt><code>flippipe</code></dt>
+<dd><p>When executing a command, toggles whether the current buffer (or marked
+region) is piped to the command.
+</p>
+</dd>
+<dt><code>flipnewbuffer</code></dt>
+<dd><p>Toggles between inserting into the current buffer and into a new
+empty buffer.
+</p>
+</dd>
+<dt><code>flipconvert</code></dt>
+<dd><p>When reading in a file, toggles between converting and not converting
+it from DOS/Mac format.  Converting is the default.
+</p>
+</dd>
+<dt><code>dosformat</code></dt>
+<dd><p>When writing a file, switches to writing a DOS format (CR/LF).
+</p>
+</dd>
+<dt><code>macformat</code></dt>
+<dd><p>When writing a file, switches to writing a Mac format.
+</p>
+</dd>
+<dt><code>append</code></dt>
+<dd><p>When writing a file, appends to the end instead of overwriting.
+</p>
+</dd>
+<dt><code>prepend</code></dt>
+<dd><p>When writing a file, &rsquo;prepends&rsquo; (writes at the beginning) instead of overwriting.
+</p>
+</dd>
+<dt><code>backup</code></dt>
+<dd><p>When writing a file, creates a backup of the current file.
+</p>
+</dd>
+<dt><code>discardbuffer</code></dt>
+<dd><p>When about to write a file, discard the current buffer without saving.
+(This function is bound by default only when option <samp>--saveonexit</samp>
+is in effect.)
+</p>
+</dd>
+<dt><code>browser</code></dt>
+<dd><p>Starts the file browser (in the Read File and Write Out menus),
+allowing to select a file from a list.
+</p>
+</dd>
+<dt><code>gotodir</code></dt>
+<dd><p>Goes to a directory to be specified, allowing to browse anywhere
+in the filesystem.
+</p>
+</dd>
+<dt><code>firstfile</code></dt>
+<dd><p>Goes to the first file in the list when using the file browser.
+</p>
+</dd>
+<dt><code>lastfile</code></dt>
+<dd><p>Goes to the last file in the list when using the file browser.
+</p>
+</dd>
+<dt><code>nohelp</code></dt>
+<dd><p>Toggles the presence of the two-line list of key bindings at the bottom of the screen.
+(This toggle is special: it is available in all menus except the help viewer
+and the linter.  All further toggles are available in the main menu only.)
+</p>
+</dd>
+<dt><code>constantshow</code></dt>
+<dd><p>Toggles the constant display of the current line, column, and character positions.
+</p>
+</dd>
+<dt><code>softwrap</code></dt>
+<dd><p>Toggles the displaying of overlong lines on multiple screen lines.
+</p>
+</dd>
+<dt><code>linenumbers</code></dt>
+<dd><p>Toggles the display of line numbers in front of the text.
+</p>
+</dd>
+<dt><code>whitespacedisplay</code></dt>
+<dd><p>Toggles the showing of whitespace.
+</p>
+</dd>
+<dt><code>nosyntax</code></dt>
+<dd><p>Toggles syntax highlighting.
+</p>
+</dd>
+<dt><code>smarthome</code></dt>
+<dd><p>Toggles the smartness of the Home key.
+</p>
+</dd>
+<dt><code>autoindent</code></dt>
+<dd><p>Toggles whether a newly created line will contain the same amount of leading
+whitespace as the preceding line &mdash; or as the next line if the preceding line
+is the beginning of a paragraph.
+</p>
+</dd>
+<dt><code>cutfromcursor</code></dt>
+<dd><p>Toggles whether cutting text will cut the whole line or just from the current cursor
+position to the end of the line.
+</p>
+</dd>
+<dt><code>nowrap</code></dt>
+<dd><p>Toggles whether long lines will be hard-wrapped to the next line.
+</p>
+</dd>
+<dt><code>tabstospaces</code></dt>
+<dd><p>Toggles whether typed tabs will be converted to spaces.
+</p>
+</dd>
+<dt><code>mouse</code></dt>
+<dd><p>Toggles mouse support.
+</p>
+</dd>
+<dt><code>suspendable</code></dt>
+<dd><p>Toggles whether the suspend keystroke (<kbd>^Z</kbd> by default)
+will actually suspend the editor.
+(The old name of this function, &rsquo;suspendenable&rsquo;, is deprecated.)
+</p>
+</dd>
+</dl>
+
+<br>
+<p>Valid names for <code>menu</code> are:
+</p>
+<dl compact="compact">
+<dt><code>main</code></dt>
+<dd><p>The main editor window where text is entered and edited.
+</p>
+</dd>
+<dt><code>help</code></dt>
+<dd><p>The help-viewer menu.
+</p>
+</dd>
+<dt><code>search</code></dt>
+<dd><p>The search menu (AKA whereis).
+</p>
+</dd>
+<dt><code>replace</code></dt>
+<dd><p>The &rsquo;search to replace&rsquo; menu.
+</p>
+</dd>
+<dt><code>replacewith</code></dt>
+<dd><p>The &rsquo;replace with&rsquo; menu, which comes up after &rsquo;search to replace&rsquo;.
+</p>
+</dd>
+<dt><code>yesno</code></dt>
+<dd><p>The &rsquo;yesno&rsquo; menu, where the Yes/No/All/Cancel question is asked.
+</p>
+</dd>
+<dt><code>gotoline</code></dt>
+<dd><p>The &rsquo;goto line (and column)&rsquo; menu.
+</p>
+</dd>
+<dt><code>writeout</code></dt>
+<dd><p>The &rsquo;write file&rsquo; menu.
+</p>
+</dd>
+<dt><code>insert</code></dt>
+<dd><p>The &rsquo;insert file&rsquo; menu.
+</p>
+</dd>
+<dt><code>browser</code></dt>
+<dd><p>The &rsquo;file browser&rsquo; menu, for selecting a file to be opened or
+inserted or written to.
+</p>
+</dd>
+<dt><code>whereisfile</code></dt>
+<dd><p>The &rsquo;search for a file&rsquo; menu in the file browser.
+</p>
+</dd>
+<dt><code>gotodir</code></dt>
+<dd><p>The &rsquo;go to directory&rsquo; menu in the file browser.
+</p>
+</dd>
+<dt><code>execute</code></dt>
+<dd><p>The menu for inserting the output from an external command,
+or for filtering the buffer (or the marked region) through
+an external command, or for executing one of several tools.
+(The old form of this menu name, &rsquo;extcmd&rsquo;, is deprecated.)
+</p>
+</dd>
+<dt><code>spell</code></dt>
+<dd><p>The menu of the integrated spell checker where the user can edit a misspelled word.
+</p>
+</dd>
+<dt><code>linter</code></dt>
+<dd><p>The linter menu, which allows jumping through the linting messages.
+</p>
+</dd>
+<dt><code>all</code></dt>
+<dd><p>A special name that encompasses all menus.  For <code>bind</code> it means
+all menus where the specified <code>function</code> exists; for <code>unbind</code>
+it means all menus where the specified <code>key</code> exists.
+</p>
+</dd>
+</dl>
+
+
+<hr>
+<span id="Pico-Compatibility"></span><span id="Pico-Compatibility-1"></span><h2 class="chapter">9 Pico Compatibility</h2>
+
+<p><code>nano</code> emulates Pico quite closely, but there
+are some differences between the two editors:
+</p>
+<dl compact="compact">
+<dt><code>Hard-Wrapping</code></dt>
+<dd><p>Unlike Pico, <code>nano</code> does not automatically hard-wrap the current
+line when it becomes overlong during typing.  This hard-wrapping can be
+switched on with the <samp>--breaklonglines</samp> option.  With that option,
+<code>nano</code> by default breaks lines at screen width minus eight columns,
+whereas Pico does it at screen width minus six columns. You can make
+<code>nano</code> do as Pico by using <samp>--fill=-6</samp>.
+</p>
+</dd>
+<dt><code>Scrolling</code></dt>
+<dd><p>By default, <code>nano</code> will scroll just one line (instead of half
+a screen) when the cursor is moved to a line that is just out of view.
+And when paging up or down, <code>nano</code> keeps the cursor in the same
+screen position as much as possible, instead of always placing it on the
+first line of the viewport.  The Pico-like behavior can be obtained
+with the <samp>--jumpyscrolling</samp> option.
+</p>
+</dd>
+<dt><code>Edit Area</code></dt>
+<dd><p>Pico never uses the line directly below the title bar, leaving it always
+blank.  <code>nano</code> includes this line in the editing area, in order
+to not waste space, and because in this way it is slightly clearer where
+the text starts.  If you are accustomed to this line being empty, you can
+get it back with the <samp>--emptyline</samp> option.
+</p>
+</dd>
+<dt><code>Interactive Replace</code></dt>
+<dd><p>Instead of allowing you to replace either just one occurrence of a search
+string or all of them, <code>nano</code>&rsquo;s replace function is interactive: it
+will pause at each found search string and query whether to replace this
+instance.  You can then choose Yes, or No (skip this one), or All (don&rsquo;t
+ask any more), or Cancel (stop with replacing).
+</p>
+</dd>
+<dt><code>Search and Replace History</code></dt>
+<dd><p>When the option <samp>-H</samp> or <samp>--historylog</samp> is given (or set in
+the a nanorc file), text entered as search or replace strings is stored.
+These strings can be accessed with the up/down arrow keys, or you can
+type the first few characters and then use <kbd>Tab</kbd> to cycle through the
+matching strings.  A retrieved string can subsequently be edited.
+</p>
+</dd>
+<dt><code>Position History</code></dt>
+<dd><p>When the option <samp>-P</samp> or <samp>--positionlog</samp> is given (or set in
+a nanorc file), <code>nano</code> will store the position of the cursor
+when you close a file, and will place the cursor in that position
+again when you later reopen the file.
+</p>
+</dd>
+<dt><code>Current Cursor Position</code></dt>
+<dd><p>The output of the &quot;Display Cursor Position&quot; command (<kbd>^C</kbd>) displays
+not only the current line and character position of the cursor,
+but also (between the two) the current column position.
+</p>
+</dd>
+<dt><code>Spell Checking</code></dt>
+<dd><p>In the internal spell checker misspelled words are sorted alphabetically
+and trimmed for uniqueness, such that the words &rsquo;apple&rsquo; and &rsquo;Apple&rsquo; will
+be prompted for correction separately.
+</p>
+</dd>
+<dt><code>Writing Selected Text to Files</code></dt>
+<dd><p>When using the Write-Out key (<kbd>^O</kbd>), text that has been selected using the
+marking key (<kbd>^^</kbd>) can not just be written out to a new (or existing) file,
+it can also be appended or prepended to an existing file.
+</p>
+</dd>
+<dt><code>Reading Text from a Command</code></dt>
+<dd><p>When using the Read-File key (<kbd>^R</kbd>), <code>nano</code> can not just read a file,
+it can also read the output of a command to be run (<kbd>^X</kbd>).
+</p>
+</dd>
+<dt><code>Reading from Working Directory</code></dt>
+<dd><p>By default, Pico will read files from the user&rsquo;s home directory (when
+using <kbd>^R</kbd>), but it will write files to the current working directory
+(when using <kbd>^O</kbd>).  <code>nano</code> makes this symmetrical: always reading
+from and writing to the current working directory &mdash; the directory
+that <code>nano</code> was started in.
+</p>
+</dd>
+<dt><code>File Browser</code></dt>
+<dd><p>In the file browser, <code>nano</code> does not implement the Add, Copy,
+Rename, and Delete commands that Pico provides.  In <code>nano</code> the
+browser is just a file browser, not a file manager.
+</p>
+</dd>
+<dt><code>Toggles</code></dt>
+<dd><p>Many options which alter the functionality of the program can be
+&quot;toggled&quot; on or off using Meta key sequences, meaning the program does
+not have to be restarted to turn a particular feature on or off.
+See <a href="#Feature-Toggles">Feature Toggles</a> for a list of options that can be toggled.
+Or see the list at the end of the main internal help text (<kbd>^G</kbd>) instead.
+</p>
+</dd>
+</dl>
+
+
+<hr>
+<span id="Building-and-Configure-Options"></span><span id="Building-and-Configure-Options-1"></span><h2 class="chapter">10 Building and Configure Options</h2>
+
+<p>Building <code>nano</code> from source is fairly straightforward if you are
+familiar with compiling programs with autoconf support:
+</p>
+<div class="example">
+<pre class="example">  tar xvzf nano-x.y.z.tar.gz
+  cd nano-x.y.z
+  ./configure
+  make
+  make install
+</pre></div>
+
+<p>The possible options to <code>./configure</code> are:
+</p>
+<dl compact="compact">
+<dt><code>--disable-browser</code></dt>
+<dd><p>Exclude the mini file browser that can be called with <kbd>^T</kbd> when
+wanting to read or write a file.
+</p>
+</dd>
+<dt><code>--disable-color</code></dt>
+<dd><p>Exclude support for syntax coloring.  This also eliminates the <samp>-Y</samp>
+command-line option, which allows choosing a specific syntax.
+</p>
+</dd>
+<dt><code>--disable-comment</code></dt>
+<dd><p>Exclude the single-keystroke comment/uncomment function (<kbd>M-3</kbd>).
+</p>
+</dd>
+<dt><code>--disable-extra</code></dt>
+<dd><p>Exclude the Easter egg: a crawl of major contributors.
+</p>
+</dd>
+<dt><code>--disable-help</code></dt>
+<dd><p>Exclude the help texts (<kbd>^G</kbd>).  This makes the binary much smaller,
+but also makes it difficult for new users to learn more than very basic
+things about using the editor.
+</p>
+</dd>
+<dt><code>--disable-histories</code></dt>
+<dd><p>Exclude the code for handling the history files: the search and
+replace strings that were used, and the cursor position at which each
+file was closed.  This also eliminates the <samp>-H</samp> and <samp>-P</samp>
+command-line options, which switch on the logging of search/replace
+strings and cursor positions.
+</p>
+</dd>
+<dt><code>--disable-justify</code></dt>
+<dd><p>Exclude the justify functions (<kbd>^J</kbd> and <kbd>M-J</kbd>).
+</p>
+</dd>
+<dt><code>--disable-libmagic</code></dt>
+<dd><p>Exclude the code for using the library of magic-number tests (for determining
+the file type and thus which syntax to use for coloring &mdash; often the regexes
+for filename and header line will be enough).
+</p>
+</dd>
+<dt><code>--disable-linenumbers</code></dt>
+<dd><p>Exclude the line-numbering function (<kbd>M-N</kbd>).  This also eliminates the
+<samp>-l</samp> command-line option, which turns line numbering on.
+</p>
+</dd>
+<dt><code>--disable-mouse</code></dt>
+<dd><p>Exclude all mouse functionality.  This also eliminates the <samp>-m</samp>
+command-line option, which enables the mouse functionality.
+</p>
+</dd>
+<dt><code>--disable-multibuffer</code></dt>
+<dd><p>Exclude support for opening multiple files at a time and switching
+between them on the fly.  This also eliminates the <samp>-F</samp> command-line
+option, which causes a file to be read into a separate buffer by default.
+</p>
+</dd>
+<dt><code>--disable-nanorc</code></dt>
+<dd><p>Exclude support for reading the nanorc files at startup.  With such
+support, you can store custom settings in a system-wide and a per-user
+nanorc file rather than having to pass command-line options to get
+the desired behavior.  See <a href="#Nanorc-Files">Nanorc Files</a> for more info.
+Disabling this also eliminates the <samp>-I</samp> command-line option,
+which inhibits the reading of nanorc files.
+</p>
+</dd>
+<dt><code>--disable-operatingdir</code></dt>
+<dd><p>Exclude the code for setting the operating directory.  This also eliminates
+the <samp>-o</samp> command-line option, which sets the operating directory.
+</p>
+</dd>
+<dt><code>--disable-speller</code></dt>
+<dd><p>Exclude the code for spell checking.  This also eliminates the <samp>-s</samp>
+command-line option, which allows specifying an alternate spell checker.
+</p>
+</dd>
+<dt><code>--disable-tabcomp</code></dt>
+<dd><p>Exclude tab completion (when nano asks for a filename or a search string).
+</p>
+</dd>
+<dt><code>--disable-wordcomp</code></dt>
+<dd><p>Exclude word completion (<kbd>^]</kbd>).
+</p>
+</dd>
+<dt><code>--disable-wrapping</code></dt>
+<dd><p>Exclude all hard-wrapping of overlong lines.  This also eliminates the
+<samp>-b</samp> and <samp>-w</samp> command-line options, which switch automatic
+long-line wrapping on and off, respectively.
+</p>
+</dd>
+<dt><code>--enable-tiny</code></dt>
+<dd><p>This option implies all of the above.  It also disables some other
+internals of the editor, like the marking code, the cut-to-end-of-line
+code, and the function toggles.  By using the enabling
+counterpart of the above options together with <samp>--enable-tiny</samp>,
+specific features can be switched back on &mdash; but a few cannot.
+</p>
+</dd>
+<dt><code>--enable-debug</code></dt>
+<dd><p>Include some code for runtime debugging output.  This can get pretty messy, so
+chances are you only want this feature when you&rsquo;re working on the nano source.
+</p>
+</dd>
+<dt><code>--disable-nls</code></dt>
+<dd><p>Exclude Native Language support.  This will disable the use of any
+available GNU <code>nano</code> translations.
+</p>
+</dd>
+<dt><code>--enable-utf8</code></dt>
+<dd><p>Include support for reading and writing Unicode files.  This will require
+either a wide version of curses, or a UTF-8-enabled version of Slang.
+</p>
+</dd>
+<dt><code>--disable-utf8</code></dt>
+<dd><p>Exclude support for reading and writing Unicode files.  Normally the
+configure script auto-detects whether to enable UTF-8 support or not.
+You can use this or the previous option to override that detection.
+</p>
+</dd>
+<dt><code>--enable-altrcname=<var>name</var></code></dt>
+<dd><p>Use the file with the given <var>name</var> (in the user&rsquo;s home directory)
+as nano&rsquo;s settings file, instead of the default <code>.nanorc</code>.
+</p>
+</dd>
+<dt><code>--with-slang</code></dt>
+<dd><p>Compile <code>nano</code> against Slang instead of against ncurses or other
+curses libraries.
+</p>
+</dd>
+</dl>
+
+<hr>
+
+<span id="SEC_Contents"></span>
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="no-bullet">
+  <li><a id="toc-Introduction-1" href="#Introduction">1 Introduction</a></li>
+  <li><a id="toc-Invoking-1" href="#Invoking">2 Invoking</a></li>
+  <li><a id="toc-Command_002dline-Options-1" href="#Command_002dline-Options">3 Command-line Options</a></li>
+  <li><a id="toc-Editor-Basics-1" href="#Editor-Basics">4 Editor Basics</a>
+  <ul class="no-bullet">
+    <li><a id="toc-Entering-Text-1" href="#Entering-Text">4.1 Entering Text</a></li>
+    <li><a id="toc-Commands-1" href="#Commands">4.2 Commands</a></li>
+    <li><a id="toc-The-Cutbuffer-1" href="#The-Cutbuffer">4.3 The Cutbuffer</a></li>
+    <li><a id="toc-The-Mark-1" href="#The-Mark">4.4 The Mark</a></li>
+    <li><a id="toc-Screen-Layout-1" href="#Screen-Layout">4.5 Screen Layout</a></li>
+    <li><a id="toc-Search-and-Replace-1" href="#Search-and-Replace">4.6 Search and Replace</a></li>
+    <li><a id="toc-Using-the-Mouse-1" href="#Using-the-Mouse">4.7 Using the Mouse</a></li>
+    <li><a id="toc-Anchors-1" href="#Anchors">4.8 Anchors</a></li>
+    <li><a id="toc-Limitations-1" href="#Limitations">4.9 Limitations</a></li>
+  </ul></li>
+  <li><a id="toc-Built_002din-Help-1" href="#Built_002din-Help">5 Built-in Help</a></li>
+  <li><a id="toc-The-File-Browser-1" href="#The-File-Browser">6 The File Browser</a></li>
+  <li><a id="toc-Feature-Toggles-1" href="#Feature-Toggles">7 Feature Toggles</a></li>
+  <li><a id="toc-Nanorc-Files-1" href="#Nanorc-Files">8 Nanorc Files</a>
+  <ul class="no-bullet">
+    <li><a id="toc-Settings-1" href="#Settings">8.1 Settings</a></li>
+    <li><a id="toc-Syntax-Highlighting-1" href="#Syntax-Highlighting">8.2 Syntax Highlighting</a></li>
+    <li><a id="toc-Rebinding-Keys-1" href="#Rebinding-Keys">8.3 Rebinding Keys</a></li>
+  </ul></li>
+  <li><a id="toc-Pico-Compatibility-1" href="#Pico-Compatibility">9 Pico Compatibility</a></li>
+  <li><a id="toc-Building-and-Configure-Options-1" href="#Building-and-Configure-Options">10 Building and Configure Options</a></li>
+</ul>
+</div>
+
+
+<hr>
+
+
+
+</body>
+</html>
diff --git a/msys2/usr/share/doc/nano/nanorc.5.html b/msys2/usr/share/doc/nano/nanorc.5.html
new file mode 100644
index 000000000..051da4c47
--- /dev/null
+++ b/msys2/usr/share/doc/nano/nanorc.5.html
@@ -0,0 +1,1557 @@
+<!-- Creator     : groff version 1.22.4 -->
+<!-- CreationDate: Wed Dec  2 11:33:23 2020 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<meta name="Content-Style" content="text/css">
+<style type="text/css">
+       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       h1      { text-align: center }
+</style>
+<title>NANORC</title>
+
+</head>
+<body>
+
+<h1 align="center">NANORC</h1>
+
+<a href="#NAME">NAME</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#NOTICE">NOTICE</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#SYNTAX HIGHLIGHTING">SYNTAX HIGHLIGHTING</a><br>
+<a href="#REBINDING KEYS">REBINDING KEYS</a><br>
+<a href="#FILES">FILES</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+
+
+<h2>NAME
+<a name="NAME"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">nanorc &minus;
+GNU nano&rsquo;s configuration file</p>
+
+<h2>DESCRIPTION
+<a name="DESCRIPTION"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">The
+<i>nanorc</i> files contain the default settings for
+<b>nano</b>, a small and friendly editor. During startup, if
+<b>&minus;&minus;rcfile</b> is not given, <b>nano</b> will
+read two files: first the system-wide settings, from
+<i>/etc/nanorc</i> (the exact path might be different on
+your system), and then the user-specific settings, either
+from <i>~/.nanorc</i> or from
+<i>$XDG_CONFIG_HOME/nano/nanorc</i> or from
+<i>~/.config/nano/nanorc</i>, whichever is encountered
+first. If <b>&minus;&minus;rcfile</b> is given, <b>nano</b>
+will read just the specified settings file.</p>
+
+<h2>NOTICE
+<a name="NOTICE"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Since version
+4.0, <b>nano</b> by default:</p>
+
+<p style="margin-left:17%; margin-top: 1em">&bull; does not
+automatically hard-wrap lines that become overlong, <br>
+&bull; includes the line below the title bar in the editing
+area, <br>
+&bull; does linewise (smooth) scrolling.</p>
+
+<p style="margin-left:11%; margin-top: 1em">To get the old,
+Pico behavior back, you can use <b>set breaklonglines</b>,
+<b>set emptyline</b>, and <b>set jumpyscrolling</b>.</p>
+
+<h2>OPTIONS
+<a name="OPTIONS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">The
+configuration file accepts a series of <b>set</b> and
+<b>unset</b> commands, which can be used to configure nano
+on startup without using command-line options. Additionally,
+there are some commands to define syntax highlighting and to
+rebind keys -- see the two separate sections on those.
+<b>nano</b> reads one command per line. All commands and
+keywords should be written in lowercase.</p>
+
+<p style="margin-left:11%; margin-top: 1em">Options in
+<i>nanorc</i> files take precedence over nano&rsquo;s
+defaults, and command-line options override <i>nanorc</i>
+settings. Also, options that do not take an argument are
+unset by default. So using the <b>unset</b> command is only
+needed when wanting to override a setting of the
+system&rsquo;s <i>nanorc</i> file in your own <i>nanorc</i>.
+Options that take an argument cannot be unset.</p>
+
+<p style="margin-left:11%; margin-top: 1em">Quotes inside
+the <i>characters</i> parameters below should not be
+escaped. The last double quote on the line will be seen as
+the closing quote.</p>
+
+<p style="margin-left:11%; margin-top: 1em">The supported
+commands and arguments are: <b><br>
+set afterends</b></p>
+
+<p style="margin-left:15%;">Make Ctrl+Right and Ctrl+Delete
+stop at word ends instead of beginnings.</p>
+
+<p style="margin-left:11%;"><b>set
+allow_insecure_backup</b></p>
+
+<p style="margin-left:15%;">When backing up files, allow
+the backup to succeed even if its permissions can&rsquo;t be
+(re)set due to special OS considerations. You should NOT
+enable this option unless you are sure you need it.</p>
+
+<p style="margin-left:11%;"><b>set atblanks</b></p>
+
+<p style="margin-left:15%;">When soft line wrapping is
+enabled, make it wrap lines at blank characters (tabs and
+spaces) instead of always at the edge of the screen.</p>
+
+<p style="margin-left:11%;"><b>set autoindent</b></p>
+
+<p style="margin-left:15%;">Automatically indent a newly
+created line to the same number of tabs and/or spaces as the
+previous line (or as the next line if the previous line is
+the beginning of a paragraph).</p>
+
+<p style="margin-left:11%;"><b>set backup</b></p>
+
+<p style="margin-left:15%;">When saving a file, create a
+backup file by adding a tilde (<b>~</b>) to the file&rsquo;s
+name.</p>
+
+<p style="margin-left:11%;"><b>set backupdir</b>
+<i>directory</i></p>
+
+<p style="margin-left:15%;">Make and keep not just one
+backup file, but make and keep a uniquely numbered one every
+time a file is saved -- when backups are enabled with <b>set
+backup</b> or <b>&minus;&minus;backup</b> or
+<b>&minus;B</b>. The uniquely numbered files are stored in
+the specified <i>directory</i>.</p>
+
+<p style="margin-left:11%;"><b>set boldtext</b></p>
+
+<p style="margin-left:15%;">Use bold instead of reverse
+video for the title bar, status bar, key combos, function
+tags, line numbers, and selected text. This can be
+overridden by setting the options <b>titlecolor</b>,
+<b>statuscolor</b>, <b>keycolor</b>, <b>functioncolor</b>,
+<b>numbercolor</b>, and <b>selectedcolor</b>.</p>
+
+<p style="margin-left:11%;"><b>set bookstyle</b></p>
+
+<p style="margin-left:15%;">When justifying, treat any line
+that starts with whitespace as the beginning of a paragraph
+(unless auto-indenting is on).</p>
+
+<p style="margin-left:11%;"><b>set brackets
+&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Set the characters treated as
+closing brackets when justifying paragraphs. This may not
+include blank characters. Only closing punctuation (see
+<b>set punct</b>), optionally followed by the specified
+closing brackets, can end sentences. The default value is
+&quot;<b>&quot;&rsquo;)&gt;]}</b>&quot;.</p>
+
+<p style="margin-left:11%;"><b>set breaklonglines</b></p>
+
+<p style="margin-left:15%;">Automatically hard-wrap the
+current line when it becomes overlong.</p>
+
+<p style="margin-left:11%;"><b>set casesensitive</b></p>
+
+<p style="margin-left:15%;">Do case-sensitive searches by
+default.</p>
+
+<p style="margin-left:11%;"><b>set constantshow</b></p>
+
+<p style="margin-left:15%;">Constantly display the cursor
+position in the status bar. This overrides the option
+<b>quickblank</b>.</p>
+
+<p style="margin-left:11%;"><b>set cutfromcursor</b></p>
+
+<p style="margin-left:15%;">Use
+cut-from-cursor-to-end-of-line by default, instead of
+cutting the whole line.</p>
+
+<p style="margin-left:11%;"><b>set emptyline</b></p>
+
+<p style="margin-left:15%;">Do not use the line below the
+title bar, leaving it entirely blank.</p>
+
+<p style="margin-left:11%;"><b>set errorcolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Use this color combination for
+the status bar when an error message is displayed. The
+default value is <b>brightwhite,red</b>. See <b>set
+titlecolor</b> for valid color names.</p>
+
+<p style="margin-left:11%;"><b>set fill</b>
+<i>number</i></p>
+
+<p style="margin-left:15%;">Set the target width for
+justifying and automatic hard-wrapping at this <i>number</i>
+of columns. If the value is 0 or less, wrapping will occur
+at the width of the screen minus <i>number</i> columns,
+allowing the wrap point to vary along with the width of the
+screen if the screen is resized. The default value is
+<b>&minus;8</b>.</p>
+
+<p style="margin-left:11%;"><b>set functioncolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the function descriptions in the two help lines
+at the bottom of the screen. See <b>set titlecolor</b> for
+more details.</p>
+
+<p style="margin-left:11%;"><b>set guidestripe</b>
+<i>number</i></p>
+
+<p style="margin-left:15%;">Draw a vertical stripe at the
+given column, to help judge the width of the text. (The
+color of the stripe can be changed with <b>set
+stripecolor</b>.)</p>
+
+<p style="margin-left:11%;"><b>set historylog</b></p>
+
+<p style="margin-left:15%;">Save the last hundred search
+strings and replacement strings and executed commands, so
+they can be easily reused in later sessions.</p>
+
+<p style="margin-left:11%;"><b>set indicator</b></p>
+
+<p style="margin-left:15%;">Display a &quot;scrollbar&quot;
+on the righthand side of the edit window. It shows the
+position of the viewport in the buffer and how much of the
+buffer is covered by the viewport.</p>
+
+<p style="margin-left:11%;"><b>set jumpyscrolling</b></p>
+
+<p style="margin-left:15%;">Scroll the buffer contents per
+half-screen instead of per line.</p>
+
+<p style="margin-left:11%;"><b>set keycolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the shortcut key combos in the two help lines at
+the bottom of the screen. See <b>set titlecolor</b> for more
+details.</p>
+
+<p style="margin-left:11%;"><b>set linenumbers</b></p>
+
+<p style="margin-left:15%;">Display line numbers to the
+left of the text area. (Any line with an anchor additionally
+gets a mark in the margin.)</p>
+
+<p style="margin-left:11%;"><b>set locking</b></p>
+
+<p style="margin-left:15%;">Enable vim-style lock-files for
+when editing files.</p>
+
+<p style="margin-left:11%;"><b>set magic</b></p>
+
+<p style="margin-left:15%;">When neither the file&rsquo;s
+name nor its first line give a clue, try using libmagic to
+determine the applicable syntax. (Calling libmagic can be
+relatively time consuming. It is therefore not done by
+default.)</p>
+
+<p style="margin-left:11%;"><b>set matchbrackets
+&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Specify the opening and closing
+brackets that can be found by bracket searches. This may not
+include blank characters. The opening set must come before
+the closing set, and the two sets must be in the same order.
+The default value is &quot;<b>(&lt;[{)&gt;]}</b>&quot;.</p>
+
+<p style="margin-left:11%;"><b>set morespace</b></p>
+
+<p style="margin-left:15%;">Deprecated option since it has
+become the default setting. When needed, use <b>unset
+emptyline</b> instead.</p>
+
+<p style="margin-left:11%;"><b>set mouse</b></p>
+
+<p style="margin-left:15%;">Enable mouse support, if
+available for your system. When enabled, mouse clicks can be
+used to place the cursor, set the mark (with a double
+click), and execute shortcuts. The mouse will work in the X
+Window System, and on the console when gpm is running. Text
+can still be selected through dragging by holding down the
+Shift key.</p>
+
+<p style="margin-left:11%;"><b>set multibuffer</b></p>
+
+<p style="margin-left:15%;">When reading in a file with
+<b>^R</b>, insert it into a new buffer by default.</p>
+
+<p style="margin-left:11%;"><b>set noconvert</b></p>
+
+<p style="margin-left:15%;">Don&rsquo;t convert files from
+DOS/Mac format.</p>
+
+<p style="margin-left:11%;"><b>set nohelp</b></p>
+
+<p style="margin-left:15%;">Don&rsquo;t display the two
+help lines at the bottom of the screen.</p>
+
+<p style="margin-left:11%;"><b>set nonewlines</b></p>
+
+<p style="margin-left:15%;">Don&rsquo;t automatically add a
+newline when a text does not end with one. (This can cause
+you to save non-POSIX text files.)</p>
+
+<p style="margin-left:11%;"><b>set nopauses</b></p>
+
+<p style="margin-left:15%;">Obsolete option. Ignored.</p>
+
+<p style="margin-left:11%;"><b>set nowrap</b></p>
+
+<p style="margin-left:15%;">Deprecated option since it has
+become the default setting. When needed, use <b>unset
+breaklonglines</b> instead.</p>
+
+<p style="margin-left:11%;"><b>set numbercolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for line numbers. See <b>set titlecolor</b> for more
+details.</p>
+
+<p style="margin-left:11%;"><b>set operatingdir</b>
+<i>directory</i></p>
+
+<p style="margin-left:15%;"><b>nano</b> will only read and
+write files inside <i>directory</i> and its subdirectories.
+Also, the current directory is changed to here, so files are
+inserted from this directory. By default, the operating
+directory feature is turned off.</p>
+
+<p style="margin-left:11%;"><b>set positionlog</b></p>
+
+<p style="margin-left:15%;">Save the cursor position of
+files between editing sessions. The cursor position is
+remembered for the 200 most-recently edited files.</p>
+
+<p style="margin-left:11%;"><b>set preserve</b></p>
+
+<p style="margin-left:15%;">Preserve the XON and XOFF keys
+(<b>^Q</b> and <b>^S</b>).</p>
+
+<p style="margin-left:11%;"><b>set punct
+&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Set the characters treated as
+closing punctuation when justifying paragraphs. This may not
+include blank characters. Only the specfified closing
+punctuation, optionally followed by closing brackets (see
+<b>brackets</b>), can end sentences. The default value is
+&quot;<b>!.?</b>&quot;.</p>
+
+<p style="margin-left:11%;"><b>set quickblank</b></p>
+
+<p style="margin-left:15%;">Do quick status-bar blanking:
+status-bar messages will disappear after 1 keystroke instead
+of 25. The option <b>constantshow</b> overrides this.</p>
+
+<p style="margin-left:11%;"><b>set quotestr
+&quot;</b><i>regex</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Set the regular expression for
+matching the quoting part of a line. The default value is
+&quot;<b>^([&nbsp;\t]*([!#%:;&gt;|}]|//))+</b>&quot;. (Note
+that <b>\t</b> stands for an actual Tab character.) This
+makes it possible to rejustify blocks of quoted text when
+composing email, and to rewrap blocks of line comments when
+writing source code.</p>
+
+<p style="margin-left:11%;"><b>set rawsequences</b></p>
+
+<p style="margin-left:15%;">Interpret escape sequences
+directly (instead of asking <b>ncurses</b> to translate
+them). If you need this option to get your keyboard to work
+properly, please report a bug. Using this option disables
+<b>nano</b>&rsquo;s mouse support.</p>
+
+<p style="margin-left:11%;"><b>set rebinddelete</b></p>
+
+<p style="margin-left:15%;">Interpret the Delete and
+Backspace keys differently so that both Backspace and Delete
+work properly. You should only use this option when on your
+system either Backspace acts like Delete or Delete acts like
+Backspace.</p>
+
+<p style="margin-left:11%;"><b>set regexp</b></p>
+
+<p style="margin-left:15%;">Do regular-expression searches
+by default. Regular expressions in <b>nano</b> are of the
+extended type (ERE).</p>
+
+<p style="margin-left:11%;"><b>set saveonexit</b></p>
+
+<p style="margin-left:15%;">Save a changed buffer
+automatically on exit (<b>^X</b>); don&rsquo;t prompt. (The
+old form of this option, <b>set tempfile</b>, is
+deprecated.)</p>
+
+<p style="margin-left:11%;"><b>set scrollercolor</b>
+<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the indicator alias &quot;scrollbar&quot;. (On
+terminal emulators that link to a libvte older than version
+0.55, using a background color here does not work
+correctly.) See <b>set titlecolor</b> for more details.</p>
+
+<p style="margin-left:11%;"><b>set selectedcolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for selected text. See <b>set titlecolor</b> for more
+details.</p>
+
+<p style="margin-left:11%;"><b>set showcursor</b></p>
+
+<p style="margin-left:15%;">Put the cursor on the
+highlighted item in the file browser, to aid braille
+users.</p>
+
+<p style="margin-left:11%;"><b>set smarthome</b></p>
+
+<p style="margin-left:15%;">Make the Home key smarter. When
+Home is pressed anywhere but at the very beginning of
+non-whitespace characters on a line, the cursor will jump to
+that beginning (either forwards or backwards). If the cursor
+is already at that position, it will jump to the true
+beginning of the line.</p>
+
+<p style="margin-left:11%;"><b>set smooth</b></p>
+
+<p style="margin-left:15%;">Deprecated option since it has
+become the default setting. When needed, use <b>unset
+jumpyscrolling</b> instead.</p>
+
+<p style="margin-left:11%;"><b>set softwrap</b></p>
+
+<p style="margin-left:15%;">Display lines that exceed the
+screen&rsquo;s width over multiple screen lines. (You can
+make this soft-wrapping occur at whitespace instead of
+rudely at the screen&rsquo;s edge, by using also <b>set
+atblanks</b>.)</p>
+
+<p style="margin-left:11%;"><b>set speller
+&quot;</b><i>program</i> [<i>argument</i>
+...]<b>&quot;</b></p>
+
+<p style="margin-left:15%;">Use the given <i>program</i> to
+do spell checking and correcting, instead of using the
+built-in corrector that calls <b>hunspell</b>(1) or
+<b>spell</b>(1).</p>
+
+<p style="margin-left:11%;"><b>set stateflags</b></p>
+
+<p style="margin-left:15%;">Use the top-right corner of the
+screen for showing some state flags: <b>I</b> when
+auto-indenting, <b>M</b> when the mark is on, <b>L</b> when
+hard-wrapping (breaking long lines), <b>R</b> when recording
+a macro, and <b>S</b> when soft-wrapping. When the buffer is
+modified, a star (<b>*</b>) is shown after the filename in
+the center of the title bar.</p>
+
+<p style="margin-left:11%;"><b>set statuscolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the status bar. See <b>set titlecolor</b> for
+more details.</p>
+
+<p style="margin-left:11%;"><b>set stripecolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the vertical guiding stripe. See <b>set
+titlecolor</b> for more details.</p>
+
+<p style="margin-left:11%;"><b>set suspendable</b></p>
+
+<p style="margin-left:15%;">Allow <b>nano</b> to be
+suspended (with <b>^Z</b> by default).</p>
+
+<p style="margin-left:11%;"><b>set tabsize</b>
+<i>number</i></p>
+
+<p style="margin-left:15%;">Use a tab size of <i>number</i>
+columns. The value of <i>number</i> must be greater than 0.
+The default value is <b>8</b>.</p>
+
+<p style="margin-left:11%;"><b>set tabstospaces</b></p>
+
+<p style="margin-left:15%;">Convert typed tabs to
+spaces.</p>
+
+<p style="margin-left:11%;"><b>set titlecolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the title bar. Valid names for the foreground and
+background colors are: <b>red</b>, <b>green</b>,
+<b>blue</b>, <b>magenta</b>, <b>yellow</b>, <b>cyan</b>,
+<b>white</b>, and <b>black</b>. Each of these eight names
+may be prefixed with the word <b>light</b> to get a brighter
+version of that color. On terminal emulators that can do at
+least 256 colors, other valid (but unprefixable) color names
+are: <b>pink</b>, <b>purple</b>, <b>mauve</b>,
+<b>lagoon</b>, <b>mint</b>, <b>lime</b>, <b>peach</b>,
+<b>orange</b>, <b>latte</b>, and <b>normal</b> -- where
+<b>normal</b> means the default foreground or background
+color. Either &quot;<i>fgcolor</i>&quot; or
+&quot;<b>,</b><i>bgcolor</i>&quot; may be left out, and the
+pair may be preceded by <b>bold</b> and/or <b>italic</b>
+(separated by commas) to get a bold and/or slanting
+typeface, if your terminal can do those.</p>
+
+<p style="margin-left:11%;"><b>set trimblanks</b></p>
+
+<p style="margin-left:15%;">Remove trailing whitespace from
+wrapped lines when automatic hard-wrapping occurs or when
+text is justified.</p>
+
+<p style="margin-left:11%;"><b>set unix</b></p>
+
+<p style="margin-left:15%;">Save a file by default in Unix
+format. This overrides nano&rsquo;s default behavior of
+saving a file in the format that it had. (This option has no
+effect when you also use <b>set noconvert</b>.)</p>
+
+<p style="margin-left:11%;"><b>set whitespace
+&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Set the two characters used to
+indicate the presence of tabs and spaces. They must be
+single-column characters. The default pair for a UTF-8
+locale is &quot;<b>&raquo;&sdot;</b>&quot;, and for other
+locales &quot;<b>&gt;.</b>&quot;.</p>
+
+<p style="margin-left:11%;"><b>set wordbounds</b></p>
+
+<p style="margin-left:15%;">Detect word boundaries
+differently by treating punctuation characters as parts of
+words.</p>
+
+<p style="margin-left:11%;"><b>set wordchars
+&quot;</b><i>characters</i><b>&quot;</b></p>
+
+<p style="margin-left:15%;">Specify which other characters
+(besides the normal alphanumeric ones) should be considered
+as parts of words. When using this option, you probably want
+to unset <b>wordbounds</b>.</p>
+
+<p style="margin-left:11%;"><b>set zap</b></p>
+
+<p style="margin-left:15%;">Let an unmodified Backspace or
+Delete erase the marked region (instead of a single
+character, and without affecting the cutbuffer).</p>
+
+<h2>SYNTAX HIGHLIGHTING
+<a name="SYNTAX HIGHLIGHTING"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Coloring the
+different syntactic elements of a file is done via regular
+expressions (see the <b>color</b> command below). This is
+inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file. Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like <b>nano</b>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">All regular
+expressions in <b>nano</b> are POSIX extended regular
+expressions. This means that <b>.</b>, <b>?</b>, <b>*</b>,
+<b>+</b>, <b>^</b>, <b>$</b>, and several other characters
+are special. The period <b>.</b> matches any single
+character, <b>?</b> means the preceding item is optional,
+<b>*</b> means the preceding item may be matched zero or
+more times, <b>+</b> means the preceding item must be
+matched one or more times, <b>^</b> matches the beginning of
+a line, and <b>$</b> the end, <b>\&lt;</b> matches the start
+of a word, and <b>\&gt;</b> the end, and <b>\s</b> matches a
+blank. It also means that lookahead and lookbehind are not
+possible. A complete explanation can be found in the manual
+page of GNU grep: <b>man grep</b>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">For each kind
+of file a separate syntax can be defined via the following
+commands: <b><br>
+syntax</b> <i>name</i>
+[<b>&quot;</b><i>fileregex</i><b>&quot;</b> ...]</p>
+
+<p style="margin-left:22%;">Start the definition of a
+syntax with this <i>name</i>. All subsequent <b>color</b>
+and other such commands will be added to this syntax, until
+a new <b>syntax</b> command is encountered.</p>
+
+<p style="margin-left:22%; margin-top: 1em">When
+<b>nano</b> is run, this syntax will be automatically
+activated if the current filename matches the extended
+regular expression <i>fileregex</i>. Or the syntax can be
+explicitly activated by using the <b>&minus;Y</b> or
+<b>&minus;&minus;syntax</b> command-line option followed by
+the <i>name</i>.</p>
+
+<p style="margin-left:22%; margin-top: 1em">The syntax
+<b>default</b> is special: it takes no <i>fileregex</i>, and
+applies to files that don&rsquo;t match any syntax&rsquo;s
+regexes. The syntax <b>none</b> is reserved; specifying it
+on the command line is the same as not having a syntax at
+all.</p>
+
+<p style="margin-left:11%;"><b>header
+&quot;</b><i>regex</i><b>&quot;</b> ...</p>
+
+<p style="margin-left:22%;">If from all defined syntaxes no
+<i>fileregex</i> matched, then compare this <i>regex</i> (or
+regexes) against the first line of the current file, to
+determine whether this syntax should be used for it.</p>
+
+<p style="margin-left:11%;"><b>magic
+&quot;</b><i>regex</i><b>&quot;</b> ...</p>
+
+<p style="margin-left:22%;">If no <i>fileregex</i> matched
+and no <b>header</b> regex matched either, then compare this
+<i>regex</i> (or regexes) against the result of querying the
+<b>magic</b> database about the current file, to determine
+whether this syntax should be used for it. (This
+functionality only works when <b>libmagic</b> is installed
+on the system and will be silently ignored otherwise.)</p>
+
+<p style="margin-left:11%;"><b>formatter</b> <i>program</i>
+[<i>argument</i> ...]</p>
+
+<p style="margin-left:22%;">Run the given <i>program</i> on
+the full contents of the current buffer. (The current buffer
+is written out to a temporary file, the program is run on
+it, and then the temporary file is read back in, replacing
+the contents of the buffer.)</p>
+
+<p style="margin-left:11%;"><b>linter</b> <i>program</i>
+[<i>argument</i> ...]</p>
+
+<p style="margin-left:22%;">Use the given <i>program</i> to
+run a syntax check on the current buffer.</p>
+
+<p style="margin-left:11%;"><b>comment
+&quot;</b><i>string</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Use the given <i>string</i> for
+commenting and uncommenting lines. If the string contains a
+vertical bar or pipe character (<b>|</b>), this designates
+bracket-style comments; for example,
+&quot;<b>/*|*/</b>&quot; for CSS files. The characters
+before the pipe are prepended to the line and the characters
+after the pipe are appended at the end of the line. If no
+pipe character is present, the full string is prepended; for
+example, &quot;<b>#</b>&quot; for Python files. If empty
+double quotes are specified, the comment/uncomment function
+is disabled; for example, &quot;&quot; for JSON. The default
+value is &quot;<b>#</b>&quot;.</p>
+
+<p style="margin-left:11%;"><b>tabgives
+&quot;</b><i>string</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Make the &lt;Tab&gt; key
+produce the given <i>string</i>. Useful for languages like
+Python that want to see only spaces for indentation. This
+overrides the setting of the <b>tabstospaces</b> option.</p>
+
+<p style="margin-left:11%;"><b>color</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i>
+<b>&quot;</b><i>regex</i><b>&quot;</b> ...</p>
+
+<p style="margin-left:22%;">Paint all pieces of text that
+match the extended regular expression <i>regex</i> with the
+given foreground and background colors, at least one of
+which must be specified. Valid color names are: <b>red</b>,
+<b>green</b>, <b>blue</b>, <b>magenta</b>, <b>yellow</b>,
+<b>cyan</b>, <b>white</b>, and <b>black</b>. Each of these
+eight names may be prefixed with the word <b>light</b> to
+get a brighter version of that color. On terminal emulators
+that can do at least 256 colors, other valid (but
+unprefixable) color names are: <b>pink</b>, <b>purple</b>,
+<b>mauve</b>, <b>lagoon</b>, <b>mint</b>, <b>lime</b>,
+<b>peach</b>, <b>orange</b>, <b>latte</b>, and <b>normal</b>
+-- where <b>normal</b> means the default foreground or
+background color. The color pair may be preceded by
+<b>bold</b> and/or <b>italic</b> (separated by commas) to
+get a bold and/or slanting typeface, if your terminal can do
+those.</p>
+
+<p style="margin-left:22%; margin-top: 1em">All coloring
+commands are applied in the order in which they are
+specified, which means that later commands can recolor stuff
+that was colored earlier.</p>
+
+<p style="margin-left:11%;"><b>icolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i>
+<b>&quot;</b><i>regex</i><b>&quot;</b> ...</p>
+
+<p style="margin-left:22%;">Same as above, except that the
+matching is case insensitive.</p>
+
+<p style="margin-left:11%;"><b>color</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i>
+<b>start=&quot;</b><i>fromrx</i><b>&quot;
+end=&quot;</b><i>torx</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Paint all pieces of text whose
+start matches extended regular expression <i>fromrx</i> and
+whose end matches extended regular expression <i>torx</i>
+with the given foreground and background colors, at least
+one of which must be specified. This means that, after an
+initial instance of <i>fromrx</i>, all text until the first
+instance of <i>torx</i> will be colored. This allows syntax
+highlighting to span multiple lines.</p>
+
+<p style="margin-left:11%;"><b>icolor</b>
+[<b>bold,</b>][<b>italic,</b>]<i>fgcolor</i><b>,</b><i>bgcolor</i>
+<b>start=&quot;</b><i>fromrx</i><b>&quot;
+end=&quot;</b><i>torx</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Same as above, except that the
+matching is case insensitive.</p>
+
+<p style="margin-left:11%;"><b>include
+&quot;</b><i>syntaxfile</i><b>&quot;</b></p>
+
+<p style="margin-left:22%;">Read in self-contained color
+syntaxes from <i>syntaxfile</i>. Note that <i>syntaxfile</i>
+may contain only the above commands, from <b>syntax</b> to
+<b>icolor</b>.</p>
+
+<p style="margin-left:11%;"><b>extendsyntax</b> <i>name
+command argument</i> ...</p>
+
+<p style="margin-left:22%;">Extend the syntax previously
+defined as <i>name</i> with another <i>command</i>. This
+allows adding a new <b>color</b>, <b>icolor</b>,
+<b>header</b>, <b>magic</b>, <b>formatter</b>,
+<b>linter</b>, <b>comment</b>, or <b>tabgives</b> command to
+an already defined syntax -- useful when you want to
+slightly improve a syntax defined in one of the
+system-installed files (which normally are not
+writable).</p>
+
+<h2>REBINDING KEYS
+<a name="REBINDING KEYS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Key bindings
+can be changed via the following three commands:</p>
+
+<p style="margin-left:15%;"><b>bind</b> <i>key function
+menu</i></p>
+
+<p style="margin-left:26%;">Rebinds the given <i>key</i> to
+the given <i>function</i> in the given <i>menu</i> (or in
+all menus where the function exists when <b>all</b> is
+used).</p>
+
+<p style="margin-left:15%;"><b>bind</b> <i>key</i>
+<b>&quot;</b><i>string</i><b>&quot;</b> <i>menu</i></p>
+
+<p style="margin-left:26%;">Makes the given <i>key</i>
+produce the given <i>string</i> in the given <i>menu</i> (or
+in all menus where the key exists when <b>all</b> is used).
+The <i>string</i> can consist of text or commands or a mix
+of them. (To enter a command into the <i>string</i>, precede
+its keystroke with <b>M&minus;V</b>.)</p>
+
+<p style="margin-left:15%;"><b>unbind</b> <i>key
+menu</i></p>
+
+<p style="margin-left:26%;">Unbinds the given <i>key</i>
+from the given <i>menu</i> (or from all menus where the key
+exists when <b>all</b> is used).</p>
+
+<p style="margin-left:11%;">The format of <i>key</i> should
+be one of:</p>
+
+<table width="100%" border="0" rules="none" frame="void"
+       cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="15%"></td>
+<td width="10%">
+
+
+<p><b>^</b><i>X</i></p></td>
+<td width="1%"></td>
+<td width="74%">
+
+
+<p>where <i>X</i> is a Latin letter, or one of several
+ASCII characters (@, ], \, ^, _), or the word
+&quot;Space&quot;. Example: ^C.</p></td></tr>
+<tr valign="top" align="left">
+<td width="15%"></td>
+<td width="10%">
+
+
+<p><b>M&minus;</b><i>X</i></p></td>
+<td width="1%"></td>
+<td width="74%">
+
+
+<p>where <i>X</i> is any ASCII character except [, or the
+word &quot;Space&quot;. Example: M&minus;8.</p></td></tr>
+<tr valign="top" align="left">
+<td width="15%"></td>
+<td width="10%">
+
+
+<p><b>Sh&minus;M&minus;</b><i>X</i></p></td>
+<td width="1%"></td>
+<td width="74%">
+
+
+<p>where <i>X</i> is a Latin letter. Example:
+Sh&minus;M&minus;U. By default, each Meta+letter keystroke
+does the same as the corresponding Shift+Meta+letter. But
+when any Shift+Meta bind is made, that will no longer be the
+case, for all letters.</p></td></tr>
+<tr valign="top" align="left">
+<td width="15%"></td>
+<td width="10%">
+
+
+<p><b>F</b><i>N</i></p></td>
+<td width="1%"></td>
+<td width="74%">
+
+
+<p>where <i>N</i> is a numeric value from 1 to 24. Example:
+F10. (Often, <b>F13</b> to <b>F24</b> can be typed as
+<b>F1</b> to <b>F12</b> with Shift.)</p></td></tr>
+</table>
+
+<p style="margin-left:15%;"><b>Ins</b> or <b>Del</b>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">Rebinding
+<b>^M</b> (Enter) or <b>^I</b> (Tab) is probably not a good
+idea. Rebinding <b>^[</b> (Esc) is not possible, because its
+keycode is the starter byte of Meta keystrokes and escape
+sequences. Rebinding any of the dedicated cursor-moving keys
+(the arrows, Home, End, PageUp and PageDown) is not
+possible. On some terminals it&rsquo;s not possible to
+rebind <b>^H</b> (unless <b>&minus;&minus;raw</b> is used)
+because its keycode is identical to that of the Backspace
+key. <br>
+Valid <i>function</i> names to be bound are:</p>
+
+<p style="margin-left:15%;"><b>help</b></p>
+
+<p style="margin-left:18%;">Invokes the help viewer.</p>
+
+<p style="margin-left:15%;"><b>cancel</b></p>
+
+<p style="margin-left:18%;">Cancels the current
+command.</p>
+
+<p style="margin-left:15%;"><b>exit</b></p>
+
+<p style="margin-left:18%;">Exits from the program (or from
+the help viewer or file browser).</p>
+
+<p style="margin-left:15%;"><b>writeout</b></p>
+
+<p style="margin-left:18%;">Writes the current buffer to
+disk, asking for a name.</p>
+
+<p style="margin-left:15%;"><b>savefile</b></p>
+
+<p style="margin-left:18%;">Writes the current file to disk
+without prompting.</p>
+
+<p style="margin-left:15%;"><b>insert</b></p>
+
+<p style="margin-left:18%;">Inserts a file into the current
+buffer (at the current cursor position), or into a new
+buffer when option <b>multibuffer</b> is set.</p>
+
+<p style="margin-left:15%;"><b>whereis</b></p>
+
+<p style="margin-left:18%;">Starts a forward search for
+text in the current buffer -- or for filenames matching a
+string in the current list in the file browser.</p>
+
+<p style="margin-left:15%;"><b>wherewas</b></p>
+
+<p style="margin-left:18%;">Starts a backward search for
+text in the current buffer -- or for filenames matching a
+string in the current list in the file browser.</p>
+
+<p style="margin-left:15%;"><b>findprevious</b></p>
+
+<p style="margin-left:18%;">Searches the next occurrence in
+the backward direction.</p>
+
+<p style="margin-left:15%;"><b>findnext</b></p>
+
+<p style="margin-left:18%;">Searches the next occurrence in
+the forward direction.</p>
+
+<p style="margin-left:15%;"><b>replace</b></p>
+
+<p style="margin-left:18%;">Interactively replaces text
+within the current buffer.</p>
+
+<p style="margin-left:15%;"><b>cut</b></p>
+
+<p style="margin-left:18%;">Cuts and stores the current
+line (or the marked region).</p>
+
+<p style="margin-left:15%;"><b>copy</b></p>
+
+<p style="margin-left:18%;">Copies the current line (or the
+marked region) without deleting it.</p>
+
+<p style="margin-left:15%;"><b>paste</b></p>
+
+<p style="margin-left:18%;">Pastes the currently stored
+text into the current buffer at the current cursor
+position.</p>
+
+<p style="margin-left:15%;"><b>zap</b></p>
+
+<p style="margin-left:18%;">Throws away the current line
+(or the marked region). (This function is bound by default
+to &lt;Meta+Delete&gt;.)</p>
+
+<p style="margin-left:15%;"><b>chopwordleft</b></p>
+
+<p style="margin-left:18%;">Deletes from the cursor
+position to the beginning of the preceding word. (This
+function is bound by default to &lt;Shift+Ctrl+Delete&gt;.
+If your terminal produces <b>^H</b> for
+&lt;Ctrl+Backspace&gt;, you can make &lt;Ctrl+Backspace&gt;
+delete the word to the left of the cursor by rebinding
+<b>^H</b> to this function.)</p>
+
+<p style="margin-left:15%;"><b>chopwordright</b></p>
+
+<p style="margin-left:18%;">Deletes from the cursor
+position to the beginning of the next word. (This function
+is bound by default to &lt;Ctrl+Delete&gt;.)</p>
+
+<p style="margin-left:15%;"><b>cutrestoffile</b></p>
+
+<p style="margin-left:18%;">Cuts all text from the cursor
+position till the end of the buffer.</p>
+
+<p style="margin-left:15%;"><b>mark</b></p>
+
+<p style="margin-left:18%;">Sets the mark at the current
+position, to start selecting text. Or, when it is set,
+unsets the mark.</p>
+
+<p style="margin-left:15%;"><b>location</b></p>
+
+<p style="margin-left:18%;">Reports the current position of
+the cursor in the buffer: the line, column, and character
+positions. (The old name of this function,
+&rsquo;curpos&rsquo;, is deprecated.)</p>
+
+<p style="margin-left:15%;"><b>wordcount</b></p>
+
+<p style="margin-left:18%;">Counts the number of words,
+lines and characters in the current buffer.</p>
+
+<p style="margin-left:15%;"><b>execute</b></p>
+
+<p style="margin-left:18%;">Prompts for a program to
+execute. The program&rsquo;s output will be inserted into
+the current buffer (or into a new buffer when <b>M-F</b> is
+toggled).</p>
+
+<p style="margin-left:15%;"><b>speller</b></p>
+
+<p style="margin-left:18%;">Invokes a spell-checking
+program, either the default <b>hunspell</b>(1) or GNU
+<b>spell</b>(1), or the one defined by
+<b>&minus;&minus;speller</b> or <b>set speller</b>.</p>
+
+<p style="margin-left:15%;"><b>formatter</b></p>
+
+<p style="margin-left:18%;">Invokes a
+full-buffer-processing program (if the active syntax defines
+one).</p>
+
+<p style="margin-left:15%;"><b>linter</b></p>
+
+<p style="margin-left:18%;">Invokes a syntax-checking
+program (if the active syntax defines one).</p>
+
+<p style="margin-left:15%;"><b>justify</b></p>
+
+<p style="margin-left:18%;">Justifies the current
+paragraph. A paragraph is a group of contiguous lines that,
+apart from possibly the first line, all have the same
+indentation. The beginning of a paragraph is detected by
+either this lone line with a differing indentation or by a
+preceding blank line.</p>
+
+<p style="margin-left:15%;"><b>fulljustify</b></p>
+
+<p style="margin-left:18%;">Justifies the entire current
+buffer.</p>
+
+<p style="margin-left:15%;"><b>indent</b></p>
+
+<p style="margin-left:18%;">Indents (shifts to the right)
+the currently marked text.</p>
+
+<p style="margin-left:15%;"><b>unindent</b></p>
+
+<p style="margin-left:18%;">Unindents (shifts to the left)
+the currently marked text.</p>
+
+<p style="margin-left:15%;"><b>comment</b></p>
+
+<p style="margin-left:18%;">Comments or uncomments the
+current line or marked lines, using the comment style
+specified in the active syntax.</p>
+
+<p style="margin-left:15%;"><b>complete</b></p>
+
+<p style="margin-left:18%;">Completes the fragment before
+the cursor to a full word found elsewhere in the current
+buffer.</p>
+
+<p style="margin-left:15%;"><b>left</b></p>
+
+<p style="margin-left:18%;">Goes left one position (in the
+editor or browser).</p>
+
+<p style="margin-left:15%;"><b>right</b></p>
+
+<p style="margin-left:18%;">Goes right one position (in the
+editor or browser).</p>
+
+<p style="margin-left:15%;"><b>up</b></p>
+
+<p style="margin-left:18%;">Goes one line up (in the editor
+or browser).</p>
+
+<p style="margin-left:15%;"><b>down</b></p>
+
+<p style="margin-left:18%;">Goes one line down (in the
+editor or browser).</p>
+
+<p style="margin-left:15%;"><b>scrollup</b></p>
+
+<p style="margin-left:18%;">Scrolls the viewport up one row
+(meaning that the text slides down) while keeping the cursor
+in the same text position, if possible.</p>
+
+<p style="margin-left:15%;"><b>scrolldown</b></p>
+
+<p style="margin-left:18%;">Scrolls the viewport down one
+row (meaning that the text slides up) while keeping the
+cursor in the same text position, if possible.</p>
+
+<p style="margin-left:15%;"><b>center</b></p>
+
+<p style="margin-left:18%;">Scrolls the line with the
+cursor to the middle of the screen.</p>
+
+<p style="margin-left:15%;"><b>prevword</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the previous word.</p>
+
+<p style="margin-left:15%;"><b>nextword</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the next word.</p>
+
+<p style="margin-left:15%;"><b>home</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the current line.</p>
+
+<p style="margin-left:15%;"><b>end</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the end of
+the current line.</p>
+
+<p style="margin-left:15%;"><b>beginpara</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the current paragraph.</p>
+
+<p style="margin-left:15%;"><b>endpara</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the end of
+the current paragraph.</p>
+
+<p style="margin-left:15%;"><b>prevblock</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the current or preceding block of text. (Blocks
+are separated by one or more blank lines.)</p>
+
+<p style="margin-left:15%;"><b>nextblock</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
+beginning of the next block of text.</p>
+
+<p style="margin-left:15%;"><b>pageup</b></p>
+
+<p style="margin-left:18%;">Goes up one screenful.</p>
+
+<p style="margin-left:15%;"><b>pagedown</b></p>
+
+<p style="margin-left:18%;">Goes down one screenful.</p>
+
+<p style="margin-left:15%;"><b>firstline</b></p>
+
+<p style="margin-left:18%;">Goes to the first line of the
+file.</p>
+
+<p style="margin-left:15%;"><b>lastline</b></p>
+
+<p style="margin-left:18%;">Goes to the last line of the
+file.</p>
+
+<p style="margin-left:15%;"><b>gotoline</b></p>
+
+<p style="margin-left:18%;">Goes to a specific line (and
+column if specified). Negative numbers count from the end of
+the file (and end of the line).</p>
+
+<p style="margin-left:15%;"><b>findbracket</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the bracket
+(or brace or parenthesis, etc.) that matches (pairs) with
+the one under the cursor. See <b>set matchbrackets</b>.</p>
+
+<p style="margin-left:15%;"><b>anchor</b></p>
+
+<p style="margin-left:18%;">Places an anchor at the current
+line, or removes it when already present. (An anchor is
+visible when line numbers are activated.)</p>
+
+<p style="margin-left:15%;"><b>prevanchor</b></p>
+
+<p style="margin-left:18%;">Goes to the first anchor before
+the current line.</p>
+
+<p style="margin-left:15%;"><b>nextanchor</b></p>
+
+<p style="margin-left:18%;">Goes to the first anchor after
+the current line.</p>
+
+<p style="margin-left:15%;"><b>prevbuf</b></p>
+
+<p style="margin-left:18%;">Switches to editing/viewing the
+previous buffer when multiple buffers are open.</p>
+
+<p style="margin-left:15%;"><b>nextbuf</b></p>
+
+<p style="margin-left:18%;">Switches to editing/viewing the
+next buffer when multiple buffers are open.</p>
+
+<p style="margin-left:15%;"><b>verbatim</b></p>
+
+<p style="margin-left:18%;">Inserts the next keystroke
+verbatim into the file.</p>
+
+<p style="margin-left:15%;"><b>tab</b></p>
+
+<p style="margin-left:18%;">Inserts a tab at the current
+cursor location.</p>
+
+<p style="margin-left:15%;"><b>enter</b></p>
+
+<p style="margin-left:18%;">Inserts a new line below the
+current one.</p>
+
+<p style="margin-left:15%;"><b>delete</b></p>
+
+<p style="margin-left:18%;">Deletes the character under the
+cursor.</p>
+
+<p style="margin-left:15%;"><b>backspace</b></p>
+
+<p style="margin-left:18%;">Deletes the character before
+the cursor.</p>
+
+<p style="margin-left:15%;"><b>recordmacro</b></p>
+
+<p style="margin-left:18%;">Starts the recording of
+keystrokes -- the keystrokes are stored as a macro. When
+already recording, the recording is stopped.</p>
+
+<p style="margin-left:15%;"><b>runmacro</b></p>
+
+<p style="margin-left:18%;">Replays the keystrokes of the
+last recorded macro.</p>
+
+<p style="margin-left:15%;"><b>undo</b></p>
+
+<p style="margin-left:18%;">Undoes the last performed text
+action (add text, delete text, etc).</p>
+
+<p style="margin-left:15%;"><b>redo</b></p>
+
+<p style="margin-left:18%;">Redoes the last undone action
+(i.e., it undoes an undo).</p>
+
+<p style="margin-left:15%;"><b>refresh</b></p>
+
+<p style="margin-left:18%;">Refreshes the screen.</p>
+
+<p style="margin-left:15%;"><b>suspend</b></p>
+
+<p style="margin-left:18%;">Suspends the editor (if the
+suspending function is enabled, see the <b>suspendable</b>
+toggle item below).</p>
+
+<p style="margin-left:15%;"><b>casesens</b></p>
+
+<p style="margin-left:18%;">Toggles whether
+searching/replacing ignores or respects the case of the
+given characters.</p>
+
+<p style="margin-left:15%;"><b>regexp</b></p>
+
+<p style="margin-left:18%;">Toggles whether
+searching/replacing uses literal strings or regular
+expressions.</p>
+
+<p style="margin-left:15%;"><b>backwards</b></p>
+
+<p style="margin-left:18%;">Toggles whether
+searching/replacing goes forward or backward.</p>
+
+<p style="margin-left:15%;"><b>older</b></p>
+
+<p style="margin-left:18%;">Retrieves the previous
+(earlier) entry at a prompt.</p>
+
+<p style="margin-left:15%;"><b>newer</b></p>
+
+<p style="margin-left:18%;">Retrieves the next (later)
+entry at a prompt.</p>
+
+<p style="margin-left:15%;"><b>flipreplace</b></p>
+
+<p style="margin-left:18%;">Toggles between searching for
+something and replacing something.</p>
+
+<p style="margin-left:15%;"><b>flipgoto</b></p>
+
+<p style="margin-left:18%;">Toggles between searching for
+text and targeting a line number.</p>
+
+<p style="margin-left:15%;"><b>flipexecute</b></p>
+
+<p style="margin-left:18%;">Toggles between inserting a
+file and executing a command.</p>
+
+<p style="margin-left:15%;"><b>flippipe</b></p>
+
+<p style="margin-left:18%;">When executing a command,
+toggles whether the current buffer (or marked region) is
+piped to the command.</p>
+
+<p style="margin-left:15%;"><b>flipnewbuffer</b></p>
+
+<p style="margin-left:18%;">Toggles between inserting into
+the current buffer and into a new empty buffer.</p>
+
+<p style="margin-left:15%;"><b>flipconvert</b></p>
+
+<p style="margin-left:18%;">When reading in a file, toggles
+between converting and not converting it from DOS/Mac
+format. Converting is the default.</p>
+
+<p style="margin-left:15%;"><b>dosformat</b></p>
+
+<p style="margin-left:18%;">When writing a file, switches
+to writing a DOS format (CR/LF).</p>
+
+<p style="margin-left:15%;"><b>macformat</b></p>
+
+<p style="margin-left:18%;">When writing a file, switches
+to writing a Mac format.</p>
+
+<p style="margin-left:15%;"><b>append</b></p>
+
+<p style="margin-left:18%;">When writing a file, appends to
+the end instead of overwriting.</p>
+
+<p style="margin-left:15%;"><b>prepend</b></p>
+
+<p style="margin-left:18%;">When writing a file,
+&rsquo;prepends&rsquo; (writes at the beginning) instead of
+overwriting.</p>
+
+<p style="margin-left:15%;"><b>backup</b></p>
+
+<p style="margin-left:18%;">When writing a file, creates a
+backup of the current file.</p>
+
+<p style="margin-left:15%;"><b>discardbuffer</b></p>
+
+<p style="margin-left:18%;">When about to write a file,
+discard the current buffer without saving. (This function is
+bound by default only when option
+<b>&minus;&minus;saveonexit</b> is in effect.)</p>
+
+<p style="margin-left:15%;"><b>browser</b></p>
+
+<p style="margin-left:18%;">Starts the file browser (in the
+Read File and Write Out menus), allowing to select a file
+from a list.</p>
+
+<p style="margin-left:15%;"><b>gotodir</b></p>
+
+<p style="margin-left:18%;">Goes to a directory to be
+specified, allowing to browse anywhere in the
+filesystem.</p>
+
+<p style="margin-left:15%;"><b>firstfile</b></p>
+
+<p style="margin-left:18%;">Goes to the first file in the
+list when using the file browser.</p>
+
+<p style="margin-left:15%;"><b>lastfile</b></p>
+
+<p style="margin-left:18%;">Goes to the last file in the
+list when using the file browser.</p>
+
+<p style="margin-left:15%;"><b>nohelp</b></p>
+
+<p style="margin-left:18%;">Toggles the presence of the
+two-line list of key bindings at the bottom of the screen.
+(This toggle is special: it is available in all menus except
+the help viewer and the linter. All further toggles are
+available in the main menu only.)</p>
+
+<p style="margin-left:15%;"><b>constantshow</b></p>
+
+<p style="margin-left:18%;">Toggles the constant display of
+the current line, column, and character positions.</p>
+
+<p style="margin-left:15%;"><b>softwrap</b></p>
+
+<p style="margin-left:18%;">Toggles the displaying of
+overlong lines on multiple screen lines.</p>
+
+<p style="margin-left:15%;"><b>linenumbers</b></p>
+
+<p style="margin-left:18%;">Toggles the display of line
+numbers in front of the text.</p>
+
+<p style="margin-left:15%;"><b>whitespacedisplay</b></p>
+
+<p style="margin-left:18%;">Toggles the showing of
+whitespace.</p>
+
+<p style="margin-left:15%;"><b>nosyntax</b></p>
+
+<p style="margin-left:18%;">Toggles syntax
+highlighting.</p>
+
+<p style="margin-left:15%;"><b>smarthome</b></p>
+
+<p style="margin-left:18%;">Toggles the smartness of the
+Home key.</p>
+
+<p style="margin-left:15%;"><b>autoindent</b></p>
+
+<p style="margin-left:18%;">Toggles whether a newly created
+line will contain the same amount of leading whitespace as
+the preceding line -- or as the next line if the preceding
+line is the beginning of a paragraph.</p>
+
+<p style="margin-left:15%;"><b>cutfromcursor</b></p>
+
+<p style="margin-left:18%;">Toggles whether cutting text
+will cut the whole line or just from the current cursor
+position to the end of the line.</p>
+
+<p style="margin-left:15%;"><b>nowrap</b></p>
+
+<p style="margin-left:18%;">Toggles whether long lines will
+be hard-wrapped to the next line.</p>
+
+<p style="margin-left:15%;"><b>tabstospaces</b></p>
+
+<p style="margin-left:18%;">Toggles whether typed tabs will
+be converted to spaces.</p>
+
+<p style="margin-left:15%;"><b>mouse</b></p>
+
+<p style="margin-left:18%;">Toggles mouse support.</p>
+
+<p style="margin-left:15%;"><b>suspendable</b></p>
+
+<p style="margin-left:18%;">Toggles whether the suspend
+keystroke (<b>^Z</b> by default) will actually suspend the
+editor. (The old name of this function,
+&rsquo;suspendenable&rsquo;, is deprecated.)</p>
+
+<p style="margin-left:11%;">Valid <i>menu</i> sections
+are:</p>
+
+<p style="margin-left:15%;"><b>main</b></p>
+
+<p style="margin-left:18%;">The main editor window where
+text is entered and edited.</p>
+
+<p style="margin-left:15%;"><b>help</b></p>
+
+<p style="margin-left:18%;">The help-viewer menu.</p>
+
+<p style="margin-left:15%;"><b>search</b></p>
+
+<p style="margin-left:18%;">The search menu (AKA
+whereis).</p>
+
+<p style="margin-left:15%;"><b>replace</b></p>
+
+<p style="margin-left:18%;">The &rsquo;search to
+replace&rsquo; menu.</p>
+
+<p style="margin-left:15%;"><b>replacewith</b></p>
+
+<p style="margin-left:18%;">The &rsquo;replace with&rsquo;
+menu, which comes up after &rsquo;search to
+replace&rsquo;.</p>
+
+<p style="margin-left:15%;"><b>yesno</b></p>
+
+<p style="margin-left:18%;">The &rsquo;yesno&rsquo; menu,
+where the Yes/No/All/Cancel question is asked.</p>
+
+<p style="margin-left:15%;"><b>gotoline</b></p>
+
+<p style="margin-left:18%;">The &rsquo;goto line (and
+column)&rsquo; menu.</p>
+
+<p style="margin-left:15%;"><b>writeout</b></p>
+
+<p style="margin-left:18%;">The &rsquo;write file&rsquo;
+menu.</p>
+
+<p style="margin-left:15%;"><b>insert</b></p>
+
+<p style="margin-left:18%;">The &rsquo;insert file&rsquo;
+menu.</p>
+
+<p style="margin-left:15%;"><b>browser</b></p>
+
+<p style="margin-left:18%;">The &rsquo;file browser&rsquo;
+menu, for selecting a file to be opened or inserted or
+written to.</p>
+
+<p style="margin-left:15%;"><b>whereisfile</b></p>
+
+<p style="margin-left:18%;">The &rsquo;search for a
+file&rsquo; menu in the file browser.</p>
+
+<p style="margin-left:15%;"><b>gotodir</b></p>
+
+<p style="margin-left:18%;">The &rsquo;go to
+directory&rsquo; menu in the file browser.</p>
+
+<p style="margin-left:15%;"><b>execute</b></p>
+
+<p style="margin-left:18%;">The menu for inserting the
+output from an external command, or for filtering the buffer
+(or the marked region) through an external command, or for
+executing one of several tools. (The old form of this menu
+name, &rsquo;extcmd&rsquo;, is deprecated.)</p>
+
+<p style="margin-left:15%;"><b>spell</b></p>
+
+<p style="margin-left:18%;">The menu of the integrated
+spell checker where the user can edit a misspelled word.</p>
+
+<p style="margin-left:15%;"><b>linter</b></p>
+
+<p style="margin-left:18%;">The linter menu, which allows
+jumping through the linting messages.</p>
+
+<p style="margin-left:15%;"><b>all</b></p>
+
+<p style="margin-left:18%;">A special name that encompasses
+all menus. For <b>bind</b> it means all menus where the
+specified <i>function</i> exists; for <b>unbind</b> it means
+all menus where the specified <i>key</i> exists.</p>
+
+<h2>FILES
+<a name="FILES"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><i>/etc/nanorc</i></p>
+
+<p style="margin-left:22%;">System-wide configuration
+file.</p>
+
+<p style="margin-left:11%;"><i>~/.nanorc</i> or
+<i>$XDG_CONFIG_HOME/nano/nanorc</i> or
+<i>~/.config/nano/nanorc</i></p>
+
+<p style="margin-left:22%;">Per-user configuration
+file.</p>
+
+<p style="margin-left:11%;"><i>/usr/share/nano/*</i></p>
+
+<p style="margin-left:22%;">Syntax definitions for the
+syntax coloring of common file types (and for less common
+file types in the <i>extra/</i> subdirectory).</p>
+
+<h2>SEE ALSO
+<a name="SEE ALSO"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>nano</b>(1)
+<i><br>
+https://nano-editor.org/cheatsheet.html</i></p>
+
+<p style="margin-left:22%;">An overview of the default key
+bindings.</p>
+<hr>
+</body>
+</html>
diff --git a/msys2/usr/share/doc/nano/rnano.1.html b/msys2/usr/share/doc/nano/rnano.1.html
new file mode 100644
index 000000000..87e223128
--- /dev/null
+++ b/msys2/usr/share/doc/nano/rnano.1.html
@@ -0,0 +1,167 @@
+<!-- Creator     : groff version 1.22.4 -->
+<!-- CreationDate: Wed Dec  2 11:30:14 2020 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<meta name="Content-Style" content="text/css">
+<style type="text/css">
+       p       { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       pre     { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       table   { margin-top: 0; margin-bottom: 0; vertical-align: top }
+       h1      { text-align: center }
+</style>
+<title>RNANO</title>
+
+</head>
+<body>
+
+<h1 align="center">RNANO</h1>
+
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#HOMEPAGE">HOMEPAGE</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+
+
+<h2>NAME
+<a name="NAME"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">rnano &minus; a
+restricted nano</p>
+
+<h2>SYNOPSIS
+<a name="SYNOPSIS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>rnano</b>
+[<i>options</i>]
+[[+<i>line</i>[,<i>column</i>]]&nbsp;<i>file</i>]...</p>
+
+<h2>DESCRIPTION
+<a name="DESCRIPTION"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>rnano</b>
+runs the <b>nano</b> editor in restricted mode. This allows
+editing only the specified file or files, and doesn&rsquo;t
+allow the user access to the filesystem nor to a command
+shell.</p>
+
+<p style="margin-left:11%; margin-top: 1em">In restricted
+mode, <b>nano</b> will:</p>
+
+<table width="100%" border="0" rules="none" frame="void"
+       cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="1%">
+
+
+<p>&bull;</p></td>
+<td width="2%"></td>
+<td width="86%">
+
+
+<p>not allow suspending;</p></td></tr>
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="1%">
+
+
+<p>&bull;</p></td>
+<td width="2%"></td>
+<td width="86%">
+
+
+<p>not allow saving the current buffer under a different
+name;</p> </td></tr>
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="1%">
+
+
+<p>&bull;</p></td>
+<td width="2%"></td>
+<td width="86%">
+
+
+<p>not allow inserting another file or opening a new
+buffer;</p> </td></tr>
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="1%">
+
+
+<p>&bull;</p></td>
+<td width="2%"></td>
+<td width="86%">
+
+
+<p>not allow appending or prepending to any file;</p></td></tr>
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="1%">
+
+
+<p>&bull;</p></td>
+<td width="2%"></td>
+<td width="86%">
+
+
+<p>not make backup files nor do spell checking.</p></td></tr>
+</table>
+
+<h2>OPTIONS
+<a name="OPTIONS"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><b>&minus;h</b>,
+<b>&minus;&minus;help</b></p>
+
+<p style="margin-left:22%;">Show the available command-line
+options and exit.</p>
+
+<p style="margin-left:11%; margin-top: 1em">For all
+existing options, see the <b>nano</b>(1) man page.</p>
+
+<h2>BUGS
+<a name="BUGS"></a>
+</h2>
+
+
+<p style="margin-left:11%; margin-top: 1em">Please report
+bugs via
+<i>https://savannah.gnu.org/bugs/?group=nano</i>.</p>
+
+<h2>HOMEPAGE
+<a name="HOMEPAGE"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><i>https://nano-editor.org/</i></p>
+
+<h2>SEE ALSO
+<a name="SEE ALSO"></a>
+</h2>
+
+
+
+<p style="margin-left:11%; margin-top: 1em"><i><b>nano</b></i>(1)</p>
+<hr>
+</body>
+</html>
diff --git a/msys2/usr/share/doc/readline/CHANGES b/msys2/usr/share/doc/readline/CHANGES
index 09eab6ee0..747fa4196 100644
--- a/msys2/usr/share/doc/readline/CHANGES
+++ b/msys2/usr/share/doc/readline/CHANGES
@@ -1,3 +1,126 @@
+This document details the changes between this version, readline-8.1, and
+the previous version, readline-8.0.
+
+1. Changes to Readline
+
+a. There are a number of fixes that were found as the result of fuzzing with
+   random input.
+
+b. Changed the revert-all-at-newline behavior to make sure to start at the end
+   of the history list when doing it, instead of the line where the user hit
+   return.
+
+c. When parsing `set' commands from the inputrc file or an application, readline
+   now allows trailing whitespace.
+
+d. Fixed a bug that left a file descriptor open to the history file if the
+   file size was 0.
+
+e. Fixed a problem with binding key sequences containing meta characters.
+
+f. Fixed a bug that caused the wrong line to be displayed if the user tried to
+   move back beyond the beginning of the history list, or forward past the end
+   of the history list.
+
+g. If readline catches SIGTSTP, it now sets a hook that allows the calling
+   application to handle it if it desires.
+
+h. Fixed a redisplay problem with a prompt string containing embedded newlines.
+
+i. Fixed a problem with completing filenames containing invalid multibyte
+   sequences when case-insensitive comparisons are enabled.
+
+j. Fixed a redisplay problem with prompt strings containing invisible multibyte
+   characters.
+
+k. Fixed a problem with multibyte characters mapped to editing commands that
+   modify the search string in incremental search.
+
+l. Fixed a bug with maintaining the key sequence while resolving a bound
+   command in the presence of ambiguous sequences (sequences with a common
+   prefix), in most cases while attempting to unbind it.
+
+m. Fixed several buffer overflows found as the result of fuzzing.
+
+n. Reworked backslash handling when translating key sequences for key binding
+   to be more uniform and consistent, which introduces a slight backwards
+   incompatibility.
+
+o. Fixed a bug with saving the history that resulted in errors not being
+   propagated to the calling application when the history file is not writable.
+
+p. Readline only calls chown(2) on a newly-written history file if it really
+   needs to, instead of having it be a no-op.
+
+q. Readline now behaves better when operate-and-get-next is used when the
+   history list is `full': when there are already $HISTSIZE entries.
+
+r. Fixed a bug that could cause vi redo (`.') of a replace command not to work
+   correctly in the C or POSIX locale.
+
+s. Fixed a bug with vi-mode digit arguments that caused the last command to be
+   set incorrectly. This prevents yank-last-arg from working as intended, for
+   example.
+
+t. Make sure that all undo groups are closed when leaving vi insertion mode.  
+
+u. Make sure that the vi-mode `C' and `c' commands enter insert mode even if
+   the motion command doesn't have any effect.
+
+v. Fixed several potential memory leaks in the callback mode context handling.
+
+w. If readline is handling a SIGTTOU, make sure SIGTTOU is blocked while
+   executing the terminal cleanup code, since it's no longer run in a signal
+   handling context.
+
+x. Fixed a bug that could cause an application with an application-specific 
+   redisplay function to crash if the line data structures had not been
+   initialized.
+
+y. Terminals that are named "dumb" or unknown do not enable bracketed paste
+   by default.
+
+z. Ensure that disabling bracketed paste turns off highlighting the incremental
+   search string when the search is successful.
+
+2. New Features in Readline
+
+a. If a second consecutive completion attempt produces matches where the first
+   did not, treat it as a new completion attempt and insert a match as
+   appropriate.
+
+b. Bracketed paste mode works in more places: incremental search strings, vi
+   overstrike mode, character search, and reading numeric arguments.
+
+c. Readline automatically switches to horizontal scrolling if the terminal has
+   only one line.
+
+d. Unbinding all key sequences bound to a particular readline function now
+   descends into keymaps for multi-key sequences.
+
+e. rl-clear-display: new bindable command that clears the screen and, if
+   possible, the scrollback buffer (bound to emacs mode M-C-l by default).
+
+f. New active mark and face feature: when enabled, it will highlight the text
+   inserted by a bracketed paste (the `active region') and the text found by
+   incremental and non-incremental history searches. This is tied to bracketed
+   paste and can be disabled by turning off bracketed paste.
+
+g. Readline sets the mark in several additional commands.
+
+h. Bracketed paste mode is enabled by default. There is a configure-time
+   option (--enable-bracketed-paste-default) to set the default to on or off.
+
+i. Readline tries to take advantage of the more regular structure of UTF-8
+   characters to identify the beginning and end of characters when moving
+   through the line buffer.
+
+j. The bindable operate-and-get-next command (and its default bindings) are
+   now part of readline instead of a bash-specific addition.
+
+k. The signal cleanup code now blocks SIGINT while processing after a SIGINT.  
+
+-------------------------------------------------------------------------------
 This document details the changes between this version, readline-8.0, and the
 previous version, readline-7.0.
 
diff --git a/msys2/usr/share/doc/readline/INSTALL b/msys2/usr/share/doc/readline/INSTALL
index afb4d53e8..4f0d7b0c0 100644
--- a/msys2/usr/share/doc/readline/INSTALL
+++ b/msys2/usr/share/doc/readline/INSTALL
@@ -1,7 +1,7 @@
 Basic Installation
 ==================
 
-These are installation instructions for Readline-8.0.
+These are installation instructions for Readline-8.1.
 
 The simplest way to compile readline is:
 
@@ -183,6 +183,11 @@ The readline `configure' recognizes a single `--with-PACKAGE' option:
 
 `--enable-static'
     Build the static libraries by default.  The default is `yes'.
+
+`--enable-bracketed-paste-default'
+    Enable bracketed paste by default, so the initial value of the
+    `enable-bracketed-paste' Readline variable is `on'. The default
+    is `yes'.
  
 Shared Libraries
 ================
diff --git a/msys2/usr/share/doc/readline/README b/msys2/usr/share/doc/readline/README
index 4fb0804fc..de9857523 100644
--- a/msys2/usr/share/doc/readline/README
+++ b/msys2/usr/share/doc/readline/README
@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This is the Gnu Readline library, version 8.0.
+This is the Gnu Readline library, version 8.1.
 
 The Readline library provides a set of functions for use by applications
 that allow users to edit command lines as they are typed in.  Both
diff --git a/msys2/usr/share/file/magic b/msys2/usr/share/file/magic
index 4c67adcaf..03c912b71 100644
--- a/msys2/usr/share/file/magic
+++ b/msys2/usr/share/file/magic
@@ -6002,113 +6002,6 @@
 >12	belong		1003			HCI BCSP
 >12	belong		1004			HCI Serial (H5)
 >>12	belong		x			type %d
-#------------------------------------------------------------------------------
-# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
-# c-lang:  file(1) magic for C and related languages programs
-#
-# The strength is to beat standard HTML
-
-# BCPL
-0	search/8192	"libhdr"	BCPL source text
-!:mime	text/x-bcpl
-0	search/8192	"LIBHDR"	BCPL source text
-!:mime	text/x-bcpl
-
-# C
-# Check for class if include is found, otherwise class is beaten by include because of lowered strength
-0	search/8192	#include
->0	regex	\^#include			C
->>0	regex	\^class[[:space:]]+
->>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
->>&0	clear	x				source text
-!:strength + 13
-!:mime	text/x-c
-0	search/8192	pragma
->0	regex	\^#[[:space:]]*pragma	C source text
-!:mime	text/x-c
-0	search/8192	endif
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*endif$	C source text
-!:mime	text/x-c
-0	search/8192	define
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*define	C source text
-!:mime	text/x-c
-0	search/8192	char
->0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	double
->0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	extern
->0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	float
->0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	struct
->0	regex	\^struct[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	union
->0	regex	\^union[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	main(
->&0 regex	\\)[[:space:]]*\\{		C source text
-!:mime	text/x-c
-
-# C++
-# The strength of these rules is increased so they beat the C rules above
-0	search/8192	namespace
->0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# using namespace [namespace] or using std::[lib]
-0	search/8192	using
->0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	template
->0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	virtual
->0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# But class alone is reduced to avoid beating php (Jens Schleusener)
-0	search/8192	class
->0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
-!:strength + 13
-!:mime	text/x-c++
-0	search/8192	public
->0	regex	\^[[:space:]]*public:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	private
->0	regex	\^[[:space:]]*private:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	protected
->0	regex	\^[[:space:]]*protected:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-
-# Objective-C
-0	search/8192	#import
->0	regex	\^#import			Objective-C source text
-!:strength + 25
-!:mime	text/x-objective-c
-
-# From: Mikhail Teterin <mi@aldan.algebra.com>
-0	string		cscope		cscope reference data
->7	string		x		version %.2s
-# We skip the path here, because it is often long (so file will
-# truncate it) and mostly redundant.
-# The inverted index functionality was added some time between
-# versions 11 and 15, so look for -q if version is above 14:
->7	string		>14
->>10	search/100	\ -q\ 		with inverted index
->10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: c64,v 1.7 2017/11/15 12:19:06 christos Exp $
@@ -6631,6 +6524,113 @@
 
 0	string		RuneCT		Citrus locale declaration for LC_CTYPE
 
+#------------------------------------------------------------------------------
+# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
+# c-lang:  file(1) magic for C and related languages programs
+#
+# The strength is to beat standard HTML
+
+# BCPL
+0	search/8192	"libhdr"	BCPL source text
+!:mime	text/x-bcpl
+0	search/8192	"LIBHDR"	BCPL source text
+!:mime	text/x-bcpl
+
+# C
+# Check for class if include is found, otherwise class is beaten by include because of lowered strength
+0	search/8192	#include
+>0	regex	\^#include			C
+>>0	regex	\^class[[:space:]]+
+>>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
+>>&0	clear	x				source text
+!:strength + 13
+!:mime	text/x-c
+0	search/8192	pragma
+>0	regex	\^#[[:space:]]*pragma	C source text
+!:mime	text/x-c
+0	search/8192	endif
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*endif$	C source text
+!:mime	text/x-c
+0	search/8192	define
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*define	C source text
+!:mime	text/x-c
+0	search/8192	char
+>0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	double
+>0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	extern
+>0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	float
+>0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	struct
+>0	regex	\^struct[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	union
+>0	regex	\^union[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	main(
+>&0 regex	\\)[[:space:]]*\\{		C source text
+!:mime	text/x-c
+
+# C++
+# The strength of these rules is increased so they beat the C rules above
+0	search/8192	namespace
+>0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# using namespace [namespace] or using std::[lib]
+0	search/8192	using
+>0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	template
+>0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	virtual
+>0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# But class alone is reduced to avoid beating php (Jens Schleusener)
+0	search/8192	class
+>0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
+!:strength + 13
+!:mime	text/x-c++
+0	search/8192	public
+>0	regex	\^[[:space:]]*public:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	private
+>0	regex	\^[[:space:]]*private:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	protected
+>0	regex	\^[[:space:]]*protected:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+
+# Objective-C
+0	search/8192	#import
+>0	regex	\^#import			Objective-C source text
+!:strength + 25
+!:mime	text/x-objective-c
+
+# From: Mikhail Teterin <mi@aldan.algebra.com>
+0	string		cscope		cscope reference data
+>7	string		x		version %.2s
+# We skip the path here, because it is often long (so file will
+# truncate it) and mostly redundant.
+# The inverted index functionality was added some time between
+# versions 11 and 15, so look for -q if version is above 14:
+>7	string		>14
+>>10	search/100	\ -q\ 		with inverted index
+>10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: clarion,v 1.5 2014/04/30 21:41:02 christos Exp $
diff --git a/msys2/usr/share/glib-2.0/gdb/glib_gdb.py b/msys2/usr/share/glib-2.0/gdb/glib_gdb.py
index 38f101ad5..fd8baf58c 100644
--- a/msys2/usr/share/glib-2.0/gdb/glib_gdb.py
+++ b/msys2/usr/share/glib-2.0/gdb/glib_gdb.py
@@ -9,7 +9,7 @@ def read_global_var (symname):
     return gdb.selected_frame().read_var(symname)
 
 def g_quark_to_string (quark):
-    if quark == None:
+    if quark is None:
         return None
     quark = long(quark)
     if quark == 0:
@@ -86,11 +86,27 @@ class GHashPrinter:
     "Prints a GHashTable"
 
     class _iterator:
+        class _pointer_array:
+            def __init__(self, ptr, big_items):
+                self._big_items = big_items
+                self._gpointer_type = gdb.lookup_type("gpointer")
+                item_type = self._gpointer_type if self._big_items else gdb.lookup_type("guint")
+
+                self._items = ptr.cast(item_type.pointer())
+
+            def __getitem__(self, item):
+                item = self._items[item]
+
+                if not self._big_items:
+                    item = item.cast(self._gpointer_type)
+
+                return item
+
         def __init__(self, ht, keys_are_strings):
             self.ht = ht
             if ht != 0:
-                self.keys = ht["keys"]
-                self.values = ht["values"]
+                self.keys = self._pointer_array(ht["keys"], ht["have_big_keys"])
+                self.values = self._pointer_array(ht["values"], ht["have_big_values"])
                 self.hashes = ht["hashes"]
                 self.size = ht["size"]
             self.pos = 0
@@ -108,7 +124,6 @@ class GHashPrinter:
                 self.value = None
                 return v
             while long(self.pos) < long(self.size):
-                self.pos = self.pos + 1
                 if long (self.hashes[self.pos]) >= 2:
                     key = self.keys[self.pos]
                     val = self.values[self.pos]
@@ -119,8 +134,12 @@ class GHashPrinter:
                     # Queue value for next result
                     self.value = ('[%dv]'% (self.pos), val)
 
-                    # Return key
-                    return ('[%dk]'% (self.pos), key)
+                    # Increment pos and return key
+                    key = ('[%dk]'% (self.pos), key)
+                    self.pos += 1
+                    return key
+
+                self.pos += 1
             raise StopIteration
 
         __next__ = next
@@ -171,7 +190,7 @@ def pretty_printer_lookup (val):
     return None
 
 def register (obj):
-    if obj == None:
+    if obj is None:
         obj = gdb
 
     obj.pretty_printers.append(pretty_printer_lookup)
diff --git a/msys2/usr/share/glib-2.0/gdb/gobject_gdb.py b/msys2/usr/share/glib-2.0/gdb/gobject_gdb.py
index 8c3022031..263ac78b6 100644
--- a/msys2/usr/share/glib-2.0/gdb/gobject_gdb.py
+++ b/msys2/usr/share/glib-2.0/gdb/gobject_gdb.py
@@ -21,14 +21,14 @@ except ImportError:
 def read_global_var (symname):
     return gdb.selected_frame().read_var(symname)
 
-def g_type_to_name (gtype):
+def g_type_to_typenode (gtype):
     def lookup_fundamental_type (typenode):
         if typenode == 0:
             return None
         val = read_global_var ("static_fundamental_type_nodes")
-        if val == None:
+        if val is None:
             return None
-        return val[typenode >> 2].address()
+        return val[typenode >> 2].address
 
     gtype = long(gtype)
     typenode = gtype - gtype % 4
@@ -36,6 +36,10 @@ def g_type_to_name (gtype):
         typenode = gdb.Value(typenode).cast (gdb.lookup_type("TypeNode").pointer())
     else:
         typenode = lookup_fundamental_type (typenode)
+    return typenode
+
+def g_type_to_name (gtype):
+    typenode = g_type_to_typenode(gtype)
     if typenode != None:
         return glib_gdb.g_quark_to_string (typenode["qname"])
     return None
@@ -88,14 +92,47 @@ class GTypePrettyPrinter:
             return ("0x%x [%s]")% (long(self.val), name)
         return  ("0x%x") % (long(self.val))
 
+def is_g_type_class_instance (val):
+    type = val.type
+    if type.code != gdb.TYPE_CODE_PTR:
+        return False
+    return str(type.target()) == "GTypeClass"
+
+class GTypeHandlePrettyPrinter:
+    "Prints a GType instance"
+
+    def __init__ (self, val, hint = ""):
+        self.val = val
+        self.hint = hint
+
+    def to_string (self):
+        typenode = g_type_to_typenode(self.val)
+        if typenode != None:
+            name = glib_gdb.g_quark_to_string (typenode["qname"])
+            s = ("0x%x [%s%s")% (long(self.val), self.hint, name)
+            for i in range (1, int(typenode["n_supers"])):
+                node = g_type_to_typenode(typenode["supers"][i])
+                if node:
+                    name = glib_gdb.g_quark_to_string(node["qname"])
+                else:
+                    name = "???"
+                s += "/" + name
+            return s + "]"
+        else:
+            return  ("0x%x") % (long(self.val))
+
 def pretty_printer_lookup (val):
     if is_g_type_instance (val):
         return GTypePrettyPrinter (val)
+    if str(val.type) == "GType":
+        return GTypeHandlePrettyPrinter (val)
+    if is_g_type_class_instance (val):
+        return GTypeHandlePrettyPrinter (val["g_type"], "g_type: ")
 
     return None
 
 def get_signal_name (id):
-    if id == None:
+    if id is None:
         return None
     id = long(id)
     if id == 0:
@@ -126,7 +163,7 @@ class SignalFrame(FrameDecorator):
     def read_var (self, frame, name, array = None):
         try:
             v = frame_var (frame, name)
-            if v == None or v.is_optimized_out:
+            if v is None or v.is_optimized_out:
                 return None
             if array != None:
                 array.append (v)
@@ -137,7 +174,7 @@ class SignalFrame(FrameDecorator):
     def read_object (self, frame, name, array = None):
         try:
             v = frame_var (frame, name)
-            if v == None or v.is_optimized_out:
+            if v is None or v.is_optimized_out:
                 return None
             v = v.cast (gdb.lookup_type("GObject").pointer())
             # Ensure this is a somewhat correct object pointer
@@ -286,7 +323,7 @@ class GFrameFilter(object):
         return GFrameDecorator(iterator)
 
 def register (obj):
-    if obj == None:
+    if obj is None:
         obj = gdb
 
     if HAVE_GDB_FRAMEDECORATOR:
diff --git a/msys2/usr/share/glib-2.0/schemas/gschema.dtd b/msys2/usr/share/glib-2.0/schemas/gschema.dtd
index 8cd552d4a..3a903e7ab 100644
--- a/msys2/usr/share/glib-2.0/schemas/gschema.dtd
+++ b/msys2/usr/share/glib-2.0/schemas/gschema.dtd
@@ -49,8 +49,8 @@
 <!ELEMENT range EMPTY >
 <!-- min and max must be parseable as values of the key type and
      min must be less than or equal to max -->
-<!ATTLIST range min CDATA #REQUIRED
-                max CDATA #REQUIRED >
+<!ATTLIST range min CDATA #IMPLIED
+                max CDATA #IMPLIED >
 
 <!-- choices is only allowed for keys with string or string array type -->
 <!ELEMENT choices (choice+) >
@@ -62,7 +62,8 @@
 <!ELEMENT aliases (alias+) >
 <!-- each alias element specifies an alias for one of the possible values -->
 <!ELEMENT alias EMPTY >
-<!ATTLIST alias value CDATA #REQUIRED >
+<!ATTLIST alias value  CDATA #REQUIRED
+                target CDATA #REQUIRED >
 
 <!ELEMENT child EMPTY >
 <!ATTLIST child name   CDATA #REQUIRED
diff --git a/msys2/usr/share/gnupg/distsigkey.gpg b/msys2/usr/share/gnupg/distsigkey.gpg
index 3eedc994d..47d767c6e 100644
Binary files a/msys2/usr/share/gnupg/distsigkey.gpg and b/msys2/usr/share/gnupg/distsigkey.gpg differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/config-example.html b/msys2/usr/share/gtk-doc/html/p11-kit/config-example.html
new file mode 100644
index 000000000..ca08f236d
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/config-example.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Example: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="config.html" title="PKCS#11 Configuration">
+<link rel="prev" href="config.html" title="PKCS#11 Configuration">
+<link rel="next" href="config-files.html" title="Configuration Files">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="config.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="config.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="config-files.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="config-example"></a>Example</h2></div></div></div>
+<p>The following sections describe the config format in detail. But first
+		an example which shows the various features. The configuration below, loads
+		two modules called 'my-module' and 'nss'. The user settings override some
+		aspects of the system settings.</p>
+<p>Global configuration file: <code class="literal">/etc/pkcs11/pkcs11.conf</code></p>
+<pre class="programlisting">
+# This setting controls whether to load user configuration from the
+# ~/.config/pkcs11 directory. Possible values:
+#    none: No user configuration
+#    merge: Merge the user config over the system configuration (default)
+#    only: Only user configuration, ignore system configuration
+user-config: merge
+</pre>
+<p>One module configuration file per module: <code class="literal">/etc/pkcs11/modules/my-module</code></p>
+<pre class="programlisting">
+# This setting controls the actual module library to load. This config file
+# might be installed by the package that installs this module library. This
+# is not an absolute path name. Relative path names are loaded from the
+# $(libdir)/pkcs11 directory by default.
+module: my-pkcs11-module.so
+
+# This controls whether the module is required to successfully initialize. If 'yes', then
+# a failure to load or initialize this module will result in a p11-kit system failure.
+critical: no
+</pre>
+<p>User configuration file: <code class="literal">~/.config/pkcs11/pkcs11.conf</code></p>
+<pre class="programlisting">
+# This is an empty file. Files that do not exist are treated as empty.
+</pre>
+<p>User configuration file: <code class="literal">~/.config/pkcs11/modules/my-module</code></p>
+<pre class="programlisting">
+# Merge with the settings in the system my-module config file. In this case
+# a developer has overridden to load a different module for my-module instead.
+module: /home/user/src/custom-module/my-module.so
+</pre>
+<p>User configuration file: <code class="literal">~/.config/pkcs11/modules/nss</code></p>
+<pre class="programlisting">
+# Load the NSS libsoftokn.so.3 PKCS#11 library as a module. Note that we pass
+# some custom non-standard initialization arguments, as NSS expects.
+module: /usr/lib/libsoftokn3.so
+x-init-reserved: configdir='sql:/home/test/.pki/nssdb' certPrefix='' keyPrefix='' secmod='socmod.db'
+critical: yes
+</pre>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/config-files.html b/msys2/usr/share/gtk-doc/html/p11-kit/config-files.html
new file mode 100644
index 000000000..63642c17c
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/config-files.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Configuration Files: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="config.html" title="PKCS#11 Configuration">
+<link rel="prev" href="config-example.html" title="Example">
+<link rel="next" href="sharing.html" title="Sharing PKCS#11 modules">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="config.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="config-example.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="sharing.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="config-files"></a>Configuration Files</h2></div></div></div>
+<p>A complete configuration consists of several files. These files are
+	text files. Since <code class="literal">p11-kit</code> is built to be used in all
+	sorts of environments and at very low levels of the software stack, we
+	cannot make use of high level configuration APIs that you may find on a
+	modern desktop.</p>
+<p><a class="link" href="pkcs11-conf.html" title="pkcs11.conf">See the manual page</a> for more details
+	on the format and available options.</p>
+<p>Note that user configuration files are not loaded from the home
+	directory if running inside a setuid or setgid program.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/config.html b/msys2/usr/share/gtk-doc/html/p11-kit/config.html
new file mode 100644
index 000000000..9190a9c62
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/config.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>PKCS#11 Configuration: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="index.html" title="p11-kit">
+<link rel="next" href="config-example.html" title="Example">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="index.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="config-example.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="config"></a>PKCS#11 Configuration</h1></div></div></div>
+<div class="toc"><dl class="toc">
+<dt><span class="section"><a href="config.html#config-introduction">Consistent configuration</a></span></dt>
+<dt><span class="section"><a href="config-example.html">Example</a></span></dt>
+<dt><span class="section"><a href="config-files.html">Configuration Files</a></span></dt>
+</dl></div>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="config-introduction"></a>Consistent configuration</h2></div></div></div>
+<p>In order for multiple applications on the user's desktop to use
+			PKCS#11 modules in a consistent manner, there must be a configuration
+			or registry to specify which modules to load and how to use them. The
+			PKCS#11 specification does not specify such a configuration standard.
+		</p>
+<p>Because of the multi-library module initialization problem, use of
+			PKCS#11 modules must be coordinated within an application. p11-kit
+			provides that coordination. Since coordination is required, it follows
+			that p11-kit can also implement a consistent module configuration.
+		</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-building-style.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-building-style.html
new file mode 100644
index 000000000..914ceb67b
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-building-style.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Coding Style: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel-building.html" title="Compiling p11-kit from Source">
+<link rel="next" href="devel-testing.html" title="Testing and Code Coverage">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel-building.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-testing.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-building-style"></a>Coding Style</h2></div></div></div>
+<p>We use a code style similar to the linux kernel. Use tabs
+		to indent and spaces to align/wrap beyond the indentation level.</p>
+<p>We don't try to guarantee completely robust and problem free
+		behavior in cases where the caller or system isn't behaving. We
+		consider these to be outside of our control:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>Broken input from callers. We use preconditions
+			to check input and immediately return. We don't try to provide
+			error codes for all the various ways callers can screw
+			around.</p></li>
+<li class="listitem">
+<p>Out of memory. It is pretty much impossible to handle out
+			of memory errors correctly. Handling them alongside other errors
+			is naive and broken. We don't try to guarantee library state
+			(such as locks or memory leaks) when memory allocation fails.</p>
+<p>We do check the results from all memory allocations, but
+			treat them as unexpected conditions. As a nod to the behavior
+			of callers of this library, we don't abort on memory allocation
+			failures. We use preconditions with somewhat sane results.</p>
+<p>Exception: when reading files or allocating potentially
+			unbounded amounts of memory, we should respond robustly to memory
+			allocation failures.</p>
+</li>
+</ul></div>
+<p>These unexpected conditions indicate a bug either in p11-kit or
+		in the system. All bets are off once this occurs.</p>
+<p>Use the <code class="literal">return_val_xxx()</code> precondition macros to
+		check for unexpected conditions.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-building.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-building.html
new file mode 100644
index 000000000..604a4b717
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-building.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Compiling p11-kit from Source: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel-commands.html" title="Customizing installed commands">
+<link rel="next" href="devel-building-style.html" title="Coding Style">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel-commands.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-building-style.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-building"></a>Compiling p11-kit from Source</h2></div></div></div>
+<p>This describes how to compiling the p11-kit package from
+		source code. This is normally only necessary for those wishing to
+		contribute to the project or package p11-kit.</p>
+<p>You can download
+		<a class="ulink" href="https://github.com/p11-glue/p11-kit/releases" target="_top">tarballs
+		of the releases</a> of p11-kit or
+		<a class="ulink" href="https://github.com/p11-glue/p11-kit/" target="_top">check
+		out the source code from git</a>. This documentation will not
+		go into all the details of how to get your development environment
+		set up and instead focus on the what's unique to compiling p11-kit.</p>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="devel-building-unix"></a>Building on UNIX</h3></div></div></div>
+<p>p11-kit uses the standard GNU build system, using autoconf for package
+			configuration and resolving portability issues, automake for building makefiles
+			that comply with the GNU Coding Standards, and libtool for building shared
+			libraries on multiple platforms. The normal sequence for compiling and
+			installing the p11-kit library is thus:</p>
+<pre class="programlisting">
+$ ./configure --prefix=/path/to/prefix ...
+$ make
+$ make install
+</pre>
+<p>If you've checked out the source code from git, then the
+			<span class="command"><strong>configure</strong></span> script does not yet exist. So use
+			the following instead:</p>
+<pre class="programlisting">
+$ ./autogen.sh --prefix=/path/to/prefix ...
+$ make
+$ make install
+</pre>
+<p>The standard options provided by GNU autoconf may be passed to the configure
+			script. Please see the autoconf documentation or run <code class="literal">./configure --help</code>
+			for information about the standard options. In particular you probably want to adjust
+			the <code class="literal">--prefix=/xxx</code> argument depending on your system and development
+			environment.</p>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="devel-building-dependencies"></a>Optional Dependencies</h3></div></div></div>
+<p>On a modern GNU Linux system, p11-kit has no required dependencies other
+			than the standard C library. However on older UNIX systems, some of the following
+			may be required.</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p><span class="command"><strong>gettext</strong></span> is required if your system doesn't
+				have the <code class="literal">gettext()</code> functionality for handling message
+				translation databases. This can be provided by the libintl library from
+				the <a class="ulink" href="http://www.gnu.org/software/gettext" target="_top">GNU gettext
+				package</a>.</p></li>
+<li class="listitem"><p><span class="command"><strong>pthread</strong></span> is required if your (ancient) system
+				doesn't have this included in the base system. How this is provided is platform
+				specific.</p></li>
+</ul></div>
+<p>In addition p11-kit has several optional dependencies. If these are not available
+			during the build, then certain features will be disabled.</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p><span class="command"><strong>libffi</strong></span> for sharing of PKCS#11 modules
+				between multiple callers in the same process. It is highly recommended that
+				this dependency be treated as a required dependency.</p></li>
+<li class="listitem"><p><span class="command"><strong>gtk-doc</strong></span> is required to build the reference
+				manual. Use <code class="literal">--enable-doc</code> to control this
+				dependency.</p></li>
+<li class="listitem"><p><span class="command"><strong>xsltproc</strong></span> is required to build the command
+				manual pages. Use <code class="literal">--enable-doc</code> to control this
+				dependency.</p></li>
+<li class="listitem"><p><span class="command"><strong>libtasn1</strong></span> is required to build the trust
+				module and code that interacts with certificates.</p></li>
+<li class="listitem"><p><span class="command"><strong>freebl3</strong></span> (developed as part of the NSS
+				code base) is an optional dependency that may be used to meet policy
+				requirements of system builders. Enabling this dependency provides no other
+				advantage.</p></li>
+</ul></div>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="devel-building-configure"></a>Extra Configuration Options</h3></div></div></div>
+<p>In addition to the normal options, the configure script in the p11-kit library
+			supports these additional arguments:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--disable-trust-module</code></span></p></td>
+<td><p>Disables building of the trust policy module.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--disable-debug</code>, <code class="option">--enable-debug</code></span></p></td>
+<td><p>By default p11-kit is built with debug symbols assertions and
+					and precondition checks. Enabling the debug option configures even more
+					detailed debug build, including disabling optimization. Disabling the debug
+					option is not recommended, as it disables all assertions, preconditions and
+					internal consistency checks, although it may result it a slightly faster
+					library.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--enable-doc</code></span></p></td>
+<td><p>Enables building of the documentation and command line manual.
+					The documentation is built in the <code class="literal">doc/html/</code> directory of
+					the build. Requires the <code class="literal">gtk-doc</code> and <code class="literal">xsltproc</code>
+					dependencies.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--enable-strict</code></span></p></td>
+<td><p>Enables strict checks during building of p11-kit. All
+					compiler warnings become errors.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-hash-impl=freebl</code></span></p></td>
+<td><p>Instead of using internal hash code, link to the freebl3
+					library and use its hash implementations. The only advantage this brings is to
+					meet the policy requirements of system builders.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-libtasn1</code>, <code class="option">--without-libtasn1</code></span></p></td>
+<td><p>Build with a dependency on the libtasn1 library. This dependency
+					allows the trust policy module to be built as well as other code that interacts with
+					certificates.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-module-path</code></span></p></td>
+<td><p>Specify the path to look for PKCS#11 modules which were
+					listed in a module config file with a relative path.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-trust-paths</code></span></p></td>
+<td><p>Specify the files or directories to look for certificate
+					anchors and blacklists. Multiple files and/or directories are specified with
+					a <code class="literal">:</code> in between them. The first path has the highest
+					priority when searching for certificates.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-system-config</code></span></p></td>
+<td><p>Specify the path to look for p11-kit config files. This
+					usually defaults to something like <code class="literal">/etc/pkcs11</code></p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--with-user-config</code></span></p></td>
+<td><p>Specify the path to look for user specific p11-kit config files. If 
+					specify a path that begins with <code class="literal">~/</code> then this is expanded to the
+					home directory of the user running p11-kit. If you specify a path that begins with
+					<code class="literal">~/.config/</code> then this is expanded to the $XDG_CONFIG_HOME directory,
+					as outlined in the
+					<a class="ulink" href="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables" target="_top">XDG Base Dir specification</a>.
+					This option defaults to <code class="literal">~/.pkcs11</code></p></td>
+</tr>
+</tbody>
+</table></div>
+<p></p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-commands.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-commands.html
new file mode 100644
index 000000000..3185e2303
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-commands.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Customizing installed commands: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel-paths.html" title="Packaging PKCS#11 module configs">
+<link rel="next" href="devel-building.html" title="Compiling p11-kit from Source">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel-paths.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-building.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-commands"></a>Customizing installed commands</h2></div></div></div>
+<p>The <code class="literal">p11-kit</code> tool provides a
+		<code class="literal">extract-trust</code> command which extracts trust
+		policy information such as certificate anchors and so on
+		into files for use with libraries that cannot read this trust
+		information directly.</p>
+<p>In order to be useful the <code class="literal">extract-trust</code>
+		command needs to be customized per distribution or site. You can
+		find this file in at <code class="literal">tools/p11-kit-trust-extract.in</code>
+		in the p11-kit source code.</p>
+<p>The command is implemented as a simple script which
+		performs the various <code class="literal">p11-kit extract</code> commands
+		necessary to extract the information.</p>
+<p>Using this script as a standard way to extract this
+		information allows for consistency between distributions and ease
+		of system administration.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-debugging.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-debugging.html
new file mode 100644
index 000000000..0d425ce5e
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-debugging.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Debugging Tips: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel-testing.html" title="Testing and Code Coverage">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel-testing.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-debugging"></a>Debugging Tips</h2></div></div></div>
+<p>Unexpected conditions will produce critical warnings by p11-kit.
+		These are often failed internal preconditions, and usually indicate a
+		bug either in p11-kit or the software calling it.</p>
+<p>You can use the environment variable <code class="literal">P11_KIT_STRICT=yes</code>
+		to make p11-kit do an <code class="literal">abort()</code> (and core dump depending on
+		your configuration) when a critical warning occurs.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-paths.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-paths.html
new file mode 100644
index 000000000..904599be3
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-paths.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Packaging PKCS#11 module configs: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="next" href="devel-commands.html" title="Customizing installed commands">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-commands.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-paths"></a>Packaging PKCS#11 module configs</h2></div></div></div>
+<p>Developers or packagers of PKCS#11 modules need to install various
+		files into specific locations so that p11-kit will recognize and load the
+		module correctly.</p>
+<p>You should use <code class="literal">pkg-config</code> as described below
+		to determine configuration paths. p11-kit installs a
+		<code class="literal">pkg-config</code> file called <code class="literal">p11-kit-1.pc</code>.
+		This file contains all the information about the various paths that p11-kit
+		looks for files at.</p>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="devel-paths-config"></a>Path to place module configuration</h3></div></div></div>
+<p>As described in the <a class="link" href="pkcs11-conf.html#config-module" title="Module Configuration">module configuration</a>
+			documentation, each PKCS#11 module should install a config file describing
+			that module. These config files should be installed to a specific directory which
+			can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_configs</strong></span>
+/usr/share/p11-kit/modules</pre>
+</div>
+<div class="section">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="devel-paths-modules"></a>Default path for modules with relative paths</h3></div></div></div>
+<p>If a <a class="link" href="pkcs11-conf.html#config-module" title="Module Configuration">module configuration</a>
+			contains a relative path in its <code class="literal">module:</code> setting,
+			then that module will be loaded from the default module path. This
+			path can be determined by running:</p>
+<pre class="programlisting">
+$ <span class="command"><strong>pkg-config p11-kit-1 --variable p11_module_path</strong></span>
+/usr/lib64/pkcs11</pre>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel-testing.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel-testing.html
new file mode 100644
index 000000000..ebfff06dc
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel-testing.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Testing and Code Coverage: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<link rel="prev" href="devel-building-style.html" title="Coding Style">
+<link rel="next" href="devel-debugging.html" title="Debugging Tips">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="devel.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="devel-building-style.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-debugging.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-testing"></a>Testing and Code Coverage</h2></div></div></div>
+<p>As a general rule changes to p11-kit should have a tests exercising
+		that change. Use the <code class="literal">make check</code> command to run all
+		the tests. If you run it from a subdirectory only the tests in that
+		directory will be run.</p>
+<p>To check for memory errors or memory leaks, run <code class="literal">make memcheck</code>
+		or <code class="literal">make leakcheck</code> respectively. This requires valgrind
+		be installed.</p>
+<p>Build p11-kit with the <code class="option">--enable-coverage</code> configure
+		option to build code coverage support.</p>
+<p>Once you've done that you can either use <code class="literal">make coverage</code>
+		to build code coverage information. Alternatively (and this is usually
+		easier) you can use
+		<a class="ulink" href="http://stef.thewalter.net/2012/12/git-coverage-useful-code-coverage.html" target="_top">
+			<code class="literal">git coverage</code></a> to easily check whether
+		you've tested the lines changed by a patch.</p>
+<p>A code coverage report is
+			<a class="ulink" href="https://coveralls.io/github/p11-glue/p11-kit" target="_top">available online</a></p>.
+	</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/devel.html b/msys2/usr/share/gtk-doc/html/p11-kit/devel.html
new file mode 100644
index 000000000..769952838
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/devel.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Building, Packaging, and Contributing to p11-kit: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="p11-kit-Deprecated.html" title="Deprecated">
+<link rel="next" href="devel-paths.html" title="Packaging PKCS#11 module configs">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="p11-kit-Deprecated.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel-paths.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="devel"></a>Building, Packaging, and Contributing to p11-kit</h1></div></div></div>
+<div class="toc"><dl class="toc">
+<dt><span class="section"><a href="devel.html#devel-links">Helpful Resources</a></span></dt>
+<dt><span class="section"><a href="devel-paths.html">Packaging PKCS#11 module configs</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="devel-paths.html#devel-paths-config">Path to place module configuration</a></span></dt>
+<dt><span class="section"><a href="devel-paths.html#devel-paths-modules">Default path for modules with relative paths</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="devel-commands.html">Customizing installed commands</a></span></dt>
+<dt><span class="section"><a href="devel-building.html">Compiling p11-kit from Source</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="devel-building.html#devel-building-unix">Building on UNIX</a></span></dt>
+<dt><span class="section"><a href="devel-building.html#devel-building-dependencies">Optional Dependencies</a></span></dt>
+<dt><span class="section"><a href="devel-building.html#devel-building-configure">Extra Configuration Options</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="devel-building-style.html">Coding Style</a></span></dt>
+<dt><span class="section"><a href="devel-testing.html">Testing and Code Coverage</a></span></dt>
+<dt><span class="section"><a href="devel-debugging.html">Debugging Tips</a></span></dt>
+</dl></div>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="devel-links"></a>Helpful Resources</h2></div></div></div>
+<p>Use the following to find more information about
+		contributing to p11-kit beyond what's in this manual:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p><a class="ulink" href="https://p11-glue.github.io/p11-glue/p11-kit.html" target="_top">Website</a></p></li>
+<li class="listitem"><p><a class="ulink" href="mail:p11-glue@lists.freedesktop.org" target="_top">Mailing list</a></p></li>
+<li class="listitem"><p><a class="ulink" href="https://github.com/p11-glue/p11-kit/issues/" target="_top">Issue tracker</a></p></li>
+</ul></div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/home.png b/msys2/usr/share/gtk-doc/html/p11-kit/home.png
new file mode 100644
index 000000000..9346b336a
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/home.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/index.html b/msys2/usr/share/gtk-doc/html/p11-kit/index.html
new file mode 100644
index 000000000..576cd3dca
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/index.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>p11-kit: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="next" href="config.html" title="PKCS#11 Configuration">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="book">
+<div class="titlepage">
+<div>
+<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">p11-kit</p></th></tr></table></div>
+<div><p class="releaseinfo">for p11-kit 0.23.22</p></div>
+</div>
+<hr>
+</div>
+<div class="toc"><dl class="toc">
+<dt><span class="chapter"><a href="config.html">PKCS#11 Configuration</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="config.html#config-introduction">Consistent configuration</a></span></dt>
+<dt><span class="section"><a href="config-example.html">Example</a></span></dt>
+<dt><span class="section"><a href="config-files.html">Configuration Files</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="sharing.html">Sharing PKCS#11 modules</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="sharing.html#sharing-problem">Multiple consumers of PKCS#11 in a process</a></span></dt>
+<dt><span class="section"><a href="sharing-managed.html">Managed modules</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="sharing.html">Proxy Module</a></span></dt>
+<dt><span class="chapter"><a href="remoting.html">Remoting / Forwarding</a></span></dt>
+<dt><span class="chapter"><a href="trust-module.html">Trust Policy Module</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="trust-module.html#trust-files">Paths loaded by the Module</a></span></dt>
+<dt><span class="section"><a href="trust-nss.html">Using the Trust Policy Module with NSS</a></span></dt>
+<dt><span class="section"><a href="trust-glib-networking.html">Using the Trust Policy Module with glib-networking</a></span></dt>
+<dt><span class="section"><a href="trust-disable.html">Disabling the Trust Policy Module</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="tools.html">Manual Pages</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="p11-kit.html">p11-kit</a></span><span class="refpurpose"> — Tool for operating on configured PKCS#11 modules</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="pkcs11-conf.html">pkcs11.conf</a></span><span class="refpurpose"> — Configuration files for PKCS#11 modules</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="trust.html">trust</a></span><span class="refpurpose"> — Tool for operating on the trust policy store</span>
+</dt>
+</dl></dd>
+<dt><span class="chapter"><a href="reference.html">API Reference</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Modules.html">Modules</a></span><span class="refpurpose"> — Module loading and initializing</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-URIs.html">URIs</a></span><span class="refpurpose"> — Parsing and formatting PKCS#11 URIs</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-PIN-Callbacks.html">PIN Callbacks</a></span><span class="refpurpose"> — PIN Callbacks</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Utilities.html">Utilities</a></span><span class="refpurpose"> — PKCS#11 utilities</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Future.html">Future</a></span><span class="refpurpose"> — Future Unstable API</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Deprecated.html">Deprecated</a></span><span class="refpurpose"> — Deprecated functions</span>
+</dt>
+<dt><span class="index"><a href="reference.html#api-index-full">API Index</a></span></dt>
+<dt><span class="glossary"><a href="reference.html#annotation-glossary">Annotation Glossary</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="devel.html">Building, Packaging, and Contributing to p11-kit</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="devel.html#devel-links">Helpful Resources</a></span></dt>
+<dt><span class="section"><a href="devel-paths.html">Packaging PKCS#11 module configs</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="devel-paths.html#devel-paths-config">Path to place module configuration</a></span></dt>
+<dt><span class="section"><a href="devel-paths.html#devel-paths-modules">Default path for modules with relative paths</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="devel-commands.html">Customizing installed commands</a></span></dt>
+<dt><span class="section"><a href="devel-building.html">Compiling p11-kit from Source</a></span></dt>
+<dd><dl>
+<dt><span class="section"><a href="devel-building.html#devel-building-unix">Building on UNIX</a></span></dt>
+<dt><span class="section"><a href="devel-building.html#devel-building-dependencies">Optional Dependencies</a></span></dt>
+<dt><span class="section"><a href="devel-building.html#devel-building-configure">Extra Configuration Options</a></span></dt>
+</dl></dd>
+<dt><span class="section"><a href="devel-building-style.html">Coding Style</a></span></dt>
+<dt><span class="section"><a href="devel-testing.html">Testing and Code Coverage</a></span></dt>
+<dt><span class="section"><a href="devel-debugging.html">Debugging Tips</a></span></dt>
+</dl></dd>
+</dl></div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/left-insensitive.png b/msys2/usr/share/gtk-doc/html/p11-kit/left-insensitive.png
new file mode 100644
index 000000000..3269393a7
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/left-insensitive.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/left.png b/msys2/usr/share/gtk-doc/html/p11-kit/left.png
new file mode 100644
index 000000000..2abde032b
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/left.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
new file mode 100644
index 000000000..2ca9cd428
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
@@ -0,0 +1,460 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Deprecated: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="p11-kit-Future.html" title="Future">
+<link rel="next" href="devel.html" title="Building, Packaging, and Contributing to p11-kit">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-Deprecated.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit-Future.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="devel.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-Deprecated"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-Deprecated.top_of_page"></a>Deprecated</span></h2>
+<p>Deprecated — Deprecated functions</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-Deprecated.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()">p11_kit_initialize_registered</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()">p11_kit_finalize_registered</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST_PTR</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-modules" title="p11_kit_registered_modules ()">p11_kit_registered_modules</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-module-to-name" title="p11_kit_registered_module_to_name ()">p11_kit_registered_module_to_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-name-to-module" title="p11_kit_registered_name_to_module ()">p11_kit_registered_name_to_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-option" title="p11_kit_registered_option ()">p11_kit_registered_option</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()">p11_kit_initialize_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-load-initialize-module" title="p11_kit_load_initialize_module ()">p11_kit_load_initialize_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()">p11_kit_finalize_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Deprecated.html#P11-KIT-DEPRECATED-FOR:CAPS" title="P11_KIT_DEPRECATED_FOR()">P11_KIT_DEPRECATED_FOR</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Deprecated.description"></a><h2>Description</h2>
+<p>These functions have been deprecated from p11-kit and are not recommended for
+general usage. In large part they were deprecated because they did not adequately
+insulate multiple callers of a PKCS#11 module from another, and could not
+support the 'managed' mode needed to do this.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Deprecated.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-initialize-registered"></a><h3>p11_kit_initialize_registered ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_initialize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_initialize_registered</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since: 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a> instead.</p>
+</div>
+<p>Initialize all the registered PKCS#11 modules.</p>
+<p>If this is the first time this function is called multiple times
+consecutively within a single process, then it merely increments an
+initialization reference count for each of these modules.</p>
+<p>Use <a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()"><code class="function">p11_kit_finalize_registered()</code></a> to finalize these registered modules once
+the caller is done with them.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-initialize-registered.returns"></a><h4>Returns</h4>
+<p> CKR_OK if the initialization succeeded, or an error code.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-finalize-registered"></a><h3>p11_kit_finalize_registered ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_finalize_registered (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_finalize_registered</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-modules-release" title="p11_kit_modules_release ()"><code class="function">p11_kit_modules_release()</code></a> instead.</p>
+</div>
+<p>Finalize all the registered PKCS#11 modules. These should have been
+initialized with <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a>.</p>
+<p>If <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> has been called more than once in this
+process, then this function must be called the same number of times before
+actual finalization will occur.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-finalize-registered.returns"></a><h4>Returns</h4>
+<p> CKR_OK if the finalization succeeded, or an error code.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-registered-modules"></a><h3>p11_kit_registered_modules ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span> *
+p11_kit_registered_modules (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_registered_modules</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a> instead.</p>
+</div>
+<p>Get a list of all the registered PKCS#11 modules. This list will be valid
+once the <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> function has been called.</p>
+<p>The returned value is a <code class="code">NULL</code> terminated array of</p>
+<code class="code">CK_FUNCTION_LIST_PTR</code> pointers.
+<p>The returned modules are unmanaged.</p>
+<div class="refsect3">
+<a name="p11-kit-registered-modules.returns"></a><h4>Returns</h4>
+<p> A list of all the registered modules. Use the <code class="function">free()</code> function to
+free the list.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-registered-module-to-name"></a><h3>p11_kit_registered_module_to_name ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_registered_module_to_name (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_registered_module_to_name</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-module-get-name" title="p11_kit_module_get_name ()"><code class="function">p11_kit_module_get_name()</code></a> instead.</p>
+</div>
+<p>Get the name of a registered PKCS#11 module.</p>
+<p>You can use <a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-modules" title="p11_kit_registered_modules ()"><code class="function">p11_kit_registered_modules()</code></a> to get a list of all the registered
+modules. This name is specified by the registered module configuration.</p>
+<div class="refsect3">
+<a name="p11-kit-registered-module-to-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>pointer to a registered module</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-registered-module-to-name.returns"></a><h4>Returns</h4>
+<p> A newly allocated string containing the module name, or</p>
+<code class="code">NULL</code> if no such registered module exists. Use <code class="function">free()</code> to
+<p>    free this string.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-registered-name-to-module"></a><h3>p11_kit_registered_name_to_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
+p11_kit_registered_name_to_module (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_registered_name_to_module</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-module-for-name" title="p11_kit_module_for_name ()"><code class="function">p11_kit_module_for_name()</code></a> instead.</p>
+</div>
+<p>Lookup a registered PKCS#11 module by its name. This name is specified by
+the registered module configuration.</p>
+<div class="refsect3">
+<a name="p11-kit-registered-name-to-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>name of a registered module</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-registered-name-to-module.returns"></a><h4>Returns</h4>
+<p> a pointer to a PKCS#11 module, or <code class="code">NULL</code> if this name was
+not found.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-registered-option"></a><h3>p11_kit_registered_option ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_registered_option (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *field</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_registered_option</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-config-option" title="p11_kit_config_option ()"><code class="function">p11_kit_config_option()</code></a> instead.</p>
+</div>
+<p>Lookup a configured option for a registered PKCS#11 module. If a</p>
+<code class="code">NULL</code> module argument is specified, then this will lookup
+<p>the configuration option in the global config file.</p>
+<div class="refsect3">
+<a name="p11-kit-registered-option.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>a pointer to a registered module</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>field</p></td>
+<td class="parameter_description"><p>the name of the option to lookup.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-registered-option.returns"></a><h4>Returns</h4>
+<p> A newly allocated string containing the option value, or</p>
+<code class="code">NULL</code> if the registered module or the option were not found.
+<p>    Use <code class="function">free()</code> to free the returned string.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-initialize-module"></a><h3>p11_kit_initialize_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_initialize_module (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_initialize_module</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-module-initialize" title="p11_kit_module_initialize ()"><code class="function">p11_kit_module_initialize()</code></a> instead.</p>
+</div>
+<p>Initialize an arbitrary PKCS#11 module. Normally using the
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> is preferred.</p>
+<p>Using this function to initialize modules allows coordination between
+multiple users of the same module in a single process. It should be called
+on modules that have been loaded (with <code class="function">dlopen()</code> for example) but not yet
+initialized. The caller should not yet have called the module's</p>
+<code class="code">C_Initialize</code> method. This function will call
+<code class="code">C_Initialize</code> as necessary.
+<p>Subsequent calls to this function for the same module will result in an
+initialization count being incremented for the module. It is safe (although
+usually unnecessary) to use this function on registered modules.</p>
+<p>The module must be finalized with <a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()"><code class="function">p11_kit_finalize_module()</code></a> instead of
+calling its <code class="code">C_Finalize</code> method directly.</p>
+<p>This function does not accept a <code class="code">CK_C_INITIALIZE_ARGS</code> argument.
+Custom initialization arguments cannot be supported when multiple consumers
+load the same module.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-initialize-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>loaded module to initialize.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-initialize-module.returns"></a><h4>Returns</h4>
+<p> CKR_OK if the initialization was successful.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-load-initialize-module"></a><h3>p11_kit_load_initialize_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_load_initialize_module (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
+                                <em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> *module</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_load_initialize_module</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-module-load" title="p11_kit_module_load ()"><code class="function">p11_kit_module_load()</code></a> instead.</p>
+</div>
+<p>Load an arbitrary PKCS#11 module from a dynamic library file, and
+initialize it. Normally using the <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()"><code class="function">p11_kit_initialize_registered()</code></a> function
+is preferred.</p>
+<p>Using this function to load and initialize modules allows coordination between
+multiple users of the same module in a single process. The caller should not
+call the module's <code class="code">C_Initialize</code> method. This function will call</p>
+<code class="code">C_Initialize</code> as necessary.
+<p>If a module has already been loaded, then use of this function is unnecesasry.
+Instead use the <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()"><code class="function">p11_kit_initialize_module()</code></a> function to initialize it.</p>
+<p>Subsequent calls to this function for the same module will result in an
+initialization count being incremented for the module. It is safe (although
+usually unnecessary) to use this function on registered modules.</p>
+<p>The module must be finalized with <a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()"><code class="function">p11_kit_finalize_module()</code></a> instead of
+calling its <code class="code">C_Finalize</code> method directly.</p>
+<p>This function does not accept a <code class="code">CK_C_INITIALIZE_ARGS</code> argument.
+Custom initialization arguments cannot be supported when multiple consumers
+load the same module.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-load-initialize-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module_path</p></td>
+<td class="parameter_description"><p>full file path of module library</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>location to place loaded module pointer</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-load-initialize-module.returns"></a><h4>Returns</h4>
+<p> CKR_OK if the initialization was successful.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-finalize-module"></a><h3>p11_kit_finalize_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_finalize_module (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_finalize_module</code> is deprecated and should not be used in newly-written code.</p>
+<p>Since 0.19.0: Use <a class="link" href="p11-kit-Modules.html#p11-kit-module-finalize" title="p11_kit_module_finalize ()"><code class="function">p11_kit_module_finalize()</code></a> and
+	<a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()"><code class="function">p11_kit_module_release()</code></a> instead.</p>
+</div>
+<p>Finalize an arbitrary PKCS#11 module. The module must have been initialized
+using <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()"><code class="function">p11_kit_initialize_module()</code></a>. In most cases callers will want to use
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()"><code class="function">p11_kit_finalize_registered()</code></a> instead of this function.</p>
+<p>Using this function to finalize modules allows coordination between
+multiple users of the same module in a single process. The caller should not
+call the module's <code class="code">C_Finalize</code> method. This function will call</p>
+<code class="code">C_Finalize</code> as necessary.
+<p>If the module was initialized more than once, then this function will
+decrement an initialization count for the module. When the count reaches zero
+the module will be truly finalized. It is safe (although usually unnecessary)
+to use this function on registered modules if (and only if) they were
+initialized using <a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()"><code class="function">p11_kit_initialize_module()</code></a> for some reason.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-finalize-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>loaded module to finalize.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-finalize-module.returns"></a><h4>Returns</h4>
+<p> CKR_OK if the finalization was successful.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11-KIT-DEPRECATED-FOR:CAPS"></a><h3>P11_KIT_DEPRECATED_FOR()</h3>
+<pre class="programlisting">#define P11_KIT_DEPRECATED_FOR(f) __attribute__((deprecated("Use " #f " instead")))
+</pre>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
new file mode 100644
index 000000000..919983a0b
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
@@ -0,0 +1,1321 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Future: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="p11-kit-Utilities.html" title="Utilities">
+<link rel="next" href="p11-kit-Deprecated.html" title="Deprecated">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-Future.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit-Utilities.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-Deprecated.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-Future"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-Future.top_of_page"></a>Future</span></h2>
+<p>Future — Future Unstable API</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-Future.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-set-progname" title="p11_kit_set_progname ()">p11_kit_set_progname</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="p11-kit-Future.html#p11-kit-destroyer" title="p11_kit_destroyer ()">*p11_kit_destroyer</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="returnvalue">P11KitIter</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-new" title="p11_kit_iter_new ()">p11_kit_iter_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-set-uri" title="p11_kit_iter_set_uri ()">p11_kit_iter_set_uri</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-add-callback" title="p11_kit_iter_add_callback ()">p11_kit_iter_add_callback</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-add-filter" title="p11_kit_iter_add_filter ()">p11_kit_iter_add_filter</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="p11-kit-Future.html#p11-kit-iter-callback" title="p11_kit_iter_callback ()">*p11_kit_iter_callback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-begin" title="p11_kit_iter_begin ()">p11_kit_iter_begin</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-begin-with" title="p11_kit_iter_begin_with ()">p11_kit_iter_begin_with</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()">p11_kit_iter_next</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-Future.html#P11KitIterKind" title="enum P11KitIterKind"><span class="returnvalue">P11KitIterKind</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-kind" title="p11_kit_iter_get_kind ()">p11_kit_iter_get_kind</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-module" title="p11_kit_iter_get_module ()">p11_kit_iter_get_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SLOT_ID</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot" title="p11_kit_iter_get_slot ()">p11_kit_iter_get_slot</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SLOT_INFO</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot-info" title="p11_kit_iter_get_slot_info ()">p11_kit_iter_get_slot_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_TOKEN_INFO</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-token" title="p11_kit_iter_get_token ()">p11_kit_iter_get_token</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SESSION_HANDLE</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-session" title="p11_kit_iter_get_session ()">p11_kit_iter_get_session</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SESSION_HANDLE</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" title="p11_kit_iter_keep_session ()">p11_kit_iter_keep_session</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_OBJECT_HANDLE</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-object" title="p11_kit_iter_get_object ()">p11_kit_iter_get_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-attributes" title="p11_kit_iter_get_attributes ()">p11_kit_iter_get_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-load-attributes" title="p11_kit_iter_load_attributes ()">p11_kit_iter_load_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-destroy-object" title="p11_kit_iter_destroy_object ()">p11_kit_iter_destroy_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-free" title="p11_kit_iter_free ()">p11_kit_iter_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-module" title="p11_kit_remote_serve_module ()">p11_kit_remote_serve_module</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-token" title="p11_kit_remote_serve_token ()">p11_kit_remote_serve_token</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-tokens" title="p11_kit_remote_serve_tokens ()">p11_kit_remote_serve_tokens</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Future.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="other_proto_type">
+<col class="other_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter">P11KitIter</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="p11-kit-Future.html#p11-kit-iter" title="p11_kit_iter">p11_kit_iter</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="p11-kit-Future.html#P11KitIterKind" title="enum P11KitIterKind">P11KitIterKind</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="p11-kit-Future.html#P11KitIterBehavior" title="enum P11KitIterBehavior">P11KitIterBehavior</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Future.description"></a><h2>Description</h2>
+<p>API that is not yet stable enough to be enabled by default. In all likelihood
+this will be included in the next release. To use this API you must define a
+MACRO. See the p11-kit.h header for more details.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Future.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-set-progname"></a><h3>p11_kit_set_progname ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_set_progname (<em class="parameter"><code>const <span class="type">char</span> *progname</code></em>);</pre>
+<p>Set the program base name that is used by the <code class="literal">enable-in</code>
+and <code class="literal">disable-in</code> module configuration options.</p>
+<p>Normally this is automatically calculated from the program's argument list.
+You would usually call this before initializing p11-kit modules.</p>
+<div class="refsect3">
+<a name="p11-kit-set-progname.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>progname</p></td>
+<td class="parameter_description"><p>the program base name</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-destroyer"></a><h3>p11_kit_destroyer ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*p11_kit_destroyer<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
+<p>A callback called to free a resource.</p>
+<div class="refsect3">
+<a name="p11-kit-destroyer.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>data</p></td>
+<td class="parameter_description"><p>data to destroy</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-new"></a><h3>p11_kit_iter_new ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="returnvalue">P11KitIter</span></a> *
+p11_kit_iter_new (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                  <em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIterBehavior" title="enum P11KitIterBehavior"><span class="type">P11KitIterBehavior</span></a> behavior</code></em>);</pre>
+<p>Create a new PKCS#11 iterator for iterating over objects. Only
+objects that match the <em class="parameter"><code>uri</code></em>
+ will be returned by the iterator.
+Relevant information in <em class="parameter"><code>uri</code></em>
+ is copied, and you need not keep
+<em class="parameter"><code>uri</code></em>
+ around.</p>
+<p>If no <em class="parameter"><code>uri</code></em>
+ is specified then the iterator will iterate over all
+objects, unless otherwise filtered.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>a PKCS#11 URI to filter on, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>behavior</p></td>
+<td class="parameter_description"><p>various behavior flags for iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-new.returns"></a><h4>Returns</h4>
+<p>a new iterator, which should be freed
+with <a class="link" href="p11-kit-Future.html#p11-kit-iter-free" title="p11_kit_iter_free ()"><code class="function">p11_kit_iter_free()</code></a>. </p>
+<p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-set-uri"></a><h3>p11_kit_iter_set_uri ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_set_uri (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                      <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Set the PKCS#11 uri for iterator. Only
+objects that match the <em class="parameter"><code>uri</code></em>
+ will be returned by the iterator.
+Relevant information in <em class="parameter"><code>uri</code></em>
+ is copied, and you need not keep
+<em class="parameter"><code>uri</code></em>
+ around.</p>
+<p>If no <em class="parameter"><code>uri</code></em>
+ is specified then the iterator will iterate over all
+objects, unless otherwise filtered.</p>
+<p>This function should be called at most once, and should be
+called before iterating begins.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-set-uri.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>a PKCS#11 URI to filter on, or <code class="literal">NULL</code>. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-add-callback"></a><h3>p11_kit_iter_add_callback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_add_callback (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                           <em class="parameter"><code><a class="link" href="p11-kit-Future.html#p11-kit-iter-callback" title="p11_kit_iter_callback ()"><span class="type">p11_kit_iter_callback</span></a> callback</code></em>,
+                           <em class="parameter"><code><span class="type">void</span> *callback_data</code></em>,
+                           <em class="parameter"><code><a class="link" href="p11-kit-Future.html#p11-kit-destroyer" title="p11_kit_destroyer ()"><span class="type">p11_kit_destroyer</span></a> callback_destroy</code></em>);</pre>
+<p>Adds a callback to the iterator which will be called each time
+that an object is iterated.</p>
+<p>These callbacks can also perform filtering. If any callback
+indicates through it's <code class="literal">matches</code> argument that
+the object should not match, then that object will not be iterated
+as far as <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> is concerned.</p>
+<p>The callbacks will be called with the <code class="literal">matches</code>
+set to <code class="literal">CK_TRUE</code> and it's up to filters to change
+it to <code class="literal">CK_FALSE</code> when necessary.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-add-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>a function to call for each iteration</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_data</p></td>
+<td class="parameter_description"><p>data to pass to the function. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_destroy</p></td>
+<td class="parameter_description"><p>used to cleanup the data. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-add-filter"></a><h3>p11_kit_iter_add_filter ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_add_filter (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                         <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *matching</code></em>,
+                         <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
+<p>Add a filter to limit the objects that the iterator iterates over.</p>
+<p>Only objects matching the passed in attributes will be iterated.
+This function can be called multiple times.</p>
+<p>The <em class="parameter"><code>matching</code></em>
+ attributes are copied.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-add-filter.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>matching</p></td>
+<td class="parameter_description"><p>the attributes that the objects should match. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>count</p></td>
+<td class="parameter_description"><p>the number of attributes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-callback"></a><h3>p11_kit_iter_callback ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+<span class="c_punctuation">(</span>*p11_kit_iter_callback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                          <em class="parameter"><code><span class="type">CK_BBOOL</span> *matches</code></em>,
+                          <em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
+<p>A callback setup with <a class="link" href="p11-kit-Future.html#p11-kit-iter-add-callback" title="p11_kit_iter_add_callback ()"><code class="function">p11_kit_iter_add_callback()</code></a>. This callback is
+called for each object iterated.</p>
+<p>If the callback sets <em class="parameter"><code>matches</code></em>
+ to CK_FALSE, then this object is
+skipped and not matched by <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a>. If you return
+anything but CKR_OK, then the iteration is stopped, and
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> returns the result code.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>matches</p></td>
+<td class="parameter_description"><p>whether to match the current object. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>data</p></td>
+<td class="parameter_description"><p>callback data</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-callback.returns"></a><h4>Returns</h4>
+<p> CKR_OK to continue iterating, CKR_CANCEL to stop, or
+anything else to fail</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-begin"></a><h3>p11_kit_iter_begin ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_begin (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                    <em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> *modules</code></em>);</pre>
+<p>Begin iterating PKCS#11 objects in the given <em class="parameter"><code>modules</code></em>
+.</p>
+<p>The <em class="parameter"><code>modules</code></em>
+ arguments should be a null-terminated list of
+pointers to the modules' PKCS#11 function pointers.</p>
+<p>For each module, all initialized slots will be iterated over,
+having sessions opened for each of them in turn, and searched
+for objects matching the search criteria.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-begin.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>null-terminated list of
+modules to iterate over. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-begin-with"></a><h3>p11_kit_iter_begin_with ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_begin_with (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                         <em class="parameter"><code><span class="type">CK_FUNCTION_LIST_PTR</span> module</code></em>,
+                         <em class="parameter"><code><span class="type">CK_SLOT_ID</span> slot</code></em>,
+                         <em class="parameter"><code><span class="type">CK_SESSION_HANDLE</span> session</code></em>);</pre>
+<p>Begin iterating PKCS#11 objects in the given <em class="parameter"><code>module</code></em>
+.</p>
+<p>If <em class="parameter"><code>slot</code></em>
+ is non-zero then the iteration will be limited to that
+slot.</p>
+<p>If <em class="parameter"><code>session</code></em>
+ is non-zero then the iteration will be limited to
+objects visible through that session, which implies that they
+are also limited to the slot which the session was opened for.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-begin-with.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module to iterate over</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>slot</p></td>
+<td class="parameter_description"><p>the slot to iterate objects in, or zero. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>session</p></td>
+<td class="parameter_description"><p>the session to search for objects on, or zero. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-next"></a><h3>p11_kit_iter_next ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_iter_next (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Iterate to the next matching object.</p>
+<p>To access the object, session and so on, use the <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-object" title="p11_kit_iter_get_object ()"><code class="function">p11_kit_iter_get_object()</code></a>,
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-session" title="p11_kit_iter_get_session ()"><code class="function">p11_kit_iter_get_session()</code></a>, and <a class="link" href="p11-kit-Future.html#p11-kit-iter-get-module" title="p11_kit_iter_get_module ()"><code class="function">p11_kit_iter_get_module()</code></a> functions.</p>
+<p>This call must only be called after either <a class="link" href="p11-kit-Future.html#p11-kit-iter-begin" title="p11_kit_iter_begin ()"><code class="function">p11_kit_iter_begin()</code></a>
+or <a class="link" href="p11-kit-Future.html#p11-kit-iter-begin-with" title="p11_kit_iter_begin_with ()"><code class="function">p11_kit_iter_begin_with()</code></a> have been called.</p>
+<p>Objects which are skipped by callbacks will not be returned here
+as matching objects.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-next.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-next.returns"></a><h4>Returns</h4>
+<p> CKR_OK if an object matched, CKR_CANCEL if no more objects, or another error</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-kind"></a><h3>p11_kit_iter_get_kind ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-Future.html#P11KitIterKind" title="enum P11KitIterKind"><span class="returnvalue">P11KitIterKind</span></a>
+p11_kit_iter_get_kind (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the kind of the current match (a module, slot, token, or an
+object).</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-kind.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-kind.returns"></a><h4>Returns</h4>
+<p> a <a class="link" href="p11-kit-Future.html#P11KitIterKind" title="enum P11KitIterKind"><span class="type">P11KitIterKind</span></a> value</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-module"></a><h3>p11_kit_iter_get_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST_PTR</span>
+p11_kit_iter_get_module (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the module function pointers for the current matching object.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-module.returns"></a><h4>Returns</h4>
+<p> the module which the current matching object is in</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-slot"></a><h3>p11_kit_iter_get_slot ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_ID</span>
+p11_kit_iter_get_slot (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the slot which the current matching object is on.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot.returns"></a><h4>Returns</h4>
+<p> the slot of the current matching object</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-slot-info"></a><h3>p11_kit_iter_get_slot_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_INFO</span> *
+p11_kit_iter_get_slot_info (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the slot info for the slot which the current matching object is on.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-slot-info.returns"></a><h4>Returns</h4>
+<p> the slot of the current matching object.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-token"></a><h3>p11_kit_iter_get_token ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_TOKEN_INFO</span> *
+p11_kit_iter_get_token (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the token info for the token which the current matching object is on.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-token.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-token.returns"></a><h4>Returns</h4>
+<p> the slot of the current matching object.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-session"></a><h3>p11_kit_iter_get_session ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SESSION_HANDLE</span>
+p11_kit_iter_get_session (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the session which the current matching object is accessible
+through.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<p>The session may be closed after the next <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> call
+unless <a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" title="p11_kit_iter_keep_session ()"><code class="function">p11_kit_iter_keep_session()</code></a> is called.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-session.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-session.returns"></a><h4>Returns</h4>
+<p> the session used to find the current matching object</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-keep-session"></a><h3>p11_kit_iter_keep_session ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SESSION_HANDLE</span>
+p11_kit_iter_keep_session (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>After calling this function the session open for iterating
+the current object will not be automatically closed by
+the iterator after later calls to <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> or
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-free" title="p11_kit_iter_free ()"><code class="function">p11_kit_iter_free()</code></a>.</p>
+<p>It is the callers responsibility to close this session,
+after the iterator has been freed. The session may still be
+used by the iterator if further iterations are performed.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-keep-session.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-keep-session.returns"></a><h4>Returns</h4>
+<p> the current session</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-object"></a><h3>p11_kit_iter_get_object ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_OBJECT_HANDLE</span>
+p11_kit_iter_get_object (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Get the current matching object.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-object.returns"></a><h4>Returns</h4>
+<p> the current matching object</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-get-attributes"></a><h3>p11_kit_iter_get_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_iter_get_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
+<p>Get attributes for the current matching object.</p>
+<p>This calls <code class="literal">C_GetAttributeValue</code> for the object
+currently iterated to. Return value and attribute memory behavior
+is identical to the PKCS#11 <code class="literal">C_GetAttributeValue</code>
+function.</p>
+<p>You might choose to use <a class="link" href="p11-kit-Future.html#p11-kit-iter-load-attributes" title="p11_kit_iter_load_attributes ()"><code class="function">p11_kit_iter_load_attributes()</code></a> for a more
+helpful variant.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-get-attributes.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>the attributes to get. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count][<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>count</p></td>
+<td class="parameter_description"><p>the number of attributes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-get-attributes.returns"></a><h4>Returns</h4>
+<p> The result from <code class="literal">C_GetAttributeValue</code>.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-load-attributes"></a><h3>p11_kit_iter_load_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_iter_load_attributes (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>,
+                              <em class="parameter"><code><span class="type">CK_ATTRIBUTE</span> *template</code></em>,
+                              <em class="parameter"><code><span class="type">CK_ULONG</span> count</code></em>);</pre>
+<p>Retrieve attributes for the current matching object.</p>
+<p>Each attribute in the array will be filled in with the value
+of that attribute retrieved from the object. After use the
+attribute value memory pointed to by the <code class="literal">pValue</code>
+of each attribute should be freed with the <code class="literal">free()</code>
+function.</p>
+<p>If the <code class="literal">pValue</code> of an attribute is not <code class="literal">NULL</code> passed
+to this function, then it will be passed to
+<code class="literal">realloc()</code> to allocate the correct amount
+of space for the attribute value.</p>
+<p>If any attribute is not present on the object, or is sensitive and
+cannot be retrieved, then the <code class="literal">pValue</code> will be NULL.
+If <code class="literal">pValue</code> was not <code class="literal">NULL</code> when passed to this function
+then it will be freed with <code class="literal">free()</code>. In these
+cases <code class="literal">CKR_OK</code> is returned.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-load-attributes.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>the attributes to load. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=count][<acronym title="Parameter for input and for returning results. Default is transfer full."><span class="acronym">inout</span></acronym>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>count</p></td>
+<td class="parameter_description"><p>the number of attributes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-load-attributes.returns"></a><h4>Returns</h4>
+<p> CKR_OK or a failure code</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-destroy-object"></a><h3>p11_kit_iter_destroy_object ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_iter_destroy_object (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Destroy the current matching object.</p>
+<p>This can only be called after <a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()"><code class="function">p11_kit_iter_next()</code></a> succeeds.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-destroy-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-iter-destroy-object.returns"></a><h4>Returns</h4>
+<p> CKR_OK or a failure code</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter-free"></a><h3>p11_kit_iter_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_iter_free (<em class="parameter"><code><a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter"><span class="type">P11KitIter</span></a> *iter</code></em>);</pre>
+<p>Frees the iterator and all resources, such as sessions
+or callbacks held by the iterator.</p>
+<div class="refsect3">
+<a name="p11-kit-iter-free.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>iter</p></td>
+<td class="parameter_description"><p>the iterator</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-remote-serve-module"></a><h3>p11_kit_remote_serve_module ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_remote_serve_module (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>,
+                             <em class="parameter"><code><span class="type">int</span> in_fd</code></em>,
+                             <em class="parameter"><code><span class="type">int</span> out_fd</code></em>);</pre>
+<p>Run a module on a given pair of input/output FDs.</p>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-module.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>a pointer to a loaded module</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>in_fd</p></td>
+<td class="parameter_description"><p>input fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_fd</p></td>
+<td class="parameter_description"><p>output fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-module.returns"></a><h4>Returns</h4>
+<p> 0 if success, non-zero otherwise.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-remote-serve-token"></a><h3>p11_kit_remote_serve_token ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_remote_serve_token (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>,
+                            <em class="parameter"><code><span class="type">CK_TOKEN_INFO</span> *token</code></em>,
+                            <em class="parameter"><code><span class="type">int</span> in_fd</code></em>,
+                            <em class="parameter"><code><span class="type">int</span> out_fd</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_remote_serve_token</code> is deprecated and should not be used in newly-written code.</p>
+<p>use <a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-tokens" title="p11_kit_remote_serve_tokens ()"><code class="function">p11_kit_remote_serve_tokens()</code></a></p>
+</div>
+<p>Run a token wrapped in a module on a given pair of input/output FDs.</p>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-token.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>a pointer to a loaded module</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>token</p></td>
+<td class="parameter_description"><p>a token info</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>in_fd</p></td>
+<td class="parameter_description"><p>input fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_fd</p></td>
+<td class="parameter_description"><p>output fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-token.returns"></a><h4>Returns</h4>
+<p> 0 if success, non-zero otherwise.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-remote-serve-tokens"></a><h3>p11_kit_remote_serve_tokens ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_remote_serve_tokens (<em class="parameter"><code>const <span class="type">char</span> **tokens</code></em>,
+                             <em class="parameter"><code><span class="type">size_t</span> n_tokens</code></em>,
+                             <em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *provider</code></em>,
+                             <em class="parameter"><code><span class="type">int</span> in_fd</code></em>,
+                             <em class="parameter"><code><span class="type">int</span> out_fd</code></em>);</pre>
+<p>Expose tokens on a given pair of input/output FDs.  If <em class="parameter"><code>provider</code></em>
+ is
+not NULL, all the tokens must be provided by the same module.</p>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-tokens.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>tokens</p></td>
+<td class="parameter_description"><p>a list of token URIs</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>n_tokens</p></td>
+<td class="parameter_description"><p>the length of <em class="parameter"><code>tokens</code></em>
+</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>provider</p></td>
+<td class="parameter_description"><p>a PKCS#11 module that provides the tokens. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<a href="http://foldoc.org/nullable"><span class="acronym">nullable</span></a>]</span></td>
+</tr>
+<tr>
+<td class="parameter_name"><p>in_fd</p></td>
+<td class="parameter_description"><p>input fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>out_fd</p></td>
+<td class="parameter_description"><p>output fd</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-remote-serve-tokens.returns"></a><h4>Returns</h4>
+<p> 0 if success, non-zero otherwise.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Future.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="P11KitIter"></a><h3>P11KitIter</h3>
+<p>Used to iterate over PKCS#11 objects, tokens, slots, and modules.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-iter"></a><h3>p11_kit_iter</h3>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitIterKind"></a><h3>enum P11KitIterKind</h3>
+<p>The kind of the current match.</p>
+<div class="refsect3">
+<a name="P11KitIterKind.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-MODULE:CAPS"></a>P11_KIT_ITER_KIND_MODULE</p></td>
+<td class="enum_member_description">
+<p>The iterator is pointing to a module.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-SLOT:CAPS"></a>P11_KIT_ITER_KIND_SLOT</p></td>
+<td class="enum_member_description">
+<p>The iterator is pointing to a slot.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-TOKEN:CAPS"></a>P11_KIT_ITER_KIND_TOKEN</p></td>
+<td class="enum_member_description">
+<p>The iterator is pointing to a token.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-OBJECT:CAPS"></a>P11_KIT_ITER_KIND_OBJECT</p></td>
+<td class="enum_member_description">
+<p>The iterator is pointing to an object.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-UNKNOWN:CAPS"></a>P11_KIT_ITER_KIND_UNKNOWN</p></td>
+<td class="enum_member_description">
+<p>The iterator doesn't point to anything.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitIterBehavior"></a><h3>enum P11KitIterBehavior</h3>
+<p>Various flags controlling the behavior of the iterator.</p>
+<div class="refsect3">
+<a name="P11KitIterBehavior.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-BUSY-SESSIONS:CAPS"></a>P11_KIT_ITER_BUSY_SESSIONS</p></td>
+<td class="enum_member_description">
+<p>Allow the iterator's sessions to be
+in a busy state when the iterator returns an object.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WANT-WRITABLE:CAPS"></a>P11_KIT_ITER_WANT_WRITABLE</p></td>
+<td class="enum_member_description">
+<p>Try to open read-write sessions when
+iterating over objects.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-MODULES:CAPS"></a>P11_KIT_ITER_WITH_MODULES</p></td>
+<td class="enum_member_description">
+<p>Stop at each module while iterating.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-SLOTS:CAPS"></a>P11_KIT_ITER_WITH_SLOTS</p></td>
+<td class="enum_member_description">
+<p>Stop at each slot while iterating.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-TOKENS:CAPS"></a>P11_KIT_ITER_WITH_TOKENS</p></td>
+<td class="enum_member_description">
+<p>Stop at each token while iterating.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITHOUT-OBJECTS:CAPS"></a>P11_KIT_ITER_WITHOUT_OBJECTS</p></td>
+<td class="enum_member_description">
+<p>Ignore objects while iterating.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html
new file mode 100644
index 000000000..0cb65bf87
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html
@@ -0,0 +1,833 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Modules: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="reference.html" title="API Reference">
+<link rel="next" href="p11-kit-URIs.html" title="URIs">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-Modules.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="reference.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-URIs.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-Modules"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-Modules.top_of_page"></a>Modules</span></h2>
+<p>Modules — Module loading and initializing</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-Modules.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST</span> **
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load-and-initialize" title="p11_kit_modules_load_and_initialize ()">p11_kit_modules_load_and_initialize</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-finalize-and-release" title="p11_kit_modules_finalize_and_release ()">p11_kit_modules_finalize_and_release</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST</span> **
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()">p11_kit_modules_load</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-initialize" title="p11_kit_modules_initialize ()">p11_kit_modules_initialize</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-finalize" title="p11_kit_modules_finalize ()">p11_kit_modules_finalize</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-release" title="p11_kit_modules_release ()">p11_kit_modules_release</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-load" title="p11_kit_module_load ()">p11_kit_module_load</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-initialize" title="p11_kit_module_initialize ()">p11_kit_module_initialize</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_RV</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-finalize" title="p11_kit_module_finalize ()">p11_kit_module_finalize</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()">p11_kit_module_release</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_FUNCTION_LIST</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-for-name" title="p11_kit_module_for_name ()">p11_kit_module_for_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-name" title="p11_kit_module_get_name ()">p11_kit_module_get_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-flags" title="p11_kit_module_get_flags ()">p11_kit_module_get_flags</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-filename" title="p11_kit_module_get_filename ()">p11_kit_module_get_filename</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Modules.html#p11-kit-config-option" title="p11_kit_config_option ()">p11_kit_config_option</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Modules.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="other_proto_type">
+<col class="other_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-CRITICAL:CAPS" title="P11_KIT_MODULE_CRITICAL">P11_KIT_MODULE_CRITICAL</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS" title="P11_KIT_MODULE_UNMANAGED">P11_KIT_MODULE_UNMANAGED</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Modules.description"></a><h2>Description</h2>
+<p>PKCS#11 modules are used by crypto libraries and applications to access
+crypto objects (like keys and certificates) and to perform crypto operations.</p>
+<p>In order for applications to behave consistently with regard to the user's
+installed PKCS#11 modules, each module must be configured so that applications
+or libraries know that they should load it.</p>
+<p>When multiple consumers of a module (such as libraries or applications) are
+in the same process, coordination of the initialization and finalization
+of PKCS#11 modules is required. To do this modules are managed by p11-kit.
+This means that various unsafe methods are coordinated between callers. Unmanaged
+modules are simply the raw PKCS#11 module pointers without p11-kit getting in the
+way. It is highly recommended that the default managed behavior is used.</p>
+<p>The functions here provide support for initializing configured modules. The
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a> function should be used to load and initialize
+the configured modules. When done, the <a class="link" href="p11-kit-Modules.html#p11-kit-modules-release" title="p11_kit_modules_release ()"><code class="function">p11_kit_modules_release()</code></a> function
+should be used to release those modules and associated resources.</p>
+<p>In addition <a class="link" href="p11-kit-Modules.html#p11-kit-config-option" title="p11_kit_config_option ()"><code class="function">p11_kit_config_option()</code></a> can be used to access other parts
+of the module configuration.</p>
+<p>If a consumer wishes to load an arbitrary PKCS#11 module that's not
+configured use <a class="link" href="p11-kit-Modules.html#p11-kit-module-load" title="p11_kit_module_load ()"><code class="function">p11_kit_module_load()</code></a> to do so. And use <a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()"><code class="function">p11_kit_module_release()</code></a>
+to later release it.</p>
+<p>Modules are represented by a pointer to their <code class="code">CK_FUNCTION_LIST</code>
+entry points.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Modules.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-modules-load-and-initialize"></a><h3>p11_kit_modules_load_and_initialize ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST</span> **
+p11_kit_modules_load_and_initialize (<em class="parameter"><code><span class="type">int</span> flags</code></em>);</pre>
+<p>Load and initialize configured modules.</p>
+<p>If a critical module fails to load or initialize then the function will
+return <code class="literal">NULL</code>. Non-critical modules will be skipped
+and not included in the returned module list.</p>
+<p>Use <a class="link" href="p11-kit-Modules.html#p11-kit-modules-finalize-and-release" title="p11_kit_modules_finalize_and_release ()"><code class="function">p11_kit_modules_finalize_and_release()</code></a> when you're done with the
+modules returned by this function.</p>
+<p>The <em class="parameter"><code>flags</code></em>
+ allowed by this function, as well as their meaning, are the
+same as with <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-load-and-initialize.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>flags to use to load the modules</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-modules-load-and-initialize.returns"></a><h4>Returns</h4>
+<p> a <code class="literal">NULL</code> terminated list of modules, or
+<code class="literal">NULL</code> on failure</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-modules-finalize-and-release"></a><h3>p11_kit_modules_finalize_and_release ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_modules_finalize_and_release (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> **modules</code></em>);</pre>
+<p>Finalize and then release the a set of loaded PKCS#11 modules.</p>
+<p>The modules may be either managed or unmanaged. The array containing
+the module pointers is also freed by this function.</p>
+<p>Modules are released even if their finalization returns an error code.
+Managed modules will not be actually finalized or released until all
+callers using them have done so.</p>
+<p>For managed modules the <code class="literal">C_Finalize</code> function
+is overridden so that multiple callers can finalize the same
+modules. In addition for managed modules multiple callers can
+finalize from different threads, and still guarantee consistent
+thread-safe behavior.</p>
+<p>For unmanaged modules if multiple callers try to finalize
+a module, then one of the calls will return
+<code class="literal">CKR_CRYPTOKI_NOT_INITIALIZED</code> according to the
+PKCS#11 specification. In addition there are no guarantees that
+thread-safe behavior will occur if multiple callers initialize from
+different threads.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-finalize-and-release.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>the modules to release</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-modules-load"></a><h3>p11_kit_modules_load ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST</span> **
+p11_kit_modules_load (<em class="parameter"><code>const <span class="type">char</span> *reserved</code></em>,
+                      <em class="parameter"><code><span class="type">int</span> flags</code></em>);</pre>
+<p>Load the configured PKCS#11 modules.</p>
+<p>If <em class="parameter"><code>flags</code></em>
+ contains the <a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS" title="P11_KIT_MODULE_UNMANAGED"><code class="literal">P11_KIT_MODULE_UNMANAGED</code></a> flag, then the
+modules will be not be loaded in 'managed' mode regardless of its
+configuration. This is not recommended for general usage.</p>
+<p>If <em class="parameter"><code>flags</code></em>
+ contains the <a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-CRITICAL:CAPS" title="P11_KIT_MODULE_CRITICAL"><code class="literal">P11_KIT_MODULE_CRITICAL</code></a> flag then the
+modules will all be treated as 'critical', regardless of the module
+configuration. This means that a failure to load any module will
+cause this function to fail.</p>
+<p>For unmanaged modules there is no guarantee to the state of the
+modules. Other callers may be using the modules. Using unmanaged
+modules haphazardly is not recommended for this reason. Some
+modules (such as those configured with RPC) cannot be loaded in
+unmanaged mode, and will be skipped.</p>
+<p>If <em class="parameter"><code>flags</code></em>
+ contains the <code class="literal">P11_KIT_MODULE_TRUSTED</code> flag then only the
+marked as trusted modules will be loaded.</p>
+<p>Use <a class="link" href="p11-kit-Modules.html#p11-kit-modules-release" title="p11_kit_modules_release ()"><code class="function">p11_kit_modules_release()</code></a> to release the modules returned by
+this function.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-load.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>reserved</p></td>
+<td class="parameter_description"><p>set to <code class="literal">NULL</code></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>flags to use to load the module</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-modules-load.returns"></a><h4>Returns</h4>
+<p> a null terminated list of modules represented as PKCS#11
+function lists, or <code class="literal">NULL</code> on failure</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-modules-initialize"></a><h3>p11_kit_modules_initialize ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_modules_initialize (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> **modules</code></em>,
+                            <em class="parameter"><code><a class="link" href="p11-kit-Future.html#p11-kit-destroyer" title="p11_kit_destroyer ()"><span class="type">p11_kit_destroyer</span></a> failure_callback</code></em>);</pre>
+<p>Initialize all the modules in the <em class="parameter"><code>modules</code></em>
+ list by calling their
+<code class="literal">C_Initialize</code> function.</p>
+<p>For managed modules the <code class="literal">C_Initialize</code> function
+is overridden so that multiple callers can initialize the same
+modules. In addition for managed modules multiple callers can
+initialize from different threads, and still guarantee consistent
+thread-safe behavior.</p>
+<p>For unmanaged modules if multiple callers try to initialize
+a module, then one of the calls will return
+<code class="literal">CKR_CRYPTOKI_ALREADY_INITIALIZED</code> according to the
+PKCS#11 specification. In addition there are no guarantees that
+thread-safe behavior will occur if multiple callers initialize from
+different threads.</p>
+<p>When a module fails to initialize it is removed from the <em class="parameter"><code>modules</code></em>
+ list.
+If the <em class="parameter"><code>failure_callback</code></em>
+ is not <code class="literal">NULL</code> then it is called with the modules that
+fail to initialize. For example, you may pass <a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()"><code class="function">p11_kit_module_release()</code></a>
+as a <em class="parameter"><code>failure_callback</code></em>
+ if the <em class="parameter"><code>modules</code></em>
+ list was loaded wit <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>.</p>
+<p>The return value will return the failure code of the last critical
+module that failed to initialize. Non-critical module failures do not affect
+the return value. If no critical modules failed to initialize then the
+return value will be <code class="literal">CKR_OK</code>.</p>
+<p>When modules are removed, the list will be <code class="literal">NULL</code> terminated at the
+appropriate place so it can continue to be used as a modules list.</p>
+<p>This function does not accept a <code class="code">CK_C_INITIALIZE_ARGS</code> argument.
+Custom initialization arguments cannot be supported when multiple consumers
+load the same module.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-initialize.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>a <code class="literal">NULL</code> terminated list of modules</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>failure_callback</p></td>
+<td class="parameter_description"><p>called with modules that fail to initialize</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-modules-initialize.returns"></a><h4>Returns</h4>
+<p> <code class="literal">CKR_OK</code> or the failure code of the last critical
+module that failed to initialize.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-modules-finalize"></a><h3>p11_kit_modules_finalize ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_modules_finalize (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> **modules</code></em>);</pre>
+<p>Finalize each module in the <em class="parameter"><code>modules</code></em>
+ list by calling its
+<code class="literal">C_Finalize</code> function. Regardless of failures, all
+<em class="parameter"><code>modules</code></em>
+ will have their <code class="literal">C_Finalize</code> function called.</p>
+<p>If a module returns a failure from its <code class="literal">C_Finalize</code>
+method it will be returned. If multiple modules fail, the last failure
+will be returned.</p>
+<p>For managed modules the <code class="literal">C_Finalize</code> function
+is overridden so that multiple callers can finalize the same
+modules. In addition for managed modules multiple callers can
+finalize from different threads, and still guarantee consistent
+thread-safe behavior.</p>
+<p>For unmanaged modules if multiple callers try to finalize
+a module, then one of the calls will return
+<code class="literal">CKR_CRYPTOKI_NOT_INITIALIZED</code> according to the
+PKCS#11 specification. In addition there are no guarantees that
+thread-safe behavior will occur if multiple callers finalize from
+different threads.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-finalize.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>a <code class="literal">NULL</code> terminated list of modules</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-modules-finalize.returns"></a><h4>Returns</h4>
+<p> <code class="literal">CKR_OK</code> or the failure code of the last
+module that failed to finalize</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-modules-release"></a><h3>p11_kit_modules_release ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_modules_release (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> **modules</code></em>);</pre>
+<p>Release the a set of loaded PKCS#11 modules.</p>
+<p>The modules may be either managed or unmanaged. The array containing
+the module pointers is also freed by this function.</p>
+<p>Managed modules will not be actually released until all
+callers using them have done so. If the modules were initialized, they
+should have been finalized first.</p>
+<div class="refsect3">
+<a name="p11-kit-modules-release.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>the modules to release</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-load"></a><h3>p11_kit_module_load ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST</span> *
+p11_kit_module_load (<em class="parameter"><code>const <span class="type">char</span> *module_path</code></em>,
+                     <em class="parameter"><code><span class="type">int</span> flags</code></em>);</pre>
+<p>Load an arbitrary PKCS#11 module from a dynamic library file, and
+initialize it. Normally using the <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a> function
+is preferred.</p>
+<p>A full file path or just (path/)filename relative to
+P11_MODULE_PATH are accepted.</p>
+<p>Using this function to load modules allows coordination between multiple
+callers of the same module in a single process. If <em class="parameter"><code>flags</code></em>
+ contains the
+<a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS" title="P11_KIT_MODULE_UNMANAGED"><code class="literal">P11_KIT_MODULE_UNMANAGED</code></a> flag, then the modules will be not be loaded
+in 'managed' mode and not be coordinated. This is not recommended
+for general usage.</p>
+<p>Subsequent calls to this function for the same module will result in an
+initialization count being incremented for the module. It is safe (although
+usually unnecessary) to use this function on registered modules.</p>
+<p>The module should be released with <a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()"><code class="function">p11_kit_module_release()</code></a>.</p>
+<p>If this function fails, then an error message will be available via the
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()"><code class="function">p11_kit_message()</code></a> function.</p>
+<div class="refsect3">
+<a name="p11-kit-module-load.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module_path</p></td>
+<td class="parameter_description"><p>relative or full file path of module library</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>flags</p></td>
+<td class="parameter_description"><p>flags to use when loading the module</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-load.returns"></a><h4>Returns</h4>
+<p> the loaded module PKCS#11 functions or <code class="literal">NULL</code> on failure</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-initialize"></a><h3>p11_kit_module_initialize ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_module_initialize (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Initialize a PKCS#11 module by calling its <code class="literal">C_Initialize</code>
+function.</p>
+<p>For managed modules the <code class="literal">C_Initialize</code> function
+is overridden so that multiple callers can initialize the same
+modules. In addition for managed modules multiple callers can
+initialize from different threads, and still guarantee consistent
+thread-safe behavior.</p>
+<p>For unmanaged modules if multiple callers try to initialize
+a module, then one of the calls will return
+<code class="literal">CKR_CRYPTOKI_ALREADY_INITIALIZED</code> according to the
+PKCS#11 specification. In addition there are no guarantees that
+thread-safe behavior will occur if multiple callers initialize from
+different threads.</p>
+<p>This function does not accept a <code class="code">CK_C_INITIALIZE_ARGS</code> argument.
+Custom initialization arguments cannot be supported when multiple consumers
+load the same module.</p>
+<div class="refsect3">
+<a name="p11-kit-module-initialize.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module to initialize</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-initialize.returns"></a><h4>Returns</h4>
+<p> <code class="literal">CKR_OK</code> or a failure code</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-finalize"></a><h3>p11_kit_module_finalize ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_RV</span>
+p11_kit_module_finalize (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Finalize a PKCS#11 module by calling its <code class="literal">C_Finalize</code>
+function.</p>
+<p>For managed modules the <code class="literal">C_Finalize</code> function
+is overridden so that multiple callers can finalize the same
+modules. In addition for managed modules multiple callers can
+finalize from different threads, and still guarantee consistent
+thread-safe behavior.</p>
+<p>For unmanaged modules if multiple callers try to finalize
+a module, then one of the calls will return
+<code class="literal">CKR_CRYPTOKI_NOT_INITIALIZED</code> according to the
+PKCS#11 specification. In addition there are no guarantees that
+thread-safe behavior will occur if multiple callers finalize from
+different threads.</p>
+<div class="refsect3">
+<a name="p11-kit-module-finalize.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module to finalize</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-finalize.returns"></a><h4>Returns</h4>
+<p> <code class="literal">CKR_OK</code> or a failure code</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-release"></a><h3>p11_kit_module_release ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_module_release (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Release the a loaded PKCS#11 modules.</p>
+<p>The module may be either managed or unmanaged. The <code class="literal">C_Finalize</code>
+function will be called if no other callers are using this module.</p>
+<div class="refsect3">
+<a name="p11-kit-module-release.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module to release</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-for-name"></a><h3>p11_kit_module_for_name ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_FUNCTION_LIST</span> *
+p11_kit_module_for_name (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> **modules</code></em>,
+                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Look through the list of <em class="parameter"><code>modules</code></em>
+ and return the module whose <em class="parameter"><code>name</code></em>
+
+matches.</p>
+<p>Only configured modules have names. Configured modules are loaded by
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>. The module passed to this function can be either
+managed or unmanaged.</p>
+<p>The return value is not copied or duplicated in anyway. It is still
+'owned' by the <em class="parameter"><code>modules</code></em>
+ list.</p>
+<div class="refsect3">
+<a name="p11-kit-module-for-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>modules</p></td>
+<td class="parameter_description"><p>a list of modules to look through</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the name of the module to find</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-for-name.returns"></a><h4>Returns</h4>
+<p> the module which matches the name, or <code class="literal">NULL</code> if no match.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-get-name"></a><h3>p11_kit_module_get_name ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_module_get_name (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Get the configured name of the PKCS#11 module.</p>
+<p>Configured modules are loaded by <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>. The module
+passed to this function can be either managed or unmanaged. Non
+configured modules will return <code class="literal">NULL</code>.</p>
+<p>Use <code class="function">free()</code> to release the return value when you're done with it.</p>
+<div class="refsect3">
+<a name="p11-kit-module-get-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>pointer to a loaded module</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-get-name.returns"></a><h4>Returns</h4>
+<p> a newly allocated string containing the module name, or</p>
+<code class="code">NULL</code> if the module is not a configured module
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-get-flags"></a><h3>p11_kit_module_get_flags ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_module_get_flags (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Get the flags for this module.</p>
+<p>The <a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS" title="P11_KIT_MODULE_UNMANAGED"><code class="literal">P11_KIT_MODULE_UNMANAGED</code></a> flag will be set if the module is not
+managed by p11-kit. It is a raw PKCS#11 module function list.</p>
+<p>The <a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-CRITICAL:CAPS" title="P11_KIT_MODULE_CRITICAL"><code class="literal">P11_KIT_MODULE_CRITICAL</code></a> flag will be set if the module is configured
+to be critical, and not be skipped over if it fails to initialize or
+load. This flag is also set for modules that are not configured, but have
+been loaded in another fashion.</p>
+<div class="refsect3">
+<a name="p11-kit-module-get-flags.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-get-flags.returns"></a><h4>Returns</h4>
+<p> the flags for the module</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-module-get-filename"></a><h3>p11_kit_module_get_filename ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_module_get_filename (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>);</pre>
+<p>Get the configured name of the PKCS#11 module.</p>
+<p>Configured modules are loaded by <a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>. The module
+passed to this function can be either managed or unmanaged. Non
+configured modules will return <code class="literal">NULL</code>.</p>
+<p>Use <code class="function">free()</code> to release the return value when you're done with it.</p>
+<div class="refsect3">
+<a name="p11-kit-module-get-filename.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>pointer to a loaded module</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-module-get-filename.returns"></a><h4>Returns</h4>
+<p> a newly allocated string containing the module name, or</p>
+<code class="code">NULL</code> if the module is not a configured module
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-config-option"></a><h3>p11_kit_config_option ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_config_option (<em class="parameter"><code><span class="type">CK_FUNCTION_LIST</span> *module</code></em>,
+                       <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);</pre>
+<p>Retrieve the value for a configured option.</p>
+<p>If <em class="parameter"><code>module</code></em>
+ is <code class="literal">NULL</code>, then the global option with the given name will
+be retrieved. Otherwise <em class="parameter"><code>module</code></em>
+ should point to a configured loaded module.
+If no such <em class="parameter"><code>option</code></em>
+ or configured <em class="parameter"><code>module</code></em>
+ exists, then <code class="literal">NULL</code> will be returned.</p>
+<p>Use <code class="function">free()</code> to release the returned value.</p>
+<div class="refsect3">
+<a name="p11-kit-config-option.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>module</p></td>
+<td class="parameter_description"><p>the module to retrieve the option for, or <code class="literal">NULL</code> for global options</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>option</p></td>
+<td class="parameter_description"><p>the option to retrieve</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-config-option.returns"></a><h4>Returns</h4>
+<p> the option value or <code class="literal">NULL</code></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Modules.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="P11-KIT-MODULE-CRITICAL:CAPS"></a><h3>P11_KIT_MODULE_CRITICAL</h3>
+<pre class="programlisting">#define P11_KIT_MODULE_CRITICAL 1
+</pre>
+<p>Flag to load a module in 'critical' mode. Failure to load a critical module
+will prevent all other modules from loading. A failure when loading a
+non-critical module skips that module.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11-KIT-MODULE-UNMANAGED:CAPS"></a><h3>P11_KIT_MODULE_UNMANAGED</h3>
+<pre class="programlisting">#define P11_KIT_MODULE_UNMANAGED 1
+</pre>
+<p>Module is loaded in non 'managed' mode. This is not recommended,
+disables many features, and prevents coordination between multiple
+callers of the same module.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
new file mode 100644
index 000000000..25b1637af
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
@@ -0,0 +1,892 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>PIN Callbacks: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="p11-kit-URIs.html" title="URIs">
+<link rel="next" href="p11-kit-Utilities.html" title="Utilities">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-PIN-Callbacks.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit-URIs.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-Utilities.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-PIN-Callbacks"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-PIN-Callbacks.top_of_page"></a>PIN Callbacks</span></h2>
+<p>PIN Callbacks — PIN Callbacks</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-PIN-Callbacks.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new" title="p11_kit_pin_new ()">p11_kit_pin_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-buffer" title="p11_kit_pin_new_for_buffer ()">p11_kit_pin_new_for_buffer</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-string" title="p11_kit_pin_new_for_string ()">p11_kit_pin_new_for_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const unsigned <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-value" title="p11_kit_pin_get_value ()">p11_kit_pin_get_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">size_t</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-length" title="p11_kit_pin_get_length ()">p11_kit_pin_get_length</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-ref" title="p11_kit_pin_ref ()">p11_kit_pin_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()">p11_kit_pin_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()">p11_kit_pin_register_callback</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unregister-callback" title="p11_kit_pin_unregister_callback ()">p11_kit_pin_unregister_callback</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-callback" title="p11_kit_pin_callback ()">*p11_kit_pin_callback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-request" title="p11_kit_pin_request ()">p11_kit_pin_request</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-destroy-func" title="p11_kit_pin_destroy_func ()">*p11_kit_pin_destroy_func</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-file-callback" title="p11_kit_pin_file_callback ()">p11_kit_pin_file_callback</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-PIN-Callbacks.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="other_proto_type">
+<col class="other_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin">P11KitPin</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPinFlags" title="enum P11KitPinFlags">P11KitPinFlags</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FALLBACK:CAPS" title="P11_KIT_PIN_FALLBACK">P11_KIT_PIN_FALLBACK</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-PIN-Callbacks.description"></a><h2>Description</h2>
+<p>Applications can register a callback which will be called to provide a
+password associated with a given pin source.</p>
+<p>PKCS#11 URIs can contain a 'pin-source' attribute. The value of this attribute
+is application dependent, but often references a file containing a PIN to
+use.</p>
+<p>Using these functions, an applications or libraries can register a
+callback with <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()"><code class="function">p11_kit_pin_register_callback()</code></a> to be called when a given
+'pin-source' attribute value is requested. The application can then prompt
+the user or retrieve a PIN for the given context. These registered
+callbacks are only relevant and valid within the current process.</p>
+<p>A fallback callback can be registered by passing the <a class="link" href="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FALLBACK:CAPS" title="P11_KIT_PIN_FALLBACK"><code class="literal">P11_KIT_PIN_FALLBACK</code></a>
+value to <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()"><code class="function">p11_kit_pin_register_callback()</code></a>. This fallback callback will be
+called for every 'pin-source' attribute request for which no callback has been
+directly registered.</p>
+<p>To request a PIN for a given 'pin-source' attribute, use the
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-request" title="p11_kit_pin_request ()"><code class="function">p11_kit_pin_request()</code></a> function. If this function returns <code class="literal">NULL</code> then either
+no callbacks were registered or none of them could handle the request.</p>
+<p>If multiple callbacks are registered for the same PIN source, then they are
+called in last-registered-first-called order. They are called in turn until
+one of them can handle the request. Fallback callbacks are not called if
+a callback was registered specifically for a requested 'pin-source' attribute.</p>
+<p>PINs themselves are handled inside of P11KitPin structures. These are thread
+safe and allow the callback to specify how the PIN is stored in memory
+and freed. A callback can use <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-string" title="p11_kit_pin_new_for_string ()"><code class="function">p11_kit_pin_new_for_string()</code></a> or related
+functions to create a PIN to be returned.</p>
+<p>For example in order to handle the following PKCS#11 URI with a 'pin-source'
+attribute</p>
+<code class="code"><div class="literallayout"><p><br>
+     pkcs11:id=\%69\%95\%3e\%5c\%f4\%bd\%ec\%91;pin-source=my-application<br>
+</p></div></code><p>an application could register a callback like this:</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4
+5
+6
+7
+8
+9
+10</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="k">static</span> <span class="n">P11KitPin</span><span class="o">*</span>
+<span class="n">my_application_pin_callback</span> <span class="p">(</span><span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">pin_source</span><span class="p">,</span> <span class="n">P11KitUri</span> <span class="o">*</span><span class="n">pin_uri</span><span class="p">,</span>
+                             <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">pin_description</span><span class="p">,</span> <span class="n">P11KitPinFlags</span> <span class="n">pin_flags</span><span class="p">,</span>
+                             <span class="kt">void</span> <span class="o">*</span><span class="n">callback_data</span><span class="p">)</span>
+<span class="p">{</span>
+    <span class="k">return</span> <span class="nf">p11_kit_pin_new_from_string</span> <span class="p">(</span><span class="s">&quot;pin-value&quot;</span><span class="p">);</span>
+<span class="p">}</span>
+
+<span class="n">p11_kit_pin_register_callback</span> <span class="p">(</span><span class="s">&quot;my-application&quot;</span><span class="p">,</span> <span class="n">my_application_pin_callback</span><span class="p">,</span>
+                               <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+</div>
+<div class="refsect1">
+<a name="p11-kit-PIN-Callbacks.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-pin-new"></a><h3>p11_kit_pin_new ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_new (<em class="parameter"><code>const unsigned <span class="type">char</span> *value</code></em>,
+                 <em class="parameter"><code><span class="type">size_t</span> length</code></em>);</pre>
+<p>Create a new P11KitPin with the given PIN value. This function is
+usually used from within registered PIN callbacks.</p>
+<p>Exactly <em class="parameter"><code>length</code></em>
+ bytes from <em class="parameter"><code>value</code></em>
+ are used. Null terminated strings,
+or encodings are not considered. A copy of the <em class="parameter"><code>value</code></em>
+ will be made.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-new.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value of the PIN</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>length</p></td>
+<td class="parameter_description"><p>the length of <em class="parameter"><code>value</code></em>
+</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-new.returns"></a><h4>Returns</h4>
+<p> The newly allocated P11KitPin, which should be freed with
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a> when no longer needed.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-new-for-buffer"></a><h3>p11_kit_pin_new_for_buffer ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_new_for_buffer (<em class="parameter"><code>unsigned <span class="type">char</span> *buffer</code></em>,
+                            <em class="parameter"><code><span class="type">size_t</span> length</code></em>,
+                            <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-destroy-func" title="p11_kit_pin_destroy_func ()"><span class="type">p11_kit_pin_destroy_func</span></a> destroy</code></em>);</pre>
+<p>Create a new P11KitPin which will use <em class="parameter"><code>buffer</code></em>
+ for the PIN value.
+This function is usually used from within registered PIN callbacks.</p>
+<p>The buffer will not be copied. String encodings and null characters
+are not considered.</p>
+<p>When the last reference to this PIN is lost, then the <em class="parameter"><code>destroy</code></em>
+ callback
+function will be called passing <em class="parameter"><code>buffer</code></em>
+ as an argument. This allows the
+caller to use a buffer as a PIN without copying it.</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="kt">char</span> <span class="o">*</span><span class="n">buffer</span> <span class="o">=</span> <span class="n">malloc</span> <span class="p">(</span><span class="mi">128</span><span class="p">);</span>
+<span class="n">P11KitPin</span> <span class="o">*</span><span class="n">pin</span><span class="p">;</span>
+ <span class="p">....</span>
+<span class="n">pin</span> <span class="o">=</span> <span class="n">p11_kit_pin_new_for_buffer</span> <span class="p">(</span><span class="n">buffer</span><span class="p">,</span> <span class="mi">128</span><span class="p">,</span> <span class="n">free</span><span class="p">);</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="refsect3">
+<a name="p11-kit-pin-new-for-buffer.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>buffer</p></td>
+<td class="parameter_description"><p>the value of the PIN</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>length</p></td>
+<td class="parameter_description"><p>the length of <em class="parameter"><code>buffer</code></em>
+</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>destroy</p></td>
+<td class="parameter_description"><p>if not <code class="literal">NULL</code>, then called when PIN is destroyed.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-new-for-buffer.returns"></a><h4>Returns</h4>
+<p> The newly allocated P11KitPin, which should be freed with
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a> when no longer needed.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-new-for-string"></a><h3>p11_kit_pin_new_for_string ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_new_for_string (<em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre>
+<p>Create a new P11KitPin for the given null-terminated string, such as a
+password. This function is usually used from within registered
+PIN callbacks.</p>
+<p>The PIN will consist of the string not including the null terminator.
+String encoding is not considered. A copy of the <em class="parameter"><code>value</code></em>
+ will be made.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-new-for-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>the value of the PIN</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-new-for-string.returns"></a><h4>Returns</h4>
+<p> The newly allocated P11KitPin, which should be freed with
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a> when no longer needed.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-get-value"></a><h3>p11_kit_pin_get_value ()</h3>
+<pre class="programlisting">const unsigned <span class="returnvalue">char</span> *
+p11_kit_pin_get_value (<em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="type">P11KitPin</span></a> *pin</code></em>,
+                       <em class="parameter"><code><span class="type">size_t</span> *length</code></em>);</pre>
+<p>Get the PIN value from a P11KitPin. <em class="parameter"><code>length</code></em>
+ will be set to the
+length of the value.</p>
+<p>The value returned is owned by the P11KitPin and should not be modified.
+It remains valid as long as a reference to the PIN is held. The PIN value
+will not contain an extra null-terminator character.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-get-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin</p></td>
+<td class="parameter_description"><p>the P11KitPin</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>length</p></td>
+<td class="parameter_description"><p>a location to return the value length</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-get-value.returns"></a><h4>Returns</h4>
+<p> the value for the PIN.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-get-length"></a><h3>p11_kit_pin_get_length ()</h3>
+<pre class="programlisting"><span class="returnvalue">size_t</span>
+p11_kit_pin_get_length (<em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="type">P11KitPin</span></a> *pin</code></em>);</pre>
+<p>Get the length of the PIN value from a P11KitPin.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-get-length.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>pin</p></td>
+<td class="parameter_description"><p>the P11KitPin</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-get-length.returns"></a><h4>Returns</h4>
+<p> the length of the PIN value.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-ref"></a><h3>p11_kit_pin_ref ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_ref (<em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="type">P11KitPin</span></a> *pin</code></em>);</pre>
+<p>Add a reference to a P11KitPin. This should be matched with a later call
+to <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a>. As long as at least one reference is held, the PIN
+will remain valid and in memory.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>pin</p></td>
+<td class="parameter_description"><p>the P11KitPin</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-ref.returns"></a><h4>Returns</h4>
+<p> the <em class="parameter"><code>pin</code></em>
+pointer, for convenience sake.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-unref"></a><h3>p11_kit_pin_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_pin_unref (<em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="type">P11KitPin</span></a> *pin</code></em>);</pre>
+<p>Remove a reference from a P11KitPin. When all references have been removed
+then the PIN will be freed and will no longer be in memory.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>pin</p></td>
+<td class="parameter_description"><p>the P11KitPin</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-register-callback"></a><h3>p11_kit_pin_register_callback ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_pin_register_callback (<em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>,
+                               <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-callback" title="p11_kit_pin_callback ()"><span class="type">p11_kit_pin_callback</span></a> callback</code></em>,
+                               <em class="parameter"><code><span class="type">void</span> *callback_data</code></em>,
+                               <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-destroy-func" title="p11_kit_pin_destroy_func ()"><span class="type">p11_kit_pin_destroy_func</span></a> callback_destroy</code></em>);</pre>
+<p>Register a callback to handle PIN requests for a given 'pin-source' attribute.
+If <em class="parameter"><code>pin_source</code></em>
+ is set to P11_KIT_PIN_FALLBACK then this will be a fallback
+callback and will be called for requests for which no other callback has
+been specifically registered.</p>
+<p>If multiple callbacks are registered for the same <em class="parameter"><code>pin_source</code></em>
+ value, then
+the last registered callback will be the first to be called.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-register-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>the 'pin-source' attribute this this callback is for</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>the callback function</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_data</p></td>
+<td class="parameter_description"><p>data that will be passed to the callback</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_destroy</p></td>
+<td class="parameter_description"><p>a function that will be called with <em class="parameter"><code>callback_data</code></em>
+when
+the callback is unregistered.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-register-callback.returns"></a><h4>Returns</h4>
+<p> Returns negative if registering fails.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-unregister-callback"></a><h3>p11_kit_pin_unregister_callback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_pin_unregister_callback (<em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>,
+                                 <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-callback" title="p11_kit_pin_callback ()"><span class="type">p11_kit_pin_callback</span></a> callback</code></em>,
+                                 <em class="parameter"><code><span class="type">void</span> *callback_data</code></em>);</pre>
+<p>Unregister a callback that was previously registered with the
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()"><code class="function">p11_kit_pin_register_callback()</code></a> function. If more than one registered
+callback matches the given arguments, then only one of those will be
+removed.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-unregister-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>the 'pin-source' attribute the callback was registered for</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback</p></td>
+<td class="parameter_description"><p>the callback function that was registered</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_data</p></td>
+<td class="parameter_description"><p>data that was registered for the callback</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-callback"></a><h3>p11_kit_pin_callback ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+<span class="c_punctuation">(</span>*p11_kit_pin_callback<span class="c_punctuation">)</span> (<em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>,
+                         <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *pin_uri</code></em>,
+                         <em class="parameter"><code>const <span class="type">char</span> *pin_description</code></em>,
+                         <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPinFlags" title="enum P11KitPinFlags"><span class="type">P11KitPinFlags</span></a> pin_flags</code></em>,
+                         <em class="parameter"><code><span class="type">void</span> *callback_data</code></em>);</pre>
+<p>Represents a PIN callback function.</p>
+<p>The various arguments are the same as the ones passed to
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-request" title="p11_kit_pin_request ()"><code class="function">p11_kit_pin_request()</code></a>. The <em class="parameter"><code>callback_data</code></em>
+ argument was the one passed to
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()"><code class="function">p11_kit_pin_register_callback()</code></a> when registering this callback.</p>
+<p>The function should return <code class="literal">NULL</code> if it could not provide a PIN, either
+because of an error or a user cancellation.</p>
+<p>If a PIN is returned, it will be unreferenced by the caller. So it should be
+either newly allocated, or referenced before returning.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>a 'pin-source' attribute string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_uri</p></td>
+<td class="parameter_description"><p>a PKCS#11 URI that the PIN is for, or <code class="literal">NULL</code></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_description</p></td>
+<td class="parameter_description"><p>a descrption of what the PIN is for</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_flags</p></td>
+<td class="parameter_description"><p>flags describing the PIN request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_data</p></td>
+<td class="parameter_description"><p>data that was provided when registering this callback</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-callback.returns"></a><h4>Returns</h4>
+<p> A PIN or <code class="literal">NULL</code></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-request"></a><h3>p11_kit_pin_request ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_request (<em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>,
+                     <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *pin_uri</code></em>,
+                     <em class="parameter"><code>const <span class="type">char</span> *pin_description</code></em>,
+                     <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPinFlags" title="enum P11KitPinFlags"><span class="type">P11KitPinFlags</span></a> pin_flags</code></em>);</pre>
+<p>Request a PIN for a given 'pin-source' attribute. The result depends on the
+registered callbacks.</p>
+<p>If not <code class="literal">NULL</code>, then the <em class="parameter"><code>pin_uri</code></em>
+ attribute should point to the thing that the
+PIN is being requested for. In most use cases this should be a PKCS#11 URI
+pointing to a token.</p>
+<p>The <em class="parameter"><code>pin_description</code></em>
+ should always be specified. It is a string describing
+what the PIN is for. For example this would be the token label, if the PIN
+is for a token.</p>
+<p>If more than one callback is registered for the <em class="parameter"><code>pin_source</code></em>
+, then the latest
+registered one will be called first. If that callback does not return a
+PIN, then the next will be called in turn.</p>
+<p>If no callback is registered for <em class="parameter"><code>pin_source</code></em>
+, then the fallback callbacks will
+be invoked in the same way. The fallback callbacks will not be called if any
+callback has been registered specifically for <em class="parameter"><code>pin_source</code></em>
+.</p>
+<p>The PIN returned should be released with <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a>.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-request.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>the 'pin-source' attribute that is being requested</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_uri</p></td>
+<td class="parameter_description"><p>a PKCS#11 URI that the PIN is being requested for, optionally <code class="literal">NULL</code>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_description</p></td>
+<td class="parameter_description"><p>a description of what the PIN is for, must not be <code class="literal">NULL</code>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_flags</p></td>
+<td class="parameter_description"><p>various flags for this request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-request.returns"></a><h4>Returns</h4>
+<p> the PIN which should be released with <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()"><code class="function">p11_kit_pin_unref()</code></a>, or <code class="literal">NULL</code>
+if no callback was registered or could proivde a PIN</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-destroy-func"></a><h3>p11_kit_pin_destroy_func ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*p11_kit_pin_destroy_func<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
+<p>A function called to free or cleanup <em class="parameter"><code>data</code></em>
+.</p>
+<div class="refsect3">
+<a name="p11-kit-pin-destroy-func.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>data</p></td>
+<td class="parameter_description"><p>the data to destroy</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-pin-file-callback"></a><h3>p11_kit_pin_file_callback ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin"><span class="returnvalue">P11KitPin</span></a> *
+p11_kit_pin_file_callback (<em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>,
+                           <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *pin_uri</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *pin_description</code></em>,
+                           <em class="parameter"><code><a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPinFlags" title="enum P11KitPinFlags"><span class="type">P11KitPinFlags</span></a> pin_flags</code></em>,
+                           <em class="parameter"><code><span class="type">void</span> *callback_data</code></em>);</pre>
+<p>This is a PIN callback function that looks up the 'pin-source' attribute in
+a file with that name. This can be used to enable the normal PKCS#11 URI
+behavior described in the RFC.</p>
+<p>If <em class="parameter"><code>pin_flags</code></em>
+ contains the <a class="link" href="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-RETRY:CAPS"><code class="literal">P11_KIT_PIN_FLAGS_RETRY</code></a> flag, then this
+callback will always return <code class="literal">NULL</code>. This is to prevent endless loops
+where an application is expecting to interact with a prompter, but
+instead is interacting with this callback reading a file over and over.</p>
+<p>This callback fails on files larger than 4 Kilobytes.</p>
+<p>This callback is not registered by default. It may have security
+implications depending on the source of the PKCS#11 URI and the PKCS#11
+in use. To register it, use code like the following:</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="n">p11_kit_pin_register_callback</span> <span class="p">(</span><span class="n">P11_KIT_PIN_FALLBACK</span><span class="p">,</span> <span class="n">p11_kit_pin_file_callback</span><span class="p">,</span>
+                               <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="refsect3">
+<a name="p11-kit-pin-file-callback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>a 'pin-source' attribute string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_uri</p></td>
+<td class="parameter_description"><p>a PKCS#11 URI that the PIN is for, or <code class="literal">NULL</code></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_description</p></td>
+<td class="parameter_description"><p>a descrption of what the PIN is for</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_flags</p></td>
+<td class="parameter_description"><p>flags describing the PIN request</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>callback_data</p></td>
+<td class="parameter_description"><p>unused, should be <code class="literal">NULL</code></p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-pin-file-callback.returns"></a><h4>Returns</h4>
+<p> a referenced PIN with the file contents, or <code class="literal">NULL</code> if the file
+could not be read</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-PIN-Callbacks.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="P11KitPin"></a><h3>P11KitPin</h3>
+<p>A structure representing a PKCS#11 PIN. There are no public fields
+visible in this structure. Use the various accessor functions.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitPinFlags"></a><h3>enum P11KitPinFlags</h3>
+<p>Flags that are passed to <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-request" title="p11_kit_pin_request ()"><code class="function">p11_kit_pin_request()</code></a> and registered callbacks.</p>
+<div class="refsect3">
+<a name="P11KitPinFlags.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-USER-LOGIN:CAPS"></a>P11_KIT_PIN_FLAGS_USER_LOGIN</p></td>
+<td class="enum_member_description">
+<p>The PIN is for a PKCS#11 user type login.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-SO-LOGIN:CAPS"></a>P11_KIT_PIN_FLAGS_SO_LOGIN</p></td>
+<td class="enum_member_description">
+<p>The PIN is for a PKCS#11 security officer type login.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-CONTEXT-LOGIN:CAPS"></a>P11_KIT_PIN_FLAGS_CONTEXT_LOGIN</p></td>
+<td class="enum_member_description">
+<p>The PIN is for a PKCS#11 contect specific type login.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-RETRY:CAPS"></a>P11_KIT_PIN_FLAGS_RETRY</p></td>
+<td class="enum_member_description">
+<p>The PIN is being requested again, due to an invalid previous PIN.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-MANY-TRIES:CAPS"></a>P11_KIT_PIN_FLAGS_MANY_TRIES</p></td>
+<td class="enum_member_description">
+<p>The PIN has failed too many times, and few tries are left.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-PIN-FLAGS-FINAL-TRY:CAPS"></a>P11_KIT_PIN_FLAGS_FINAL_TRY</p></td>
+<td class="enum_member_description">
+<p>The PIN has failed too many times, and this is the last try.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11-KIT-PIN-FALLBACK:CAPS"></a><h3>P11_KIT_PIN_FALLBACK</h3>
+<pre class="programlisting">#define             P11_KIT_PIN_FALLBACK</pre>
+<p>Used with <a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()"><code class="function">p11_kit_pin_register_callback()</code></a> to register a fallback callback.
+This callback will be called if no other callback is registered for a 'pin-source'.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html
new file mode 100644
index 000000000..09bca341e
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html
@@ -0,0 +1,1595 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>URIs: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="p11-kit-Modules.html" title="Modules">
+<link rel="next" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-URIs.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit-Modules.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-PIN-Callbacks.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-URIs"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-URIs.top_of_page"></a>URIs</span></h2>
+<p>URIs — Parsing and formatting PKCS#11 URIs</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-URIs.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="returnvalue">P11KitUri</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-new" title="p11_kit_uri_new ()">p11_kit_uri_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_INFO_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-info" title="p11_kit_uri_get_module_info ()">p11_kit_uri_get_module_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-module-info" title="p11_kit_uri_match_module_info ()">p11_kit_uri_match_module_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SLOT_INFO_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-slot-info" title="p11_kit_uri_get_slot_info ()">p11_kit_uri_get_slot_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-slot-info" title="p11_kit_uri_match_slot_info ()">p11_kit_uri_match_slot_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_SLOT_ID</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-slot-id" title="p11_kit_uri_get_slot_id ()">p11_kit_uri_get_slot_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-slot-id" title="p11_kit_uri_set_slot_id ()">p11_kit_uri_set_slot_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_TOKEN_INFO_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-token-info" title="p11_kit_uri_get_token_info ()">p11_kit_uri_get_token_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-token-info" title="p11_kit_uri_match_token_info ()">p11_kit_uri_match_token_info</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_ATTRIBUTE_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attributes" title="p11_kit_uri_get_attributes ()">p11_kit_uri_get_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attributes" title="p11_kit_uri_set_attributes ()">p11_kit_uri_set_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-clear-attributes" title="p11_kit_uri_clear_attributes ()">p11_kit_uri_clear_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-attributes" title="p11_kit_uri_match_attributes ()">p11_kit_uri_match_attributes</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">CK_ATTRIBUTE_PTR</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attribute" title="p11_kit_uri_get_attribute ()">p11_kit_uri_get_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attribute" title="p11_kit_uri_set_attribute ()">p11_kit_uri_set_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-clear-attribute" title="p11_kit_uri_clear_attribute ()">p11_kit_uri_clear_attribute</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-unrecognized" title="p11_kit_uri_set_unrecognized ()">p11_kit_uri_set_unrecognized</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-any-unrecognized" title="p11_kit_uri_any_unrecognized ()">p11_kit_uri_any_unrecognized</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pin-value" title="p11_kit_uri_get_pin_value ()">p11_kit_uri_get_pin_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pin-value" title="p11_kit_uri_set_pin_value ()">p11_kit_uri_set_pin_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pin-source" title="p11_kit_uri_get_pin_source ()">p11_kit_uri_get_pin_source</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pin-source" title="p11_kit_uri_set_pin_source ()">p11_kit_uri_set_pin_source</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pinfile" title="p11_kit_uri_get_pinfile ()">p11_kit_uri_get_pinfile</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pinfile" title="p11_kit_uri_set_pinfile ()">p11_kit_uri_set_pinfile</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-name" title="p11_kit_uri_get_module_name ()">p11_kit_uri_get_module_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-module-name" title="p11_kit_uri_set_module_name ()">p11_kit_uri_set_module_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-path" title="p11_kit_uri_get_module_path ()">p11_kit_uri_get_module_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-module-path" title="p11_kit_uri_set_module_path ()">p11_kit_uri_set_module_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-vendor-query" title="p11_kit_uri_get_vendor_query ()">p11_kit_uri_get_vendor_query</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-vendor-query" title="p11_kit_uri_set_vendor_query ()">p11_kit_uri_set_vendor_query</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-format" title="p11_kit_uri_format ()">p11_kit_uri_format</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-parse" title="p11_kit_uri_parse ()">p11_kit_uri_parse</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-free" title="p11_kit_uri_free ()">p11_kit_uri_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-message" title="p11_kit_uri_message ()">p11_kit_uri_message</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-URIs.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="other_proto_type">
+<col class="other_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME:CAPS" title="P11_KIT_URI_SCHEME">P11_KIT_URI_SCHEME</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME-LEN:CAPS" title="P11_KIT_URI_SCHEME_LEN">P11_KIT_URI_SCHEME_LEN</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11KitUriType" title="enum P11KitUriType">P11KitUriType</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11KitUriResult" title="enum P11KitUriResult">P11KitUriResult</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri">P11KitUri</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#p11-kit-uri" title="p11_kit_uri">p11_kit_uri</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="p11-kit-URIs.html#P11-KIT-URI-NO-MEMORY:CAPS" title="P11_KIT_URI_NO_MEMORY">P11_KIT_URI_NO_MEMORY</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-URIs.description"></a><h2>Description</h2>
+<p>PKCS#11 URIs can be used in configuration files or applications to represent
+PKCS#11 modules, tokens or objects. An example of a URI might be:</p>
+<code class="code"><div class="literallayout"><p><br>
+     pkcs11:token=The\%20Software\%20PKCS#11\%20softtoken;<br>
+         manufacturer=Snake\%20Oil,\%20Inc.;serial=;object=my-certificate;<br>
+         model=1.0;type=cert;id=\%69\%95\%3e\%5c\%f4\%bd\%ec\%91<br>
+</p></div></code><p>You can use <a class="link" href="p11-kit-URIs.html#p11-kit-uri-parse" title="p11_kit_uri_parse ()"><code class="function">p11_kit_uri_parse()</code></a> to parse such a URI, and <a class="link" href="p11-kit-URIs.html#p11-kit-uri-format" title="p11_kit_uri_format ()"><code class="function">p11_kit_uri_format()</code></a>
+to build one. URIs are represented by the <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> structure. You can match
+a parsed URI against PKCS#11 tokens with <a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-token-info" title="p11_kit_uri_match_token_info ()"><code class="function">p11_kit_uri_match_token_info()</code></a>
+or attributes with <a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-attributes" title="p11_kit_uri_match_attributes ()"><code class="function">p11_kit_uri_match_attributes()</code></a>.</p>
+<p>Since URIs can represent different sorts of things, when parsing or formatting
+a URI a 'context' can be used to indicate which sort of URI is expected.</p>
+<p>URIs have an <code class="code">unrecognized</code> flag. This flag is set during parsing
+if any parts of the URI are not recognized. This may be because the part is
+from a newer version of the PKCS#11 spec or because that part was not valid
+inside of the desired context used when parsing.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-URIs.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-uri-new"></a><h3>p11_kit_uri_new ()</h3>
+<pre class="programlisting"><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="returnvalue">P11KitUri</span></a> *
+p11_kit_uri_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Create a new blank PKCS#11 URI.</p>
+<p>The new URI is in the right state to parse a string into. All relevant fields
+are zeroed out. Formatting this URI will produce a valid but empty URI.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-new.returns"></a><h4>Returns</h4>
+<p> A newly allocated URI. This should be freed with <a class="link" href="p11-kit-URIs.html#p11-kit-uri-free" title="p11_kit_uri_free ()"><code class="function">p11_kit_uri_free()</code></a>.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-module-info"></a><h3>p11_kit_uri_get_module_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_INFO_PTR</span>
+p11_kit_uri_get_module_info (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the <code class="code">CK_INFO</code> structure associated with this URI.</p>
+<p>If this is a parsed URI, then the fields corresponding to library parts of
+the URI will be filled in. Any library URI parts that were missing will have
+their fields filled with zeros.</p>
+<p>If the caller wishes to setup information for building a URI, then relevant
+fields should be filled in. Fields that should not appear as parts in the
+resulting URI should be filled with zeros.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-info.returns"></a><h4>Returns</h4>
+<p> A pointer to the <code class="code">CK_INFO</code> structure.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-match-module-info"></a><h3>p11_kit_uri_match_module_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_match_module_info (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                               <em class="parameter"><code>const <span class="type">CK_INFO</span> *info</code></em>);</pre>
+<p>Match a <code class="code">CK_INFO</code> structure against the library parts of this URI.</p>
+<p>Only the fields of the <code class="code">CK_INFO</code> structure that are valid for use
+in a URI will be matched. A URI part that was not specified in the URI will
+match any value in the structure. If during the URI parsing any unrecognized
+parts were encountered then this match will fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-match-module-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>info</p></td>
+<td class="parameter_description"><p>the structure to match against the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-match-module-info.returns"></a><h4>Returns</h4>
+<p> 1 if the URI matches, 0 if not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-slot-info"></a><h3>p11_kit_uri_get_slot_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_INFO_PTR</span>
+p11_kit_uri_get_slot_info (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the <code class="code">CK_SLOT_INFO</code> structure associated with this URI.</p>
+<p>If this is a parsed URI, then the fields corresponding to slot parts of
+the URI will be filled in. Any slot URI parts that were missing will have
+their fields filled with zeros.</p>
+<p>If the caller wishes to setup information for building a URI, then relevant
+fields should be filled in. Fields that should not appear as parts in the
+resulting URI should be filled with zeros.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-slot-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-slot-info.returns"></a><h4>Returns</h4>
+<p> A pointer to the <code class="code">CK_INFO</code> structure.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-match-slot-info"></a><h3>p11_kit_uri_match_slot_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_match_slot_info (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                             <em class="parameter"><code>const <span class="type">CK_SLOT_INFO</span> *slot_info</code></em>);</pre>
+<p>Match a <code class="code">CK_SLOT_INFO</code> structure against the slot parts of this
+URI.</p>
+<p>Only the fields of the <code class="code">CK_SLOT_INFO</code> structure that are valid
+for use in a URI will be matched. A URI part that was not specified in the
+URI will match any value in the structure. If during the URI parsing any
+unrecognized parts were encountered then this match will fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-match-slot-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>slot_info</p></td>
+<td class="parameter_description"><p>the structure to match against the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-match-slot-info.returns"></a><h4>Returns</h4>
+<p> 1 if the URI matches, 0 if not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-slot-id"></a><h3>p11_kit_uri_get_slot_id ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_SLOT_ID</span>
+p11_kit_uri_get_slot_id (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the 'slot-id' part of the URI.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-slot-id.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-slot-id.returns"></a><h4>Returns</h4>
+<p> The slot-id or <code class="code">(CK_SLOT_ID)-1</code> if not set.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-slot-id"></a><h3>p11_kit_uri_set_slot_id ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_slot_id (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                         <em class="parameter"><code><span class="type">CK_SLOT_ID</span> slot_id</code></em>);</pre>
+<p>Set the 'slot-id' part of the URI.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-slot-id.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>slot_id</p></td>
+<td class="parameter_description"><p>The new slot-id</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-token-info"></a><h3>p11_kit_uri_get_token_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_TOKEN_INFO_PTR</span>
+p11_kit_uri_get_token_info (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the <code class="code">CK_TOKEN_INFO</code> structure associated with this URI.</p>
+<p>If this is a parsed URI, then the fields corresponding to token parts of
+the URI will be filled in. Any token URI parts that were missing will have
+their fields filled with zeros.</p>
+<p>If the caller wishes to setup information for building a URI, then relevant
+fields should be filled in. Fields that should not appear as parts in the
+resulting URI should be filled with zeros.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-token-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-token-info.returns"></a><h4>Returns</h4>
+<p> A pointer to the <code class="code">CK_INFO</code> structure.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-match-token-info"></a><h3>p11_kit_uri_match_token_info ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_match_token_info (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                              <em class="parameter"><code>const <span class="type">CK_TOKEN_INFO</span> *token_info</code></em>);</pre>
+<p>Match a <code class="code">CK_TOKEN_INFO</code> structure against the token parts of this
+URI.</p>
+<p>Only the fields of the <code class="code">CK_TOKEN_INFO</code> structure that are valid
+for use in a URI will be matched. A URI part that was not specified in the
+URI will match any value in the structure. If during the URI parsing any
+unrecognized parts were encountered then this match will fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-match-token-info.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>token_info</p></td>
+<td class="parameter_description"><p>the structure to match against the URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-match-token-info.returns"></a><h4>Returns</h4>
+<p> 1 if the URI matches, 0 if not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-attributes"></a><h3>p11_kit_uri_get_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_ATTRIBUTE_PTR</span>
+p11_kit_uri_get_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                            <em class="parameter"><code><span class="type">CK_ULONG</span> *n_attrs</code></em>);</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-attributes"></a><h3>p11_kit_uri_set_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_set_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                            <em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attrs</code></em>,
+                            <em class="parameter"><code><span class="type">CK_ULONG</span> n_attrs</code></em>);</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-clear-attributes"></a><h3>p11_kit_uri_clear_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_clear_attributes (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-match-attributes"></a><h3>p11_kit_uri_match_attributes ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_match_attributes (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                              <em class="parameter"><code>const <span class="type">CK_ATTRIBUTE</span> *attrs</code></em>,
+                              <em class="parameter"><code><span class="type">CK_ULONG</span> n_attrs</code></em>);</pre>
+<p>Match a attributes against the object parts of this URI.</p>
+<p>Only the attributes that are valid for use in a URI will be matched. A URI
+part that was not specified in the URI will match any attribute value. If
+during the URI parsing any unrecognized parts were encountered then this
+match will fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-match-attributes.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>attrs</p></td>
+<td class="parameter_description"><p>The attributes to match</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>n_attrs</p></td>
+<td class="parameter_description"><p>The number of attributes</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-match-attributes.returns"></a><h4>Returns</h4>
+<p> 1 if the URI matches, 0 if not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-attribute"></a><h3>p11_kit_uri_get_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">CK_ATTRIBUTE_PTR</span>
+p11_kit_uri_get_attribute (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                           <em class="parameter"><code><span class="type">CK_ATTRIBUTE_TYPE</span> attr_type</code></em>);</pre>
+<p>Get a pointer to an attribute present in this URI.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>attr_type</p></td>
+<td class="parameter_description"><p>The attribute type</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-attribute.returns"></a><h4>Returns</h4>
+<p> A pointer to the attribute, or <code class="code">NULL</code> if not present.
+The attribute is owned by the URI and should not be freed.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-attribute"></a><h3>p11_kit_uri_set_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_set_attribute (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                           <em class="parameter"><code><span class="type">CK_ATTRIBUTE_PTR</span> attr</code></em>);</pre>
+<p>Set an attribute on the URI.</p>
+<p>Only attributes that map to parts in a PKCS#11 URI will be accepted.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>attr</p></td>
+<td class="parameter_description"><p>The attribute to set</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-set-attribute.returns"></a><h4>Returns</h4>
+<p> <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"><code class="literal">P11_KIT_URI_OK</code></a> if the attribute was successfully set.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-NOT-FOUND:CAPS"><code class="literal">P11_KIT_URI_NOT_FOUND</code></a> if the attribute was not valid for a URI.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-clear-attribute"></a><h3>p11_kit_uri_clear_attribute ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_clear_attribute (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                             <em class="parameter"><code><span class="type">CK_ATTRIBUTE_TYPE</span> attr_type</code></em>);</pre>
+<p>Clear an attribute on the URI.</p>
+<p>Only attributes that map to parts in a PKCS#11 URI will be accepted.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-clear-attribute.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>attr_type</p></td>
+<td class="parameter_description"><p>The type of the attribute to clear</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-clear-attribute.returns"></a><h4>Returns</h4>
+<p> <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"><code class="literal">P11_KIT_URI_OK</code></a> if the attribute was successfully cleared.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-NOT-FOUND:CAPS"><code class="literal">P11_KIT_URI_NOT_FOUND</code></a> if the attribute was not valid for a URI.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-unrecognized"></a><h3>p11_kit_uri_set_unrecognized ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_unrecognized (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                              <em class="parameter"><code><span class="type">int</span> unrecognized</code></em>);</pre>
+<p>Set the unrecognized flag on this URI.</p>
+<p>The unrecognized flag is automatically set to 1 when during parsing any part
+of the URI is unrecognized. If the unrecognized flag is set to 1, then
+matching against this URI will always fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-unrecognized.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>unrecognized</p></td>
+<td class="parameter_description"><p>The new unregognized flag value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-any-unrecognized"></a><h3>p11_kit_uri_any_unrecognized ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_any_unrecognized (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the unrecognized flag for this URI.</p>
+<p>The unrecognized flag is automatically set to 1 when during parsing any part
+of the URI is unrecognized. If the unrecognized flag is set to 1, then
+matching against this URI will always fail.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-any-unrecognized.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-any-unrecognized.returns"></a><h4>Returns</h4>
+<p> 1 if unrecognized flag is set, 0 otherwise.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-pin-value"></a><h3>p11_kit_uri_get_pin_value ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_pin_value (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the 'pin-value' part of the URI. This is used by some applications to
+read the PIN for logging into a PKCS#11 token.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-pin-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-pin-value.returns"></a><h4>Returns</h4>
+<p> The pin-value or <code class="literal">NULL</code> if not present.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-pin-value"></a><h3>p11_kit_uri_set_pin_value ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_pin_value (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                           <em class="parameter"><code>const <span class="type">char</span> *pin</code></em>);</pre>
+<p>Set the 'pin-value' part of the URI. This is used by some applications to
+specify the PIN for logging into a PKCS#11 token.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-pin-value.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin</p></td>
+<td class="parameter_description"><p>The new pin-value</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-pin-source"></a><h3>p11_kit_uri_get_pin_source ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_pin_source (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the 'pin-source' part of the URI. This is used by some applications to
+lookup a PIN for logging into a PKCS#11 token.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-pin-source.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-pin-source.returns"></a><h4>Returns</h4>
+<p> The pin-source or <code class="literal">NULL</code> if not present.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-pin-source"></a><h3>p11_kit_uri_set_pin_source ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_pin_source (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                            <em class="parameter"><code>const <span class="type">char</span> *pin_source</code></em>);</pre>
+<p>Set the 'pin-source' part of the URI. This is used by some applications to
+lookup a PIN for logging into a PKCS#11 token.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-pin-source.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pin_source</p></td>
+<td class="parameter_description"><p>The new pin-source</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-pinfile"></a><h3>p11_kit_uri_get_pinfile ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_pinfile (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_uri_get_pinfile</code> is deprecated and should not be used in newly-written code.</p>
+<p>use <a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pin-source" title="p11_kit_uri_get_pin_source ()"><code class="function">p11_kit_uri_get_pin_source()</code></a>.</p>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-pinfile.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-pinfile"></a><h3>p11_kit_uri_set_pinfile ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_pinfile (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                         <em class="parameter"><code>const <span class="type">char</span> *pinfile</code></em>);</pre>
+<div class="warning">
+<p><code class="literal">p11_kit_uri_set_pinfile</code> is deprecated and should not be used in newly-written code.</p>
+<p>use <a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pin-source" title="p11_kit_uri_set_pin_source ()"><code class="function">p11_kit_uri_set_pin_source()</code></a>.</p>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-set-pinfile.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>pinfile</p></td>
+<td class="parameter_description"><p>The pinfile</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-module-name"></a><h3>p11_kit_uri_get_module_name ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_module_name (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the 'module-name' part of the URI. This is used by some
+applications to explicitly specify the name of a PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-name.returns"></a><h4>Returns</h4>
+<p> The module-name or <code class="literal">NULL</code> if not present.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-module-name"></a><h3>p11_kit_uri_set_module_name ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_module_name (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                             <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Set the 'module-name' part of the URI. This is used by some
+applications to explicitly specify the name of a PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-module-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The new module-name</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-module-path"></a><h3>p11_kit_uri_get_module_path ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_module_path (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Get the 'module-path' part of the URI. This is used by some
+applications to explicitly specify the path of a PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-path.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-module-path.returns"></a><h4>Returns</h4>
+<p> The module-path or <code class="literal">NULL</code> if not present.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-module-path"></a><h3>p11_kit_uri_set_module_path ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_set_module_path (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                             <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
+<p>Set the 'module-path' part of the URI. This is used by some
+applications to explicitly specify the path of a PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-module-path.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>path</p></td>
+<td class="parameter_description"><p>The new module-path</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-get-vendor-query"></a><h3>p11_kit_uri_get_vendor_query ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_get_vendor_query (<em class="parameter"><code>const <a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                              <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
+<p>Get the vendor query part of the URI, identified by <em class="parameter"><code>name</code></em>
+. This is
+used by some applications to explicitly specify the path of a
+PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-get-vendor-query.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The name of vendor query</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-get-vendor-query.returns"></a><h4>Returns</h4>
+<p> The value of vendor query or <code class="literal">NULL</code> if not present.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-set-vendor-query"></a><h3>p11_kit_uri_set_vendor_query ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_set_vendor_query (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                              <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+                              <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre>
+<p>Set the vendor query part of the URI, identified by <em class="parameter"><code>name</code></em>
+. This is
+used by some applications to explicitly specify the path of a
+PKCS#11 module.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-set-vendor-query.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The name of vendor query</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>The value of vendor query. </p></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-set-vendor-query.returns"></a><h4>Returns</h4>
+<p> 1 if the vendor query is set or removed, 0 if not.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-format"></a><h3>p11_kit_uri_format ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_format (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>,
+                    <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUriType" title="enum P11KitUriType"><span class="type">P11KitUriType</span></a> uri_type</code></em>,
+                    <em class="parameter"><code><span class="type">char</span> **string</code></em>);</pre>
+<p>Format a PKCS#11 URI into a string.</p>
+<p>Fields which are zeroed out will not be included in the resulting string.
+Attributes which are not present will also not be included.</p>
+<p>The uri_type of URI specified limits the different parts of the resulting
+URI. To format a URI containing all possible information use
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-FOR-ANY:CAPS"><code class="literal">P11_KIT_URI_FOR_ANY</code></a></p>
+<p>It's up to the caller to guarantee that the attributes set in <em class="parameter"><code>uri</code></em>
+ are
+those appropriate for inclusion in a URI, specifically:
+<code class="literal">CKA_ID</code>, <code class="literal">CKA_LABEL</code>
+and <code class="literal">CKA_CLASS</code>. The class must be one of
+<code class="literal">CKO_DATA</code>, <code class="literal">CKO_SECRET_KEY</code>,
+<code class="literal">CKO_CERTIFICATE</code>, <code class="literal">CKO_PUBLIC_KEY</code>,
+<code class="literal">CKO_PRIVATE_KEY</code>.</p>
+<p>The resulting string should be freed with <code class="function">free()</code>.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-format.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>uri_type</p></td>
+<td class="parameter_description"><p>The type of URI that should be produced.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>Location to store a newly allocated string.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-format.returns"></a><h4>Returns</h4>
+<p> <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"><code class="literal">P11_KIT_URI_OK</code></a> if the URI was formatted successfully,
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-UNEXPECTED:CAPS"><code class="literal">P11_KIT_URI_UNEXPECTED</code></a> if the data in <em class="parameter"><code>uri</code></em>
+is invalid for a URI.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-parse"></a><h3>p11_kit_uri_parse ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+p11_kit_uri_parse (<em class="parameter"><code>const <span class="type">char</span> *string</code></em>,
+                   <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUriType" title="enum P11KitUriType"><span class="type">P11KitUriType</span></a> uri_type</code></em>,
+                   <em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Parse a PKCS#11 URI string.</p>
+<p>PKCS#11 URIs can represent tokens, objects or modules. The uri_type argument
+allows the caller to specify what type of URI is expected and the sorts of
+things the URI should match. <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-FOR-ANY:CAPS"><code class="literal">P11_KIT_URI_FOR_ANY</code></a> can be used to parse a URI
+for any context. It's then up to the caller to make sense of the way that
+it is used.</p>
+<p>If the PKCS#11 URI contains unrecognized URI parts or parts not applicable
+to the specified context, then the unrecognized flag will be set. This will
+prevent the URI from matching using the various match functions.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-parse.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>The string to parse</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>uri_type</p></td>
+<td class="parameter_description"><p>The type of URI that is expected</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The blank URI to parse the values into</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-parse.returns"></a><h4>Returns</h4>
+<p> <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"><code class="literal">P11_KIT_URI_OK</code></a> if the URI was parsed successfully.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-BAD-SCHEME:CAPS"><code class="literal">P11_KIT_URI_BAD_SCHEME</code></a> if this was not a PKCS#11 URI.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-BAD-SYNTAX:CAPS"><code class="literal">P11_KIT_URI_BAD_SYNTAX</code></a> if the URI syntax was bad.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-BAD-VERSION:CAPS"><code class="literal">P11_KIT_URI_BAD_VERSION</code></a> if a version number was bad.
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-BAD-ENCODING:CAPS"><code class="literal">P11_KIT_URI_BAD_ENCODING</code></a> if the URI encoding was invalid.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-free"></a><h3>p11_kit_uri_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_uri_free (<em class="parameter"><code><a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri"><span class="type">P11KitUri</span></a> *uri</code></em>);</pre>
+<p>Free a PKCS#11 URI.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-free.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>uri</p></td>
+<td class="parameter_description"><p>The URI</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri-message"></a><h3>p11_kit_uri_message ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_uri_message (<em class="parameter"><code><span class="type">int</span> code</code></em>);</pre>
+<p>Lookup a message for the uri error code. These codes are the P11_KIT_URI_XXX
+error codes that can be returned from <a class="link" href="p11-kit-URIs.html#p11-kit-uri-parse" title="p11_kit_uri_parse ()"><code class="function">p11_kit_uri_parse()</code></a> or
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-format" title="p11_kit_uri_format ()"><code class="function">p11_kit_uri_format()</code></a>. As a special case <code class="literal">NULL</code>, will be returned for
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"><code class="literal">P11_KIT_URI_OK</code></a>.</p>
+<div class="refsect3">
+<a name="p11-kit-uri-message.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>code</p></td>
+<td class="parameter_description"><p>The error code</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-uri-message.returns"></a><h4>Returns</h4>
+<p> The message for the error code. This string is owned by the p11-kit
+library.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-URIs.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="P11-KIT-URI-SCHEME:CAPS"></a><h3>P11_KIT_URI_SCHEME</h3>
+<pre class="programlisting">#define             P11_KIT_URI_SCHEME</pre>
+<p>String of URI scheme for PKCS#11 URIs.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11-KIT-URI-SCHEME-LEN:CAPS"></a><h3>P11_KIT_URI_SCHEME_LEN</h3>
+<pre class="programlisting">#define             P11_KIT_URI_SCHEME_LEN</pre>
+<p>Length of <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME:CAPS" title="P11_KIT_URI_SCHEME"><code class="literal">P11_KIT_URI_SCHEME</code></a>.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitUriType"></a><h3>enum P11KitUriType</h3>
+<p>A PKCS#11 URI can represent different kinds of things. This flag is used by
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-parse" title="p11_kit_uri_parse ()"><code class="function">p11_kit_uri_parse()</code></a> to denote in what context the URI will be used.</p>
+<p>The various types can be combined.</p>
+<div class="refsect3">
+<a name="P11KitUriType.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-OBJECT:CAPS"></a>P11_KIT_URI_FOR_OBJECT</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more objects</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-TOKEN:CAPS"></a>P11_KIT_URI_FOR_TOKEN</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more tokens</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-SLOT:CAPS"></a>P11_KIT_URI_FOR_SLOT</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more slots</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-MODULE:CAPS"></a>P11_KIT_URI_FOR_MODULE</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more modules</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-MODULE-WITH-VERSION:CAPS"></a>P11_KIT_URI_FOR_MODULE_WITH_VERSION</p></td>
+<td class="enum_member_description">
+<p>The URI represents a module with
+a specific version.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-OBJECT-ON-TOKEN:CAPS"></a>P11_KIT_URI_FOR_OBJECT_ON_TOKEN</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more objects
+that are present on a specific token.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-OBJECT-ON-TOKEN-AND-MODULE:CAPS"></a>P11_KIT_URI_FOR_OBJECT_ON_TOKEN_AND_MODULE</p></td>
+<td class="enum_member_description">
+<p>The URI represents one or more
+objects that are present on a specific token, being used with a certain
+module.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-FOR-ANY:CAPS"></a>P11_KIT_URI_FOR_ANY</p></td>
+<td class="enum_member_description">
+<p>The URI can represent anything</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitUriResult"></a><h3>enum P11KitUriResult</h3>
+<p>Error codes returned by various functions. The functions each clearly state
+which error codes they are capable of returning.</p>
+<div class="refsect3">
+<a name="P11KitUriResult.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-OK:CAPS"></a>P11_KIT_URI_OK</p></td>
+<td class="enum_member_description">
+<p>Success</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-UNEXPECTED:CAPS"></a>P11_KIT_URI_UNEXPECTED</p></td>
+<td class="enum_member_description">
+<p>Unexpected or internal system error</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-BAD-SCHEME:CAPS"></a>P11_KIT_URI_BAD_SCHEME</p></td>
+<td class="enum_member_description">
+<p>The URI had a bad scheme</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-BAD-ENCODING:CAPS"></a>P11_KIT_URI_BAD_ENCODING</p></td>
+<td class="enum_member_description">
+<p>The URI had a bad encoding</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-BAD-SYNTAX:CAPS"></a>P11_KIT_URI_BAD_SYNTAX</p></td>
+<td class="enum_member_description">
+<p>The URI had a bad syntax</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-BAD-VERSION:CAPS"></a>P11_KIT_URI_BAD_VERSION</p></td>
+<td class="enum_member_description">
+<p>The URI contained a bad version number</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="P11-KIT-URI-NOT-FOUND:CAPS"></a>P11_KIT_URI_NOT_FOUND</p></td>
+<td class="enum_member_description">
+<p>A requested part of the URI was not found</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11KitUri"></a><h3>P11KitUri</h3>
+<p>A structure representing a PKCS#11 URI. There are no public fields
+visible in this structure. Use the various accessor functions.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-uri"></a><h3>p11_kit_uri</h3>
+</div>
+<hr>
+<div class="refsect2">
+<a name="P11-KIT-URI-NO-MEMORY:CAPS"></a><h3>P11_KIT_URI_NO_MEMORY</h3>
+<pre class="programlisting">#define             P11_KIT_URI_NO_MEMORY</pre>
+<p>Unexpected memory allocation failure result. Same as <a class="link" href="p11-kit-URIs.html#P11-KIT-URI-UNEXPECTED:CAPS"><span class="type">P11_KIT_URI_UNEXPECTED</span></a>.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
new file mode 100644
index 000000000..bcfc1ebe2
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
@@ -0,0 +1,269 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Utilities: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="reference.html" title="API Reference">
+<link rel="prev" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">
+<link rel="next" href="p11-kit-Future.html" title="Future">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#p11-kit-Utilities.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="reference.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit-PIN-Callbacks.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-Future.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit-Utilities"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="p11-kit-Utilities.top_of_page"></a>Utilities</span></h2>
+<p>Utilities — PKCS#11 utilities</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="p11-kit-Utilities.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_proto_type">
+<col class="functions_proto_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-strerror" title="p11_kit_strerror ()">p11_kit_strerror</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">const <span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()">p11_kit_message</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">char</span> *
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-space-strdup" title="p11_kit_space_strdup ()">p11_kit_space_strdup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">size_t</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-space-strlen" title="p11_kit_space_strlen ()">p11_kit_space_strlen</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-be-quiet" title="p11_kit_be_quiet ()">p11_kit_be_quiet</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="p11-kit-Utilities.html#p11-kit-be-loud" title="p11_kit_be_loud ()">p11_kit_be_loud</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Utilities.description"></a><h2>Description</h2>
+<p>Utility functions for working with PKCS#11.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-Utilities.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="p11-kit-strerror"></a><h3>p11_kit_strerror ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_strerror (<em class="parameter"><code><span class="type">CK_RV</span> rv</code></em>);</pre>
+<p>Get a message for a PKCS#11 return value or error code. Do not
+pass CKR_OK or other such non errors to this function.</p>
+<div class="refsect3">
+<a name="p11-kit-strerror.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>rv</p></td>
+<td class="parameter_description"><p>The code to get a message for.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-strerror.returns"></a><h4>Returns</h4>
+<p> The user readable and localized message.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-message"></a><h3>p11_kit_message ()</h3>
+<pre class="programlisting">const <span class="returnvalue">char</span> *
+p11_kit_message (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Gets the failure message for a recently called p11-kit function, which
+returned a failure code on this thread. Not all functions set this message.
+Each function that does so, will note it in its documentation.</p>
+<p>If the most recent p11-kit function did not fail, then this will return NULL.
+The string is owned by the p11-kit library and is only valid on the same
+thread that the failed function executed on.</p>
+<div class="refsect3">
+<a name="p11-kit-message.returns"></a><h4>Returns</h4>
+<p> The last failure message, or <code class="literal">NULL</code>.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-space-strdup"></a><h3>p11_kit_space_strdup ()</h3>
+<pre class="programlisting"><span class="returnvalue">char</span> *
+p11_kit_space_strdup (<em class="parameter"><code>const unsigned <span class="type">char</span> *string</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> max_length</code></em>);</pre>
+<p>In PKCS#11 structures many strings are encoded in a strange way. The string
+is placed in a fixed length buffer and then padded with spaces.</p>
+<p>This function copies the space padded string into a normal null-terminated
+string. The result is owned by the caller.</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="n">CK_INFO</span> <span class="n">info</span><span class="p">;</span>
+<span class="kt">char</span> <span class="o">*</span><span class="n">description</span><span class="p">;</span>
+   <span class="p">...</span>
+<span class="n">description</span> <span class="o">=</span> <span class="n">p11_kit_space_strdup</span> <span class="p">(</span><span class="n">info</span><span class="o">-&gt;</span><span class="n">libraryDescription</span><span class="p">,</span> <span class="k">sizeof</span> <span class="p">(</span><span class="n">info</span><span class="o">-&gt;</span><span class="n">libraryDescription</span><span class="p">));</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="refsect3">
+<a name="p11-kit-space-strdup.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>Pointer to string block</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>max_length</p></td>
+<td class="parameter_description"><p>Maximum length of string block</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-space-strdup.returns"></a><h4>Returns</h4>
+<p> The newly allocated string, or <code class="literal">NULL</code> if memory could not be allocated.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-space-strlen"></a><h3>p11_kit_space_strlen ()</h3>
+<pre class="programlisting"><span class="returnvalue">size_t</span>
+p11_kit_space_strlen (<em class="parameter"><code>const unsigned <span class="type">char</span> *string</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> max_length</code></em>);</pre>
+<p>In PKCS#11 structures many strings are encoded in a strange way. The string
+is placed in a fixed length buffer and then padded with spaces.</p>
+<p>This function determines the actual length of the string. Since the string
+is not null-terminated you need to pass in the size of buffer as max_length.
+The string will never be longer than this buffer.</p>
+<div class="informalexample">
+  <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+    <tbody>
+      <tr>
+        <td class="listing_lines" align="right"><pre>1
+2
+3
+4</pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="n">CK_INFO</span> <span class="n">info</span><span class="p">;</span>
+<span class="kt">size_t</span> <span class="n">length</span><span class="p">;</span>
+   <span class="p">...</span>
+<span class="n">length</span> <span class="o">=</span> <span class="n">p11_kit_space_strlen</span> <span class="p">(</span><span class="n">info</span><span class="o">-&gt;</span><span class="n">libraryDescription</span><span class="p">,</span> <span class="k">sizeof</span> <span class="p">(</span><span class="n">info</span><span class="o">-&gt;</span><span class="n">libraryDescription</span><span class="p">));</span></pre></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="refsect3">
+<a name="p11-kit-space-strlen.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>Pointer to string block</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>max_length</p></td>
+<td class="parameter_description"><p>Maximum length of string block</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="p11-kit-space-strlen.returns"></a><h4>Returns</h4>
+<p> The length of the space padded string.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-be-quiet"></a><h3>p11_kit_be_quiet ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_be_quiet (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Once this function is called, the p11-kit library will no longer print
+failure or warning messages to stderr.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="p11-kit-be-loud"></a><h3>p11_kit_be_loud ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+p11_kit_be_loud (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Tell the p11-kit library will print failure or warning messages to stderr.
+This is the default behavior, but can be changed using <a class="link" href="p11-kit-Utilities.html#p11-kit-be-quiet" title="p11_kit_be_quiet ()"><code class="function">p11_kit_be_quiet()</code></a>.</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2 b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
new file mode 100644
index 000000000..810c02354
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<book xmlns="http://www.devhelp.net/book" title="p11-kit" link="index.html" author="" name="p11-kit" version="2" language="c">
+  <chapters>
+    <sub name="PKCS#11 Configuration" link="config.html">
+      <sub name="Consistent configuration" link="config.html#config-introduction"/>
+      <sub name="Example" link="config-example.html"/>
+      <sub name="Configuration Files" link="config-files.html"/>
+    </sub>
+    <sub name="Sharing PKCS#11 modules" link="sharing.html">
+      <sub name="Multiple consumers of PKCS#11 in a process" link="sharing.html#sharing-problem"/>
+      <sub name="Managed modules" link="sharing-managed.html"/>
+    </sub>
+    <sub name="Proxy Module" link="sharing.html"/>
+    <sub name="Remoting / Forwarding" link="remoting.html"/>
+    <sub name="Trust Policy Module" link="trust-module.html">
+      <sub name="Paths loaded by the Module" link="trust-module.html#trust-files"/>
+      <sub name="Using the Trust Policy Module with NSS" link="trust-nss.html"/>
+      <sub name="Using the Trust Policy Module with glib-networking" link="trust-glib-networking.html"/>
+      <sub name="Disabling the Trust Policy Module" link="trust-disable.html"/>
+    </sub>
+    <sub name="Manual Pages" link="tools.html">
+      <sub name="p11-kit" link="p11-kit.html"/>
+      <sub name="pkcs11.conf" link="pkcs11-conf.html"/>
+      <sub name="trust" link="trust.html"/>
+    </sub>
+    <sub name="API Reference" link="reference.html">
+      <sub name="Modules" link="p11-kit-Modules.html"/>
+      <sub name="URIs" link="p11-kit-URIs.html"/>
+      <sub name="PIN Callbacks" link="p11-kit-PIN-Callbacks.html"/>
+      <sub name="Utilities" link="p11-kit-Utilities.html"/>
+      <sub name="Future" link="p11-kit-Future.html"/>
+      <sub name="Deprecated" link="p11-kit-Deprecated.html"/>
+      <sub name="API Index" link="reference.html#api-index-full"/>
+      <sub name="Annotation Glossary" link="reference.html#annotation-glossary"/>
+    </sub>
+    <sub name="Building, Packaging, and Contributing to p11-kit" link="devel.html">
+      <sub name="Helpful Resources" link="devel.html#devel-links"/>
+      <sub name="Packaging PKCS#11 module configs" link="devel-paths.html">
+        <sub name="Path to place module configuration" link="devel-paths.html#devel-paths-config"/>
+        <sub name="Default path for modules with relative paths" link="devel-paths.html#devel-paths-modules"/>
+      </sub>
+      <sub name="Customizing installed commands" link="devel-commands.html"/>
+      <sub name="Compiling p11-kit from Source" link="devel-building.html">
+        <sub name="Building on UNIX" link="devel-building.html#devel-building-unix"/>
+        <sub name="Optional Dependencies" link="devel-building.html#devel-building-dependencies"/>
+        <sub name="Extra Configuration Options" link="devel-building.html#devel-building-configure"/>
+      </sub>
+      <sub name="Coding Style" link="devel-building-style.html"/>
+      <sub name="Testing and Code Coverage" link="devel-testing.html"/>
+      <sub name="Debugging Tips" link="devel-debugging.html"/>
+    </sub>
+  </chapters>
+  <functions>
+    <keyword type="function" name="p11_kit_modules_load_and_initialize ()" link="p11-kit-Modules.html#p11-kit-modules-load-and-initialize"/>
+    <keyword type="function" name="p11_kit_modules_finalize_and_release ()" link="p11-kit-Modules.html#p11-kit-modules-finalize-and-release"/>
+    <keyword type="function" name="p11_kit_modules_load ()" link="p11-kit-Modules.html#p11-kit-modules-load"/>
+    <keyword type="function" name="p11_kit_modules_initialize ()" link="p11-kit-Modules.html#p11-kit-modules-initialize"/>
+    <keyword type="function" name="p11_kit_modules_finalize ()" link="p11-kit-Modules.html#p11-kit-modules-finalize"/>
+    <keyword type="function" name="p11_kit_modules_release ()" link="p11-kit-Modules.html#p11-kit-modules-release"/>
+    <keyword type="function" name="p11_kit_module_load ()" link="p11-kit-Modules.html#p11-kit-module-load"/>
+    <keyword type="function" name="p11_kit_module_initialize ()" link="p11-kit-Modules.html#p11-kit-module-initialize"/>
+    <keyword type="function" name="p11_kit_module_finalize ()" link="p11-kit-Modules.html#p11-kit-module-finalize"/>
+    <keyword type="function" name="p11_kit_module_release ()" link="p11-kit-Modules.html#p11-kit-module-release"/>
+    <keyword type="function" name="p11_kit_module_for_name ()" link="p11-kit-Modules.html#p11-kit-module-for-name"/>
+    <keyword type="function" name="p11_kit_module_get_name ()" link="p11-kit-Modules.html#p11-kit-module-get-name"/>
+    <keyword type="function" name="p11_kit_module_get_flags ()" link="p11-kit-Modules.html#p11-kit-module-get-flags"/>
+    <keyword type="function" name="p11_kit_module_get_filename ()" link="p11-kit-Modules.html#p11-kit-module-get-filename"/>
+    <keyword type="function" name="p11_kit_config_option ()" link="p11-kit-Modules.html#p11-kit-config-option"/>
+    <keyword type="macro" name="P11_KIT_MODULE_CRITICAL" link="p11-kit-Modules.html#P11-KIT-MODULE-CRITICAL:CAPS"/>
+    <keyword type="macro" name="P11_KIT_MODULE_UNMANAGED" link="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS"/>
+    <keyword type="function" name="p11_kit_uri_new ()" link="p11-kit-URIs.html#p11-kit-uri-new"/>
+    <keyword type="function" name="p11_kit_uri_get_module_info ()" link="p11-kit-URIs.html#p11-kit-uri-get-module-info"/>
+    <keyword type="function" name="p11_kit_uri_match_module_info ()" link="p11-kit-URIs.html#p11-kit-uri-match-module-info"/>
+    <keyword type="function" name="p11_kit_uri_get_slot_info ()" link="p11-kit-URIs.html#p11-kit-uri-get-slot-info"/>
+    <keyword type="function" name="p11_kit_uri_match_slot_info ()" link="p11-kit-URIs.html#p11-kit-uri-match-slot-info"/>
+    <keyword type="function" name="p11_kit_uri_get_slot_id ()" link="p11-kit-URIs.html#p11-kit-uri-get-slot-id"/>
+    <keyword type="function" name="p11_kit_uri_set_slot_id ()" link="p11-kit-URIs.html#p11-kit-uri-set-slot-id"/>
+    <keyword type="function" name="p11_kit_uri_get_token_info ()" link="p11-kit-URIs.html#p11-kit-uri-get-token-info"/>
+    <keyword type="function" name="p11_kit_uri_match_token_info ()" link="p11-kit-URIs.html#p11-kit-uri-match-token-info"/>
+    <keyword type="function" name="p11_kit_uri_get_attributes ()" link="p11-kit-URIs.html#p11-kit-uri-get-attributes"/>
+    <keyword type="function" name="p11_kit_uri_set_attributes ()" link="p11-kit-URIs.html#p11-kit-uri-set-attributes"/>
+    <keyword type="function" name="p11_kit_uri_clear_attributes ()" link="p11-kit-URIs.html#p11-kit-uri-clear-attributes"/>
+    <keyword type="function" name="p11_kit_uri_match_attributes ()" link="p11-kit-URIs.html#p11-kit-uri-match-attributes"/>
+    <keyword type="function" name="p11_kit_uri_get_attribute ()" link="p11-kit-URIs.html#p11-kit-uri-get-attribute"/>
+    <keyword type="function" name="p11_kit_uri_set_attribute ()" link="p11-kit-URIs.html#p11-kit-uri-set-attribute"/>
+    <keyword type="function" name="p11_kit_uri_clear_attribute ()" link="p11-kit-URIs.html#p11-kit-uri-clear-attribute"/>
+    <keyword type="function" name="p11_kit_uri_set_unrecognized ()" link="p11-kit-URIs.html#p11-kit-uri-set-unrecognized"/>
+    <keyword type="function" name="p11_kit_uri_any_unrecognized ()" link="p11-kit-URIs.html#p11-kit-uri-any-unrecognized"/>
+    <keyword type="function" name="p11_kit_uri_get_pin_value ()" link="p11-kit-URIs.html#p11-kit-uri-get-pin-value"/>
+    <keyword type="function" name="p11_kit_uri_set_pin_value ()" link="p11-kit-URIs.html#p11-kit-uri-set-pin-value"/>
+    <keyword type="function" name="p11_kit_uri_get_pin_source ()" link="p11-kit-URIs.html#p11-kit-uri-get-pin-source"/>
+    <keyword type="function" name="p11_kit_uri_set_pin_source ()" link="p11-kit-URIs.html#p11-kit-uri-set-pin-source"/>
+    <keyword type="function" name="p11_kit_uri_get_pinfile ()" link="p11-kit-URIs.html#p11-kit-uri-get-pinfile" deprecated="use p11_kit_uri_get_pin_source()."/>
+    <keyword type="function" name="p11_kit_uri_set_pinfile ()" link="p11-kit-URIs.html#p11-kit-uri-set-pinfile" deprecated="use p11_kit_uri_set_pin_source()."/>
+    <keyword type="function" name="p11_kit_uri_get_module_name ()" link="p11-kit-URIs.html#p11-kit-uri-get-module-name"/>
+    <keyword type="function" name="p11_kit_uri_set_module_name ()" link="p11-kit-URIs.html#p11-kit-uri-set-module-name"/>
+    <keyword type="function" name="p11_kit_uri_get_module_path ()" link="p11-kit-URIs.html#p11-kit-uri-get-module-path"/>
+    <keyword type="function" name="p11_kit_uri_set_module_path ()" link="p11-kit-URIs.html#p11-kit-uri-set-module-path"/>
+    <keyword type="function" name="p11_kit_uri_get_vendor_query ()" link="p11-kit-URIs.html#p11-kit-uri-get-vendor-query"/>
+    <keyword type="function" name="p11_kit_uri_set_vendor_query ()" link="p11-kit-URIs.html#p11-kit-uri-set-vendor-query"/>
+    <keyword type="function" name="p11_kit_uri_format ()" link="p11-kit-URIs.html#p11-kit-uri-format"/>
+    <keyword type="function" name="p11_kit_uri_parse ()" link="p11-kit-URIs.html#p11-kit-uri-parse"/>
+    <keyword type="function" name="p11_kit_uri_free ()" link="p11-kit-URIs.html#p11-kit-uri-free"/>
+    <keyword type="function" name="p11_kit_uri_message ()" link="p11-kit-URIs.html#p11-kit-uri-message"/>
+    <keyword type="macro" name="P11_KIT_URI_SCHEME" link="p11-kit-URIs.html#P11-KIT-URI-SCHEME:CAPS"/>
+    <keyword type="macro" name="P11_KIT_URI_SCHEME_LEN" link="p11-kit-URIs.html#P11-KIT-URI-SCHEME-LEN:CAPS"/>
+    <keyword type="enum" name="enum P11KitUriType" link="p11-kit-URIs.html#P11KitUriType"/>
+    <keyword type="enum" name="enum P11KitUriResult" link="p11-kit-URIs.html#P11KitUriResult"/>
+    <keyword type="typedef" name="P11KitUri" link="p11-kit-URIs.html#P11KitUri"/>
+    <keyword type="typedef" name="p11_kit_uri" link="p11-kit-URIs.html#p11-kit-uri"/>
+    <keyword type="macro" name="P11_KIT_URI_NO_MEMORY" link="p11-kit-URIs.html#P11-KIT-URI-NO-MEMORY:CAPS"/>
+    <keyword type="function" name="p11_kit_pin_new ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-new"/>
+    <keyword type="function" name="p11_kit_pin_new_for_buffer ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-buffer"/>
+    <keyword type="function" name="p11_kit_pin_new_for_string ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-string"/>
+    <keyword type="function" name="p11_kit_pin_get_value ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-value"/>
+    <keyword type="function" name="p11_kit_pin_get_length ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-length"/>
+    <keyword type="function" name="p11_kit_pin_ref ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-ref"/>
+    <keyword type="function" name="p11_kit_pin_unref ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref"/>
+    <keyword type="function" name="p11_kit_pin_register_callback ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback"/>
+    <keyword type="function" name="p11_kit_pin_unregister_callback ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-unregister-callback"/>
+    <keyword type="function" name="p11_kit_pin_callback ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-callback"/>
+    <keyword type="function" name="p11_kit_pin_request ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-request"/>
+    <keyword type="function" name="p11_kit_pin_destroy_func ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-destroy-func"/>
+    <keyword type="function" name="p11_kit_pin_file_callback ()" link="p11-kit-PIN-Callbacks.html#p11-kit-pin-file-callback"/>
+    <keyword type="typedef" name="P11KitPin" link="p11-kit-PIN-Callbacks.html#P11KitPin"/>
+    <keyword type="enum" name="enum P11KitPinFlags" link="p11-kit-PIN-Callbacks.html#P11KitPinFlags"/>
+    <keyword type="macro" name="P11_KIT_PIN_FALLBACK" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FALLBACK:CAPS"/>
+    <keyword type="function" name="p11_kit_strerror ()" link="p11-kit-Utilities.html#p11-kit-strerror"/>
+    <keyword type="function" name="p11_kit_message ()" link="p11-kit-Utilities.html#p11-kit-message"/>
+    <keyword type="function" name="p11_kit_space_strdup ()" link="p11-kit-Utilities.html#p11-kit-space-strdup"/>
+    <keyword type="function" name="p11_kit_space_strlen ()" link="p11-kit-Utilities.html#p11-kit-space-strlen"/>
+    <keyword type="function" name="p11_kit_be_quiet ()" link="p11-kit-Utilities.html#p11-kit-be-quiet"/>
+    <keyword type="function" name="p11_kit_be_loud ()" link="p11-kit-Utilities.html#p11-kit-be-loud"/>
+    <keyword type="function" name="p11_kit_set_progname ()" link="p11-kit-Future.html#p11-kit-set-progname"/>
+    <keyword type="function" name="p11_kit_destroyer ()" link="p11-kit-Future.html#p11-kit-destroyer"/>
+    <keyword type="function" name="p11_kit_iter_new ()" link="p11-kit-Future.html#p11-kit-iter-new"/>
+    <keyword type="function" name="p11_kit_iter_set_uri ()" link="p11-kit-Future.html#p11-kit-iter-set-uri"/>
+    <keyword type="function" name="p11_kit_iter_add_callback ()" link="p11-kit-Future.html#p11-kit-iter-add-callback"/>
+    <keyword type="function" name="p11_kit_iter_add_filter ()" link="p11-kit-Future.html#p11-kit-iter-add-filter"/>
+    <keyword type="function" name="p11_kit_iter_callback ()" link="p11-kit-Future.html#p11-kit-iter-callback"/>
+    <keyword type="function" name="p11_kit_iter_begin ()" link="p11-kit-Future.html#p11-kit-iter-begin"/>
+    <keyword type="function" name="p11_kit_iter_begin_with ()" link="p11-kit-Future.html#p11-kit-iter-begin-with"/>
+    <keyword type="function" name="p11_kit_iter_next ()" link="p11-kit-Future.html#p11-kit-iter-next"/>
+    <keyword type="function" name="p11_kit_iter_get_kind ()" link="p11-kit-Future.html#p11-kit-iter-get-kind"/>
+    <keyword type="function" name="p11_kit_iter_get_module ()" link="p11-kit-Future.html#p11-kit-iter-get-module"/>
+    <keyword type="function" name="p11_kit_iter_get_slot ()" link="p11-kit-Future.html#p11-kit-iter-get-slot"/>
+    <keyword type="function" name="p11_kit_iter_get_slot_info ()" link="p11-kit-Future.html#p11-kit-iter-get-slot-info"/>
+    <keyword type="function" name="p11_kit_iter_get_token ()" link="p11-kit-Future.html#p11-kit-iter-get-token"/>
+    <keyword type="function" name="p11_kit_iter_get_session ()" link="p11-kit-Future.html#p11-kit-iter-get-session"/>
+    <keyword type="function" name="p11_kit_iter_keep_session ()" link="p11-kit-Future.html#p11-kit-iter-keep-session"/>
+    <keyword type="function" name="p11_kit_iter_get_object ()" link="p11-kit-Future.html#p11-kit-iter-get-object"/>
+    <keyword type="function" name="p11_kit_iter_get_attributes ()" link="p11-kit-Future.html#p11-kit-iter-get-attributes"/>
+    <keyword type="function" name="p11_kit_iter_load_attributes ()" link="p11-kit-Future.html#p11-kit-iter-load-attributes"/>
+    <keyword type="function" name="p11_kit_iter_destroy_object ()" link="p11-kit-Future.html#p11-kit-iter-destroy-object"/>
+    <keyword type="function" name="p11_kit_iter_free ()" link="p11-kit-Future.html#p11-kit-iter-free"/>
+    <keyword type="function" name="p11_kit_remote_serve_module ()" link="p11-kit-Future.html#p11-kit-remote-serve-module"/>
+    <keyword type="function" name="p11_kit_remote_serve_token ()" link="p11-kit-Future.html#p11-kit-remote-serve-token" deprecated="use p11_kit_remote_serve_tokens()"/>
+    <keyword type="function" name="p11_kit_remote_serve_tokens ()" link="p11-kit-Future.html#p11-kit-remote-serve-tokens"/>
+    <keyword type="typedef" name="P11KitIter" link="p11-kit-Future.html#P11KitIter"/>
+    <keyword type="typedef" name="p11_kit_iter" link="p11-kit-Future.html#p11-kit-iter"/>
+    <keyword type="enum" name="enum P11KitIterKind" link="p11-kit-Future.html#P11KitIterKind"/>
+    <keyword type="enum" name="enum P11KitIterBehavior" link="p11-kit-Future.html#P11KitIterBehavior"/>
+    <keyword type="function" name="p11_kit_initialize_registered ()" link="p11-kit-Deprecated.html#p11-kit-initialize-registered" deprecated="Since: 0.19.0: Use p11_kit_modules_load() instead."/>
+    <keyword type="function" name="p11_kit_finalize_registered ()" link="p11-kit-Deprecated.html#p11-kit-finalize-registered" deprecated="Since 0.19.0: Use p11_kit_modules_release() instead."/>
+    <keyword type="function" name="p11_kit_registered_modules ()" link="p11-kit-Deprecated.html#p11-kit-registered-modules" deprecated="Since 0.19.0: Use p11_kit_modules_load() instead."/>
+    <keyword type="function" name="p11_kit_registered_module_to_name ()" link="p11-kit-Deprecated.html#p11-kit-registered-module-to-name" deprecated="Since 0.19.0: Use p11_kit_module_get_name() instead."/>
+    <keyword type="function" name="p11_kit_registered_name_to_module ()" link="p11-kit-Deprecated.html#p11-kit-registered-name-to-module" deprecated="Since 0.19.0: Use p11_kit_module_for_name() instead."/>
+    <keyword type="function" name="p11_kit_registered_option ()" link="p11-kit-Deprecated.html#p11-kit-registered-option" deprecated="Since 0.19.0: Use p11_kit_config_option() instead."/>
+    <keyword type="function" name="p11_kit_initialize_module ()" link="p11-kit-Deprecated.html#p11-kit-initialize-module" deprecated="Since 0.19.0: Use p11_kit_module_initialize() instead."/>
+    <keyword type="function" name="p11_kit_load_initialize_module ()" link="p11-kit-Deprecated.html#p11-kit-load-initialize-module" deprecated="Since 0.19.0: Use p11_kit_module_load() instead."/>
+    <keyword type="function" name="p11_kit_finalize_module ()" link="p11-kit-Deprecated.html#p11-kit-finalize-module" deprecated=""/>
+    <keyword type="macro" name="P11_KIT_DEPRECATED_FOR()" link="p11-kit-Deprecated.html#P11-KIT-DEPRECATED-FOR:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_OBJECT" link="p11-kit-URIs.html#P11-KIT-URI-FOR-OBJECT:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_TOKEN" link="p11-kit-URIs.html#P11-KIT-URI-FOR-TOKEN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_SLOT" link="p11-kit-URIs.html#P11-KIT-URI-FOR-SLOT:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_MODULE" link="p11-kit-URIs.html#P11-KIT-URI-FOR-MODULE:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_MODULE_WITH_VERSION" link="p11-kit-URIs.html#P11-KIT-URI-FOR-MODULE-WITH-VERSION:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_OBJECT_ON_TOKEN" link="p11-kit-URIs.html#P11-KIT-URI-FOR-OBJECT-ON-TOKEN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_OBJECT_ON_TOKEN_AND_MODULE" link="p11-kit-URIs.html#P11-KIT-URI-FOR-OBJECT-ON-TOKEN-AND-MODULE:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_FOR_ANY" link="p11-kit-URIs.html#P11-KIT-URI-FOR-ANY:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_OK" link="p11-kit-URIs.html#P11-KIT-URI-OK:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_UNEXPECTED" link="p11-kit-URIs.html#P11-KIT-URI-UNEXPECTED:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_BAD_SCHEME" link="p11-kit-URIs.html#P11-KIT-URI-BAD-SCHEME:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_BAD_ENCODING" link="p11-kit-URIs.html#P11-KIT-URI-BAD-ENCODING:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_BAD_SYNTAX" link="p11-kit-URIs.html#P11-KIT-URI-BAD-SYNTAX:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_BAD_VERSION" link="p11-kit-URIs.html#P11-KIT-URI-BAD-VERSION:CAPS"/>
+    <keyword type="constant" name="P11_KIT_URI_NOT_FOUND" link="p11-kit-URIs.html#P11-KIT-URI-NOT-FOUND:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_USER_LOGIN" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-USER-LOGIN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_SO_LOGIN" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-SO-LOGIN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_CONTEXT_LOGIN" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-CONTEXT-LOGIN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_RETRY" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-RETRY:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_MANY_TRIES" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-MANY-TRIES:CAPS"/>
+    <keyword type="constant" name="P11_KIT_PIN_FLAGS_FINAL_TRY" link="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FLAGS-FINAL-TRY:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_MODULE" link="p11-kit-Future.html#P11-KIT-ITER-KIND-MODULE:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_SLOT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-SLOT:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_TOKEN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-TOKEN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_OBJECT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-OBJECT:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_KIND_UNKNOWN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_BUSY_SESSIONS" link="p11-kit-Future.html#P11-KIT-ITER-BUSY-SESSIONS:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WANT_WRITABLE" link="p11-kit-Future.html#P11-KIT-ITER-WANT-WRITABLE:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITH_MODULES" link="p11-kit-Future.html#P11-KIT-ITER-WITH-MODULES:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITH_SLOTS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-SLOTS:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITH_TOKENS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-TOKENS:CAPS"/>
+    <keyword type="constant" name="P11_KIT_ITER_WITHOUT_OBJECTS" link="p11-kit-Future.html#P11-KIT-ITER-WITHOUT-OBJECTS:CAPS"/>
+  </functions>
+</book>
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.html b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.html
new file mode 100644
index 000000000..a45229ab9
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/p11-kit.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>p11-kit: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="tools.html" title="Manual Pages">
+<link rel="prev" href="tools.html" title="Manual Pages">
+<link rel="next" href="pkcs11-conf.html" title="pkcs11.conf">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="tools.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="tools.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="pkcs11-conf.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="p11-kit"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">p11-kit</span></h2>
+<p>p11-kit — Tool for operating on configured PKCS#11 modules</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<h2>Synopsis</h2>
+<div class="cmdsynopsis"><p><code class="command">p11-kit list-modules</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit extract</code>  ...
+	</p></div>
+<div class="cmdsynopsis"><p><code class="command">p11-kit server</code>  ...
+	</p></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-description"></a><h2>Description</h2>
+<p><span class="command"><strong>p11-kit</strong></span> is a command line tool that
+	can be used to perform operations on PKCS#11 modules configured on the
+	system.</p>
+<p>See the various sub commands below. The following global options
+	can be used:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">-v, --verbose</code></span></p></td>
+<td><p>Run in verbose mode with debug
+			output.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">-q, --quiet</code></span></p></td>
+<td><p>Run in quiet mode without warning or
+			failure messages.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="p11-kit-list-modules"></a><h2>List Modules</h2>
+<p>List system configured PKCS#11 modules.</p>
+<pre class="programlisting">
+$ p11-kit list-modules
+</pre>
+<p>The modules, information about them and the tokens present in
+	the PKCS#11 modules will be displayed.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-extract"></a><h2>Extract</h2>
+<p>Extract certificates from configured PKCS#11 modules.</p>
+<p>This operation has been moved to a separate command <span class="command"><strong>trust extract</strong></span>.
+	See <span class="citerefentry"><span class="refentrytitle">trust</span>(1)</span>
+	for more information</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-server"></a><h2>Server</h2>
+<p>Run a server process that exposes PKCS#11 module remotely.</p>
+<pre class="programlisting">
+$ p11-kit server pkcs11:token1 pkcs11:token2 ...
+$ p11-kit server --provider /path/to/pkcs11-module.so pkcs11:token1 pkcs11:token2 ...
+</pre>
+<p>This launches a server that exposes the given PKCS#11 tokens on a local socket. The tokens must belong to the same module. To access the socket, use <code class="literal">p11-kit-client.so</code> module. The server address and PID are printed as a shell-script snippet which sets the appropriate environment variable: <code class="literal">P11_KIT_SERVER_ADDRESS</code> and <code class="literal">P11_KIT_SERVER_PID</code>.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-extract-trust"></a><h2>Extract Trust</h2>
+<p>Extract standard trust information files.</p>
+<p>This operation has been moved to a separate command <span class="command"><strong>trust extract-compat</strong></span>.
+	See <span class="citerefentry"><span class="refentrytitle">trust</span>(1)</span>
+	for more information</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-remote"></a><h2>Remote</h2>
+<p>Run a PKCS#11 module remotely.</p>
+<pre class="programlisting">
+$ p11-kit remote /path/to/pkcs11-module.so
+$ p11-kit remote pkcs11:token1 pkcs11:token2 ...
+</pre>
+<p>This is not meant to be run directly from a terminal. But rather in a
+	<code class="option">remote</code> option in a
+	<span class="citerefentry"><span class="refentrytitle">pkcs11.conf</span>(5)</span>
+	file.</p>
+<p>This exposes the given PKCS#11 module or tokens over standard input and output. Those two forms, whether to expose a module or tokens, are mutually exclusive and if the second form is used, the tokens must belong to the same module.</p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-bugs"></a><h2>Bugs</h2>
+<p>
+    Please send bug reports to either the distribution bug tracker
+    or the upstream bug tracker at
+    <a class="ulink" href="https://github.com/p11-glue/p11-kit/issues/" target="_top">https://github.com/p11-glue/p11-kit/issues/</a>.
+  </p>
+</div>
+<div class="refsect1">
+<a name="p11-kit-see-also"></a><h2>See also</h2>
+<span class="simplelist"><span class="citerefentry"><span class="refentrytitle">pkcs11.conf</span>(5)</span></span><p>
+    Further details available in the p11-kit online documentation at
+    <a class="ulink" href="https://p11-glue.github.io/p11-glue/p11-kit/manual/" target="_top">https://p11-glue.github.io/p11-glue/p11-kit/manual/</a>.
+  </p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html b/msys2/usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html
new file mode 100644
index 000000000..0c94a139a
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html
@@ -0,0 +1,262 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>pkcs11.conf: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="tools.html" title="Manual Pages">
+<link rel="prev" href="p11-kit.html" title="p11-kit">
+<link rel="next" href="trust.html" title="trust">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="tools.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="p11-kit.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="trust.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="pkcs11-conf"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">pkcs11.conf</span></h2>
+<p>pkcs11.conf — Configuration files for PKCS#11 modules</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="pkcs11-conf-description"></a><h2>Description</h2>
+<p>The <span class="command"><strong>pkcs11.conf</strong></span> configuration files are a standard
+	way to configure PKCS#11 modules.</p>
+</div>
+<div class="refsect1">
+<a name="config-format"></a><h2>File format</h2>
+<p>A complete configuration consists of several files. These files are
+	text files. Since <code class="literal">p11-kit</code> is built to be used in all
+	sorts of environments and at very low levels of the software stack, we
+	cannot make use of high level configuration APIs that you may find on a
+	modern desktop.</p>
+<p>Each setting in the config file is specified consists of a name and
+	a value. The name is a simple string consisting of characters and dashes.
+	The name consists of alpha numeric characters, dot, hyphen and
+	underscore.</p>
+<p>The value is specified after the name on the same line, separated
+	from it by a <code class="literal">:</code> (colon). White space between the
+	name and value is ignored.</p>
+<p>Blank lines are ignored. White space at the beginning or end of
+	lines is stripped. Lines that begin with a <code class="literal">#</code> character
+	are ignored as comments. Comments are not recognized when they come after
+	a value on a line.</p>
+<p>A fictitious module configuration file might look like:</p>
+<pre class="programlisting">
+module: module.so
+# Here is a comment
+
+managed: true
+setting.2: A long value with text.
+x-custom : text
+</pre>
+</div>
+<div class="refsect1">
+<a name="config-module"></a><h2>Module Configuration</h2>
+<p>Each configured PKCS#11 module has its own config file. These files
+	can be <a class="link" href="pkcs11-conf.html#config-locations" title="Configuration Files">placed in various locations</a>.</p>
+<p>The filename of the configuration file may consist of upper and lowercase letters
+	underscore, comma, dash and dots. The first characters needs to be an alphanumeric,
+	the filename should end with a <code class="literal">.module</code> extension.</p>
+<p>Most importantly each config file specifies the path of the PKCS#11 module to
+	load. A module config file has the following fields:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">module:</code></span></p></td>
+<td>
+<p>The filename of the PKCS#11 module to load.
+			This should include an extension like <code class="literal">.so</code></p>
+<p>If this value is blank, then the module will be ignored.
+			This can be used in the user configs to override loading of a module
+			specified in the system configuration.</p>
+<p>If this is a relative path, then the module will be loaded
+			from the <a class="link" href="devel-paths.html#devel-paths-modules" title="Default path for modules with relative paths">default module directory</a>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">critical:</code></span></p></td>
+<td>
+<p>Set to <code class="literal">yes</code> if the module is critical and
+			required to load. If a critical module fails to load or initialize,
+			then the loading process for all registered modules will abort and
+			return an error code.</p>
+<p>This argument is optional and defaults to <code class="literal">no</code>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">enable-in:</code></span></p></td>
+<td>
+<p>A comma and/or space separated list of names of programs that
+			this module should only be loaded in. The module will not be loaded
+			for other programs using p11-kit. The base name of the process executable
+			should be used here, for example
+			<code class="literal">seahorse, ssh</code>.</p>
+<p>This option can also be used to control whether the module will be loaded by <a class="link" href="sharing.html" title="Sharing PKCS#11 modules">the proxy module</a>.  To enable loading only from the proxy module, specify <code class="literal">p11-kit-proxy</code> as the value.</p>
+<p>This is not a security feature. The argument is optional. If
+			not present, then any process will load the module.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">disable-in:</code></span></p></td>
+<td>
+<p>A comma and/or space separated list of names of programs that
+			this module should not be loaded in. The module will be loaded for any
+			other programs using p11-kit. The base name of the process
+			executable should be used here, for example
+			<code class="literal">firefox, thunderbird-bin</code>.</p>
+<p>This option can also be used to control whether the module will be loaded by <a class="link" href="sharing.html" title="Sharing PKCS#11 modules">the proxy module</a>.  To disable loading from the proxy module, specify <code class="literal">p11-kit-proxy</code> as the value.</p>
+<p>This is not a security feature. The argument is optional. If
+			not present, then any process will load the module.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">managed:</code></span></p></td>
+<td>
+<p>Set to <code class="literal">no</code> if the module is not to be managed by
+			p11-kit. Making a module unmanaged is not recommended, and will cause
+			problems if multiple callers in a single process share a PKCS#11 module.</p>
+<p>This argument is optional and defaults to <code class="literal">yes</code>.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">priority:</code></span></p></td>
+<td>
+<p>The value should be an integer. When lists of modules are
+			returned to a caller of p11-kit, modules with a higher number are sorted
+			first. When applications search modules for certificates, keys and
+			trust policy information, this setting will affect what find
+			first.</p>
+<p>This argument is optional, and defaults to zero. Modules
+			with the same <code class="option">priority</code> option will be sorted
+			alphabetically.</p>
+</td>
+</tr>
+<tr>
+<td><p><a name="option-remote"></a><span class="term"><code class="option">remote:</code></span></p></td>
+<td>
+<p>Instead of loading the PKCS#11 module locally, run the module
+			remotely.</p>
+<p>Specify a command to run, prefixed with <code class="literal">|</code> a pipe.
+			The command must speak the p11-kit remoting protocol on its standard in
+			and standard out. For example:</p>
+<pre class="programlisting">
+remote: |ssh user@remote p11-kit remote /path/to/module.so
+</pre>
+<p>Other forms of remoting will appear in later p11-kit releases.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">trust-policy:</code></span></p></td>
+<td><p>Set to <code class="literal">yes</code> to use use this module as a source
+			of trust policy information such as certificate anchors and black lists.</p></td>
+</tr>
+<tr>
+<td><p><a name="option-log-calls"></a><span class="term"><code class="option">log-calls:</code></span></p></td>
+<td>
+<p>Set to <code class="literal">yes</code> to write a log to stderr of all the
+			calls into the module. This is only supported for managed modules.</p>
+<p>This argument is optional and defaults to <code class="literal">no</code>.</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p>Do not specify both <code class="literal">enable-in</code> and <code class="literal">disable-in</code>
+	for the same module.</p>
+<p>Other fields may be present, but it is recommended that field names
+	that are not specified in this document start with a <code class="literal">x-</code>
+	prefix.</p>
+</div>
+<div class="refsect1">
+<a name="config-global"></a><h2>Global Configuration</h2>
+<p>A global configuration may also be present. This file contains settings
+	that are not related to a single PKCS#11 module. The location(s) of the
+	global configuration are described below. The global configuration file
+	can contain the following fields:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">user-config:</code></span></p></td>
+<td><p>This will be equal to one of the following values:
+		<code class="literal">none</code>, <code class="literal">merge</code>,
+		<code class="literal">only</code>.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">managed:</code></span></p></td>
+<td>
+<p>Set to <code class="literal">yes</code> or <code class="literal">no</code> to
+			force all modules to be managed or unmanaged by p11-kit. Setting this
+			setting in a global configuration file will override the
+			<code class="literal">managed</code> setting in the individual module configuration
+			files. Making modules unmanaged is not recommended, and will cause
+			problems if multiple callers in a single process share a PKCS#11
+			module.</p>
+<p>This argument is optional.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">log-calls:</code></span></p></td>
+<td>
+<p>Set to <code class="literal">yes</code> to write a log to stderr of all the
+			calls into all configured modules. This is only supported for managed
+			modules.</p>
+<p>This argument is optional.</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p>Other fields may be present, but it is recommended that field names
+	that are not specified in this document start with a <code class="literal">x-</code>
+	prefix.</p>
+</div>
+<div class="refsect1">
+<a name="config-locations"></a><h2>Configuration Files</h2>
+<p>Each configured PKCS#11 module has its own config file. These
+	files are placed in a directory. In addition a global config file exists.
+	There is a system configuration consisting of the various module config
+	files and a file for global configuration. Optionally each user can provide
+	additional configuration or override the system configuration.</p>
+<p>The system global configuration file is usually in
+	<code class="literal">/etc/pkcs11/pkcs11.conf</code> and the user global
+	configuration file is in <code class="literal">~/.config/pkcs11/pkcs11.conf</code> in the
+	user's home directory.</p>
+<p>The module config files are usually located in the
+	<code class="literal">/etc/pkcs11/modules</code> directory, with one configuration
+	file per module. In addition the <code class="literal">~/.config/pkcs11/modules</code> directory
+	can be used for modules installed by the user.</p>
+<p>Note that user configuration files are not loaded from the home
+	directory if running inside a setuid or setgid program.</p>
+<p>The default system config file and module directory can be changed
+	when building p11-kit. Always
+	<a class="link" href="devel-paths.html" title="Packaging PKCS#11 module configs">lookup these paths</a> using
+	<code class="literal">pkg-config</code>.</p>
+</div>
+<div class="refsect1">
+<a name="pkcs11-conf-see-also"></a><h2>See also</h2>
+<span class="simplelist"><span class="citerefentry"><span class="refentrytitle">p11-kit</span>(8)</span></span><p>Further details available in the p11-kit online documentation at
+	<a class="ulink" href="https://p11-glue.github.io/p11-glue/p11-kit/manual/" target="_top">https://p11-glue.github.io/p11-glue/p11-kit/manual/</a>.
+	</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/reference.html b/msys2/usr/share/gtk-doc/html/p11-kit/reference.html
new file mode 100644
index 000000000..6d2edb1f1
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/reference.html
@@ -0,0 +1,567 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>API Reference: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="trust.html" title="trust">
+<link rel="next" href="p11-kit-Modules.html" title="Modules">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="trust.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit-Modules.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="reference"></a>API Reference</h1></div></div></div>
+<div class="toc"><dl class="toc">
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Modules.html">Modules</a></span><span class="refpurpose"> — Module loading and initializing</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-URIs.html">URIs</a></span><span class="refpurpose"> — Parsing and formatting PKCS#11 URIs</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-PIN-Callbacks.html">PIN Callbacks</a></span><span class="refpurpose"> — PIN Callbacks</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Utilities.html">Utilities</a></span><span class="refpurpose"> — PKCS#11 utilities</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Future.html">Future</a></span><span class="refpurpose"> — Future Unstable API</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="p11-kit-Deprecated.html">Deprecated</a></span><span class="refpurpose"> — Deprecated functions</span>
+</dt>
+<dt><span class="index"><a href="reference.html#api-index-full">API Index</a></span></dt>
+<dt><span class="glossary"><a href="reference.html#annotation-glossary">Annotation Glossary</a></span></dt>
+</dl></div>
+<div class="index">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="api-index-full"></a>API Index</h2></div></div></div>
+<a name="idx"></a><a name="idxB"></a><h3 class="title">B</h3>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-be-loud" title="p11_kit_be_loud ()">p11_kit_be_loud</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-be-quiet" title="p11_kit_be_quiet ()">p11_kit_be_quiet</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<a name="idxC"></a><h3 class="title">C</h3>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-config-option" title="p11_kit_config_option ()">p11_kit_config_option</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<a name="idxD"></a><h3 class="title">D</h3>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#P11-KIT-DEPRECATED-FOR:CAPS" title="P11_KIT_DEPRECATED_FOR()">P11_KIT_DEPRECATED_FOR</a>, macro in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-destroyer" title="p11_kit_destroyer ()">p11_kit_destroyer</a>, user_function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<a name="idxF"></a><h3 class="title">F</h3>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-module" title="p11_kit_finalize_module ()">p11_kit_finalize_module</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-finalize-registered" title="p11_kit_finalize_registered ()">p11_kit_finalize_registered</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<a name="idxI"></a><h3 class="title">I</h3>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-module" title="p11_kit_initialize_module ()">p11_kit_initialize_module</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-initialize-registered" title="p11_kit_initialize_registered ()">p11_kit_initialize_registered</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter" title="p11_kit_iter">p11_kit_iter</a>, typedef in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-add-callback" title="p11_kit_iter_add_callback ()">p11_kit_iter_add_callback</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-add-filter" title="p11_kit_iter_add_filter ()">p11_kit_iter_add_filter</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-begin" title="p11_kit_iter_begin ()">p11_kit_iter_begin</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-begin-with" title="p11_kit_iter_begin_with ()">p11_kit_iter_begin_with</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-callback" title="p11_kit_iter_callback ()">p11_kit_iter_callback</a>, user_function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-destroy-object" title="p11_kit_iter_destroy_object ()">p11_kit_iter_destroy_object</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-free" title="p11_kit_iter_free ()">p11_kit_iter_free</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-attributes" title="p11_kit_iter_get_attributes ()">p11_kit_iter_get_attributes</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-kind" title="p11_kit_iter_get_kind ()">p11_kit_iter_get_kind</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-module" title="p11_kit_iter_get_module ()">p11_kit_iter_get_module</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-object" title="p11_kit_iter_get_object ()">p11_kit_iter_get_object</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-session" title="p11_kit_iter_get_session ()">p11_kit_iter_get_session</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot" title="p11_kit_iter_get_slot ()">p11_kit_iter_get_slot</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-slot-info" title="p11_kit_iter_get_slot_info ()">p11_kit_iter_get_slot_info</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-get-token" title="p11_kit_iter_get_token ()">p11_kit_iter_get_token</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-keep-session" title="p11_kit_iter_keep_session ()">p11_kit_iter_keep_session</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-load-attributes" title="p11_kit_iter_load_attributes ()">p11_kit_iter_load_attributes</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-new" title="p11_kit_iter_new ()">p11_kit_iter_new</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-next" title="p11_kit_iter_next ()">p11_kit_iter_next</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-iter-set-uri" title="p11_kit_iter_set_uri ()">p11_kit_iter_set_uri</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<a name="idxL"></a><h3 class="title">L</h3>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-load-initialize-module" title="p11_kit_load_initialize_module ()">p11_kit_load_initialize_module</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<a name="idxM"></a><h3 class="title">M</h3>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-message" title="p11_kit_message ()">p11_kit_message</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-finalize" title="p11_kit_modules_finalize ()">p11_kit_modules_finalize</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-finalize-and-release" title="p11_kit_modules_finalize_and_release ()">p11_kit_modules_finalize_and_release</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-initialize" title="p11_kit_modules_initialize ()">p11_kit_modules_initialize</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()">p11_kit_modules_load</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load-and-initialize" title="p11_kit_modules_load_and_initialize ()">p11_kit_modules_load_and_initialize</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-modules-release" title="p11_kit_modules_release ()">p11_kit_modules_release</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-CRITICAL:CAPS" title="P11_KIT_MODULE_CRITICAL">P11_KIT_MODULE_CRITICAL</a>, macro in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-finalize" title="p11_kit_module_finalize ()">p11_kit_module_finalize</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-for-name" title="p11_kit_module_for_name ()">p11_kit_module_for_name</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-filename" title="p11_kit_module_get_filename ()">p11_kit_module_get_filename</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-flags" title="p11_kit_module_get_flags ()">p11_kit_module_get_flags</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-get-name" title="p11_kit_module_get_name ()">p11_kit_module_get_name</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-initialize" title="p11_kit_module_initialize ()">p11_kit_module_initialize</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-load" title="p11_kit_module_load ()">p11_kit_module_load</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#p11-kit-module-release" title="p11_kit_module_release ()">p11_kit_module_release</a>, function in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Modules.html#P11-KIT-MODULE-UNMANAGED:CAPS" title="P11_KIT_MODULE_UNMANAGED">P11_KIT_MODULE_UNMANAGED</a>, macro in <a class="link" href="p11-kit-Modules.html" title="Modules">Modules</a>
+</dt>
+<dd></dd>
+<a name="idxP"></a><h3 class="title">P</h3>
+<dt>
+<a class="link" href="p11-kit-Future.html#P11KitIter" title="P11KitIter">P11KitIter</a>, typedef in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#P11KitIterBehavior" title="enum P11KitIterBehavior">P11KitIterBehavior</a>, enum in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#P11KitIterKind" title="enum P11KitIterKind">P11KitIterKind</a>, enum in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPin" title="P11KitPin">P11KitPin</a>, typedef in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11KitPinFlags" title="enum P11KitPinFlags">P11KitPinFlags</a>, enum in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11KitUri" title="P11KitUri">P11KitUri</a>, typedef in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11KitUriResult" title="enum P11KitUriResult">P11KitUriResult</a>, enum in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11KitUriType" title="enum P11KitUriType">P11KitUriType</a>, enum in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-callback" title="p11_kit_pin_callback ()">p11_kit_pin_callback</a>, user_function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-destroy-func" title="p11_kit_pin_destroy_func ()">p11_kit_pin_destroy_func</a>, user_function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#P11-KIT-PIN-FALLBACK:CAPS" title="P11_KIT_PIN_FALLBACK">P11_KIT_PIN_FALLBACK</a>, macro in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-file-callback" title="p11_kit_pin_file_callback ()">p11_kit_pin_file_callback</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-length" title="p11_kit_pin_get_length ()">p11_kit_pin_get_length</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-get-value" title="p11_kit_pin_get_value ()">p11_kit_pin_get_value</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new" title="p11_kit_pin_new ()">p11_kit_pin_new</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-buffer" title="p11_kit_pin_new_for_buffer ()">p11_kit_pin_new_for_buffer</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-new-for-string" title="p11_kit_pin_new_for_string ()">p11_kit_pin_new_for_string</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-ref" title="p11_kit_pin_ref ()">p11_kit_pin_ref</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-register-callback" title="p11_kit_pin_register_callback ()">p11_kit_pin_register_callback</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-request" title="p11_kit_pin_request ()">p11_kit_pin_request</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unref" title="p11_kit_pin_unref ()">p11_kit_pin_unref</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-PIN-Callbacks.html#p11-kit-pin-unregister-callback" title="p11_kit_pin_unregister_callback ()">p11_kit_pin_unregister_callback</a>, function in <a class="link" href="p11-kit-PIN-Callbacks.html" title="PIN Callbacks">PIN Callbacks</a>
+</dt>
+<dd></dd>
+<a name="idxR"></a><h3 class="title">R</h3>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-modules" title="p11_kit_registered_modules ()">p11_kit_registered_modules</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-module-to-name" title="p11_kit_registered_module_to_name ()">p11_kit_registered_module_to_name</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-name-to-module" title="p11_kit_registered_name_to_module ()">p11_kit_registered_name_to_module</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Deprecated.html#p11-kit-registered-option" title="p11_kit_registered_option ()">p11_kit_registered_option</a>, function in <a class="link" href="p11-kit-Deprecated.html" title="Deprecated">Deprecated</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-module" title="p11_kit_remote_serve_module ()">p11_kit_remote_serve_module</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-token" title="p11_kit_remote_serve_token ()">p11_kit_remote_serve_token</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-remote-serve-tokens" title="p11_kit_remote_serve_tokens ()">p11_kit_remote_serve_tokens</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<a name="idxS"></a><h3 class="title">S</h3>
+<dt>
+<a class="link" href="p11-kit-Future.html#p11-kit-set-progname" title="p11_kit_set_progname ()">p11_kit_set_progname</a>, function in <a class="link" href="p11-kit-Future.html" title="Future">Future</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-space-strdup" title="p11_kit_space_strdup ()">p11_kit_space_strdup</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-space-strlen" title="p11_kit_space_strlen ()">p11_kit_space_strlen</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-Utilities.html#p11-kit-strerror" title="p11_kit_strerror ()">p11_kit_strerror</a>, function in <a class="link" href="p11-kit-Utilities.html" title="Utilities">Utilities</a>
+</dt>
+<dd></dd>
+<a name="idxU"></a><h3 class="title">U</h3>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri" title="p11_kit_uri">p11_kit_uri</a>, typedef in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-any-unrecognized" title="p11_kit_uri_any_unrecognized ()">p11_kit_uri_any_unrecognized</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-clear-attribute" title="p11_kit_uri_clear_attribute ()">p11_kit_uri_clear_attribute</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-clear-attributes" title="p11_kit_uri_clear_attributes ()">p11_kit_uri_clear_attributes</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-format" title="p11_kit_uri_format ()">p11_kit_uri_format</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-free" title="p11_kit_uri_free ()">p11_kit_uri_free</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attribute" title="p11_kit_uri_get_attribute ()">p11_kit_uri_get_attribute</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-attributes" title="p11_kit_uri_get_attributes ()">p11_kit_uri_get_attributes</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-info" title="p11_kit_uri_get_module_info ()">p11_kit_uri_get_module_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-name" title="p11_kit_uri_get_module_name ()">p11_kit_uri_get_module_name</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-module-path" title="p11_kit_uri_get_module_path ()">p11_kit_uri_get_module_path</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pinfile" title="p11_kit_uri_get_pinfile ()">p11_kit_uri_get_pinfile</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pin-source" title="p11_kit_uri_get_pin_source ()">p11_kit_uri_get_pin_source</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-pin-value" title="p11_kit_uri_get_pin_value ()">p11_kit_uri_get_pin_value</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-slot-id" title="p11_kit_uri_get_slot_id ()">p11_kit_uri_get_slot_id</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-slot-info" title="p11_kit_uri_get_slot_info ()">p11_kit_uri_get_slot_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-token-info" title="p11_kit_uri_get_token_info ()">p11_kit_uri_get_token_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-get-vendor-query" title="p11_kit_uri_get_vendor_query ()">p11_kit_uri_get_vendor_query</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-attributes" title="p11_kit_uri_match_attributes ()">p11_kit_uri_match_attributes</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-module-info" title="p11_kit_uri_match_module_info ()">p11_kit_uri_match_module_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-slot-info" title="p11_kit_uri_match_slot_info ()">p11_kit_uri_match_slot_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-match-token-info" title="p11_kit_uri_match_token_info ()">p11_kit_uri_match_token_info</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-message" title="p11_kit_uri_message ()">p11_kit_uri_message</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-new" title="p11_kit_uri_new ()">p11_kit_uri_new</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-NO-MEMORY:CAPS" title="P11_KIT_URI_NO_MEMORY">P11_KIT_URI_NO_MEMORY</a>, macro in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-parse" title="p11_kit_uri_parse ()">p11_kit_uri_parse</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME:CAPS" title="P11_KIT_URI_SCHEME">P11_KIT_URI_SCHEME</a>, macro in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#P11-KIT-URI-SCHEME-LEN:CAPS" title="P11_KIT_URI_SCHEME_LEN">P11_KIT_URI_SCHEME_LEN</a>, macro in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attribute" title="p11_kit_uri_set_attribute ()">p11_kit_uri_set_attribute</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-attributes" title="p11_kit_uri_set_attributes ()">p11_kit_uri_set_attributes</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-module-name" title="p11_kit_uri_set_module_name ()">p11_kit_uri_set_module_name</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-module-path" title="p11_kit_uri_set_module_path ()">p11_kit_uri_set_module_path</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pinfile" title="p11_kit_uri_set_pinfile ()">p11_kit_uri_set_pinfile</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pin-source" title="p11_kit_uri_set_pin_source ()">p11_kit_uri_set_pin_source</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-pin-value" title="p11_kit_uri_set_pin_value ()">p11_kit_uri_set_pin_value</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-slot-id" title="p11_kit_uri_set_slot_id ()">p11_kit_uri_set_slot_id</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-unrecognized" title="p11_kit_uri_set_unrecognized ()">p11_kit_uri_set_unrecognized</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="p11-kit-URIs.html#p11-kit-uri-set-vendor-query" title="p11_kit_uri_set_vendor_query ()">p11_kit_uri_set_vendor_query</a>, function in <a class="link" href="p11-kit-URIs.html" title="URIs">URIs</a>
+</dt>
+<dd></dd>
+</div>
+<div class="glossary">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
+<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
+<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
+<a name="glsI"></a><h3 class="title">I</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-inout"></a>inout</span></dt>
+<dd class="glossdef"><p>Parameter for input and for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsO"></a><h3 class="title">O</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
+<dd class="glossdef"><p>Override the parsed C type with given type</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
+<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/remoting.html b/msys2/usr/share/gtk-doc/html/p11-kit/remoting.html
new file mode 100644
index 000000000..7933c126d
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/remoting.html
@@ -0,0 +1,230 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Remoting / Forwarding: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="sharing.html" title="Proxy Module">
+<link rel="next" href="trust-module.html" title="Trust Policy Module">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="sharing.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="trust-module.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="remoting"></a>Remoting / Forwarding</h1></div></div></div>
+<p>Smartcards or hardware security modules (HSM) are technologies to
+	keep private keys on devices physically isolated to a device only available
+	to the user. That way only the intended user can use that device to authenticate,
+	authorize or perform other functions that involve the private keys. These come
+	usually in the form of a USB device or token which is plugged into the local computer.
+	</p>
+<p>In modern "cloud" computing, it is often desirable to virtually transfer such
+	a device on remote servers. For example, one can sign software or documents on a remote
+	server, use the local smart card to authorize itself to Kerberos, or any other
+	possible use. There are various approaches to tackle that problem, and on different
+	levels of the smart card application stack. It is possible to forward the USB
+	device holding the smart card, or forward the lower-level PC/SC protocol which
+	some smart cards talk, or forward the high-level interface used to communicate
+	with smart cards, the PKCS#11 interface.</p>
+<p>To address that problem, in p11-kit, we allow the forwarding of
+	the higher level smart card interface, PKCS#11. In the following paragraphs
+	we describe the approach and tools needed to perform that forwarding over SSH
+	secure communication channels.</p>
+<div class="refsect1">
+<a name="remoting-scenario"></a><h2>Scenario</h2>
+<p>We assume having a local workstation, and a remote server. On the local
+	computer we have inserted a smart card, in our examples we use a Nitrokey
+	card with the OpenSC drivers. We will forward the card
+	from the workstation to the remote server.</p>
+</div>
+<div class="refsect1">
+<a name="remoting-setup"></a><h2>Setting up the PKCS#11 forwarding server on a local client</h2>
+<p>To forward a smartcard to a remote server, we first need to identify which
+	smartcards are available. To list the smartcards currently attached to the local
+	computer, use the p11tool command from the gnutls package. For example:
+	</p>
+<pre class="programlisting">
+$ p11tool --list-tokens
+...
+Token 6:
+        URL: pkcs11:model=PKCS%2315%20emulated;manufacturer=www.CardContact.de;serial=DENK0000000;token=UserPIN%20%28Daiki%27s%20token%29
+        Label: UserPIN (Daiki's token)
+        Type: Hardware token
+        Manufacturer: www.CardContact.de
+        Model: PKCS#15 emulated
+        Serial: DENK0000000
+        Module: opensc-pkcs11.so
+...
+</pre>
+<p>This is the entry for the card we'd like to forward to remote system. The important
+	pieces are the 'pkcs11:' URL listed above, and the module name. Once we determine which
+	smartcard to forward, we expose it to a local Unix domain socket, with the following
+	p11-kit server command.
+	</p>
+<pre class="programlisting">
+$ p11-kit server --provider /usr/lib64/pkcs11/opensc-pkcs11.so "pkcs11:model=PKCS%2315%20emulated;manufacturer=www.CardContact.de;serial=DENK0000000;token=UserPIN%20%28Daiki%27s%20token%29"
+</pre>
+<p>Here we provide to the server the module location (optional) with the --provider
+	option, as well as the URL of the card. We copied the values from the Module and URL
+	lines of the p11tool output above. When the p11-kit server command starts, it will
+	print the address of the PKCS#11 unix domain socket and the process ID of the server.
+	</p>
+<pre class="programlisting">
+P11_KIT_SERVER_ADDRESS=unix:path=/run/user/12345/p11-kit/pkcs11-12345
+P11_KIT_SERVER_PID=12345
+</pre>
+<p>For later use, set the variables output by the tool on your shell prompt
+	(e.g., copy and paste them or call the above p11-kit server command line with
+	<code class="literal">eval $(p11-kit server ...)</code>).
+	</p>
+</div>
+<div class="refsect1">
+<a name="remoting-forwarding-socket"></a><h2>Forwarding and using the PKCS#11 Unix socket on the remote server</h2>
+<p>On the remote server, we will initially forward the previously generated PKCS#11
+	unix socket, and then access the smart card through it. To access the forwarded socket
+	as if it were a smart card, a dedicated PKCS#11 module p11-kit-client.so is provided as
+	part of the p11-kit-server package.
+	</p>
+</div>
+<div class="refsect1">
+<a name="remoting-forwarding-socket-prep"></a><h2>Preparing the remote system for PKCS#11 socket forwarding</h2>
+<p>One important detail you should be aware of, is the file system location of the
+	forwarded socket. By convention, the p11-kit-client.so module utilizes the "user runtime
+	directory", managed by systemd; the directory is created when a user logs in, and removed
+	upon logout, so that the user doesn't need to manually clean up the socket file.
+	</p>
+<p>To locate your user runtime directory, do:
+	</p>
+<pre class="programlisting">
+$ systemd-path user-runtime
+/run/user/1000
+</pre>
+<p>The <code class="literal">p11-kit-client.so</code> module looks for the socket file under a
+	subdirectory (<code class="literal">/run/user/1000/p11-kit</code> in this example). To enable
+	auto-creation of the directory, do the following.
+	</p>
+<pre class="programlisting">
+$ systemctl --user enable p11-kit-client.service
+</pre>
+</div>
+<div class="refsect1">
+<a name="remoting-finally-forwarding"></a><h2>Forwarding the PKCS#11 socket</h2>
+<p>We will use ssh to forward the local PKCS#11 unix socket to the remote server.
+	Following the p11-kit-client convention, we will forward the socket to the remote user
+	run-time path so that cleaning up on disconnect is not required. The remote location
+	of the run-time path can be obtained as follows.
+	</p>
+<pre class="programlisting">
+$ ssh [user]@[remotehost] systemd-path user-runtime
+/run/user/1000
+</pre>
+<p>The number at the end of the path above is your user ID in that system
+	(and thus will vary from user to user). You can now forward the Unix domain socket
+	with the -R option of the ssh command, after replacing the example path with the
+	actual run-time path.
+	</p>
+<pre class="programlisting">
+$ ssh -R /run/user/[userID]/p11-kit/pkcs11:${P11_KIT_SERVER_ADDRESS#*=} [user]@[remotehost]
+</pre>
+<p>After successfully logging in to the remote host, you can use the forwarded
+	smartcard as if it were directly connected to the server using the
+	<code class="literal">p11-kit-client.so</code>. Note that if any error occurs during the forwarding
+	setup, you will see something like this on your terminal:
+	</p>
+<pre class="programlisting">
+Warning: remote port forwarding failed for listen path /run/user/...
+</pre>
+</div>
+<div class="refsect1">
+<a name="remoting-using"></a><h2>Using the forwarded PKCS#11 socket</h2>
+<p>Let's first make sure the smart card works on the remote system, by listing it:
+	</p>
+<pre class="programlisting">
+$ ls -l /run/user/1000/p11-kit/pkcs11
+
+$ p11tool --provider /usr/lib64/pkcs11/p11-kit-client.so --list-tokens
+...
+Token 0:
+        URL: pkcs11:model=PKCS%2315%20emulated;manufacturer=www.CardContact.de;serial=DENK0000000;token=UserPIN%20%28Daiki%27s%20token%29
+        Label: UserPIN (Daiki's token)
+        Type: Hardware token
+        Manufacturer: www.CardContact.de
+        Model: PKCS#15 emulated
+        Serial: DENK0000000
+        Module: (null)
+...
+</pre>
+<p>We can similarly generate, copy objects or test certificates to the card using
+	the same command. Any applications which support PKCS#11 can perform cryptographic
+	operations through the client module.
+	</p>
+</div>
+<div class="refsect1">
+<a name="remoting-registering"></a><h2>Registering the client module for use with OpenSSL and GnuTLS apps</h2>
+<p>To utilize the p11-kit-client module with OpenSSL (via engine_pkcs11 provided
+	by the libp11 package) and GnuTLS applications, you have to register it in
+	p11-kit. To do it for the current user, use the following commands:
+	</p>
+<pre class="programlisting">
+$ mkdir .config/pkcs11/modules/
+$ echo "module: /usr/lib64/pkcs11/p11-kit-client.so" &gt;.config/pkcs11/modules/p11-kit-client.module
+</pre>
+<p>Once this is done both OpenSSL and GnuTLS applications should work, for example:
+	</p>
+<pre class="programlisting">
+$ URL="pkcs11:model=PKCS%2315%20emulated;manufacturer=www.CardContact.de;serial=DENK0000000;token=UserPIN%20%28Daiki%27s%20token%29"
+
+# Generate a key using gnutls’ p11tool
+$ p11tool --generate-ecc --login --label test-key "$URL"
+
+# generate a certificate request with the previous key using openssl
+$ openssl req -engine pkcs11 -new -key "$URL;;object=test-key;type=private;pin-value=XXXX" \
+         -keyform engine -out req.pem -text -subj "/CN=Test user"
+</pre>
+<p>Note that the token URL remains the same in the forwarded system as in the original one.
+	</p>
+</div>
+<div class="refsect1">
+<a name="remoting-ssh"></a><h2>Using the client module with OpenSSH</h2>
+<p>To re-use the already forwarded smartcard for authentication with another remote host, you can run ssh and provide the -I option with p11-kit-client.so. For example:
+	</p>
+<pre class="programlisting">
+$ ssh -I /usr/lib64/pkcs11/p11-kit-client.so [user]@[anotherhost]
+</pre>
+</div>
+<div class="refsect1">
+<a name="remoting-nss"></a><h2>Using the client module with NSS applications</h2>
+<p>To register the forwarded smartcard in NSS applications, you can set it up with
+	the modutil command, as follows.
+	</p>
+<pre class="programlisting">
+$ sudo modutil -dbdir /etc/pki/nssdb -add p11-kit-client -libfile /usr/lib64/pkcs11/p11-kit-client.so
+
+$ modutil -dbdir /etc/pki/nssdb -list
+...
+  3. p11-kit-client
+    library name: /usr/lib64/pkcs11/p11-kit-client.so
+       uri: pkcs11:library-manufacturer=OpenSC%20Project;library-description=OpenSC%20smartcard%20framework;library-version=0.17
+     slots: 1 slot attached
+    status: loaded
+
+     slot: Nitrokey Nitrokey HSM (010000000000000000000000) 00 00
+    token: UserPIN (Daiki's token)
+      uri: pkcs11:token=UserPIN%20(Daiki's%20token);manufacturer=www.CardContact.de;serial=DENK0000000;model=PKCS%2315%20emulated
+</pre>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/right-insensitive.png b/msys2/usr/share/gtk-doc/html/p11-kit/right-insensitive.png
new file mode 100644
index 000000000..4c95785b9
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/right-insensitive.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/right.png b/msys2/usr/share/gtk-doc/html/p11-kit/right.png
new file mode 100644
index 000000000..76260ec88
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/right.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/sharing-managed.html b/msys2/usr/share/gtk-doc/html/p11-kit/sharing-managed.html
new file mode 100644
index 000000000..32fbfdd3d
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/sharing-managed.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Managed modules: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="sharing.html" title="Sharing PKCS#11 modules">
+<link rel="prev" href="sharing.html" title="Sharing PKCS#11 modules">
+<link rel="next" href="sharing.html" title="Proxy Module">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="sharing.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="sharing.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="sharing.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="sharing-managed"></a>Managed modules</h2></div></div></div>
+<p><code class="literal">p11-kit</code> wraps PKCS#11 modules to manage
+		them and customize their functionality so that they are able
+		to be shared between multiple callers in the same process.</p>
+<p>Each caller that uses the
+		<a class="link" href="p11-kit-Modules.html#p11-kit-modules-load" title="p11_kit_modules_load ()"><code class="function">p11_kit_modules_load()</code></a>
+		or <a class="link" href="p11-kit-Modules.html#p11-kit-module-load" title="p11_kit_module_load ()"><code class="function">p11_kit_module_load()</code></a>
+		function gets independent wrapped PKCS#11 module(s). This is unless a caller
+		or module configuration specifies that a module should be used in an
+		unmanaged fashion.</p>
+<p>When modules are managed, the following aspects are wrapped and
+		coordinated:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p>Calls to <code class="literal">C_Initialize</code> and
+			<code class="literal">C_Finalize</code> can be called by multiple
+			callers.</p>
+<p>The first time that the managed module
+			<code class="literal">C_Initialize</code> is called, the PKCS#11 module's actual
+			<code class="literal">C_Initialize</code> function is called. Subsequent calls by
+			other callers will cause <code class="literal">p11-kit</code> to increment an
+			internal initialization count, rather than calling
+			<code class="literal">C_Initialize</code> again.</p>
+<p>Multiple callers can call the managed
+			<code class="literal">C_Initialize</code> function concurrently from different
+			threads and <code class="literal">p11-kit</code> will guarantee that this managed
+			in a thread-safe manner.</p>
+</li>
+<li class="listitem">
+<p>When the managed module <code class="literal">C_Finalize</code> is used
+			to finalize a module, each time it is called it decrements the internal
+			initialization count for that module. When the internal initialization
+			count reaches zero, the module's actual <code class="literal">C_Finalize</code>
+			function is called.</p>
+<p>Multiple callers can call the managed <code class="literal">C_Finalize</code>
+			function concurrently from different threads and <code class="literal">p11-kit</code>
+			will guarantee that this managed in a thread-safe manner.</p>
+</li>
+<li class="listitem"><p>Call to <code class="literal">C_CloseAllSessions</code> only close the
+			sessions that the caller of the managed module has opened. This allows the
+			<code class="literal">C_CloseAllSessions</code> function to be used without closing
+			sessions for other callers of the same PKCS#11 module.</p></li>
+<li class="listitem"><p>Managed modules have ability to log PKCS#11 method calls for debugging
+			purposes. See the <a class="link" href="pkcs11-conf.html#option-log-calls"><code class="literal">log-calls = yes</code></a>
+			module configuration option.</p></li>
+<li class="listitem"><p>Managed modules have the ability to be remoted to another machine or
+			isolated in their own process.
+			See the <a class="link" href="pkcs11-conf.html#option-remote"><code class="literal">remote = ...</code></a>
+			module configuration option.</p></li>
+</ul></div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/sharing.html b/msys2/usr/share/gtk-doc/html/p11-kit/sharing.html
new file mode 100644
index 000000000..5499bd46f
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/sharing.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Proxy Module: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="sharing-managed.html" title="Managed modules">
+<link rel="next" href="remoting.html" title="Remoting / Forwarding">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="sharing-managed.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="remoting.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="sharing"></a>Proxy Module</h1></div></div></div>
+<p>When an application is aware of the fact that coordination
+	is necessary between multiple consumers of a PKCS#11 module, and wants
+	to load standard configured PKCS#11 modules, it can link to
+	<code class="literal">p11-kit</code> and use the functions there to provide this
+	functionality.</p>
+<p>However most current consumers of PKCS#11 are ignorant of
+	this problem, and do not link to p11-kit. In order to solve this
+	multiple initialization problem for all applications,
+	<code class="literal">p11-kit</code> provides a proxy compatibility
+	module.</p>
+<p>This proxy module acts like a normal PKCS#11 module, but
+	internally loads a preconfigured set of PKCS#11 modules and
+	manages their features as described earlier. Each slot in the configured modules
+	is exposed as a slot of the <code class="literal">p11-kit</code> proxy module. The proxy
+	module is then used as a normal PKCS#11 module would be. It can be loaded by
+	crypto libraries like NSS and behaves as expected.</p>
+<p>The <code class="literal">C_GetFunctionList</code> exported entry point of the
+	proxy module returns a new managed PKCS#11 module each time it is called. These
+	managed instances are released when the proxy module is unloaded.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/style.css b/msys2/usr/share/gtk-doc/html/p11-kit/style.css
new file mode 100644
index 000000000..41781ba5d
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/style.css
@@ -0,0 +1,530 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
+.synopsis, .classsynopsis
+{
+  /* tango:aluminium 1/2 */
+  background: #eeeeec;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
+  padding: 0.5em;
+}
+.programlisting
+{
+  /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
+  background: #e6f3ff;
+  border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
+  padding: 0.5em;
+}
+.variablelist
+{
+  padding: 4px;
+  margin-left: 3em;
+}
+.variablelist td:first-child
+{
+  vertical-align: top;
+}
+
+span.nowrap {
+  white-space: nowrap;
+}
+
+div.gallery-float
+{
+  float: left;
+  padding: 10px;
+}
+div.gallery-float img
+{
+  border-style: none;
+}
+div.gallery-spacer
+{
+  clear: both;
+}
+
+a, a:visited
+{
+  text-decoration: none;
+  /* tango:sky blue 2 */
+  color: #3465a4;
+}
+a:hover
+{
+  text-decoration: underline;
+  /* tango:sky blue 1 */
+  color: #729fcf;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
+td p
+{
+  margin: 0.25em;
+}
+
+div.informaltable table[border="1"],
+div.table table
+{
+  border-collapse: collapse;
+  border-spacing: 0px;
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+}
+
+div.informaltable table[border="1"] td,
+div.informaltable table th,
+div.table table td, div.table table th
+{
+  /* tango:aluminium 3 */
+  border: solid 1px #babdb6;
+  padding: 3px;
+  vertical-align: top;
+}
+
+div.informaltable table[border="1"] th,
+div.table table th
+{
+  /* tango:aluminium 2 */
+  background-color: #d3d7cf;
+}
+
+h4
+{
+  color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+hr
+{
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
+  border: none 0px;
+  height: 1px;
+  clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+  font-weight: bold;
+}
+
+dl.toc > dl
+{
+  padding-bottom: 0.5em;
+}
+
+.parameter
+{
+  font-style: normal;
+}
+
+.footer
+{
+  padding-top: 3.5em;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  text-align: center;
+  font-size: 80%;
+}
+
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+.warning
+{
+  /* tango:orange 0/1 */
+  background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
+  border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
+}
+.note
+{
+  /* tango:chameleon 0/0.5 */
+  background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
+  border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
+}
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
+{
+  padding: 0.5em;
+  border-width: 1px;
+  border-style: solid;
+  margin: 2em;
+}
+.note p, .warning p
+{
+  margin: 0;
+}
+
+div.warning h3.title,
+div.note h3.title
+{
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
+}
+
+/* blob links */
+h2 .extralinks, h3 .extralinks
+{
+  float: right;
+  /* tango:aluminium 3 */
+  color: #babdb6;
+  font-size: 80%;
+  font-weight: normal;
+}
+
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
+.annotation
+{
+  /* tango:aluminium 5 */
+  color: #555753;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
+  font-weight: normal;
+}
+
+acronym,abbr
+{
+  border-bottom: 1px dotted gray;
+}
+
+.listing_frame {
+  /* tango:sky blue 1 */
+  border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
+  padding: 0px;
+}
+
+.listing_lines, .listing_code {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  padding: 0.5em;
+}
+.listing_lines {
+  /* tango:sky blue 0.5 */
+  background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
+  /* tango:aluminium 6 */
+  color: #2e3436;
+}
+.listing_code {
+  /* tango:sky blue 0 */
+  background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
+}
+.listing_code .programlisting {
+  /* override from previous */
+  border: none 0px;
+  padding: 0px;
+  background: none;
+}
+.listing_lines pre, .listing_code pre {
+  margin: 0px;
+}
+
+@media screen {
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    display: inline-block;
+    position: relative;
+    top:-5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 2.5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
+    border-spacing: 5px;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    z-index: 10;
+  }
+  table.navigation#top td
+  {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:sky blue 3 */
+    color: #204a87;
+  }
+  .navigation a:hover
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+  }
+  td.shortcuts
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+  .navigation .title
+  {
+    font-size: 80%;
+    max-width: none;
+    margin: 0px;
+    font-weight: normal;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
+  .listing_lines { display: none; }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
+pre { line-height: 125%; margin: 0; }
+td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
+span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
+td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
+.hll { background-color: #ffffcc }
+.c { color: #408080; font-style: italic } /* Comment */
+.err { border: 1px solid #FF0000 } /* Error */
+.k { color: #008000; font-weight: bold } /* Keyword */
+.o { color: #666666 } /* Operator */
+.ch { color: #408080; font-style: italic } /* Comment.Hashbang */
+.cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.cp { color: #BC7A00 } /* Comment.Preproc */
+.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
+.c1 { color: #408080; font-style: italic } /* Comment.Single */
+.cs { color: #408080; font-style: italic } /* Comment.Special */
+.gd { color: #A00000 } /* Generic.Deleted */
+.ge { font-style: italic } /* Generic.Emph */
+.gr { color: #FF0000 } /* Generic.Error */
+.gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.gi { color: #00A000 } /* Generic.Inserted */
+.go { color: #888888 } /* Generic.Output */
+.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.gt { color: #0044DD } /* Generic.Traceback */
+.kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #008000 } /* Keyword.Pseudo */
+.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #B00040 } /* Keyword.Type */
+.m { color: #666666 } /* Literal.Number */
+.s { color: #BA2121 } /* Literal.String */
+.na { color: #7D9029 } /* Name.Attribute */
+.nb { color: #008000 } /* Name.Builtin */
+.nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.no { color: #880000 } /* Name.Constant */
+.nd { color: #AA22FF } /* Name.Decorator */
+.ni { color: #999999; font-weight: bold } /* Name.Entity */
+.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.nf { color: #0000FF } /* Name.Function */
+.nl { color: #A0A000 } /* Name.Label */
+.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.nt { color: #008000; font-weight: bold } /* Name.Tag */
+.nv { color: #19177C } /* Name.Variable */
+.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mb { color: #666666 } /* Literal.Number.Bin */
+.mf { color: #666666 } /* Literal.Number.Float */
+.mh { color: #666666 } /* Literal.Number.Hex */
+.mi { color: #666666 } /* Literal.Number.Integer */
+.mo { color: #666666 } /* Literal.Number.Oct */
+.sa { color: #BA2121 } /* Literal.String.Affix */
+.sb { color: #BA2121 } /* Literal.String.Backtick */
+.sc { color: #BA2121 } /* Literal.String.Char */
+.dl { color: #BA2121 } /* Literal.String.Delimiter */
+.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #BA2121 } /* Literal.String.Double */
+.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.sh { color: #BA2121 } /* Literal.String.Heredoc */
+.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.sx { color: #008000 } /* Literal.String.Other */
+.sr { color: #BB6688 } /* Literal.String.Regex */
+.s1 { color: #BA2121 } /* Literal.String.Single */
+.ss { color: #19177C } /* Literal.String.Symbol */
+.bp { color: #008000 } /* Name.Builtin.Pseudo */
+.fm { color: #0000FF } /* Name.Function.Magic */
+.vc { color: #19177C } /* Name.Variable.Class */
+.vg { color: #19177C } /* Name.Variable.Global */
+.vi { color: #19177C } /* Name.Variable.Instance */
+.vm { color: #19177C } /* Name.Variable.Magic */
+.il { color: #666666 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/tools.html b/msys2/usr/share/gtk-doc/html/p11-kit/tools.html
new file mode 100644
index 000000000..3bcb7c440
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/tools.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Manual Pages: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="trust-disable.html" title="Disabling the Trust Policy Module">
+<link rel="next" href="p11-kit.html" title="p11-kit">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="trust-disable.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="p11-kit.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="tools"></a>Manual Pages</h1></div></div></div>
+<div class="toc"><dl class="toc">
+<dt>
+<span class="refentrytitle"><a href="p11-kit.html">p11-kit</a></span><span class="refpurpose"> — Tool for operating on configured PKCS#11 modules</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="pkcs11-conf.html">pkcs11.conf</a></span><span class="refpurpose"> — Configuration files for PKCS#11 modules</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="trust.html">trust</a></span><span class="refpurpose"> — Tool for operating on the trust policy store</span>
+</dt>
+</dl></div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/trust-disable.html b/msys2/usr/share/gtk-doc/html/p11-kit/trust-disable.html
new file mode 100644
index 000000000..813e503c1
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/trust-disable.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Disabling the Trust Policy Module: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="trust-module.html" title="Trust Policy Module">
+<link rel="prev" href="trust-glib-networking.html" title="Using the Trust Policy Module with glib-networking">
+<link rel="next" href="tools.html" title="Manual Pages">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="trust-module.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="trust-glib-networking.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="tools.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="trust-disable"></a>Disabling the Trust Policy Module</h2></div></div></div>
+<p>This module is installed and enabled by default. It may
+	be disabled in the following ways:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>Use the <code class="option">--disable-trust-module</code>
+		during the <a class="link" href="devel-building.html#devel-building-configure" title="Extra Configuration Options">p11-kit
+		build</a>.</p></li>
+<li class="listitem"><p>Disable loading trust policy information
+		from this module by adding a file to <code class="literal">/etc/pkcs11/modules</code>
+		called <code class="literal">p11-kit-trust.module</code> containing a
+		<code class="literal">trust-policy: no</code> line.</p></li>
+<li class="listitem"><p>Disable this module completely by
+		adding a file to <code class="literal">/etc/pkcs11/modules</code>
+		called <code class="literal">p11-kit-trust.module</code> containing a
+		<code class="literal">enable-in:</code> line (without a value).</p></li>
+</ul></div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html b/msys2/usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html
new file mode 100644
index 000000000..bf587a3c8
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Using the Trust Policy Module with glib-networking: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="trust-module.html" title="Trust Policy Module">
+<link rel="prev" href="trust-nss.html" title="Using the Trust Policy Module with NSS">
+<link rel="next" href="trust-disable.html" title="Disabling the Trust Policy Module">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="trust-module.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="trust-nss.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="trust-disable.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="trust-glib-networking"></a>Using the Trust Policy Module with glib-networking</h2></div></div></div>
+<p>The trust policy module can be used as a source of trust
+	information for glib-networking's <code class="literal">gnutls-pkcs11</code> backend.
+	The module provides PKCS#11 trust assertion objects as expected.</p>
+<p>The module should work by default if the <code class="literal">gnutls-pkcs11</code>
+	backend is selected as the glib-networking TLS backend.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/trust-module.html b/msys2/usr/share/gtk-doc/html/p11-kit/trust-module.html
new file mode 100644
index 000000000..a77ee5001
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/trust-module.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Trust Policy Module: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="index.html" title="p11-kit">
+<link rel="prev" href="remoting.html" title="Remoting / Forwarding">
+<link rel="next" href="trust-nss.html" title="Using the Trust Policy Module with NSS">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="remoting.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="trust-nss.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="chapter">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="trust-module"></a>Trust Policy Module</h1></div></div></div>
+<div class="toc"><dl class="toc">
+<dt><span class="section"><a href="trust-module.html#trust-files">Paths loaded by the Module</a></span></dt>
+<dt><span class="section"><a href="trust-nss.html">Using the Trust Policy Module with NSS</a></span></dt>
+<dt><span class="section"><a href="trust-glib-networking.html">Using the Trust Policy Module with glib-networking</a></span></dt>
+<dt><span class="section"><a href="trust-disable.html">Disabling the Trust Policy Module</a></span></dt>
+</dl></div>
+<p>The trust module provides system certificate anchors, blacklists
+	and other trust policy to crypto libraries applications. This
+	information is exposed as PKCS#11 objects.</p>
+<p>You can use the <a class="link" href="trust.html" title="trust">trust</a> command line
+	tool to examine and modify the trust policy store.</p>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="trust-files"></a>Paths loaded by the Module</h2></div></div></div>
+<p>The trust module loads certificates and trust policy information
+	from preconfigured paths and allows them to be looked up via PKCS#11.
+	The input paths can be determined with using the following command:</p>
+<pre class="programlisting">
+$ pkg-config --variable p11_trust_paths p11-kit-1
+/usr/share/p11-kit/trust:/etc/pki/trust
+</pre>
+<p>Files in the following formats are supported for loading by the
+	trust policy module:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term">X.509 certificates</span></p></td>
+<td><p>X.509 certificates in raw DER format. Does not
+			automatically contain trust policy information.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">PEM certificates</span></p></td>
+<td><p>X.509 certificates in PEM format. These have a
+			<code class="literal">BEGIN CERTIFICATE</code> header. This file does not
+			automatically contain trust policy information.</p></td>
+</tr>
+<tr>
+<td><p><span class="term">OpenSSL trust certificates</span></p></td>
+<td><p>OpenSSL specific certificates in PEM format
+			that contain trust information. These have a
+			<code class="literal">BEGIN TRUSTED CERTIFICATE</code> PEM header. Both
+			trust anchor and blacklist information can be loaded
+			from these files.</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>If the input path is a file, then it is loaded. Certificate(s) in the
+	file are automatically treated as anchors, unless they contain alternate
+	trust policy information.</p>
+<p>If the input path is a directory, files inside that directory are
+	parsed and loaded. If the file contains trust policy information (such as the
+	OpenSSL trust certificates) then it will be respected. Files without trust policy
+	information are not automatically marked as an anchor or blacklisted.</p>
+<p>In addition two optional subdirectories of the input path are loaded. Files
+	placed in the <code class="literal">anchors/</code> subdirectory become trust anchors
+	when they do not contain trust policy information. Files placed in the
+	<code class="literal">blacklist/</code> subdirectory are blacklisted whether they
+	contain trust information or not.</p>
+<p>The first input path becomes the first PKCS#11 token of the trust
+	module, and has the highest priority when callers search for trust
+	policy information.</p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/trust-nss.html b/msys2/usr/share/gtk-doc/html/p11-kit/trust-nss.html
new file mode 100644
index 000000000..c0f9de904
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/trust-nss.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Using the Trust Policy Module with NSS: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="trust-module.html" title="Trust Policy Module">
+<link rel="prev" href="trust-module.html" title="Trust Policy Module">
+<link rel="next" href="trust-glib-networking.html" title="Using the Trust Policy Module with glib-networking">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="trust-module.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="trust-module.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="trust-glib-networking.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="trust-nss"></a>Using the Trust Policy Module with NSS</h2></div></div></div>
+<p>The trust policy module is a drop in replacement for the
+	<code class="literal">libnssckbi.so</code> module and thus works out of
+	the box with NSS. The trust policy module provides NSS style
+	PKCS#11 trust objects for NSS to retrieve.</p>
+<p>The module may be used to replace the
+	<code class="literal">libnssckbi.so</code> file via an distribution
+	specific alternatives mechanism or otherwise.</p>
+<p>Alternatively NSS applications like Firefox or Thunderbird
+	may be configured to use the trust policy module by adding
+	the <code class="literal">p11-kit-trust.so</code> PKCS#11 module via their
+	GUI or command line configuration.</p>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/trust.html b/msys2/usr/share/gtk-doc/html/p11-kit/trust.html
new file mode 100644
index 000000000..b2289826a
--- /dev/null
+++ b/msys2/usr/share/gtk-doc/html/p11-kit/trust.html
@@ -0,0 +1,423 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>trust: p11-kit</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="p11-kit">
+<link rel="up" href="tools.html" title="Manual Pages">
+<link rel="prev" href="pkcs11-conf.html" title="pkcs11.conf">
+<link rel="next" href="reference.html" title="API Reference">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="tools.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="pkcs11-conf.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="reference.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="trust"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle">trust</span></h2>
+<p>trust — Tool for operating on the trust policy store</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<h2>Synopsis</h2>
+<div class="cmdsynopsis"><p><code class="command">trust list</code> </p></div>
+<div class="cmdsynopsis"><p><code class="command">trust extract</code>   --filter=&lt;what&gt;   --format=&lt;type&gt;  /path/to/destination
+	</p></div>
+<div class="cmdsynopsis"><p><code class="command">trust anchor</code>  /path/to/certificate.crt
+	</p></div>
+<div class="cmdsynopsis"><p><code class="command">trust dump</code> </p></div>
+</div>
+<div class="refsect1">
+<a name="trust-description"></a><h2>Description</h2>
+<p><span class="command"><strong>trust</strong></span> is a command line tool to examine and
+	modify the shared trust policy store.</p>
+<p>See the various sub commands below. The following global options
+	can be used:</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">-v, --verbose</code></span></p></td>
+<td><p>Run in verbose mode with debug
+			output.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">-q, --quiet</code></span></p></td>
+<td><p>Run in quiet mode without warning or
+			failure messages.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="trust-list"></a><h2>List</h2>
+<p>List trust policy store items.</p>
+<pre class="programlisting">
+$ trust list
+</pre>
+<p>List information about the various items in the trust policy store.
+	Each item is listed with it's PKCS#11 URI and some descriptive information.</p>
+<p>You can specify the following options to control what to list.</p>
+<dt><span class="term"><code class="option">--filter=&lt;what&gt;</code></span></dt>
+<dd>
+<p>Specifies what certificates to extract. You can specify the following values:
+		</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ca-anchors</code></span></p></td>
+<td><p>Certificate anchors</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">trust-policy</code></span></p></td>
+<td><p>Anchors and blacklist (default)</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">blacklist</code></span></p></td>
+<td><p>Blacklisted certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">certificates</code></span></p></td>
+<td><p>All certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pkcs11:object=xx</code></span></p></td>
+<td><p>A PKCS#11 URI to filter with</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+		</p>
+<p>If an output format is chosen that cannot support type what has been
+		specified by the filter, a message will be printed.</p>
+<p>None of the available formats support storage of blacklist entries
+		that do not contain a full certificate. Thus any certificates blacklisted by
+		their issuer and serial number alone, are not included in the extracted
+		blacklist.</p>
+</dd>
+<dt><span class="term"><code class="option">--purpose=&lt;usage&gt;</code></span></dt>
+<dd>
+<p>Limit to certificates usable for the given purpose
+		You can specify one of the following values:
+		</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">server-auth</code></span></p></td>
+<td><p>For authenticating servers</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">client-auth</code></span></p></td>
+<td><p>For authenticating clients</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">email</code></span></p></td>
+<td><p>For email protection</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">code-signing</code></span></p></td>
+<td><p>For authenticated signed code</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">1.2.3.4.5...</code></span></p></td>
+<td><p>An arbitrary purpose OID</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+		</p>
+</dd>
+</div>
+<div class="refsect1">
+<a name="trust-anchor"></a><h2>Anchor</h2>
+<p>Store or remove trust anchors.</p>
+<pre class="programlisting">
+$ trust anchor /path/to/certificate.crt
+$ trust anchor --remove /path/to/certificate.crt
+$ trust anchor --remove "pkcs11:id=%AA%BB%CC%DD%EE;type=cert"
+</pre>
+<p>Store or remove trust anchors in the trust policy store. These are
+	usually root certificate authorities.</p>
+<p>Specify either the <code class="option">--store</code> or <code class="option">--remove</code>
+	operations. If no operation is specified then <code class="option">--store</code> is
+	assumed.</p>
+<p>When storing, one or more certificate files are expected on the
+	command line. These are stored as anchors, unless they are already
+	present.</p>
+<p>When removing an anchor, either specify certificate files or
+	PKCS#11 URI's on the command line. Matching anchors will be removed.</p>
+<p>It may be that this command needs to be run as root in order to
+	modify the system trust policy store, if no user specific store is
+	available.</p>
+<p>You can specify the following options.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--remove</code></span></p></td>
+<td><p>Remove one or more anchors from the trust
+			policy store. Specify certificate files or PKCS#11 URI's
+			on the command line.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--store</code></span></p></td>
+<td><p>Store one or more anchors to the trust
+			policy store. Specify certificate files on the command
+			line.</p></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="trust-extract"></a><h2>Extract</h2>
+<p>Extract trust policy from the shared trust policy store.</p>
+<pre class="programlisting">
+$ trust extract --format=x509-directory --filter=ca-anchors /path/to/directory
+</pre>
+<p>You can specify the following options to control what to extract.
+	The <code class="option">--filter</code> and <code class="option">--format</code> arguments
+	should be specified. By default this command will not overwrite the
+	destination file or directory.</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">--comment</code></span></p></td>
+<td><p>Add identifying comments to PEM bundle output files
+			before each certificate.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--filter=&lt;what&gt;</code></span></p></td>
+<td>
+<p>Specifies what certificates to extract. You can specify the following values:
+			</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">ca-anchors</code></span></p></td>
+<td><p>Certificate anchors (default)</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">trust-policy</code></span></p></td>
+<td><p>Anchors and blacklist</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">blacklist</code></span></p></td>
+<td><p>Blacklisted certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">certificates</code></span></p></td>
+<td><p>All certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pkcs11:object=xx</code></span></p></td>
+<td><p>A PKCS#11 URI</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+			</p>
+<p>If an output format is chosen that cannot support type what has been
+			specified by the filter, a message will be printed.</p>
+<p>None of the available formats support storage of blacklist entries
+			that do not contain a full certificate. Thus any certificates blacklisted by
+			their issuer and serial number alone, are not included in the extracted
+			blacklist.</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--format=&lt;type&gt;</code></span></p></td>
+<td>
+<p>The format of the destination file or directory.
+			You can specify one of the following values:
+			</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">x509-file</code></span></p></td>
+<td><p>DER X.509 certificate file</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">x509-directory</code></span></p></td>
+<td><p>directory of X.509 certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pem-bundle</code></span></p></td>
+<td><p>File containing one or more certificate PEM blocks</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pem-directory</code></span></p></td>
+<td><p>Directory of PEM files each containing one certificate</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pem-directory-hash</code></span></p></td>
+<td><p>Directory of PEM files each containing one certificate, with hash symlinks</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">openssl-bundle</code></span></p></td>
+<td><p>OpenSSL specific PEM bundle of certificates</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">openssl-directory</code></span></p></td>
+<td><p>Directory of OpenSSL specific PEM files</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">java-cacerts</code></span></p></td>
+<td><p>Java keystore 'cacerts' certificate bundle</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+			</p>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--overwrite</code></span></p></td>
+<td><p>Overwrite output file or directory.</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">--purpose=&lt;usage&gt;</code></span></p></td>
+<td>
+<p>Limit to certificates usable for the given purpose
+			You can specify one of the following values:
+			</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">server-auth</code></span></p></td>
+<td><p>For authenticating servers</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">client-auth</code></span></p></td>
+<td><p>For authenticating clients</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">email</code></span></p></td>
+<td><p>For email protection</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">code-signing</code></span></p></td>
+<td><p>For authenticated signed code</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">1.2.3.4.5...</code></span></p></td>
+<td><p>An arbitrary purpose OID</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+			</p>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="trust-extract-compat"></a><h2>Extract Compat</h2>
+<p>Extract compatibility trust certificate bundles.</p>
+<pre class="programlisting">
+$ trust extract-compat
+</pre>
+<p>OpenSSL, Java and some versions of GnuTLS cannot currently read
+	trust information directly from the trust policy store. This command
+	extracts trust information such as certificate anchors for use by
+	these libraries.</p>
+<p>What this command does, and where it extracts the files is
+	distribution or site specific. Packagers or administrators are expected
+	customize this command.</p>
+</div>
+<div class="refsect1">
+<a name="trust-dump"></a><h2>Dump</h2>
+<p>Dump PKCS#11 items in the various tokens.</p>
+<pre class="programlisting">
+$ trust dump
+</pre>
+<p>Dump information about the various PKCS#11 items in the tokens.
+	Each item is dumped with it's PKCS#11 URI and information in the .p11-kit
+	persistence format.</p>
+<p>You can specify the following options to control what to dump.</p>
+<dt><span class="term"><code class="option">--filter=&lt;what&gt;</code></span></dt>
+<dd>
+<p>Specifies what certificates to extract. You can specify the following values:
+		</p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><code class="option">all</code></span></p></td>
+<td><p>All objects. This is the default</p></td>
+</tr>
+<tr>
+<td><p><span class="term"><code class="option">pkcs11:object=xx</code></span></p></td>
+<td><p>A PKCS#11 URI to filter with</p></td>
+</tr>
+</tbody>
+</table></div>
+<p>
+		</p>
+</dd>
+</div>
+<div class="refsect1">
+<a name="trust-bugs"></a><h2>Bugs</h2>
+<p>
+    Please send bug reports to either the distribution bug tracker
+    or the upstream bug tracker at
+    <a class="ulink" href="https://github.com/p11-glue/p11-kit/issues/" target="_top">https://github.com/p11-glue/p11-kit/issues/</a>.
+  </p>
+</div>
+<div class="refsect1">
+<a name="trust-see-also"></a><h2>See also</h2>
+<span class="simplelist"><span class="citerefentry"><span class="refentrytitle">p11-kit</span>(8)</span></span><p>An explanatory document about storing trust policy:
+    <a class="ulink" href="https://p11-glue.github.io/p11-glue/doc/storing-trust-policy/" target="_top">https://p11-glue.github.io/p11-glue/doc/storing-trust-policy/</a></p>
+<p>
+    Further details available in the p11-kit online documentation at
+    <a class="ulink" href="https://p11-glue.github.io/p11-glue/p11-kit/manual/" target="_top">https://p11-glue.github.io/p11-glue/p11-kit/manual/</a>.
+  </p>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/up-insensitive.png b/msys2/usr/share/gtk-doc/html/p11-kit/up-insensitive.png
new file mode 100644
index 000000000..f40498606
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/up-insensitive.png differ
diff --git a/msys2/usr/share/gtk-doc/html/p11-kit/up.png b/msys2/usr/share/gtk-doc/html/p11-kit/up.png
new file mode 100644
index 000000000..80b4b37e9
Binary files /dev/null and b/msys2/usr/share/gtk-doc/html/p11-kit/up.png differ
diff --git a/msys2/usr/share/info/assuan.info.gz b/msys2/usr/share/info/assuan.info.gz
index 931a0fb36..9e182059b 100644
Binary files a/msys2/usr/share/info/assuan.info.gz and b/msys2/usr/share/info/assuan.info.gz differ
diff --git a/msys2/usr/share/info/bash.info.gz b/msys2/usr/share/info/bash.info.gz
index f1d8357fe..9bc494be1 100644
Binary files a/msys2/usr/share/info/bash.info.gz and b/msys2/usr/share/info/bash.info.gz differ
diff --git a/msys2/usr/share/info/dir b/msys2/usr/share/info/dir
index 93f0b7db2..9d0cf7dd3 100644
--- a/msys2/usr/share/info/dir
+++ b/msys2/usr/share/info/dir
@@ -35,6 +35,9 @@ Compression
 Development
 * libffi: (libffi).             Portable foreign function interface library.
 
+Editors
+* nano: (nano).                 Small and friendly text editor.
+
 Encryption
 * Nettle: (nettle).             A low-level cryptographic library.
 
diff --git a/msys2/usr/share/info/gcrypt.info-1.gz b/msys2/usr/share/info/gcrypt.info-1.gz
index 7c4864891..af962940b 100644
Binary files a/msys2/usr/share/info/gcrypt.info-1.gz and b/msys2/usr/share/info/gcrypt.info-1.gz differ
diff --git a/msys2/usr/share/info/gcrypt.info-2.gz b/msys2/usr/share/info/gcrypt.info-2.gz
index 76f720c92..03e6cd037 100644
Binary files a/msys2/usr/share/info/gcrypt.info-2.gz and b/msys2/usr/share/info/gcrypt.info-2.gz differ
diff --git a/msys2/usr/share/info/gcrypt.info.gz b/msys2/usr/share/info/gcrypt.info.gz
index ed5e50cc5..552a1bb5b 100644
Binary files a/msys2/usr/share/info/gcrypt.info.gz and b/msys2/usr/share/info/gcrypt.info.gz differ
diff --git a/msys2/usr/share/info/gdbm.info.gz b/msys2/usr/share/info/gdbm.info.gz
index e6dc41100..f5860da7c 100644
Binary files a/msys2/usr/share/info/gdbm.info.gz and b/msys2/usr/share/info/gdbm.info.gz differ
diff --git a/msys2/usr/share/info/gmp.info-1.gz b/msys2/usr/share/info/gmp.info-1.gz
index a0e2caa46..0dec8dca4 100644
Binary files a/msys2/usr/share/info/gmp.info-1.gz and b/msys2/usr/share/info/gmp.info-1.gz differ
diff --git a/msys2/usr/share/info/gmp.info-2.gz b/msys2/usr/share/info/gmp.info-2.gz
index 8d11d769b..72ee16b5e 100644
Binary files a/msys2/usr/share/info/gmp.info-2.gz and b/msys2/usr/share/info/gmp.info-2.gz differ
diff --git a/msys2/usr/share/info/gmp.info.gz b/msys2/usr/share/info/gmp.info.gz
index 6498d61d1..15ff8ce21 100644
Binary files a/msys2/usr/share/info/gmp.info.gz and b/msys2/usr/share/info/gmp.info.gz differ
diff --git a/msys2/usr/share/info/gnupg.info-1.gz b/msys2/usr/share/info/gnupg.info-1.gz
index f65833395..a30449849 100644
Binary files a/msys2/usr/share/info/gnupg.info-1.gz and b/msys2/usr/share/info/gnupg.info-1.gz differ
diff --git a/msys2/usr/share/info/gnupg.info-2.gz b/msys2/usr/share/info/gnupg.info-2.gz
index ee406072a..2c778b720 100644
Binary files a/msys2/usr/share/info/gnupg.info-2.gz and b/msys2/usr/share/info/gnupg.info-2.gz differ
diff --git a/msys2/usr/share/info/gnupg.info.gz b/msys2/usr/share/info/gnupg.info.gz
index 819561027..c2d9d8d58 100644
Binary files a/msys2/usr/share/info/gnupg.info.gz and b/msys2/usr/share/info/gnupg.info.gz differ
diff --git a/msys2/usr/share/info/gnutls-guile.info.gz b/msys2/usr/share/info/gnutls-guile.info.gz
index 1c9ab0b5d..b67a091ab 100644
Binary files a/msys2/usr/share/info/gnutls-guile.info.gz and b/msys2/usr/share/info/gnutls-guile.info.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-1.gz b/msys2/usr/share/info/gnutls.info-1.gz
index fe81d62c0..2e7f24168 100644
Binary files a/msys2/usr/share/info/gnutls.info-1.gz and b/msys2/usr/share/info/gnutls.info-1.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-2.gz b/msys2/usr/share/info/gnutls.info-2.gz
index c9f7abe56..31dea7b1e 100644
Binary files a/msys2/usr/share/info/gnutls.info-2.gz and b/msys2/usr/share/info/gnutls.info-2.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-3.gz b/msys2/usr/share/info/gnutls.info-3.gz
index a05d54285..616483a3a 100644
Binary files a/msys2/usr/share/info/gnutls.info-3.gz and b/msys2/usr/share/info/gnutls.info-3.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-4.gz b/msys2/usr/share/info/gnutls.info-4.gz
index 456bcae0d..04fbd1bfa 100644
Binary files a/msys2/usr/share/info/gnutls.info-4.gz and b/msys2/usr/share/info/gnutls.info-4.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-5.gz b/msys2/usr/share/info/gnutls.info-5.gz
index 3764b3756..7c8b1a996 100644
Binary files a/msys2/usr/share/info/gnutls.info-5.gz and b/msys2/usr/share/info/gnutls.info-5.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-6.gz b/msys2/usr/share/info/gnutls.info-6.gz
index c0f6e704d..e3b76f7e5 100644
Binary files a/msys2/usr/share/info/gnutls.info-6.gz and b/msys2/usr/share/info/gnutls.info-6.gz differ
diff --git a/msys2/usr/share/info/gnutls.info-7.gz b/msys2/usr/share/info/gnutls.info-7.gz
index 8083c6fb6..3966152d4 100644
Binary files a/msys2/usr/share/info/gnutls.info-7.gz and b/msys2/usr/share/info/gnutls.info-7.gz differ
diff --git a/msys2/usr/share/info/gnutls.info.gz b/msys2/usr/share/info/gnutls.info.gz
index d8b7e90aa..598c7759e 100644
Binary files a/msys2/usr/share/info/gnutls.info.gz and b/msys2/usr/share/info/gnutls.info.gz differ
diff --git a/msys2/usr/share/info/gpgme.info-1.gz b/msys2/usr/share/info/gpgme.info-1.gz
index ba671dc32..1054cf673 100644
Binary files a/msys2/usr/share/info/gpgme.info-1.gz and b/msys2/usr/share/info/gpgme.info-1.gz differ
diff --git a/msys2/usr/share/info/gpgme.info-2.gz b/msys2/usr/share/info/gpgme.info-2.gz
index 3141e4e77..15488edd9 100644
Binary files a/msys2/usr/share/info/gpgme.info-2.gz and b/msys2/usr/share/info/gpgme.info-2.gz differ
diff --git a/msys2/usr/share/info/gpgme.info.gz b/msys2/usr/share/info/gpgme.info.gz
index 7e972027e..1dd548393 100644
Binary files a/msys2/usr/share/info/gpgme.info.gz and b/msys2/usr/share/info/gpgme.info.gz differ
diff --git a/msys2/usr/share/info/history.info.gz b/msys2/usr/share/info/history.info.gz
index 19e81d57a..188aed610 100644
Binary files a/msys2/usr/share/info/history.info.gz and b/msys2/usr/share/info/history.info.gz differ
diff --git a/msys2/usr/share/info/libgomp.info.gz b/msys2/usr/share/info/libgomp.info.gz
index 7f558cebb..9b0d549b3 100644
Binary files a/msys2/usr/share/info/libgomp.info.gz and b/msys2/usr/share/info/libgomp.info.gz differ
diff --git a/msys2/usr/share/info/libquadmath.info.gz b/msys2/usr/share/info/libquadmath.info.gz
index d6267cc8f..02c484814 100644
Binary files a/msys2/usr/share/info/libquadmath.info.gz and b/msys2/usr/share/info/libquadmath.info.gz differ
diff --git a/msys2/usr/share/info/nano.info.gz b/msys2/usr/share/info/nano.info.gz
new file mode 100644
index 000000000..a12708c35
Binary files /dev/null and b/msys2/usr/share/info/nano.info.gz differ
diff --git a/msys2/usr/share/info/nettle.info.gz b/msys2/usr/share/info/nettle.info.gz
index 448f9068d..d07a45913 100644
Binary files a/msys2/usr/share/info/nettle.info.gz and b/msys2/usr/share/info/nettle.info.gz differ
diff --git a/msys2/usr/share/info/readline.info.gz b/msys2/usr/share/info/readline.info.gz
index a1406b778..7f5bd0a4d 100644
Binary files a/msys2/usr/share/info/readline.info.gz and b/msys2/usr/share/info/readline.info.gz differ
diff --git a/msys2/usr/share/info/rluserman.info.gz b/msys2/usr/share/info/rluserman.info.gz
index 4abab3cfd..67db5f135 100644
Binary files a/msys2/usr/share/info/rluserman.info.gz and b/msys2/usr/share/info/rluserman.info.gz differ
diff --git a/msys2/usr/share/info/wget.info.gz b/msys2/usr/share/info/wget.info.gz
index 0432c5d55..757d820db 100644
Binary files a/msys2/usr/share/info/wget.info.gz and b/msys2/usr/share/info/wget.info.gz differ
diff --git a/msys2/usr/share/locale/af/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/af/LC_MESSAGES/bash.mo
index 65138ec15..28fbbfb67 100644
Binary files a/msys2/usr/share/locale/af/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/af/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/af/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/af/LC_MESSAGES/glib20.mo
index f0ed89cfe..a22ddcbfb 100644
Binary files a/msys2/usr/share/locale/af/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/af/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..303e31cae
Binary files /dev/null and b/msys2/usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/an/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/an/LC_MESSAGES/glib20.mo
index d42ad23e0..77b4a90a3 100644
Binary files a/msys2/usr/share/locale/an/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/an/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ar/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ar/LC_MESSAGES/glib20.mo
index 78ed47ae0..52305f6c2 100644
Binary files a/msys2/usr/share/locale/ar/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ar/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ar/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ar/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..76b8dc08a
Binary files /dev/null and b/msys2/usr/share/locale/ar/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/as/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/as/LC_MESSAGES/glib20.mo
index b3acfa3b5..a78c7e458 100644
Binary files a/msys2/usr/share/locale/as/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/as/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/as/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/as/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9e669eaaf
Binary files /dev/null and b/msys2/usr/share/locale/as/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ast/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ast/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..7097bffa8
Binary files /dev/null and b/msys2/usr/share/locale/ast/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/az/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/az/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..1cb43fb31
Binary files /dev/null and b/msys2/usr/share/locale/az/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/be/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/be/LC_MESSAGES/glib20.mo
index c46979051..757934d2b 100644
Binary files a/msys2/usr/share/locale/be/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/be/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..b4ef5f098
Binary files /dev/null and b/msys2/usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/be/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/be/LC_MESSAGES/wget.mo
index 9fd58e800..5ca068933 100644
Binary files a/msys2/usr/share/locale/be/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/be/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/bash.mo
index d30439946..fc647414e 100644
Binary files a/msys2/usr/share/locale/bg/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/bg/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/glib20.mo
index e53d84784..589cf040a 100644
Binary files a/msys2/usr/share/locale/bg/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/bg/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..38969ef5e
Binary files /dev/null and b/msys2/usr/share/locale/bg/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..f87f1904d
Binary files /dev/null and b/msys2/usr/share/locale/bg/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..d26449153
Binary files /dev/null and b/msys2/usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/bg/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/bg/LC_MESSAGES/wget.mo
index 065bd6d07..31faed5c9 100644
Binary files a/msys2/usr/share/locale/bg/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/bg/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/bn_IN/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/bn_IN/LC_MESSAGES/glib20.mo
index 147880c46..8b49c0f6d 100644
Binary files a/msys2/usr/share/locale/bn_IN/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/bn_IN/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/bn_IN/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/bn_IN/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5fc75bba1
Binary files /dev/null and b/msys2/usr/share/locale/bn_IN/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/bs/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/bs/LC_MESSAGES/glib20.mo
index e9a3d97bd..270a9711d 100644
Binary files a/msys2/usr/share/locale/bs/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/bs/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/bash.mo
index bae5d3f4d..0b94a7a0c 100644
Binary files a/msys2/usr/share/locale/ca/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/ca/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/glib20.mo
index 3a0eec031..c892f0bab 100644
Binary files a/msys2/usr/share/locale/ca/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ca/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/gnupg2.mo
index 3022dd358..7a437d81c 100644
Binary files a/msys2/usr/share/locale/ca/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/ca/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..6504f655d
Binary files /dev/null and b/msys2/usr/share/locale/ca/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..f5afd90df
Binary files /dev/null and b/msys2/usr/share/locale/ca/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..486952eb3
Binary files /dev/null and b/msys2/usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/ca/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/ca/LC_MESSAGES/wget.mo
index 08916b3c9..4b2d75c80 100644
Binary files a/msys2/usr/share/locale/ca/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/ca/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo
index b3bd52c0a..7aac2c3b1 100644
Binary files a/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5158d7605
Binary files /dev/null and b/msys2/usr/share/locale/ca@valencia/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/bash.mo
index 5d6ad4d4b..8058f0bb5 100644
Binary files a/msys2/usr/share/locale/cs/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/cs/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/glib20.mo
index 86cd07d2e..6b54fcf4a 100644
Binary files a/msys2/usr/share/locale/cs/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/cs/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/gnupg2.mo
index d384f294d..6f420a9fc 100644
Binary files a/msys2/usr/share/locale/cs/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/cs/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
index 25602c07a..d2bce7197 100644
Binary files a/msys2/usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..639329251
Binary files /dev/null and b/msys2/usr/share/locale/cs/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..f905405a0
Binary files /dev/null and b/msys2/usr/share/locale/cs/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..0d09340eb
Binary files /dev/null and b/msys2/usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/cs/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/cs/LC_MESSAGES/wget.mo
index 25d4bf917..27f06a736 100644
Binary files a/msys2/usr/share/locale/cs/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/cs/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/cy/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/cy/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..470013956
Binary files /dev/null and b/msys2/usr/share/locale/cy/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/da/LC_MESSAGES/bash.mo
index 6aa94c4e2..44572c77b 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/da/LC_MESSAGES/gdbm.mo
index ed6159e78..7117d01a4 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/da/LC_MESSAGES/glib20.mo
index 7555be15c..52c6305fd 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/da/LC_MESSAGES/gnupg2.mo
index 2a9fdbd3e..17b334a24 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
index 67ef04ed3..833f0f25a 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/da/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..cdd67f29c
Binary files /dev/null and b/msys2/usr/share/locale/da/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/da/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..b468e23d7
Binary files /dev/null and b/msys2/usr/share/locale/da/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/da/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..3a6099ccf
Binary files /dev/null and b/msys2/usr/share/locale/da/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/da/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/da/LC_MESSAGES/wget.mo
index 6cd22dea5..515f2be79 100644
Binary files a/msys2/usr/share/locale/da/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/da/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/de/LC_MESSAGES/bash.mo
index 887bdc7b1..7a31bc581 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/de/LC_MESSAGES/gdbm.mo
index 687e7d06b..2d6b4ecb0 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/de/LC_MESSAGES/glib20.mo
index 618703bcb..0cf6c30b0 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/de/LC_MESSAGES/gnupg2.mo
index e453a7657..dcb1965a9 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
index 572882534..ba8257335 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/de/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..35d22514e
Binary files /dev/null and b/msys2/usr/share/locale/de/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/de/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9f7a966f3
Binary files /dev/null and b/msys2/usr/share/locale/de/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/de/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..71e0665ec
Binary files /dev/null and b/msys2/usr/share/locale/de/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/de/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/de/LC_MESSAGES/wget.mo
index 6942b53e9..67eff10df 100644
Binary files a/msys2/usr/share/locale/de/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/de/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/el/LC_MESSAGES/bash.mo
index f7c64e50c..97304da9e 100644
Binary files a/msys2/usr/share/locale/el/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/el/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/el/LC_MESSAGES/glib20.mo
index 67e17ee66..a577826f3 100644
Binary files a/msys2/usr/share/locale/el/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/el/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/el/LC_MESSAGES/gnupg2.mo
index c2b6cdee4..3db5a681b 100644
Binary files a/msys2/usr/share/locale/el/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/el/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/el/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..6e3bbab6c
Binary files /dev/null and b/msys2/usr/share/locale/el/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/el/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..6b6ffd0c9
Binary files /dev/null and b/msys2/usr/share/locale/el/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/el/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/el/LC_MESSAGES/wget.mo
index 71107a1d8..10aafebea 100644
Binary files a/msys2/usr/share/locale/el/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/el/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
index 72a1a7b37..15cd5f1ff 100644
Binary files a/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
index 624b61f15..265e5acc4 100644
Binary files a/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/en@quot/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/en@quot/LC_MESSAGES/bash.mo
index 54803fc37..749c3a704 100644
Binary files a/msys2/usr/share/locale/en@quot/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/en@quot/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo
index 6e4f8cf9e..080904cd9 100644
Binary files a/msys2/usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/en_CA/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
index 0a5855b83..f87ae895f 100644
Binary files a/msys2/usr/share/locale/en_CA/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/en_CA/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/en_GB/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/en_GB/LC_MESSAGES/glib20.mo
index d67a61599..a3a4d45bf 100644
Binary files a/msys2/usr/share/locale/en_GB/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/en_GB/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/en_GB/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/en_GB/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..11465d9a3
Binary files /dev/null and b/msys2/usr/share/locale/en_GB/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/en_GB/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/en_GB/LC_MESSAGES/wget.mo
index 71a986a01..d0f1e6c86 100644
Binary files a/msys2/usr/share/locale/en_GB/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/en_GB/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/bash.mo
index 90aef6b1c..4efbdee34 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/gdbm.mo
index 257640815..572d3adc9 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/glib20.mo
index d0db97ee8..e73f0a5cc 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/gnupg2.mo
index 31d7b39e3..aae474a59 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
index b4653bfd5..c371c47e2 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..2b4e25e0a
Binary files /dev/null and b/msys2/usr/share/locale/eo/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..a631f3d73
Binary files /dev/null and b/msys2/usr/share/locale/eo/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..37923278a
Binary files /dev/null and b/msys2/usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/eo/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/eo/LC_MESSAGES/wget.mo
index 74f33234b..99364f990 100644
Binary files a/msys2/usr/share/locale/eo/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/eo/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/es/LC_MESSAGES/bash.mo
index 5edaa91d3..455535b35 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/es/LC_MESSAGES/gdbm.mo
index 880daa9aa..4507b9b4f 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/es/LC_MESSAGES/glib20.mo
index a091a6159..3f6e3d264 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/es/LC_MESSAGES/gnupg2.mo
index 03bbcd456..f4b5c12ee 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/es/LC_MESSAGES/libgpg-error.mo
index 3022d77e0..c1ddadddc 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/es/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..f8be93817
Binary files /dev/null and b/msys2/usr/share/locale/es/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/es/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..d9ad38f97
Binary files /dev/null and b/msys2/usr/share/locale/es/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..df7ac5082
Binary files /dev/null and b/msys2/usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/es/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/es/LC_MESSAGES/wget.mo
index 23cc42d92..2239ae356 100644
Binary files a/msys2/usr/share/locale/es/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/es/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/et/LC_MESSAGES/bash.mo
index fe7414264..c01812548 100644
Binary files a/msys2/usr/share/locale/et/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/et/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/et/LC_MESSAGES/glib20.mo
index 15980967f..6974efbd7 100644
Binary files a/msys2/usr/share/locale/et/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/et/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/et/LC_MESSAGES/gnupg2.mo
index 1da5d42a9..7ed9f6844 100644
Binary files a/msys2/usr/share/locale/et/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/et/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/et/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..95ca6629b
Binary files /dev/null and b/msys2/usr/share/locale/et/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..145b359d6
Binary files /dev/null and b/msys2/usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/et/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/et/LC_MESSAGES/wget.mo
index c95188f0f..b7b5ab6d9 100644
Binary files a/msys2/usr/share/locale/et/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/et/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/eu/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/eu/LC_MESSAGES/glib20.mo
index d2f2b55c0..7d3a0fcb5 100644
Binary files a/msys2/usr/share/locale/eu/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/eu/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/eu/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/eu/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..411dab229
Binary files /dev/null and b/msys2/usr/share/locale/eu/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/eu/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/eu/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..530161e48
Binary files /dev/null and b/msys2/usr/share/locale/eu/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..0da0aef7d
Binary files /dev/null and b/msys2/usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/eu/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/eu/LC_MESSAGES/wget.mo
index e56ee2c1f..fe9e958d9 100644
Binary files a/msys2/usr/share/locale/eu/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/eu/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/fa/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/fa/LC_MESSAGES/glib20.mo
index 48016a8a6..212286879 100644
Binary files a/msys2/usr/share/locale/fa/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/fa/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/fa/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/fa/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..220759f1d
Binary files /dev/null and b/msys2/usr/share/locale/fa/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/bash.mo
index 96ee531ac..31ddbe452 100644
Binary files a/msys2/usr/share/locale/fi/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/fi/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/gdbm.mo
index 98e5a5814..38fd0f0ad 100644
Binary files a/msys2/usr/share/locale/fi/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/fi/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/glib20.mo
index 17924a804..a31cddf9c 100644
Binary files a/msys2/usr/share/locale/fi/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/fi/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/gnupg2.mo
index 83f443e94..15d1d0dfe 100644
Binary files a/msys2/usr/share/locale/fi/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/fi/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..06756161d
Binary files /dev/null and b/msys2/usr/share/locale/fi/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..56cafc375
Binary files /dev/null and b/msys2/usr/share/locale/fi/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..5b5377731
Binary files /dev/null and b/msys2/usr/share/locale/fi/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/fi/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/fi/LC_MESSAGES/wget.mo
index eb6cf2519..b50ec79d0 100644
Binary files a/msys2/usr/share/locale/fi/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/fi/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/fo/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/fo/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5f50d1654
Binary files /dev/null and b/msys2/usr/share/locale/fo/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/bash.mo
index 7c7a736f1..2e08b7888 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/gdbm.mo
index a0db5ead0..fe6a44217 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/glib20.mo
index 4b81907bf..2b9eb41c4 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/gnupg2.mo
index 0107230e8..4df68b5e6 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
index ee971f7f8..a8328e104 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..3b802f0b7
Binary files /dev/null and b/msys2/usr/share/locale/fr/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..59bd2c09e
Binary files /dev/null and b/msys2/usr/share/locale/fr/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..7358e36da
Binary files /dev/null and b/msys2/usr/share/locale/fr/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/fr/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/fr/LC_MESSAGES/wget.mo
index 005d44848..623423c2e 100644
Binary files a/msys2/usr/share/locale/fr/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/fr/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/fur/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/fur/LC_MESSAGES/glib20.mo
index 43c8c1453..9534ee07c 100644
Binary files a/msys2/usr/share/locale/fur/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/fur/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/fur/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/fur/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..839ce8a97
Binary files /dev/null and b/msys2/usr/share/locale/fur/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/bash.mo
index 692913440..70423c34e 100644
Binary files a/msys2/usr/share/locale/ga/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/ga/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/glib20.mo
index 3c758ba59..ff93bb356 100644
Binary files a/msys2/usr/share/locale/ga/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ga/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..5973aa068
Binary files /dev/null and b/msys2/usr/share/locale/ga/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9445e0d73
Binary files /dev/null and b/msys2/usr/share/locale/ga/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..880c3f50e
Binary files /dev/null and b/msys2/usr/share/locale/ga/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/ga/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/ga/LC_MESSAGES/wget.mo
index d1284b097..0d60b3eef 100644
Binary files a/msys2/usr/share/locale/ga/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/ga/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/gd/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/gd/LC_MESSAGES/glib20.mo
index 1a20ceff2..30c4ff175 100644
Binary files a/msys2/usr/share/locale/gd/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/gd/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/bash.mo
index de9d0aedb..36e79c597 100644
Binary files a/msys2/usr/share/locale/gl/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/gl/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/glib20.mo
index 01d5fe6bb..ff587739b 100644
Binary files a/msys2/usr/share/locale/gl/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/gl/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/gnupg2.mo
index 65b58f916..930d22254 100644
Binary files a/msys2/usr/share/locale/gl/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/gl/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..6a9ccf34a
Binary files /dev/null and b/msys2/usr/share/locale/gl/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5b461bfa4
Binary files /dev/null and b/msys2/usr/share/locale/gl/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..7ff2fc7fb
Binary files /dev/null and b/msys2/usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/gl/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/gl/LC_MESSAGES/wget.mo
index 886a8a753..425959ef1 100644
Binary files a/msys2/usr/share/locale/gl/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/gl/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/gu/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/gu/LC_MESSAGES/glib20.mo
index 32ee1014f..dd7ea6ff2 100644
Binary files a/msys2/usr/share/locale/gu/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/gu/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/gu/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/gu/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..58958b157
Binary files /dev/null and b/msys2/usr/share/locale/gu/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/he/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/he/LC_MESSAGES/glib20.mo
index 9afa0b658..742a44f85 100644
Binary files a/msys2/usr/share/locale/he/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/he/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/he/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/he/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9801c76a6
Binary files /dev/null and b/msys2/usr/share/locale/he/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/he/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/he/LC_MESSAGES/wget.mo
index 3e174fb22..0867ceed0 100644
Binary files a/msys2/usr/share/locale/he/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/he/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/hi/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/hi/LC_MESSAGES/glib20.mo
index 19fbff0a8..2d3366706 100644
Binary files a/msys2/usr/share/locale/hi/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/hi/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/hi/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/hi/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..6916f06eb
Binary files /dev/null and b/msys2/usr/share/locale/hi/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/hr/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/hr/LC_MESSAGES/bash.mo
index cc117fe74..513672e76 100644
Binary files a/msys2/usr/share/locale/hr/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/hr/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/hr/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/hr/LC_MESSAGES/glib20.mo
index a8b2f6df7..328485712 100644
Binary files a/msys2/usr/share/locale/hr/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/hr/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/hr/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/hr/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..db19ab72f
Binary files /dev/null and b/msys2/usr/share/locale/hr/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/hr/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/hr/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..d4e6d087c
Binary files /dev/null and b/msys2/usr/share/locale/hr/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/hr/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/hr/LC_MESSAGES/wget.mo
index 784b77a62..7df4f80e1 100644
Binary files a/msys2/usr/share/locale/hr/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/hr/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/bash.mo
index a1b022e36..08cb51155 100644
Binary files a/msys2/usr/share/locale/hu/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/hu/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/glib20.mo
index f0756defa..4c3b2c5ae 100644
Binary files a/msys2/usr/share/locale/hu/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/hu/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/gnupg2.mo
index 8a87de355..d48cf36a6 100644
Binary files a/msys2/usr/share/locale/hu/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/hu/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo
index 198a09381..5209b7e0b 100644
Binary files a/msys2/usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..6e738b807
Binary files /dev/null and b/msys2/usr/share/locale/hu/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..313658bec
Binary files /dev/null and b/msys2/usr/share/locale/hu/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..bfef2d9dd
Binary files /dev/null and b/msys2/usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/hu/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/hu/LC_MESSAGES/wget.mo
index e2ff20ee2..fff5b5c44 100644
Binary files a/msys2/usr/share/locale/hu/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/hu/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ia/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ia/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9739d5098
Binary files /dev/null and b/msys2/usr/share/locale/ia/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/id/LC_MESSAGES/bash.mo
index 388299aaf..61f53205e 100644
Binary files a/msys2/usr/share/locale/id/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/id/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/id/LC_MESSAGES/glib20.mo
index f6167e16b..3dc6d5a52 100644
Binary files a/msys2/usr/share/locale/id/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/id/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/id/LC_MESSAGES/gnupg2.mo
index 4af9e9e07..e20484121 100644
Binary files a/msys2/usr/share/locale/id/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/id/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/id/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..25d3dd425
Binary files /dev/null and b/msys2/usr/share/locale/id/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/id/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..3ebf2de48
Binary files /dev/null and b/msys2/usr/share/locale/id/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/id/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/id/LC_MESSAGES/wget.mo
index c9fe1dcdb..ae47ddea7 100644
Binary files a/msys2/usr/share/locale/id/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/id/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/is/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/is/LC_MESSAGES/glib20.mo
index 6044076de..0757253d8 100644
Binary files a/msys2/usr/share/locale/is/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/is/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/it/LC_MESSAGES/bash.mo
index 99e98a493..4bbd10a4e 100644
Binary files a/msys2/usr/share/locale/it/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/it/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/it/LC_MESSAGES/glib20.mo
index e4f5e40e6..45cf502c3 100644
Binary files a/msys2/usr/share/locale/it/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/it/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/it/LC_MESSAGES/gnupg2.mo
index 75fe77979..4f195bf5d 100644
Binary files a/msys2/usr/share/locale/it/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/it/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
index b1525f8f1..fc5733eec 100644
Binary files a/msys2/usr/share/locale/it/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/it/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/it/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..dc44ae5f6
Binary files /dev/null and b/msys2/usr/share/locale/it/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/it/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..be75426d1
Binary files /dev/null and b/msys2/usr/share/locale/it/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/it/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..dce92620d
Binary files /dev/null and b/msys2/usr/share/locale/it/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/it/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/it/LC_MESSAGES/wget.mo
index 29d5d9af3..d7e27222a 100644
Binary files a/msys2/usr/share/locale/it/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/it/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/bash.mo
index 3f5a091a3..b1c1af95f 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/gdbm.mo
index edb4100de..430547bca 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/glib20.mo
index 42d109d17..0428869ae 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/gnupg2.mo
index 803f38a6d..d4803453c 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
index e31ed53e1..845399a81 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..b97533c60
Binary files /dev/null and b/msys2/usr/share/locale/ja/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..c54a3a4bb
Binary files /dev/null and b/msys2/usr/share/locale/ja/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..8f41b8b82
Binary files /dev/null and b/msys2/usr/share/locale/ja/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/ja/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/ja/LC_MESSAGES/wget.mo
index ac3bcbbd2..b17354c08 100644
Binary files a/msys2/usr/share/locale/ja/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/ja/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ka/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ka/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..a269af3aa
Binary files /dev/null and b/msys2/usr/share/locale/ka/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/kk/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/kk/LC_MESSAGES/glib20.mo
index f88045f84..10453b8c0 100644
Binary files a/msys2/usr/share/locale/kk/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/kk/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/kk/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/kk/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..655c8d92a
Binary files /dev/null and b/msys2/usr/share/locale/kk/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/kn/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/kn/LC_MESSAGES/glib20.mo
index ee34d8219..8b06a002b 100644
Binary files a/msys2/usr/share/locale/kn/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/kn/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/kn/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/kn/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..df35e8a31
Binary files /dev/null and b/msys2/usr/share/locale/kn/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ko/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ko/LC_MESSAGES/bash.mo
new file mode 100644
index 000000000..e8dbf4963
Binary files /dev/null and b/msys2/usr/share/locale/ko/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ko/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ko/LC_MESSAGES/glib20.mo
index db53960df..ade1f01cb 100644
Binary files a/msys2/usr/share/locale/ko/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ko/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ko/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ko/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..cfe5e02b4
Binary files /dev/null and b/msys2/usr/share/locale/ko/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ko/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ko/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..745f3b110
Binary files /dev/null and b/msys2/usr/share/locale/ko/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ko/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ko/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..ee46f1f67
Binary files /dev/null and b/msys2/usr/share/locale/ko/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/lt/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/lt/LC_MESSAGES/bash.mo
index 36a127952..31a29ca45 100644
Binary files a/msys2/usr/share/locale/lt/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/lt/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/lt/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/lt/LC_MESSAGES/glib20.mo
index ebf2285c6..0d169d156 100644
Binary files a/msys2/usr/share/locale/lt/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/lt/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/lt/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/lt/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..41c8f55e4
Binary files /dev/null and b/msys2/usr/share/locale/lt/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/lt/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/lt/LC_MESSAGES/wget.mo
index dd19b0ca3..921d0938c 100644
Binary files a/msys2/usr/share/locale/lt/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/lt/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/lv/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/lv/LC_MESSAGES/glib20.mo
index 3cabccd93..c6597a3bf 100644
Binary files a/msys2/usr/share/locale/lv/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/lv/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/lv/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/lv/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..75d72a3e0
Binary files /dev/null and b/msys2/usr/share/locale/lv/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ml/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ml/LC_MESSAGES/glib20.mo
index 71e8585f4..ef302eb04 100644
Binary files a/msys2/usr/share/locale/ml/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ml/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ml/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ml/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..a460d4145
Binary files /dev/null and b/msys2/usr/share/locale/ml/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/mr/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/mr/LC_MESSAGES/glib20.mo
index 00493f85a..cbb2e7218 100644
Binary files a/msys2/usr/share/locale/mr/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/mr/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/mr/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/mr/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..030545eb8
Binary files /dev/null and b/msys2/usr/share/locale/mr/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ms/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ms/LC_MESSAGES/glib20.mo
index 2f707754c..6d0d2001b 100644
Binary files a/msys2/usr/share/locale/ms/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ms/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ms/LC_MESSAGES/gnutls.mo b/msys2/usr/share/locale/ms/LC_MESSAGES/gnutls.mo
index ee145b9cb..4e9924e4d 100644
Binary files a/msys2/usr/share/locale/ms/LC_MESSAGES/gnutls.mo and b/msys2/usr/share/locale/ms/LC_MESSAGES/gnutls.mo differ
diff --git a/msys2/usr/share/locale/ms/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ms/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..af1478448
Binary files /dev/null and b/msys2/usr/share/locale/ms/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ms/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ms/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5c33f04d6
Binary files /dev/null and b/msys2/usr/share/locale/ms/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..008d5c002
Binary files /dev/null and b/msys2/usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/bash.mo
index 63a485d60..894af6926 100644
Binary files a/msys2/usr/share/locale/nb/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/nb/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/glib20.mo
index 7866a53ff..015f259ad 100644
Binary files a/msys2/usr/share/locale/nb/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/nb/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/gnupg2.mo
index a3ab3957c..ffa439a57 100644
Binary files a/msys2/usr/share/locale/nb/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/nb/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..0aee0a519
Binary files /dev/null and b/msys2/usr/share/locale/nb/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..a6f225190
Binary files /dev/null and b/msys2/usr/share/locale/nb/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..c31fa1b8e
Binary files /dev/null and b/msys2/usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/nb/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/nb/LC_MESSAGES/wget.mo
index 19c6a82a0..6c6b4fc26 100644
Binary files a/msys2/usr/share/locale/nb/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/nb/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ne/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ne/LC_MESSAGES/glib20.mo
index c5cc2432f..64ddeecd1 100644
Binary files a/msys2/usr/share/locale/ne/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ne/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/bash.mo
index 34efe81bf..613132285 100644
Binary files a/msys2/usr/share/locale/nl/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/nl/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/glib20.mo
index 9a30c1981..d71499e14 100644
Binary files a/msys2/usr/share/locale/nl/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/nl/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
index ed38d5005..e228de922 100644
Binary files a/msys2/usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..0c82c2e4e
Binary files /dev/null and b/msys2/usr/share/locale/nl/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..42d8abb5c
Binary files /dev/null and b/msys2/usr/share/locale/nl/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..8d7ca80d6
Binary files /dev/null and b/msys2/usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/nl/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/nl/LC_MESSAGES/wget.mo
index e97b67217..ac2cf4f6a 100644
Binary files a/msys2/usr/share/locale/nl/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/nl/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/nn/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/nn/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..8a268087c
Binary files /dev/null and b/msys2/usr/share/locale/nn/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/nn/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/nn/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..c9521560d
Binary files /dev/null and b/msys2/usr/share/locale/nn/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/oc/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/oc/LC_MESSAGES/glib20.mo
index f461da365..2f3ae4a6a 100644
Binary files a/msys2/usr/share/locale/oc/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/oc/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/oc/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/oc/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..30dc02bba
Binary files /dev/null and b/msys2/usr/share/locale/oc/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/or/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/or/LC_MESSAGES/glib20.mo
index 545a76c4e..6e0f5ff85 100644
Binary files a/msys2/usr/share/locale/or/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/or/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/or/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/or/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..b9ef69bb5
Binary files /dev/null and b/msys2/usr/share/locale/or/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/pa/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/pa/LC_MESSAGES/glib20.mo
index 5c8ab2544..fa2845d8b 100644
Binary files a/msys2/usr/share/locale/pa/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/pa/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/pa/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/pa/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..51eb72bc1
Binary files /dev/null and b/msys2/usr/share/locale/pa/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/bash.mo
index a67cbd54c..be60e28c3 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/gdbm.mo
index 8760e7b99..7587656bc 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/glib20.mo
index af6966efc..c318733ee 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/gnupg2.mo
index c4d162710..6ac8e51ba 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
index 50a13fb5d..6796b6336 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..7500e7000
Binary files /dev/null and b/msys2/usr/share/locale/pl/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..b28991081
Binary files /dev/null and b/msys2/usr/share/locale/pl/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..31a065ad8
Binary files /dev/null and b/msys2/usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/pl/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/pl/LC_MESSAGES/wget.mo
index 00df6bab6..5ca7254d8 100644
Binary files a/msys2/usr/share/locale/pl/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/pl/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/bash.mo
new file mode 100644
index 000000000..a66d7c7c5
Binary files /dev/null and b/msys2/usr/share/locale/pt/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/glib20.mo
index 6acec0b05..ed7c7ee41 100644
Binary files a/msys2/usr/share/locale/pt/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/pt/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/gnupg2.mo
index ed8baa3b8..61a894450 100644
Binary files a/msys2/usr/share/locale/pt/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/pt/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo
index a7383b034..a295ff2ca 100644
Binary files a/msys2/usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..60b2b3024
Binary files /dev/null and b/msys2/usr/share/locale/pt/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..8ca579ab7
Binary files /dev/null and b/msys2/usr/share/locale/pt/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..94490209a
Binary files /dev/null and b/msys2/usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/pt/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/pt/LC_MESSAGES/wget.mo
index 8126f8a4a..c5023b7bc 100644
Binary files a/msys2/usr/share/locale/pt/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/pt/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
index fd7eae62d..cd1093ad7 100644
Binary files a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/gdbm.mo
index 48af21a98..9e4327e40 100644
Binary files a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
index 406d27d08..46f5e5567 100644
Binary files a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..1b8e6d169
Binary files /dev/null and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..ac1ec4037
Binary files /dev/null and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..50ec20300
Binary files /dev/null and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo
index a1c2249c9..996ebcefb 100644
Binary files a/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/bash.mo
index 5c7cb9a8b..3a69a47a6 100644
Binary files a/msys2/usr/share/locale/ro/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/ro/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/glib20.mo
index 8d32f1797..5c3ef3311 100644
Binary files a/msys2/usr/share/locale/ro/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ro/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/gnupg2.mo
index d89f840a8..bd6490e78 100644
Binary files a/msys2/usr/share/locale/ro/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/ro/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
index 98ffb75e4..5e2b0275a 100644
Binary files a/msys2/usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..7e751eb0a
Binary files /dev/null and b/msys2/usr/share/locale/ro/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..00626968b
Binary files /dev/null and b/msys2/usr/share/locale/ro/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..e5c7f62e3
Binary files /dev/null and b/msys2/usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/ro/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/ro/LC_MESSAGES/wget.mo
index 873d5c34e..3315a1f18 100644
Binary files a/msys2/usr/share/locale/ro/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/ro/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/bash.mo
index 86ac1a6a3..f16a5378f 100644
Binary files a/msys2/usr/share/locale/ru/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/ru/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/gdbm.mo
new file mode 100644
index 000000000..bc34d8512
Binary files /dev/null and b/msys2/usr/share/locale/ru/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/glib20.mo
index 793116c14..1dd810181 100644
Binary files a/msys2/usr/share/locale/ru/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ru/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/gnupg2.mo
index 81c019db0..b80ed1939 100644
Binary files a/msys2/usr/share/locale/ru/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/ru/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo
index fdf359c65..c75bf0175 100644
Binary files a/msys2/usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..90273dae9
Binary files /dev/null and b/msys2/usr/share/locale/ru/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..662ed9c13
Binary files /dev/null and b/msys2/usr/share/locale/ru/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..4f27a9247
Binary files /dev/null and b/msys2/usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/ru/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/ru/LC_MESSAGES/wget.mo
index b7a4d5438..81e776eb8 100644
Binary files a/msys2/usr/share/locale/ru/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/ru/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..b7a12234a
Binary files /dev/null and b/msys2/usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/bash.mo
index 366d2179b..c6c89c52b 100644
Binary files a/msys2/usr/share/locale/sk/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/sk/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/glib20.mo
index 7dccc1b28..6dd0a6464 100644
Binary files a/msys2/usr/share/locale/sk/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/sk/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/gnupg2.mo
index 193243351..09a18ca84 100644
Binary files a/msys2/usr/share/locale/sk/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/sk/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..ad44c5b91
Binary files /dev/null and b/msys2/usr/share/locale/sk/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..36cd7aacd
Binary files /dev/null and b/msys2/usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/sk/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/sk/LC_MESSAGES/wget.mo
index b1d6a4b86..fd1a7de00 100644
Binary files a/msys2/usr/share/locale/sk/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/sk/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/bash.mo
index 52935ec88..db02245a7 100644
Binary files a/msys2/usr/share/locale/sl/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/sl/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/glib20.mo
index 4917cb4b6..2847188ff 100644
Binary files a/msys2/usr/share/locale/sl/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/sl/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..750149eed
Binary files /dev/null and b/msys2/usr/share/locale/sl/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..e886ceaed
Binary files /dev/null and b/msys2/usr/share/locale/sl/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..6f81e221d
Binary files /dev/null and b/msys2/usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/sl/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/sl/LC_MESSAGES/wget.mo
index ffca4a480..df0db96e9 100644
Binary files a/msys2/usr/share/locale/sl/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/sl/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/sq/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sq/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..dae6d0f5a
Binary files /dev/null and b/msys2/usr/share/locale/sq/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/bash.mo
index c052db364..6e2fdf929 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/gdbm.mo
index 49213186a..df906d23c 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/glib20.mo
index a8fe15577..d934866d0 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/gnutls.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/gnutls.mo
index 8166eb993..7be8d4fff 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/gnutls.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/gnutls.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo
index 3e269bd9b..e072cfc2a 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..8d7656c17
Binary files /dev/null and b/msys2/usr/share/locale/sr/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..6b42df16c
Binary files /dev/null and b/msys2/usr/share/locale/sr/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..9ec6691e8
Binary files /dev/null and b/msys2/usr/share/locale/sr/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/sr/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/sr/LC_MESSAGES/wget.mo
index 037aee331..a3c3399b1 100644
Binary files a/msys2/usr/share/locale/sr/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/sr/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo
index d1022c224..158459227 100644
Binary files a/msys2/usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/sr@latin/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/sr@latin/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sr@latin/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..020317dfa
Binary files /dev/null and b/msys2/usr/share/locale/sr@latin/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/bash.mo
index ba977e8da..1b825f688 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/gdbm.mo
index 744d8b701..107355ef9 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/glib20.mo
index c33a9942e..ed38a0d19 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/gnupg2.mo
index acc33192c..11feed0a9 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
index b1a5275f3..d54d92ea7 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..b88868cdf
Binary files /dev/null and b/msys2/usr/share/locale/sv/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..6e0e89fa3
Binary files /dev/null and b/msys2/usr/share/locale/sv/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..b14e491cf
Binary files /dev/null and b/msys2/usr/share/locale/sv/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/sv/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/sv/LC_MESSAGES/wget.mo
index 5c43eeb28..6870eb212 100644
Binary files a/msys2/usr/share/locale/sv/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/sv/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ta/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ta/LC_MESSAGES/glib20.mo
index d0885ea13..93200eda3 100644
Binary files a/msys2/usr/share/locale/ta/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ta/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/ta/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/ta/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..9b9f41adf
Binary files /dev/null and b/msys2/usr/share/locale/ta/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/te/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/te/LC_MESSAGES/glib20.mo
index 4faf3cee6..ca482434e 100644
Binary files a/msys2/usr/share/locale/te/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/te/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/te/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/te/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..674a56542
Binary files /dev/null and b/msys2/usr/share/locale/te/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/tg/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/tg/LC_MESSAGES/glib20.mo
index 266ee3ec8..7ad436829 100644
Binary files a/msys2/usr/share/locale/tg/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/tg/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/th/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/th/LC_MESSAGES/glib20.mo
index db57a8e12..cb21c29b9 100644
Binary files a/msys2/usr/share/locale/th/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/th/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/th/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/th/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..98617765e
Binary files /dev/null and b/msys2/usr/share/locale/th/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/bash.mo
index a4a89c6fe..49558623c 100644
Binary files a/msys2/usr/share/locale/tr/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/tr/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/glib20.mo
index f38abae05..bda76e09a 100644
Binary files a/msys2/usr/share/locale/tr/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/tr/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/gnupg2.mo
index a4a4f0905..514e83604 100644
Binary files a/msys2/usr/share/locale/tr/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/tr/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..d8e165e4e
Binary files /dev/null and b/msys2/usr/share/locale/tr/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..ce1ec7396
Binary files /dev/null and b/msys2/usr/share/locale/tr/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..de1a82093
Binary files /dev/null and b/msys2/usr/share/locale/tr/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/tr/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/tr/LC_MESSAGES/wget.mo
index 0534e5907..3baa2a6a9 100644
Binary files a/msys2/usr/share/locale/tr/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/tr/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/ug/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/ug/LC_MESSAGES/glib20.mo
index 1e6f83fc7..47006af80 100644
Binary files a/msys2/usr/share/locale/ug/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/ug/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/bash.mo
index 466af2cdc..0e79dd2c7 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/gdbm.mo
index 4ea8ecaf8..dc3de492c 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/glib20.mo
index 371b7930d..57e5a9708 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/gnupg2.mo
index c4a32df00..c009d9312 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
index a4eaf691a..f8b3105a7 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..4a5bb0e2e
Binary files /dev/null and b/msys2/usr/share/locale/uk/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..10a66530d
Binary files /dev/null and b/msys2/usr/share/locale/uk/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..cb0ed2cd4
Binary files /dev/null and b/msys2/usr/share/locale/uk/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/uk/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/uk/LC_MESSAGES/wget.mo
index bcf130ebe..26f85c515 100644
Binary files a/msys2/usr/share/locale/uk/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/uk/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/bash.mo
index 9d187c416..256ec8eef 100644
Binary files a/msys2/usr/share/locale/vi/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/vi/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/gdbm.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/gdbm.mo
index f361b19d8..005e03db0 100644
Binary files a/msys2/usr/share/locale/vi/LC_MESSAGES/gdbm.mo and b/msys2/usr/share/locale/vi/LC_MESSAGES/gdbm.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/glib20.mo
index a51ff2765..f39ffcf14 100644
Binary files a/msys2/usr/share/locale/vi/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/vi/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
index d871fae2a..8cf4c0f45 100644
Binary files a/msys2/usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..2ccfba7d7
Binary files /dev/null and b/msys2/usr/share/locale/vi/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..19155f2c2
Binary files /dev/null and b/msys2/usr/share/locale/vi/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..974ae395b
Binary files /dev/null and b/msys2/usr/share/locale/vi/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/vi/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/vi/LC_MESSAGES/wget.mo
index 56916320f..7d8a2e9bf 100644
Binary files a/msys2/usr/share/locale/vi/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/vi/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/wa/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/wa/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..f7d286f48
Binary files /dev/null and b/msys2/usr/share/locale/wa/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo
index 5eda361f2..9712f241e 100644
Binary files a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
index b05452630..b380b727e 100644
Binary files a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
index 482fcee97..543e570a6 100644
Binary files a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
index 2db6b4327..882d12ac4 100644
Binary files a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..20de46a23
Binary files /dev/null and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..e8d8ee260
Binary files /dev/null and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..91ab5d589
Binary files /dev/null and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget.mo
index 2352fc717..1f7c8a68c 100644
Binary files a/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/zh_CN/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo
index 941817e37..e1fbba3dc 100644
Binary files a/msys2/usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/zh_HK/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/zh_HK/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..5063f40d2
Binary files /dev/null and b/msys2/usr/share/locale/zh_HK/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
index 6e07b8db6..f566ab318 100644
Binary files a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
index 4d4598f31..4b938f5f2 100644
Binary files a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
index 3d13a7bb6..5a01c808b 100644
Binary files a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
index eb76dfada..5e7ae2e4d 100644
Binary files a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/nano.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/nano.mo
new file mode 100644
index 000000000..3179c2c57
Binary files /dev/null and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/nano.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/p11-kit.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/p11-kit.mo
new file mode 100644
index 000000000..05407b36b
Binary files /dev/null and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/p11-kit.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo
new file mode 100644
index 000000000..1ad3d556e
Binary files /dev/null and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo differ
diff --git a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget.mo b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
index 1001cb432..2bc22eab9 100644
Binary files a/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget.mo and b/msys2/usr/share/locale/zh_TW/LC_MESSAGES/wget.mo differ
diff --git a/msys2/usr/share/magic b/msys2/usr/share/magic
index 4c67adcaf..03c912b71 100644
--- a/msys2/usr/share/magic
+++ b/msys2/usr/share/magic
@@ -6002,113 +6002,6 @@
 >12	belong		1003			HCI BCSP
 >12	belong		1004			HCI Serial (H5)
 >>12	belong		x			type %d
-#------------------------------------------------------------------------------
-# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
-# c-lang:  file(1) magic for C and related languages programs
-#
-# The strength is to beat standard HTML
-
-# BCPL
-0	search/8192	"libhdr"	BCPL source text
-!:mime	text/x-bcpl
-0	search/8192	"LIBHDR"	BCPL source text
-!:mime	text/x-bcpl
-
-# C
-# Check for class if include is found, otherwise class is beaten by include because of lowered strength
-0	search/8192	#include
->0	regex	\^#include			C
->>0	regex	\^class[[:space:]]+
->>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
->>&0	clear	x				source text
-!:strength + 13
-!:mime	text/x-c
-0	search/8192	pragma
->0	regex	\^#[[:space:]]*pragma	C source text
-!:mime	text/x-c
-0	search/8192	endif
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*endif$	C source text
-!:mime	text/x-c
-0	search/8192	define
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*define	C source text
-!:mime	text/x-c
-0	search/8192	char
->0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	double
->0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	extern
->0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	float
->0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	struct
->0	regex	\^struct[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	union
->0	regex	\^union[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	main(
->&0 regex	\\)[[:space:]]*\\{		C source text
-!:mime	text/x-c
-
-# C++
-# The strength of these rules is increased so they beat the C rules above
-0	search/8192	namespace
->0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# using namespace [namespace] or using std::[lib]
-0	search/8192	using
->0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	template
->0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	virtual
->0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# But class alone is reduced to avoid beating php (Jens Schleusener)
-0	search/8192	class
->0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
-!:strength + 13
-!:mime	text/x-c++
-0	search/8192	public
->0	regex	\^[[:space:]]*public:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	private
->0	regex	\^[[:space:]]*private:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	protected
->0	regex	\^[[:space:]]*protected:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-
-# Objective-C
-0	search/8192	#import
->0	regex	\^#import			Objective-C source text
-!:strength + 25
-!:mime	text/x-objective-c
-
-# From: Mikhail Teterin <mi@aldan.algebra.com>
-0	string		cscope		cscope reference data
->7	string		x		version %.2s
-# We skip the path here, because it is often long (so file will
-# truncate it) and mostly redundant.
-# The inverted index functionality was added some time between
-# versions 11 and 15, so look for -q if version is above 14:
->7	string		>14
->>10	search/100	\ -q\ 		with inverted index
->10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: c64,v 1.7 2017/11/15 12:19:06 christos Exp $
@@ -6631,6 +6524,113 @@
 
 0	string		RuneCT		Citrus locale declaration for LC_CTYPE
 
+#------------------------------------------------------------------------------
+# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
+# c-lang:  file(1) magic for C and related languages programs
+#
+# The strength is to beat standard HTML
+
+# BCPL
+0	search/8192	"libhdr"	BCPL source text
+!:mime	text/x-bcpl
+0	search/8192	"LIBHDR"	BCPL source text
+!:mime	text/x-bcpl
+
+# C
+# Check for class if include is found, otherwise class is beaten by include because of lowered strength
+0	search/8192	#include
+>0	regex	\^#include			C
+>>0	regex	\^class[[:space:]]+
+>>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
+>>&0	clear	x				source text
+!:strength + 13
+!:mime	text/x-c
+0	search/8192	pragma
+>0	regex	\^#[[:space:]]*pragma	C source text
+!:mime	text/x-c
+0	search/8192	endif
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*endif$	C source text
+!:mime	text/x-c
+0	search/8192	define
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*define	C source text
+!:mime	text/x-c
+0	search/8192	char
+>0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	double
+>0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	extern
+>0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	float
+>0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	struct
+>0	regex	\^struct[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	union
+>0	regex	\^union[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	main(
+>&0 regex	\\)[[:space:]]*\\{		C source text
+!:mime	text/x-c
+
+# C++
+# The strength of these rules is increased so they beat the C rules above
+0	search/8192	namespace
+>0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# using namespace [namespace] or using std::[lib]
+0	search/8192	using
+>0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	template
+>0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	virtual
+>0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# But class alone is reduced to avoid beating php (Jens Schleusener)
+0	search/8192	class
+>0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
+!:strength + 13
+!:mime	text/x-c++
+0	search/8192	public
+>0	regex	\^[[:space:]]*public:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	private
+>0	regex	\^[[:space:]]*private:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	protected
+>0	regex	\^[[:space:]]*protected:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+
+# Objective-C
+0	search/8192	#import
+>0	regex	\^#import			Objective-C source text
+!:strength + 25
+!:mime	text/x-objective-c
+
+# From: Mikhail Teterin <mi@aldan.algebra.com>
+0	string		cscope		cscope reference data
+>7	string		x		version %.2s
+# We skip the path here, because it is often long (so file will
+# truncate it) and mostly redundant.
+# The inverted index functionality was added some time between
+# versions 11 and 15, so look for -q if version is above 14:
+>7	string		>14
+>>10	search/100	\ -q\ 		with inverted index
+>10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: clarion,v 1.5 2014/04/30 21:41:02 christos Exp $
diff --git a/msys2/usr/share/man/man1/CA.pl.1ssl.gz b/msys2/usr/share/man/man1/CA.pl.1ssl.gz
index be8a2967a..c1ae4078a 100644
Binary files a/msys2/usr/share/man/man1/CA.pl.1ssl.gz and b/msys2/usr/share/man/man1/CA.pl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/[.1.gz b/msys2/usr/share/man/man1/[.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/[.1.gz and b/msys2/usr/share/man/man1/[.1.gz differ
diff --git a/msys2/usr/share/man/man1/alias.1.gz b/msys2/usr/share/man/man1/alias.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/alias.1.gz and b/msys2/usr/share/man/man1/alias.1.gz differ
diff --git a/msys2/usr/share/man/man1/asn1parse.1ssl.gz b/msys2/usr/share/man/man1/asn1parse.1ssl.gz
index f6d08d8b0..6a10b248d 100644
Binary files a/msys2/usr/share/man/man1/asn1parse.1ssl.gz and b/msys2/usr/share/man/man1/asn1parse.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/bash.1.gz b/msys2/usr/share/man/man1/bash.1.gz
index 451178b5e..517b9ebcf 100644
Binary files a/msys2/usr/share/man/man1/bash.1.gz and b/msys2/usr/share/man/man1/bash.1.gz differ
diff --git a/msys2/usr/share/man/man1/bash_builtins.1.gz b/msys2/usr/share/man/man1/bash_builtins.1.gz
index 9eb49f4e5..c63ab094b 100644
Binary files a/msys2/usr/share/man/man1/bash_builtins.1.gz and b/msys2/usr/share/man/man1/bash_builtins.1.gz differ
diff --git a/msys2/usr/share/man/man1/bashbug.1.gz b/msys2/usr/share/man/man1/bashbug.1.gz
index 491ae8e94..441169a8f 100644
Binary files a/msys2/usr/share/man/man1/bashbug.1.gz and b/msys2/usr/share/man/man1/bashbug.1.gz differ
diff --git a/msys2/usr/share/man/man1/bg.1.gz b/msys2/usr/share/man/man1/bg.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/bg.1.gz and b/msys2/usr/share/man/man1/bg.1.gz differ
diff --git a/msys2/usr/share/man/man1/bind.1.gz b/msys2/usr/share/man/man1/bind.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/bind.1.gz and b/msys2/usr/share/man/man1/bind.1.gz differ
diff --git a/msys2/usr/share/man/man1/break.1.gz b/msys2/usr/share/man/man1/break.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/break.1.gz and b/msys2/usr/share/man/man1/break.1.gz differ
diff --git a/msys2/usr/share/man/man1/builtin.1.gz b/msys2/usr/share/man/man1/builtin.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/builtin.1.gz and b/msys2/usr/share/man/man1/builtin.1.gz differ
diff --git a/msys2/usr/share/man/man1/c_rehash.1ssl.gz b/msys2/usr/share/man/man1/c_rehash.1ssl.gz
index a287ba618..90b176287 100644
Binary files a/msys2/usr/share/man/man1/c_rehash.1ssl.gz and b/msys2/usr/share/man/man1/c_rehash.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/ca.1ssl.gz b/msys2/usr/share/man/man1/ca.1ssl.gz
index 9599686ad..1c8b7f0e4 100644
Binary files a/msys2/usr/share/man/man1/ca.1ssl.gz and b/msys2/usr/share/man/man1/ca.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/caller.1.gz b/msys2/usr/share/man/man1/caller.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/caller.1.gz and b/msys2/usr/share/man/man1/caller.1.gz differ
diff --git a/msys2/usr/share/man/man1/case.1.gz b/msys2/usr/share/man/man1/case.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/case.1.gz and b/msys2/usr/share/man/man1/case.1.gz differ
diff --git a/msys2/usr/share/man/man1/cd.1.gz b/msys2/usr/share/man/man1/cd.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/cd.1.gz and b/msys2/usr/share/man/man1/cd.1.gz differ
diff --git a/msys2/usr/share/man/man1/ciphers.1ssl.gz b/msys2/usr/share/man/man1/ciphers.1ssl.gz
index 8ac14e322..619c630fd 100644
Binary files a/msys2/usr/share/man/man1/ciphers.1ssl.gz and b/msys2/usr/share/man/man1/ciphers.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/cms.1ssl.gz b/msys2/usr/share/man/man1/cms.1ssl.gz
index c1ed4884f..179a85cda 100644
Binary files a/msys2/usr/share/man/man1/cms.1ssl.gz and b/msys2/usr/share/man/man1/cms.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/command.1.gz b/msys2/usr/share/man/man1/command.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/command.1.gz and b/msys2/usr/share/man/man1/command.1.gz differ
diff --git a/msys2/usr/share/man/man1/compgen.1.gz b/msys2/usr/share/man/man1/compgen.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/compgen.1.gz and b/msys2/usr/share/man/man1/compgen.1.gz differ
diff --git a/msys2/usr/share/man/man1/complete.1.gz b/msys2/usr/share/man/man1/complete.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/complete.1.gz and b/msys2/usr/share/man/man1/complete.1.gz differ
diff --git a/msys2/usr/share/man/man1/continue.1.gz b/msys2/usr/share/man/man1/continue.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/continue.1.gz and b/msys2/usr/share/man/man1/continue.1.gz differ
diff --git a/msys2/usr/share/man/man1/crl.1ssl.gz b/msys2/usr/share/man/man1/crl.1ssl.gz
index 79022e529..6f2213675 100644
Binary files a/msys2/usr/share/man/man1/crl.1ssl.gz and b/msys2/usr/share/man/man1/crl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/crl2pkcs7.1ssl.gz b/msys2/usr/share/man/man1/crl2pkcs7.1ssl.gz
index d19932c19..20ef4f8bf 100644
Binary files a/msys2/usr/share/man/man1/crl2pkcs7.1ssl.gz and b/msys2/usr/share/man/man1/crl2pkcs7.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/curl-config.1.gz b/msys2/usr/share/man/man1/curl-config.1.gz
index 61318fdd7..d3ac0d77e 100644
Binary files a/msys2/usr/share/man/man1/curl-config.1.gz and b/msys2/usr/share/man/man1/curl-config.1.gz differ
diff --git a/msys2/usr/share/man/man1/curl.1.gz b/msys2/usr/share/man/man1/curl.1.gz
index 1ebf714ac..36d648558 100644
Binary files a/msys2/usr/share/man/man1/curl.1.gz and b/msys2/usr/share/man/man1/curl.1.gz differ
diff --git a/msys2/usr/share/man/man1/declare.1.gz b/msys2/usr/share/man/man1/declare.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/declare.1.gz and b/msys2/usr/share/man/man1/declare.1.gz differ
diff --git a/msys2/usr/share/man/man1/dgst.1ssl.gz b/msys2/usr/share/man/man1/dgst.1ssl.gz
index e53ea520e..8d19ec7d4 100644
Binary files a/msys2/usr/share/man/man1/dgst.1ssl.gz and b/msys2/usr/share/man/man1/dgst.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/dhparam.1ssl.gz b/msys2/usr/share/man/man1/dhparam.1ssl.gz
index 09be4d461..230199a01 100644
Binary files a/msys2/usr/share/man/man1/dhparam.1ssl.gz and b/msys2/usr/share/man/man1/dhparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/dirmngr-client.1.gz b/msys2/usr/share/man/man1/dirmngr-client.1.gz
index 26e0caf7b..365984fd9 100644
Binary files a/msys2/usr/share/man/man1/dirmngr-client.1.gz and b/msys2/usr/share/man/man1/dirmngr-client.1.gz differ
diff --git a/msys2/usr/share/man/man1/dirs.1.gz b/msys2/usr/share/man/man1/dirs.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/dirs.1.gz and b/msys2/usr/share/man/man1/dirs.1.gz differ
diff --git a/msys2/usr/share/man/man1/disown.1.gz b/msys2/usr/share/man/man1/disown.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/disown.1.gz and b/msys2/usr/share/man/man1/disown.1.gz differ
diff --git a/msys2/usr/share/man/man1/do.1.gz b/msys2/usr/share/man/man1/do.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/do.1.gz and b/msys2/usr/share/man/man1/do.1.gz differ
diff --git a/msys2/usr/share/man/man1/done.1.gz b/msys2/usr/share/man/man1/done.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/done.1.gz and b/msys2/usr/share/man/man1/done.1.gz differ
diff --git a/msys2/usr/share/man/man1/dsa.1ssl.gz b/msys2/usr/share/man/man1/dsa.1ssl.gz
index 71a3fd64a..b913302b5 100644
Binary files a/msys2/usr/share/man/man1/dsa.1ssl.gz and b/msys2/usr/share/man/man1/dsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/dsaparam.1ssl.gz b/msys2/usr/share/man/man1/dsaparam.1ssl.gz
index 51131de7a..63653b75a 100644
Binary files a/msys2/usr/share/man/man1/dsaparam.1ssl.gz and b/msys2/usr/share/man/man1/dsaparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/ec.1ssl.gz b/msys2/usr/share/man/man1/ec.1ssl.gz
index c8056ec78..99acd1ba1 100644
Binary files a/msys2/usr/share/man/man1/ec.1ssl.gz and b/msys2/usr/share/man/man1/ec.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/ecparam.1ssl.gz b/msys2/usr/share/man/man1/ecparam.1ssl.gz
index 9b17082e8..9553fbd50 100644
Binary files a/msys2/usr/share/man/man1/ecparam.1ssl.gz and b/msys2/usr/share/man/man1/ecparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/elif.1.gz b/msys2/usr/share/man/man1/elif.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/elif.1.gz and b/msys2/usr/share/man/man1/elif.1.gz differ
diff --git a/msys2/usr/share/man/man1/else.1.gz b/msys2/usr/share/man/man1/else.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/else.1.gz and b/msys2/usr/share/man/man1/else.1.gz differ
diff --git a/msys2/usr/share/man/man1/enable.1.gz b/msys2/usr/share/man/man1/enable.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/enable.1.gz and b/msys2/usr/share/man/man1/enable.1.gz differ
diff --git a/msys2/usr/share/man/man1/enc.1ssl.gz b/msys2/usr/share/man/man1/enc.1ssl.gz
index 26b0a77d2..204151a67 100644
Binary files a/msys2/usr/share/man/man1/enc.1ssl.gz and b/msys2/usr/share/man/man1/enc.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/engine.1ssl.gz b/msys2/usr/share/man/man1/engine.1ssl.gz
index 49ffbdae6..60d0001d5 100644
Binary files a/msys2/usr/share/man/man1/engine.1ssl.gz and b/msys2/usr/share/man/man1/engine.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/errstr.1ssl.gz b/msys2/usr/share/man/man1/errstr.1ssl.gz
index c08157a87..51e182397 100644
Binary files a/msys2/usr/share/man/man1/errstr.1ssl.gz and b/msys2/usr/share/man/man1/errstr.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/esac.1.gz b/msys2/usr/share/man/man1/esac.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/esac.1.gz and b/msys2/usr/share/man/man1/esac.1.gz differ
diff --git a/msys2/usr/share/man/man1/eval.1.gz b/msys2/usr/share/man/man1/eval.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/eval.1.gz and b/msys2/usr/share/man/man1/eval.1.gz differ
diff --git a/msys2/usr/share/man/man1/exec.1.gz b/msys2/usr/share/man/man1/exec.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/exec.1.gz and b/msys2/usr/share/man/man1/exec.1.gz differ
diff --git a/msys2/usr/share/man/man1/exit.1.gz b/msys2/usr/share/man/man1/exit.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/exit.1.gz and b/msys2/usr/share/man/man1/exit.1.gz differ
diff --git a/msys2/usr/share/man/man1/export.1.gz b/msys2/usr/share/man/man1/export.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/export.1.gz and b/msys2/usr/share/man/man1/export.1.gz differ
diff --git a/msys2/usr/share/man/man1/fc.1.gz b/msys2/usr/share/man/man1/fc.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/fc.1.gz and b/msys2/usr/share/man/man1/fc.1.gz differ
diff --git a/msys2/usr/share/man/man1/fg.1.gz b/msys2/usr/share/man/man1/fg.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/fg.1.gz and b/msys2/usr/share/man/man1/fg.1.gz differ
diff --git a/msys2/usr/share/man/man1/fi.1.gz b/msys2/usr/share/man/man1/fi.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/fi.1.gz and b/msys2/usr/share/man/man1/fi.1.gz differ
diff --git a/msys2/usr/share/man/man1/for.1.gz b/msys2/usr/share/man/man1/for.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/for.1.gz and b/msys2/usr/share/man/man1/for.1.gz differ
diff --git a/msys2/usr/share/man/man1/function.1.gz b/msys2/usr/share/man/man1/function.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/function.1.gz and b/msys2/usr/share/man/man1/function.1.gz differ
diff --git a/msys2/usr/share/man/man1/gdbm_dump.1.gz b/msys2/usr/share/man/man1/gdbm_dump.1.gz
index 22e033612..1751040cc 100644
Binary files a/msys2/usr/share/man/man1/gdbm_dump.1.gz and b/msys2/usr/share/man/man1/gdbm_dump.1.gz differ
diff --git a/msys2/usr/share/man/man1/gdbm_load.1.gz b/msys2/usr/share/man/man1/gdbm_load.1.gz
index 27e50c61e..55be517e5 100644
Binary files a/msys2/usr/share/man/man1/gdbm_load.1.gz and b/msys2/usr/share/man/man1/gdbm_load.1.gz differ
diff --git a/msys2/usr/share/man/man1/gdbmtool.1.gz b/msys2/usr/share/man/man1/gdbmtool.1.gz
index fd51d7acc..2b76838f9 100644
Binary files a/msys2/usr/share/man/man1/gdbmtool.1.gz and b/msys2/usr/share/man/man1/gdbmtool.1.gz differ
diff --git a/msys2/usr/share/man/man1/gendsa.1ssl.gz b/msys2/usr/share/man/man1/gendsa.1ssl.gz
index 0304952d1..d9a0f1933 100644
Binary files a/msys2/usr/share/man/man1/gendsa.1ssl.gz and b/msys2/usr/share/man/man1/gendsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/genpkey.1ssl.gz b/msys2/usr/share/man/man1/genpkey.1ssl.gz
index 393c0d2ea..7fee2f0c7 100644
Binary files a/msys2/usr/share/man/man1/genpkey.1ssl.gz and b/msys2/usr/share/man/man1/genpkey.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/genrsa.1ssl.gz b/msys2/usr/share/man/man1/genrsa.1ssl.gz
index 0fd7d4b03..bb81d632f 100644
Binary files a/msys2/usr/share/man/man1/genrsa.1ssl.gz and b/msys2/usr/share/man/man1/genrsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/getopts.1.gz b/msys2/usr/share/man/man1/getopts.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/getopts.1.gz and b/msys2/usr/share/man/man1/getopts.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg-agent.1.gz b/msys2/usr/share/man/man1/gpg-agent.1.gz
index 846425fc7..3a6a2e829 100644
Binary files a/msys2/usr/share/man/man1/gpg-agent.1.gz and b/msys2/usr/share/man/man1/gpg-agent.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg-connect-agent.1.gz b/msys2/usr/share/man/man1/gpg-connect-agent.1.gz
index 5377fef79..485ee63dc 100644
Binary files a/msys2/usr/share/man/man1/gpg-connect-agent.1.gz and b/msys2/usr/share/man/man1/gpg-connect-agent.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg-preset-passphrase.1.gz b/msys2/usr/share/man/man1/gpg-preset-passphrase.1.gz
index 470704acd..0fd4d197f 100644
Binary files a/msys2/usr/share/man/man1/gpg-preset-passphrase.1.gz and b/msys2/usr/share/man/man1/gpg-preset-passphrase.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg-wks-client.1.gz b/msys2/usr/share/man/man1/gpg-wks-client.1.gz
index 598e92a8f..09b2dc53f 100644
Binary files a/msys2/usr/share/man/man1/gpg-wks-client.1.gz and b/msys2/usr/share/man/man1/gpg-wks-client.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg-wks-server.1.gz b/msys2/usr/share/man/man1/gpg-wks-server.1.gz
index d23072bfc..b0bb6997e 100644
Binary files a/msys2/usr/share/man/man1/gpg-wks-server.1.gz and b/msys2/usr/share/man/man1/gpg-wks-server.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpg.1.gz b/msys2/usr/share/man/man1/gpg.1.gz
index 5f3a56e71..098eae36c 100644
Binary files a/msys2/usr/share/man/man1/gpg.1.gz and b/msys2/usr/share/man/man1/gpg.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpgconf.1.gz b/msys2/usr/share/man/man1/gpgconf.1.gz
index 48bbc9fb0..c9006c690 100644
Binary files a/msys2/usr/share/man/man1/gpgconf.1.gz and b/msys2/usr/share/man/man1/gpgconf.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpgparsemail.1.gz b/msys2/usr/share/man/man1/gpgparsemail.1.gz
index 7866c006c..055a2bc11 100644
Binary files a/msys2/usr/share/man/man1/gpgparsemail.1.gz and b/msys2/usr/share/man/man1/gpgparsemail.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpgsm.1.gz b/msys2/usr/share/man/man1/gpgsm.1.gz
index 79f28e913..4c7fb32e2 100644
Binary files a/msys2/usr/share/man/man1/gpgsm.1.gz and b/msys2/usr/share/man/man1/gpgsm.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpgtar.1.gz b/msys2/usr/share/man/man1/gpgtar.1.gz
index 300f258ab..32a8b7a0a 100644
Binary files a/msys2/usr/share/man/man1/gpgtar.1.gz and b/msys2/usr/share/man/man1/gpgtar.1.gz differ
diff --git a/msys2/usr/share/man/man1/gpgv.1.gz b/msys2/usr/share/man/man1/gpgv.1.gz
index e19b3816e..dea813d60 100644
Binary files a/msys2/usr/share/man/man1/gpgv.1.gz and b/msys2/usr/share/man/man1/gpgv.1.gz differ
diff --git a/msys2/usr/share/man/man1/hash.1.gz b/msys2/usr/share/man/man1/hash.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/hash.1.gz and b/msys2/usr/share/man/man1/hash.1.gz differ
diff --git a/msys2/usr/share/man/man1/help.1.gz b/msys2/usr/share/man/man1/help.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/help.1.gz and b/msys2/usr/share/man/man1/help.1.gz differ
diff --git a/msys2/usr/share/man/man1/history.1.gz b/msys2/usr/share/man/man1/history.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/history.1.gz and b/msys2/usr/share/man/man1/history.1.gz differ
diff --git a/msys2/usr/share/man/man1/if.1.gz b/msys2/usr/share/man/man1/if.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/if.1.gz and b/msys2/usr/share/man/man1/if.1.gz differ
diff --git a/msys2/usr/share/man/man1/in.1.gz b/msys2/usr/share/man/man1/in.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/in.1.gz and b/msys2/usr/share/man/man1/in.1.gz differ
diff --git a/msys2/usr/share/man/man1/info.1.gz b/msys2/usr/share/man/man1/info.1.gz
index bc710826d..922315f34 100644
Binary files a/msys2/usr/share/man/man1/info.1.gz and b/msys2/usr/share/man/man1/info.1.gz differ
diff --git a/msys2/usr/share/man/man1/install-info.1.gz b/msys2/usr/share/man/man1/install-info.1.gz
index c1cde5918..c05a7fe18 100644
Binary files a/msys2/usr/share/man/man1/install-info.1.gz and b/msys2/usr/share/man/man1/install-info.1.gz differ
diff --git a/msys2/usr/share/man/man1/jobs.1.gz b/msys2/usr/share/man/man1/jobs.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/jobs.1.gz and b/msys2/usr/share/man/man1/jobs.1.gz differ
diff --git a/msys2/usr/share/man/man1/less.1.gz b/msys2/usr/share/man/man1/less.1.gz
index db9699fb3..0ed372e49 100644
Binary files a/msys2/usr/share/man/man1/less.1.gz and b/msys2/usr/share/man/man1/less.1.gz differ
diff --git a/msys2/usr/share/man/man1/lessecho.1.gz b/msys2/usr/share/man/man1/lessecho.1.gz
index 364499b17..63c9022c7 100644
Binary files a/msys2/usr/share/man/man1/lessecho.1.gz and b/msys2/usr/share/man/man1/lessecho.1.gz differ
diff --git a/msys2/usr/share/man/man1/lesskey.1.gz b/msys2/usr/share/man/man1/lesskey.1.gz
index d4c02fd6b..dff918467 100644
Binary files a/msys2/usr/share/man/man1/lesskey.1.gz and b/msys2/usr/share/man/man1/lesskey.1.gz differ
diff --git a/msys2/usr/share/man/man1/let.1.gz b/msys2/usr/share/man/man1/let.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/let.1.gz and b/msys2/usr/share/man/man1/let.1.gz differ
diff --git a/msys2/usr/share/man/man1/list.1ssl.gz b/msys2/usr/share/man/man1/list.1ssl.gz
index 75d5e4146..17b7d00a6 100644
Binary files a/msys2/usr/share/man/man1/list.1ssl.gz and b/msys2/usr/share/man/man1/list.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/local.1.gz b/msys2/usr/share/man/man1/local.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/local.1.gz and b/msys2/usr/share/man/man1/local.1.gz differ
diff --git a/msys2/usr/share/man/man1/logout.1.gz b/msys2/usr/share/man/man1/logout.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/logout.1.gz and b/msys2/usr/share/man/man1/logout.1.gz differ
diff --git a/msys2/usr/share/man/man1/makepkg-template.1.gz b/msys2/usr/share/man/man1/makepkg-template.1.gz
index 45d7d916a..a9ee122fe 100644
Binary files a/msys2/usr/share/man/man1/makepkg-template.1.gz and b/msys2/usr/share/man/man1/makepkg-template.1.gz differ
diff --git a/msys2/usr/share/man/man1/mintty.1.gz b/msys2/usr/share/man/man1/mintty.1.gz
index 377e1f40c..e1bfd3113 100644
Binary files a/msys2/usr/share/man/man1/mintty.1.gz and b/msys2/usr/share/man/man1/mintty.1.gz differ
diff --git a/msys2/usr/share/man/man1/nano.1.gz b/msys2/usr/share/man/man1/nano.1.gz
new file mode 100644
index 000000000..b9267bddf
Binary files /dev/null and b/msys2/usr/share/man/man1/nano.1.gz differ
diff --git a/msys2/usr/share/man/man1/nseq.1ssl.gz b/msys2/usr/share/man/man1/nseq.1ssl.gz
index bc9bf8407..59aca28dd 100644
Binary files a/msys2/usr/share/man/man1/nseq.1ssl.gz and b/msys2/usr/share/man/man1/nseq.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/ocsp.1ssl.gz b/msys2/usr/share/man/man1/ocsp.1ssl.gz
index bda3d7d2d..bd3578730 100644
Binary files a/msys2/usr/share/man/man1/ocsp.1ssl.gz and b/msys2/usr/share/man/man1/ocsp.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-asn1parse.1ssl.gz b/msys2/usr/share/man/man1/openssl-asn1parse.1ssl.gz
index f6d08d8b0..6a10b248d 100644
Binary files a/msys2/usr/share/man/man1/openssl-asn1parse.1ssl.gz and b/msys2/usr/share/man/man1/openssl-asn1parse.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-c_rehash.1ssl.gz b/msys2/usr/share/man/man1/openssl-c_rehash.1ssl.gz
index a287ba618..90b176287 100644
Binary files a/msys2/usr/share/man/man1/openssl-c_rehash.1ssl.gz and b/msys2/usr/share/man/man1/openssl-c_rehash.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ca.1ssl.gz b/msys2/usr/share/man/man1/openssl-ca.1ssl.gz
index 9599686ad..1c8b7f0e4 100644
Binary files a/msys2/usr/share/man/man1/openssl-ca.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ca.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ciphers.1ssl.gz b/msys2/usr/share/man/man1/openssl-ciphers.1ssl.gz
index 8ac14e322..619c630fd 100644
Binary files a/msys2/usr/share/man/man1/openssl-ciphers.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ciphers.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-cms.1ssl.gz b/msys2/usr/share/man/man1/openssl-cms.1ssl.gz
index c1ed4884f..179a85cda 100644
Binary files a/msys2/usr/share/man/man1/openssl-cms.1ssl.gz and b/msys2/usr/share/man/man1/openssl-cms.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-crl.1ssl.gz b/msys2/usr/share/man/man1/openssl-crl.1ssl.gz
index 79022e529..6f2213675 100644
Binary files a/msys2/usr/share/man/man1/openssl-crl.1ssl.gz and b/msys2/usr/share/man/man1/openssl-crl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-crl2pkcs7.1ssl.gz b/msys2/usr/share/man/man1/openssl-crl2pkcs7.1ssl.gz
index d19932c19..20ef4f8bf 100644
Binary files a/msys2/usr/share/man/man1/openssl-crl2pkcs7.1ssl.gz and b/msys2/usr/share/man/man1/openssl-crl2pkcs7.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-dgst.1ssl.gz b/msys2/usr/share/man/man1/openssl-dgst.1ssl.gz
index e53ea520e..8d19ec7d4 100644
Binary files a/msys2/usr/share/man/man1/openssl-dgst.1ssl.gz and b/msys2/usr/share/man/man1/openssl-dgst.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-dhparam.1ssl.gz b/msys2/usr/share/man/man1/openssl-dhparam.1ssl.gz
index 09be4d461..230199a01 100644
Binary files a/msys2/usr/share/man/man1/openssl-dhparam.1ssl.gz and b/msys2/usr/share/man/man1/openssl-dhparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-dsa.1ssl.gz b/msys2/usr/share/man/man1/openssl-dsa.1ssl.gz
index 71a3fd64a..b913302b5 100644
Binary files a/msys2/usr/share/man/man1/openssl-dsa.1ssl.gz and b/msys2/usr/share/man/man1/openssl-dsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-dsaparam.1ssl.gz b/msys2/usr/share/man/man1/openssl-dsaparam.1ssl.gz
index 51131de7a..63653b75a 100644
Binary files a/msys2/usr/share/man/man1/openssl-dsaparam.1ssl.gz and b/msys2/usr/share/man/man1/openssl-dsaparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ec.1ssl.gz b/msys2/usr/share/man/man1/openssl-ec.1ssl.gz
index c8056ec78..99acd1ba1 100644
Binary files a/msys2/usr/share/man/man1/openssl-ec.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ec.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ecparam.1ssl.gz b/msys2/usr/share/man/man1/openssl-ecparam.1ssl.gz
index 9b17082e8..9553fbd50 100644
Binary files a/msys2/usr/share/man/man1/openssl-ecparam.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ecparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-enc.1ssl.gz b/msys2/usr/share/man/man1/openssl-enc.1ssl.gz
index 26b0a77d2..204151a67 100644
Binary files a/msys2/usr/share/man/man1/openssl-enc.1ssl.gz and b/msys2/usr/share/man/man1/openssl-enc.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-engine.1ssl.gz b/msys2/usr/share/man/man1/openssl-engine.1ssl.gz
index 49ffbdae6..60d0001d5 100644
Binary files a/msys2/usr/share/man/man1/openssl-engine.1ssl.gz and b/msys2/usr/share/man/man1/openssl-engine.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-errstr.1ssl.gz b/msys2/usr/share/man/man1/openssl-errstr.1ssl.gz
index c08157a87..51e182397 100644
Binary files a/msys2/usr/share/man/man1/openssl-errstr.1ssl.gz and b/msys2/usr/share/man/man1/openssl-errstr.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-gendsa.1ssl.gz b/msys2/usr/share/man/man1/openssl-gendsa.1ssl.gz
index 0304952d1..d9a0f1933 100644
Binary files a/msys2/usr/share/man/man1/openssl-gendsa.1ssl.gz and b/msys2/usr/share/man/man1/openssl-gendsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-genpkey.1ssl.gz b/msys2/usr/share/man/man1/openssl-genpkey.1ssl.gz
index 393c0d2ea..7fee2f0c7 100644
Binary files a/msys2/usr/share/man/man1/openssl-genpkey.1ssl.gz and b/msys2/usr/share/man/man1/openssl-genpkey.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-genrsa.1ssl.gz b/msys2/usr/share/man/man1/openssl-genrsa.1ssl.gz
index 0fd7d4b03..bb81d632f 100644
Binary files a/msys2/usr/share/man/man1/openssl-genrsa.1ssl.gz and b/msys2/usr/share/man/man1/openssl-genrsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-list.1ssl.gz b/msys2/usr/share/man/man1/openssl-list.1ssl.gz
index 75d5e4146..17b7d00a6 100644
Binary files a/msys2/usr/share/man/man1/openssl-list.1ssl.gz and b/msys2/usr/share/man/man1/openssl-list.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-nseq.1ssl.gz b/msys2/usr/share/man/man1/openssl-nseq.1ssl.gz
index bc9bf8407..59aca28dd 100644
Binary files a/msys2/usr/share/man/man1/openssl-nseq.1ssl.gz and b/msys2/usr/share/man/man1/openssl-nseq.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ocsp.1ssl.gz b/msys2/usr/share/man/man1/openssl-ocsp.1ssl.gz
index bda3d7d2d..bd3578730 100644
Binary files a/msys2/usr/share/man/man1/openssl-ocsp.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ocsp.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-passwd.1ssl.gz b/msys2/usr/share/man/man1/openssl-passwd.1ssl.gz
index c50b23a95..5981c88a5 100644
Binary files a/msys2/usr/share/man/man1/openssl-passwd.1ssl.gz and b/msys2/usr/share/man/man1/openssl-passwd.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkcs12.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkcs12.1ssl.gz
index ab0f938c6..0a1855fb1 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkcs12.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkcs12.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkcs7.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkcs7.1ssl.gz
index 2f92ddd9d..32326c594 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkcs7.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkcs7.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkcs8.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkcs8.1ssl.gz
index 9d3bd89cf..d33d370a1 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkcs8.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkcs8.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkey.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkey.1ssl.gz
index 0c39fe00e..85eefb026 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkey.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkey.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkeyparam.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkeyparam.1ssl.gz
index 3be5a56bb..f9b424062 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkeyparam.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkeyparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-pkeyutl.1ssl.gz b/msys2/usr/share/man/man1/openssl-pkeyutl.1ssl.gz
index 4ce0713ab..72440bb07 100644
Binary files a/msys2/usr/share/man/man1/openssl-pkeyutl.1ssl.gz and b/msys2/usr/share/man/man1/openssl-pkeyutl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-prime.1ssl.gz b/msys2/usr/share/man/man1/openssl-prime.1ssl.gz
index 1c0a54d3e..78ef9b1ef 100644
Binary files a/msys2/usr/share/man/man1/openssl-prime.1ssl.gz and b/msys2/usr/share/man/man1/openssl-prime.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-rand.1ssl.gz b/msys2/usr/share/man/man1/openssl-rand.1ssl.gz
index ef4d9508f..21c25d6a4 100644
Binary files a/msys2/usr/share/man/man1/openssl-rand.1ssl.gz and b/msys2/usr/share/man/man1/openssl-rand.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-rehash.1ssl.gz b/msys2/usr/share/man/man1/openssl-rehash.1ssl.gz
index a287ba618..90b176287 100644
Binary files a/msys2/usr/share/man/man1/openssl-rehash.1ssl.gz and b/msys2/usr/share/man/man1/openssl-rehash.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-req.1ssl.gz b/msys2/usr/share/man/man1/openssl-req.1ssl.gz
index 268ff3827..d5cc81448 100644
Binary files a/msys2/usr/share/man/man1/openssl-req.1ssl.gz and b/msys2/usr/share/man/man1/openssl-req.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-rsa.1ssl.gz b/msys2/usr/share/man/man1/openssl-rsa.1ssl.gz
index 781497076..7d1e60415 100644
Binary files a/msys2/usr/share/man/man1/openssl-rsa.1ssl.gz and b/msys2/usr/share/man/man1/openssl-rsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-rsautl.1ssl.gz b/msys2/usr/share/man/man1/openssl-rsautl.1ssl.gz
index 4a3330961..b4fee1448 100644
Binary files a/msys2/usr/share/man/man1/openssl-rsautl.1ssl.gz and b/msys2/usr/share/man/man1/openssl-rsautl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-s_client.1ssl.gz b/msys2/usr/share/man/man1/openssl-s_client.1ssl.gz
index b1f79200a..a89130527 100644
Binary files a/msys2/usr/share/man/man1/openssl-s_client.1ssl.gz and b/msys2/usr/share/man/man1/openssl-s_client.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-s_server.1ssl.gz b/msys2/usr/share/man/man1/openssl-s_server.1ssl.gz
index b7f23713f..cacdc670f 100644
Binary files a/msys2/usr/share/man/man1/openssl-s_server.1ssl.gz and b/msys2/usr/share/man/man1/openssl-s_server.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-s_time.1ssl.gz b/msys2/usr/share/man/man1/openssl-s_time.1ssl.gz
index 52a64a90a..e051029f3 100644
Binary files a/msys2/usr/share/man/man1/openssl-s_time.1ssl.gz and b/msys2/usr/share/man/man1/openssl-s_time.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-sess_id.1ssl.gz b/msys2/usr/share/man/man1/openssl-sess_id.1ssl.gz
index 2ca658d81..e5a836fa5 100644
Binary files a/msys2/usr/share/man/man1/openssl-sess_id.1ssl.gz and b/msys2/usr/share/man/man1/openssl-sess_id.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-smime.1ssl.gz b/msys2/usr/share/man/man1/openssl-smime.1ssl.gz
index 7361ea7f1..19ce1b001 100644
Binary files a/msys2/usr/share/man/man1/openssl-smime.1ssl.gz and b/msys2/usr/share/man/man1/openssl-smime.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-speed.1ssl.gz b/msys2/usr/share/man/man1/openssl-speed.1ssl.gz
index 4fc1eff6e..710f79375 100644
Binary files a/msys2/usr/share/man/man1/openssl-speed.1ssl.gz and b/msys2/usr/share/man/man1/openssl-speed.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-spkac.1ssl.gz b/msys2/usr/share/man/man1/openssl-spkac.1ssl.gz
index a7009f01e..35c7e2383 100644
Binary files a/msys2/usr/share/man/man1/openssl-spkac.1ssl.gz and b/msys2/usr/share/man/man1/openssl-spkac.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-srp.1ssl.gz b/msys2/usr/share/man/man1/openssl-srp.1ssl.gz
index be005b5ca..89d951ad8 100644
Binary files a/msys2/usr/share/man/man1/openssl-srp.1ssl.gz and b/msys2/usr/share/man/man1/openssl-srp.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-storeutl.1ssl.gz b/msys2/usr/share/man/man1/openssl-storeutl.1ssl.gz
index 629dbaf5c..d9374d247 100644
Binary files a/msys2/usr/share/man/man1/openssl-storeutl.1ssl.gz and b/msys2/usr/share/man/man1/openssl-storeutl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-ts.1ssl.gz b/msys2/usr/share/man/man1/openssl-ts.1ssl.gz
index e137a19c9..605fc30e0 100644
Binary files a/msys2/usr/share/man/man1/openssl-ts.1ssl.gz and b/msys2/usr/share/man/man1/openssl-ts.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-tsget.1ssl.gz b/msys2/usr/share/man/man1/openssl-tsget.1ssl.gz
index e806930fc..846f11fa0 100644
Binary files a/msys2/usr/share/man/man1/openssl-tsget.1ssl.gz and b/msys2/usr/share/man/man1/openssl-tsget.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-verify.1ssl.gz b/msys2/usr/share/man/man1/openssl-verify.1ssl.gz
index 389c43ef4..8d2ca7115 100644
Binary files a/msys2/usr/share/man/man1/openssl-verify.1ssl.gz and b/msys2/usr/share/man/man1/openssl-verify.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-version.1ssl.gz b/msys2/usr/share/man/man1/openssl-version.1ssl.gz
index 07ca63222..af6b60a75 100644
Binary files a/msys2/usr/share/man/man1/openssl-version.1ssl.gz and b/msys2/usr/share/man/man1/openssl-version.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl-x509.1ssl.gz b/msys2/usr/share/man/man1/openssl-x509.1ssl.gz
index acce95e8a..5c50cc4f9 100644
Binary files a/msys2/usr/share/man/man1/openssl-x509.1ssl.gz and b/msys2/usr/share/man/man1/openssl-x509.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/openssl.1ssl.gz b/msys2/usr/share/man/man1/openssl.1ssl.gz
index fc2b92474..3dc243c59 100644
Binary files a/msys2/usr/share/man/man1/openssl.1ssl.gz and b/msys2/usr/share/man/man1/openssl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/passwd.1ssl.gz b/msys2/usr/share/man/man1/passwd.1ssl.gz
index c50b23a95..5981c88a5 100644
Binary files a/msys2/usr/share/man/man1/passwd.1ssl.gz and b/msys2/usr/share/man/man1/passwd.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkcs12.1ssl.gz b/msys2/usr/share/man/man1/pkcs12.1ssl.gz
index ab0f938c6..0a1855fb1 100644
Binary files a/msys2/usr/share/man/man1/pkcs12.1ssl.gz and b/msys2/usr/share/man/man1/pkcs12.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkcs7.1ssl.gz b/msys2/usr/share/man/man1/pkcs7.1ssl.gz
index 2f92ddd9d..32326c594 100644
Binary files a/msys2/usr/share/man/man1/pkcs7.1ssl.gz and b/msys2/usr/share/man/man1/pkcs7.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkcs8.1ssl.gz b/msys2/usr/share/man/man1/pkcs8.1ssl.gz
index 9d3bd89cf..d33d370a1 100644
Binary files a/msys2/usr/share/man/man1/pkcs8.1ssl.gz and b/msys2/usr/share/man/man1/pkcs8.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkey.1ssl.gz b/msys2/usr/share/man/man1/pkey.1ssl.gz
index 0c39fe00e..85eefb026 100644
Binary files a/msys2/usr/share/man/man1/pkey.1ssl.gz and b/msys2/usr/share/man/man1/pkey.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkeyparam.1ssl.gz b/msys2/usr/share/man/man1/pkeyparam.1ssl.gz
index 3be5a56bb..f9b424062 100644
Binary files a/msys2/usr/share/man/man1/pkeyparam.1ssl.gz and b/msys2/usr/share/man/man1/pkeyparam.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pkeyutl.1ssl.gz b/msys2/usr/share/man/man1/pkeyutl.1ssl.gz
index 4ce0713ab..72440bb07 100644
Binary files a/msys2/usr/share/man/man1/pkeyutl.1ssl.gz and b/msys2/usr/share/man/man1/pkeyutl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/popd.1.gz b/msys2/usr/share/man/man1/popd.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/popd.1.gz and b/msys2/usr/share/man/man1/popd.1.gz differ
diff --git a/msys2/usr/share/man/man1/prime.1ssl.gz b/msys2/usr/share/man/man1/prime.1ssl.gz
index 1c0a54d3e..78ef9b1ef 100644
Binary files a/msys2/usr/share/man/man1/prime.1ssl.gz and b/msys2/usr/share/man/man1/prime.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/pushd.1.gz b/msys2/usr/share/man/man1/pushd.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/pushd.1.gz and b/msys2/usr/share/man/man1/pushd.1.gz differ
diff --git a/msys2/usr/share/man/man1/rand.1ssl.gz b/msys2/usr/share/man/man1/rand.1ssl.gz
index ef4d9508f..21c25d6a4 100644
Binary files a/msys2/usr/share/man/man1/rand.1ssl.gz and b/msys2/usr/share/man/man1/rand.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/read.1.gz b/msys2/usr/share/man/man1/read.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/read.1.gz and b/msys2/usr/share/man/man1/read.1.gz differ
diff --git a/msys2/usr/share/man/man1/readonly.1.gz b/msys2/usr/share/man/man1/readonly.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/readonly.1.gz and b/msys2/usr/share/man/man1/readonly.1.gz differ
diff --git a/msys2/usr/share/man/man1/rehash.1ssl.gz b/msys2/usr/share/man/man1/rehash.1ssl.gz
index a287ba618..90b176287 100644
Binary files a/msys2/usr/share/man/man1/rehash.1ssl.gz and b/msys2/usr/share/man/man1/rehash.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/req.1ssl.gz b/msys2/usr/share/man/man1/req.1ssl.gz
index 268ff3827..d5cc81448 100644
Binary files a/msys2/usr/share/man/man1/req.1ssl.gz and b/msys2/usr/share/man/man1/req.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/return.1.gz b/msys2/usr/share/man/man1/return.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/return.1.gz and b/msys2/usr/share/man/man1/return.1.gz differ
diff --git a/msys2/usr/share/man/man1/rnano.1.gz b/msys2/usr/share/man/man1/rnano.1.gz
new file mode 100644
index 000000000..0aa7acd6f
Binary files /dev/null and b/msys2/usr/share/man/man1/rnano.1.gz differ
diff --git a/msys2/usr/share/man/man1/rsa.1ssl.gz b/msys2/usr/share/man/man1/rsa.1ssl.gz
index 781497076..7d1e60415 100644
Binary files a/msys2/usr/share/man/man1/rsa.1ssl.gz and b/msys2/usr/share/man/man1/rsa.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/rsautl.1ssl.gz b/msys2/usr/share/man/man1/rsautl.1ssl.gz
index 4a3330961..b4fee1448 100644
Binary files a/msys2/usr/share/man/man1/rsautl.1ssl.gz and b/msys2/usr/share/man/man1/rsautl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/s_client.1ssl.gz b/msys2/usr/share/man/man1/s_client.1ssl.gz
index b1f79200a..a89130527 100644
Binary files a/msys2/usr/share/man/man1/s_client.1ssl.gz and b/msys2/usr/share/man/man1/s_client.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/s_server.1ssl.gz b/msys2/usr/share/man/man1/s_server.1ssl.gz
index b7f23713f..cacdc670f 100644
Binary files a/msys2/usr/share/man/man1/s_server.1ssl.gz and b/msys2/usr/share/man/man1/s_server.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/s_time.1ssl.gz b/msys2/usr/share/man/man1/s_time.1ssl.gz
index 52a64a90a..e051029f3 100644
Binary files a/msys2/usr/share/man/man1/s_time.1ssl.gz and b/msys2/usr/share/man/man1/s_time.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/scdaemon.1.gz b/msys2/usr/share/man/man1/scdaemon.1.gz
index 55b30d510..c47c32b9f 100644
Binary files a/msys2/usr/share/man/man1/scdaemon.1.gz and b/msys2/usr/share/man/man1/scdaemon.1.gz differ
diff --git a/msys2/usr/share/man/man1/select.1.gz b/msys2/usr/share/man/man1/select.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/select.1.gz and b/msys2/usr/share/man/man1/select.1.gz differ
diff --git a/msys2/usr/share/man/man1/sess_id.1ssl.gz b/msys2/usr/share/man/man1/sess_id.1ssl.gz
index 2ca658d81..e5a836fa5 100644
Binary files a/msys2/usr/share/man/man1/sess_id.1ssl.gz and b/msys2/usr/share/man/man1/sess_id.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/set.1.gz b/msys2/usr/share/man/man1/set.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/set.1.gz and b/msys2/usr/share/man/man1/set.1.gz differ
diff --git a/msys2/usr/share/man/man1/shift.1.gz b/msys2/usr/share/man/man1/shift.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/shift.1.gz and b/msys2/usr/share/man/man1/shift.1.gz differ
diff --git a/msys2/usr/share/man/man1/shopt.1.gz b/msys2/usr/share/man/man1/shopt.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/shopt.1.gz and b/msys2/usr/share/man/man1/shopt.1.gz differ
diff --git a/msys2/usr/share/man/man1/smime.1ssl.gz b/msys2/usr/share/man/man1/smime.1ssl.gz
index 7361ea7f1..19ce1b001 100644
Binary files a/msys2/usr/share/man/man1/smime.1ssl.gz and b/msys2/usr/share/man/man1/smime.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/source.1.gz b/msys2/usr/share/man/man1/source.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/source.1.gz and b/msys2/usr/share/man/man1/source.1.gz differ
diff --git a/msys2/usr/share/man/man1/speed.1ssl.gz b/msys2/usr/share/man/man1/speed.1ssl.gz
index 4fc1eff6e..710f79375 100644
Binary files a/msys2/usr/share/man/man1/speed.1ssl.gz and b/msys2/usr/share/man/man1/speed.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/spkac.1ssl.gz b/msys2/usr/share/man/man1/spkac.1ssl.gz
index a7009f01e..35c7e2383 100644
Binary files a/msys2/usr/share/man/man1/spkac.1ssl.gz and b/msys2/usr/share/man/man1/spkac.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/srp.1ssl.gz b/msys2/usr/share/man/man1/srp.1ssl.gz
index be005b5ca..89d951ad8 100644
Binary files a/msys2/usr/share/man/man1/srp.1ssl.gz and b/msys2/usr/share/man/man1/srp.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/storeutl.1ssl.gz b/msys2/usr/share/man/man1/storeutl.1ssl.gz
index 629dbaf5c..d9374d247 100644
Binary files a/msys2/usr/share/man/man1/storeutl.1ssl.gz and b/msys2/usr/share/man/man1/storeutl.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/suspend.1.gz b/msys2/usr/share/man/man1/suspend.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/suspend.1.gz and b/msys2/usr/share/man/man1/suspend.1.gz differ
diff --git a/msys2/usr/share/man/man1/symcryptrun.1.gz b/msys2/usr/share/man/man1/symcryptrun.1.gz
index 0f6ec8466..3f6568dd9 100644
Binary files a/msys2/usr/share/man/man1/symcryptrun.1.gz and b/msys2/usr/share/man/man1/symcryptrun.1.gz differ
diff --git a/msys2/usr/share/man/man1/then.1.gz b/msys2/usr/share/man/man1/then.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/then.1.gz and b/msys2/usr/share/man/man1/then.1.gz differ
diff --git a/msys2/usr/share/man/man1/time.1.gz b/msys2/usr/share/man/man1/time.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/time.1.gz and b/msys2/usr/share/man/man1/time.1.gz differ
diff --git a/msys2/usr/share/man/man1/times.1.gz b/msys2/usr/share/man/man1/times.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/times.1.gz and b/msys2/usr/share/man/man1/times.1.gz differ
diff --git a/msys2/usr/share/man/man1/trap.1.gz b/msys2/usr/share/man/man1/trap.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/trap.1.gz and b/msys2/usr/share/man/man1/trap.1.gz differ
diff --git a/msys2/usr/share/man/man1/trust.1.gz b/msys2/usr/share/man/man1/trust.1.gz
new file mode 100644
index 000000000..8944d380a
Binary files /dev/null and b/msys2/usr/share/man/man1/trust.1.gz differ
diff --git a/msys2/usr/share/man/man1/ts.1ssl.gz b/msys2/usr/share/man/man1/ts.1ssl.gz
index e137a19c9..605fc30e0 100644
Binary files a/msys2/usr/share/man/man1/ts.1ssl.gz and b/msys2/usr/share/man/man1/ts.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/tsget.1ssl.gz b/msys2/usr/share/man/man1/tsget.1ssl.gz
index e806930fc..846f11fa0 100644
Binary files a/msys2/usr/share/man/man1/tsget.1ssl.gz and b/msys2/usr/share/man/man1/tsget.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/type.1.gz b/msys2/usr/share/man/man1/type.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/type.1.gz and b/msys2/usr/share/man/man1/type.1.gz differ
diff --git a/msys2/usr/share/man/man1/typeset.1.gz b/msys2/usr/share/man/man1/typeset.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/typeset.1.gz and b/msys2/usr/share/man/man1/typeset.1.gz differ
diff --git a/msys2/usr/share/man/man1/ulimit.1.gz b/msys2/usr/share/man/man1/ulimit.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/ulimit.1.gz and b/msys2/usr/share/man/man1/ulimit.1.gz differ
diff --git a/msys2/usr/share/man/man1/umask.1.gz b/msys2/usr/share/man/man1/umask.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/umask.1.gz and b/msys2/usr/share/man/man1/umask.1.gz differ
diff --git a/msys2/usr/share/man/man1/unalias.1.gz b/msys2/usr/share/man/man1/unalias.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/unalias.1.gz and b/msys2/usr/share/man/man1/unalias.1.gz differ
diff --git a/msys2/usr/share/man/man1/unset.1.gz b/msys2/usr/share/man/man1/unset.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/unset.1.gz and b/msys2/usr/share/man/man1/unset.1.gz differ
diff --git a/msys2/usr/share/man/man1/until.1.gz b/msys2/usr/share/man/man1/until.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/until.1.gz and b/msys2/usr/share/man/man1/until.1.gz differ
diff --git a/msys2/usr/share/man/man1/unzstd.1.gz b/msys2/usr/share/man/man1/unzstd.1.gz
index ee94796e7..c377cc179 100644
Binary files a/msys2/usr/share/man/man1/unzstd.1.gz and b/msys2/usr/share/man/man1/unzstd.1.gz differ
diff --git a/msys2/usr/share/man/man1/verify.1ssl.gz b/msys2/usr/share/man/man1/verify.1ssl.gz
index 389c43ef4..8d2ca7115 100644
Binary files a/msys2/usr/share/man/man1/verify.1ssl.gz and b/msys2/usr/share/man/man1/verify.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/version.1ssl.gz b/msys2/usr/share/man/man1/version.1ssl.gz
index 07ca63222..af6b60a75 100644
Binary files a/msys2/usr/share/man/man1/version.1ssl.gz and b/msys2/usr/share/man/man1/version.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/wait.1.gz b/msys2/usr/share/man/man1/wait.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/wait.1.gz and b/msys2/usr/share/man/man1/wait.1.gz differ
diff --git a/msys2/usr/share/man/man1/watchgnupg.1.gz b/msys2/usr/share/man/man1/watchgnupg.1.gz
index a13a57325..852e0573e 100644
Binary files a/msys2/usr/share/man/man1/watchgnupg.1.gz and b/msys2/usr/share/man/man1/watchgnupg.1.gz differ
diff --git a/msys2/usr/share/man/man1/wget.1.gz b/msys2/usr/share/man/man1/wget.1.gz
index 3eca5c54e..93cb46f73 100644
Binary files a/msys2/usr/share/man/man1/wget.1.gz and b/msys2/usr/share/man/man1/wget.1.gz differ
diff --git a/msys2/usr/share/man/man1/while.1.gz b/msys2/usr/share/man/man1/while.1.gz
index d8aadb85a..e8ca09f80 100644
Binary files a/msys2/usr/share/man/man1/while.1.gz and b/msys2/usr/share/man/man1/while.1.gz differ
diff --git a/msys2/usr/share/man/man1/x509.1ssl.gz b/msys2/usr/share/man/man1/x509.1ssl.gz
index acce95e8a..5c50cc4f9 100644
Binary files a/msys2/usr/share/man/man1/x509.1ssl.gz and b/msys2/usr/share/man/man1/x509.1ssl.gz differ
diff --git a/msys2/usr/share/man/man1/zstd.1.gz b/msys2/usr/share/man/man1/zstd.1.gz
index ee94796e7..c377cc179 100644
Binary files a/msys2/usr/share/man/man1/zstd.1.gz and b/msys2/usr/share/man/man1/zstd.1.gz differ
diff --git a/msys2/usr/share/man/man1/zstdcat.1.gz b/msys2/usr/share/man/man1/zstdcat.1.gz
index ee94796e7..c377cc179 100644
Binary files a/msys2/usr/share/man/man1/zstdcat.1.gz and b/msys2/usr/share/man/man1/zstdcat.1.gz differ
diff --git a/msys2/usr/share/man/man1/zstdgrep.1.gz b/msys2/usr/share/man/man1/zstdgrep.1.gz
index 9b9a5fef2..e2a51638b 100644
Binary files a/msys2/usr/share/man/man1/zstdgrep.1.gz and b/msys2/usr/share/man/man1/zstdgrep.1.gz differ
diff --git a/msys2/usr/share/man/man1/zstdless.1.gz b/msys2/usr/share/man/man1/zstdless.1.gz
index 0c94f92ca..096a9525f 100644
Binary files a/msys2/usr/share/man/man1/zstdless.1.gz and b/msys2/usr/share/man/man1/zstdless.1.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz b/msys2/usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz
index 465298be5..d5d94408f 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz and b/msys2/usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz
index a2b9eef03..7e224d364 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3.gz
index 668070adc..6eb5ce076 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CERTINFO.3.gz b/msys2/usr/share/man/man3/CURLINFO_CERTINFO.3.gz
index b5ab9d2c0..17a59cbc7 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CERTINFO.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CERTINFO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONDITION_UNMET.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONDITION_UNMET.3.gz
index 94290063a..be8416669 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONDITION_UNMET.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONDITION_UNMET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME.3.gz
index fd12014f7..f75c972de 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3.gz
index 1d82d3991..2900d7191 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz
index 76fd30dc8..b7c8ac4e7 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3.gz
index 191269b62..caa3d77dd 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz
index 80905f756..bc1fa8839 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3.gz
index 99af68042..6b3e8c188 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz b/msys2/usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz
index bd53a16ea..f1a6d4ce3 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_COOKIELIST.3.gz b/msys2/usr/share/man/man3/CURLINFO_COOKIELIST.3.gz
index 067ac1523..a38d318cc 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_COOKIELIST.3.gz and b/msys2/usr/share/man/man3/CURLINFO_COOKIELIST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3.gz b/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3.gz
new file mode 100644
index 000000000..8b705efa4
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz b/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz
index c47c1df1c..5c6754614 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz and b/msys2/usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_FILETIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_FILETIME.3.gz
index eb209cf90..1134a8a91 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_FILETIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_FILETIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_FILETIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_FILETIME_T.3.gz
index f58bdbdf6..eb394703b 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_FILETIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_FILETIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz b/msys2/usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz
index d4881e86b..a27ce8f01 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz and b/msys2/usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_HEADER_SIZE.3.gz b/msys2/usr/share/man/man3/CURLINFO_HEADER_SIZE.3.gz
index 36ab7c358..eaa0d0e66 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_HEADER_SIZE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_HEADER_SIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz b/msys2/usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz
index 4d8fb5e58..56fe2c4e7 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz and b/msys2/usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz b/msys2/usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz
index 28c38f031..677178c95 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_HTTP_VERSION.3.gz b/msys2/usr/share/man/man3/CURLINFO_HTTP_VERSION.3.gz
index 0341862a0..045c08787 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_HTTP_VERSION.3.gz and b/msys2/usr/share/man/man3/CURLINFO_HTTP_VERSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_LASTSOCKET.3.gz b/msys2/usr/share/man/man3/CURLINFO_LASTSOCKET.3.gz
index a519460bf..3c1086002 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_LASTSOCKET.3.gz and b/msys2/usr/share/man/man3/CURLINFO_LASTSOCKET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_LOCAL_IP.3.gz b/msys2/usr/share/man/man3/CURLINFO_LOCAL_IP.3.gz
index 8dd60100a..1df8a9ce9 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_LOCAL_IP.3.gz and b/msys2/usr/share/man/man3/CURLINFO_LOCAL_IP.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_LOCAL_PORT.3.gz b/msys2/usr/share/man/man3/CURLINFO_LOCAL_PORT.3.gz
index a74289849..222050406 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_LOCAL_PORT.3.gz and b/msys2/usr/share/man/man3/CURLINFO_LOCAL_PORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz
index dde9ae8ec..4e8808ce8 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3.gz
index 9c3ef7f05..985bdc175 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_NUM_CONNECTS.3.gz b/msys2/usr/share/man/man3/CURLINFO_NUM_CONNECTS.3.gz
index 48c906db5..42530bdfc 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_NUM_CONNECTS.3.gz and b/msys2/usr/share/man/man3/CURLINFO_NUM_CONNECTS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_OS_ERRNO.3.gz b/msys2/usr/share/man/man3/CURLINFO_OS_ERRNO.3.gz
index 9b1281fe5..aa9a4c470 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_OS_ERRNO.3.gz and b/msys2/usr/share/man/man3/CURLINFO_OS_ERRNO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3.gz
index d8bf1b10b..14b6c2b40 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3.gz
index 0ad6509d6..c5fcdab3e 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz b/msys2/usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz
index 429c62040..60253b787 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz b/msys2/usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz
index a6d1580f7..ff74781a9 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PRIVATE.3.gz b/msys2/usr/share/man/man3/CURLINFO_PRIVATE.3.gz
index 42c22d1cd..0307b6c33 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PRIVATE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PRIVATE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PROTOCOL.3.gz b/msys2/usr/share/man/man3/CURLINFO_PROTOCOL.3.gz
index 44eda16b6..e7eddd637 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PROTOCOL.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PROTOCOL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz b/msys2/usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
index edb53c3a9..e9a885a1a 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PROXY_ERROR.3.gz b/msys2/usr/share/man/man3/CURLINFO_PROXY_ERROR.3.gz
new file mode 100644
index 000000000..3c0ff42e8
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLINFO_PROXY_ERROR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz b/msys2/usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz
index 58b0d8ca9..5999bc208 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz and b/msys2/usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz
index dc0541e89..f46c0f6f8 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz and b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME.3.gz
index 43fff8972..13cb98401 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3.gz
index 291c954cf..2da61d086 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_URL.3.gz b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_URL.3.gz
index 1589f3b5f..ac0e1d220 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_REDIRECT_URL.3.gz and b/msys2/usr/share/man/man3/CURLINFO_REDIRECT_URL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_REQUEST_SIZE.3.gz b/msys2/usr/share/man/man3/CURLINFO_REQUEST_SIZE.3.gz
index fa55c142d..d76bf3318 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_REQUEST_SIZE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_REQUEST_SIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RESPONSE_CODE.3.gz b/msys2/usr/share/man/man3/CURLINFO_RESPONSE_CODE.3.gz
index 50cedb103..ddc26b6dc 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RESPONSE_CODE.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RESPONSE_CODE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RETRY_AFTER.3.gz b/msys2/usr/share/man/man3/CURLINFO_RETRY_AFTER.3.gz
index 88875c17e..a18688323 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RETRY_AFTER.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RETRY_AFTER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz b/msys2/usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz
index 36da6bf46..3f1098caa 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz b/msys2/usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz
index 49c22b81a..e91826e8f 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz b/msys2/usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz
index b2a20c869..b3187ab45 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3.gz b/msys2/usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3.gz
index 103944c86..94535074c 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3.gz and b/msys2/usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SCHEME.3.gz b/msys2/usr/share/man/man3/CURLINFO_SCHEME.3.gz
index f5947621a..10e442219 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SCHEME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SCHEME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz
index 1ba41b6ce..1ef7d0d76 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3.gz
index 23eecf4d6..cf19b0ed2 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3.gz
index 6edc99d97..ecf774769 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3.gz
index 4643f47af..0569d0e22 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz
index f6c5d0bd4..2b74b7cf1 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3.gz
index e658d4f6e..5b8208b37 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3.gz b/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3.gz
index 2254606ef..618509dbe 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3.gz
index 6ef519c2c..8470e2b33 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SSL_ENGINES.3.gz b/msys2/usr/share/man/man3/CURLINFO_SSL_ENGINES.3.gz
index 1948e4b25..e3dfc28b3 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SSL_ENGINES.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SSL_ENGINES.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz b/msys2/usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz
index 3d755222c..b95789864 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz and b/msys2/usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz
index aeca8d6c3..b76990d16 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3.gz
index 338d04fdd..517f32a34 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_TLS_SESSION.3.gz b/msys2/usr/share/man/man3/CURLINFO_TLS_SESSION.3.gz
index 6be400d8f..e80e9fbe9 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_TLS_SESSION.3.gz and b/msys2/usr/share/man/man3/CURLINFO_TLS_SESSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3.gz b/msys2/usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3.gz
index 4e1fecb75..40e3e44b9 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3.gz and b/msys2/usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz b/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz
index b7a2ed74c..7bf95e662 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz and b/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz b/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz
index 8af1d2ee4..30cd856cf 100644
Binary files a/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz and b/msys2/usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz b/msys2/usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz
index 7e6a89563..903695581 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz b/msys2/usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz
index 5cef255a5..652019403 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_MAXCONNECTS.3.gz b/msys2/usr/share/man/man3/CURLMOPT_MAXCONNECTS.3.gz
index e79d07f5c..cd406510b 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_MAXCONNECTS.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_MAXCONNECTS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3.gz b/msys2/usr/share/man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3.gz
index 51540fd13..c62b113e5 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz b/msys2/usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz
index 51eaec82e..c19556af4 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz b/msys2/usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz
index 5745346c4..b47971c72 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz b/msys2/usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz
index e4433b6ed..076f71206 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING.3.gz b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING.3.gz
index 45b7a0eb8..20cbb7a06 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz
index 6ebec7ea4..0abc312a6 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz
index 48ec9d1e3..361395cbf 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_PUSHDATA.3.gz b/msys2/usr/share/man/man3/CURLMOPT_PUSHDATA.3.gz
index ce7aca165..5be6023b3 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_PUSHDATA.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_PUSHDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3.gz
index 2cc3420ce..dd1963150 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_SOCKETDATA.3.gz b/msys2/usr/share/man/man3/CURLMOPT_SOCKETDATA.3.gz
index 7315382e8..0d7a01cc6 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_SOCKETDATA.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_SOCKETDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3.gz
index 3a9d0fa8d..48268ea8d 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_TIMERDATA.3.gz b/msys2/usr/share/man/man3/CURLMOPT_TIMERDATA.3.gz
index aff77a7c4..c6f813b20 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_TIMERDATA.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_TIMERDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3.gz
index 07cf3b77b..cb7890448 100644
Binary files a/msys2/usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz b/msys2/usr/share/man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz
index 5265943c1..0be3fdad7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz
index f37e75f8e..38a7f1081 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3.gz b/msys2/usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3.gz
index 579a35e37..310029ac9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3.gz
index eccc5f50c..fc091713d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ALTSVC.3.gz b/msys2/usr/share/man/man3/CURLOPT_ALTSVC.3.gz
index 362289c0f..9ff45398a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ALTSVC.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ALTSVC.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3.gz b/msys2/usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3.gz
index 5138bc159..1b798f104 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ALTSVC_CTRL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_APPEND.3.gz b/msys2/usr/share/man/man3/CURLOPT_APPEND.3.gz
index 0dcdd28a7..cad6275a8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_APPEND.3.gz and b/msys2/usr/share/man/man3/CURLOPT_APPEND.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_AUTOREFERER.3.gz b/msys2/usr/share/man/man3/CURLOPT_AUTOREFERER.3.gz
index 9b2eeae4b..2da6280ce 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_AUTOREFERER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_AUTOREFERER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_BUFFERSIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_BUFFERSIZE.3.gz
index c6308a544..c197989d0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_BUFFERSIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_BUFFERSIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CAINFO.3.gz b/msys2/usr/share/man/man3/CURLOPT_CAINFO.3.gz
index ee91bd6d9..7775c18eb 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CAINFO.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CAINFO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CAPATH.3.gz b/msys2/usr/share/man/man3/CURLOPT_CAPATH.3.gz
index f52fb8c10..55f800957 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CAPATH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CAPATH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CERTINFO.3.gz b/msys2/usr/share/man/man3/CURLOPT_CERTINFO.3.gz
index b3382c7c3..539125b54 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CERTINFO.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CERTINFO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz
index b5e712e14..ac579b6c6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CHUNK_DATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_CHUNK_DATA.3.gz
index 1f1d4f5a0..092057bb8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CHUNK_DATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CHUNK_DATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3.gz
index ddb94d16c..965aab695 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3.gz
index d95fd1bee..97d2ff1cc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3.gz
index 91d58d024..9d29c8ef0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3.gz
index 5265569d7..7e4fcb8b0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz
index a1f3151a0..7f63a297a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONNECT_ONLY.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONNECT_ONLY.3.gz
index 8a1ae3fc4..5296115b4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONNECT_ONLY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONNECT_ONLY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONNECT_TO.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONNECT_TO.3.gz
index c18ffe341..38e832cf4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONNECT_TO.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONNECT_TO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz
index 23c4071eb..4d39c8b24 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz
index 9cc265740..1a40a107a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz
index e76e81b22..d57f563e1 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COOKIE.3.gz b/msys2/usr/share/man/man3/CURLOPT_COOKIE.3.gz
index d4c83e32d..f8d36bcb1 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COOKIE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COOKIE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COOKIEFILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_COOKIEFILE.3.gz
index 37f8bfe7f..8c89ce150 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COOKIEFILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COOKIEFILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COOKIEJAR.3.gz b/msys2/usr/share/man/man3/CURLOPT_COOKIEJAR.3.gz
index 668f6e98b..7fd0b5bcc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COOKIEJAR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COOKIEJAR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COOKIELIST.3.gz b/msys2/usr/share/man/man3/CURLOPT_COOKIELIST.3.gz
index b2de3f79a..1ef25dab0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COOKIELIST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COOKIELIST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COOKIESESSION.3.gz b/msys2/usr/share/man/man3/CURLOPT_COOKIESESSION.3.gz
index dd1dd074f..664d11b96 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COOKIESESSION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COOKIESESSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3.gz b/msys2/usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3.gz
index 2c3aa5475..3a763e191 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CRLF.3.gz b/msys2/usr/share/man/man3/CURLOPT_CRLF.3.gz
index f59fd67bf..79edd0dfa 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CRLF.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CRLF.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CRLFILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_CRLFILE.3.gz
index 72223e866..c12b8faae 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CRLFILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CRLFILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CURLU.3.gz b/msys2/usr/share/man/man3/CURLOPT_CURLU.3.gz
index 5f749a7df..0576f3622 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CURLU.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CURLU.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3.gz b/msys2/usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3.gz
index 4039c851a..f1687cc2f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DEBUGDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_DEBUGDATA.3.gz
index 1a50efd43..0cb7fe8c8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DEBUGDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DEBUGDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3.gz
index 0880a886e..5d5bfb643 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz b/msys2/usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz
index 646da00c9..769c195c7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DIRLISTONLY.3.gz b/msys2/usr/share/man/man3/CURLOPT_DIRLISTONLY.3.gz
index ec7aec71f..aeeb6dadc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DIRLISTONLY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DIRLISTONLY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3.gz b/msys2/usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3.gz
index dfb79c735..74c970d6d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz
index 286740774..0bce4fd2a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_INTERFACE.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_INTERFACE.3.gz
index 66e8fa821..8321e6758 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_INTERFACE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_INTERFACE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz
index 3fb2a57ab..2846cc1af 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz
index 9cf72eff6..5c04d611c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_SERVERS.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_SERVERS.3.gz
index 31352e0f0..59ef5eca7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_SERVERS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_SERVERS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz
index 55968550c..f6ab9fc4a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz b/msys2/usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz
index d12c4445e..b17c22a7c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_DOH_URL.3.gz b/msys2/usr/share/man/man3/CURLOPT_DOH_URL.3.gz
index 1eaa5752f..72f665da9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_DOH_URL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_DOH_URL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_EGDSOCKET.3.gz b/msys2/usr/share/man/man3/CURLOPT_EGDSOCKET.3.gz
index dd73af4c2..9f5470386 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_EGDSOCKET.3.gz and b/msys2/usr/share/man/man3/CURLOPT_EGDSOCKET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ERRORBUFFER.3.gz b/msys2/usr/share/man/man3/CURLOPT_ERRORBUFFER.3.gz
index 0b76d2971..d9046cd56 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ERRORBUFFER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ERRORBUFFER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz
index 8c08391e6..ac1ca13bf 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FAILONERROR.3.gz b/msys2/usr/share/man/man3/CURLOPT_FAILONERROR.3.gz
index 34961ef4c..6ae38b8d3 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FAILONERROR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FAILONERROR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FILETIME.3.gz b/msys2/usr/share/man/man3/CURLOPT_FILETIME.3.gz
index df54db00b..f4895c13c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FILETIME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FILETIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FNMATCH_DATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_FNMATCH_DATA.3.gz
index 5ffbc5f96..8d8e5af41 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FNMATCH_DATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FNMATCH_DATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3.gz
index 199d7ab7b..9d9a8c215 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3.gz b/msys2/usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3.gz
index ea30f7063..eda58d4e5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FORBID_REUSE.3.gz b/msys2/usr/share/man/man3/CURLOPT_FORBID_REUSE.3.gz
index 298772892..7dfa382eb 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FORBID_REUSE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FORBID_REUSE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FRESH_CONNECT.3.gz b/msys2/usr/share/man/man3/CURLOPT_FRESH_CONNECT.3.gz
index 4e37784fb..eff1fd324 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FRESH_CONNECT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FRESH_CONNECT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTPPORT.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTPPORT.3.gz
index e5de3e644..718d4cf33 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTPPORT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTPPORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTPSSLAUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTPSSLAUTH.3.gz
index 7dbac9692..be0beadad 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTPSSLAUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTPSSLAUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3.gz
index a87b206ed..85d33ac3d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3.gz
index 51b04bdee..26538c9e9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3.gz
index ffa1149b6..c2ae8a957 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3.gz
index 1acf845b0..8209947e7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3.gz
index 343a6edf3..a6dfe3e57 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3.gz
index 0904871c6..b85542250 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3.gz
index 7fa5c4c8c..7a68c408d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3.gz
index 209e5a695..668cec85a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3.gz
index 12d79e235..2029e7e44 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_PRET.3.gz b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_PRET.3.gz
index 9e88d4754..d95041cdf 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_FTP_USE_PRET.3.gz and b/msys2/usr/share/man/man3/CURLOPT_FTP_USE_PRET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz b/msys2/usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz
index f6d537731..5627da97a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz
index 253401841..f78d59e84 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz b/msys2/usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz
index db0088f62..85149abcc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HEADER.3.gz b/msys2/usr/share/man/man3/CURLOPT_HEADER.3.gz
index 8adc7ab6a..2f0754a91 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HEADER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HEADER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HEADERDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_HEADERDATA.3.gz
index c416e301a..328e2c6e3 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HEADERDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HEADERDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz
index 80e27d844..b33f79556 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HEADEROPT.3.gz b/msys2/usr/share/man/man3/CURLOPT_HEADEROPT.3.gz
index 6e7bc0225..a03b3e8e0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HEADEROPT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HEADEROPT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTS.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTS.3.gz
new file mode 100644
index 000000000..3fe760c5f
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTSREADDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTSREADDATA.3.gz
new file mode 100644
index 000000000..6fbf0ad6b
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTSREADDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3.gz
new file mode 100644
index 000000000..7d3295497
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3.gz
new file mode 100644
index 000000000..1fd2a5883
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3.gz
new file mode 100644
index 000000000..dd22aae2f
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HSTS_CTRL.3.gz b/msys2/usr/share/man/man3/CURLOPT_HSTS_CTRL.3.gz
new file mode 100644
index 000000000..fa064d3bf
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_HSTS_CTRL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3.gz
index 7ecb33871..88bb95919 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTP200ALIASES.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTP200ALIASES.3.gz
index 78e062502..5f4497503 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTP200ALIASES.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTP200ALIASES.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTPAUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTPAUTH.3.gz
index 659336d53..08ce88250 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTPAUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTPAUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTPGET.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTPGET.3.gz
index 65cc3bd9a..bfcada7c4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTPGET.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTPGET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTPHEADER.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTPHEADER.3.gz
index d39cbf997..1205ae222 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTPHEADER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTPHEADER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTPPOST.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTPPOST.3.gz
index 9709f431a..419ce9455 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTPPOST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTPPOST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz
index 1b32ce44b..119b3de57 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz
index f2898c309..7eb231849 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz
index 602485a04..4258ccae2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_HTTP_VERSION.3.gz b/msys2/usr/share/man/man3/CURLOPT_HTTP_VERSION.3.gz
index 532c6aa70..2e01c4cbc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_HTTP_VERSION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_HTTP_VERSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3.gz
index 709190ac3..e4fc6d17f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_INFILESIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_INFILESIZE.3.gz
index d70fd4b53..cd8a3cc19 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_INFILESIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_INFILESIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3.gz
index 004a29d6a..230014060 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_INTERFACE.3.gz b/msys2/usr/share/man/man3/CURLOPT_INTERFACE.3.gz
index df528a492..a2ea69733 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_INTERFACE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_INTERFACE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3.gz
index 588238851..8ca19987b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3.gz
index 0a7920f66..72aa1a505 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_IOCTLDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_IOCTLDATA.3.gz
index 560d96afb..6c192193e 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_IOCTLDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_IOCTLDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3.gz
index 569828829..ed1c0d87b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_IPRESOLVE.3.gz b/msys2/usr/share/man/man3/CURLOPT_IPRESOLVE.3.gz
index 947d1fa5f..64fae1f53 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_IPRESOLVE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_IPRESOLVE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT.3.gz b/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT.3.gz
index 68cd9fd84..cf1c6093d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT_BLOB.3.gz
index eb6f8c051..6fa1aca3c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_ISSUERCERT_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz b/msys2/usr/share/man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz
index f7b3450ee..11af2d0cc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_KEYPASSWD.3.gz b/msys2/usr/share/man/man3/CURLOPT_KEYPASSWD.3.gz
index b51000f81..f8acc819a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_KEYPASSWD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_KEYPASSWD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_KRBLEVEL.3.gz b/msys2/usr/share/man/man3/CURLOPT_KRBLEVEL.3.gz
index 92f4a8884..1f398ca52 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_KRBLEVEL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_KRBLEVEL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_LOCALPORT.3.gz b/msys2/usr/share/man/man3/CURLOPT_LOCALPORT.3.gz
index bd6ec222b..769ae217e 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_LOCALPORT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_LOCALPORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3.gz
index 0930347ad..f029f03fa 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3.gz b/msys2/usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3.gz
index dc4e6dee5..c5260e51a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3.gz b/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3.gz
index 41dfeca1d..417ea3c37 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3.gz b/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3.gz
index 54d655071..d49441d1d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAIL_AUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAIL_AUTH.3.gz
index bcca2768d..312310769 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAIL_AUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAIL_AUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAIL_FROM.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAIL_FROM.3.gz
index 586ec1753..a9be438d5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAIL_FROM.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAIL_FROM.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT.3.gz
index 4d4c9d4ef..ed404a852 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3.gz
index 465e12871..7d02e7a87 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAXAGE_CONN.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAXAGE_CONN.3.gz
index fc1b59612..295fcd18a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAXAGE_CONN.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAXAGE_CONN.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAXCONNECTS.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAXCONNECTS.3.gz
index ad221d70c..6d0cc25f5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAXCONNECTS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAXCONNECTS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE.3.gz
index ac08e31ce..017d5a11b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz
index 2fb00b6f6..f2d36e441 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAXREDIRS.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAXREDIRS.3.gz
index 25eba3b68..709282d22 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAXREDIRS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAXREDIRS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3.gz
index 9596272a7..bf8b78a40 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3.gz
index ddbe3a3f4..8d9531016 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_MIMEPOST.3.gz b/msys2/usr/share/man/man3/CURLOPT_MIMEPOST.3.gz
index 33d120dd9..d51ff5df4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_MIMEPOST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_MIMEPOST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NETRC.3.gz b/msys2/usr/share/man/man3/CURLOPT_NETRC.3.gz
index f206d8531..e58dc0551 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NETRC.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NETRC.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NETRC_FILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_NETRC_FILE.3.gz
index 7c8bb97c6..3199c3ddd 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NETRC_FILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NETRC_FILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3.gz b/msys2/usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3.gz
index 363e28de7..cf665c845 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3.gz b/msys2/usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3.gz
index 4d46f0a68..cd3338972 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NOBODY.3.gz b/msys2/usr/share/man/man3/CURLOPT_NOBODY.3.gz
index fb2301297..2309eb4fa 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NOBODY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NOBODY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NOPROGRESS.3.gz b/msys2/usr/share/man/man3/CURLOPT_NOPROGRESS.3.gz
index 790a0c6ac..216b7c5b2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NOPROGRESS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NOPROGRESS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NOPROXY.3.gz b/msys2/usr/share/man/man3/CURLOPT_NOPROXY.3.gz
index 6c848eff9..45fb38bbd 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NOPROXY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NOPROXY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_NOSIGNAL.3.gz b/msys2/usr/share/man/man3/CURLOPT_NOSIGNAL.3.gz
index b3e4d001b..4eba5d6e7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_NOSIGNAL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_NOSIGNAL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3.gz
index e7b32b691..2b1691aa1 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz
index 8773c1ffb..6ded1acb7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PASSWORD.3.gz b/msys2/usr/share/man/man3/CURLOPT_PASSWORD.3.gz
index 790ed08f5..5ce2aade9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PASSWORD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PASSWORD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PATH_AS_IS.3.gz b/msys2/usr/share/man/man3/CURLOPT_PATH_AS_IS.3.gz
index be5585f2d..709b08716 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PATH_AS_IS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PATH_AS_IS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz b/msys2/usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz
index b55828482..c19f5d46e 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PIPEWAIT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PIPEWAIT.3.gz
index 25dbfb7e2..df860c585 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PIPEWAIT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PIPEWAIT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PORT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PORT.3.gz
index 955e72504..c8684c011 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PORT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POST.3.gz b/msys2/usr/share/man/man3/CURLOPT_POST.3.gz
index 36dfd698d..0c815b1c0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDS.3.gz b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDS.3.gz
index cd2234640..5f8c73202 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3.gz
index 233a00af2..869033efa 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3.gz
index fc0b954af..06bb584c3 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POSTQUOTE.3.gz b/msys2/usr/share/man/man3/CURLOPT_POSTQUOTE.3.gz
index 01b48cab8..35844aa8a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POSTQUOTE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POSTQUOTE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_POSTREDIR.3.gz b/msys2/usr/share/man/man3/CURLOPT_POSTREDIR.3.gz
index 6dfdfcd20..d506113b0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_POSTREDIR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_POSTREDIR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PREQUOTE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PREQUOTE.3.gz
index 8ace955c7..a185fbd42 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PREQUOTE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PREQUOTE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PRE_PROXY.3.gz b/msys2/usr/share/man/man3/CURLOPT_PRE_PROXY.3.gz
index 2c9af7a75..5ca6e2788 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PRE_PROXY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PRE_PROXY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PRIVATE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PRIVATE.3.gz
index 22782f81d..4ffd52251 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PRIVATE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PRIVATE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROGRESSDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROGRESSDATA.3.gz
index dac414070..2de885b26 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROGRESSDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROGRESSDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3.gz
index f464b75ee..736262b43 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROTOCOLS.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROTOCOLS.3.gz
index 77ce7303d..e099d51e9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROTOCOLS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROTOCOLS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY.3.gz
index 31e1eafb5..f72008c7c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYAUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYAUTH.3.gz
index 7ca05689f..f9766e701 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYAUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYAUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYHEADER.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYHEADER.3.gz
index e5060e624..f3614b205 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYHEADER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYHEADER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYPASSWORD.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYPASSWORD.3.gz
index eec2b0b66..9078dcb98 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYPASSWORD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYPASSWORD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYPORT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYPORT.3.gz
index e749ebc89..9f1b05fb6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYPORT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYPORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYTYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYTYPE.3.gz
index 1eec18b00..2971e4bd8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYTYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYTYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYUSERNAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYUSERNAME.3.gz
index 796525f9b..2d91d367a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYUSERNAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYUSERNAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXYUSERPWD.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXYUSERPWD.3.gz
index 61e82e0a4..3c564c3ac 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXYUSERPWD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXYUSERPWD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_CAINFO.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_CAINFO.3.gz
index cb33f86d3..3b50f6d6a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_CAINFO.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_CAINFO.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_CAPATH.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_CAPATH.3.gz
index 20ae7f6dc..1dfe2af82 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_CAPATH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_CAPATH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_CRLFILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_CRLFILE.3.gz
index 3505769b2..fde65bffb 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_CRLFILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_CRLFILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT.3.gz
index 7030b14aa..abebcec07 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT_BLOB.3.gz
index 13b29aee9..dd3cc8a40 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_ISSUERCERT_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz
index 8f758d34f..96b3def34 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz
index ca7d9ffef..8293b616b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz
index 1fc3629c5..f0c10659a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT.3.gz
index 076b3a321..82eac8c2f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz
index 52417de40..6b5320442 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT_BLOB.3.gz
index fc977924d..0070f1418 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLCERT_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY.3.gz
index ccf6e522e..b707b8878 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz
index 4e93b24f9..b61cd26cd 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY_BLOB.3.gz
index f2ffd75c1..d23b6a0e2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLKEY_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLVERSION.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLVERSION.3.gz
index 0f39ce48a..fd44f7faf 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLVERSION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSLVERSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz
index 7030f7161..ccc3ae647 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz
index 2604a0c92..399b28d83 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz
index 8653e9d78..688dcb4f2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz
index 99eb47af7..ceb891b06 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3.gz
index 3beaa903d..e38e7a5ca 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz
index 802a3b577..da1b64438 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz
index 2be84ffeb..d81cb11f4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz
index 4de3dd25f..0dfcc25ce 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz b/msys2/usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz
index fa96313e0..bc8fe94ef 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_PUT.3.gz b/msys2/usr/share/man/man3/CURLOPT_PUT.3.gz
index b0fcfec2f..7afbc3cc6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_PUT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_PUT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_QUOTE.3.gz b/msys2/usr/share/man/man3/CURLOPT_QUOTE.3.gz
index 893d644e6..fd38d14d4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_QUOTE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_QUOTE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RANDOM_FILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_RANDOM_FILE.3.gz
index 44246dc6e..8b76677c6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RANDOM_FILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RANDOM_FILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RANGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_RANGE.3.gz
index 557a98b96..094dd4d92 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RANGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RANGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_READDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_READDATA.3.gz
index 4ad47e6d0..9a6403628 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_READDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_READDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_READFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_READFUNCTION.3.gz
index 4d30e19dd..d9e8e151f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_READFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_READFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3.gz b/msys2/usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3.gz
index 34beb2bdf..d1951c600 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_REFERER.3.gz b/msys2/usr/share/man/man3/CURLOPT_REFERER.3.gz
index 95028a133..2ba35c796 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_REFERER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_REFERER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_REQUEST_TARGET.3.gz b/msys2/usr/share/man/man3/CURLOPT_REQUEST_TARGET.3.gz
index 94fa50dc7..81ed416a1 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_REQUEST_TARGET.3.gz and b/msys2/usr/share/man/man3/CURLOPT_REQUEST_TARGET.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RESOLVE.3.gz b/msys2/usr/share/man/man3/CURLOPT_RESOLVE.3.gz
index b782c4c77..eb2ebebde 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RESOLVE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RESOLVE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3.gz
index 3c37defe8..eea9a8d5a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3.gz
index 2bd197bff..33fdd0df5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM.3.gz b/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM.3.gz
index 8eb83774a..b1e83b07c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3.gz
index 8c82d1f5a..8ddc67671 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3.gz
index 31aa11bdc..c89e0b986 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_REQUEST.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_REQUEST.3.gz
index ec81bf8f7..4c43b9787 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_REQUEST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_REQUEST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz
index 14baa49d8..b3fdb39e0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3.gz
index d3cbfc091..2cb26574a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3.gz
index 64de78c61..911b7a30b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3.gz b/msys2/usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3.gz
index a7ddae812..0e0172e5d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SASL_AUTHZID.3.gz b/msys2/usr/share/man/man3/CURLOPT_SASL_AUTHZID.3.gz
index 5453f2fd1..4440b3f4f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SASL_AUTHZID.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SASL_AUTHZID.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SASL_IR.3.gz b/msys2/usr/share/man/man3/CURLOPT_SASL_IR.3.gz
index a2cac9770..e0878b368 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SASL_IR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SASL_IR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SEEKDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_SEEKDATA.3.gz
index 19c1ecbc4..72e2e9832 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SEEKDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SEEKDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SEEKFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SEEKFUNCTION.3.gz
index 0efad63ee..cfb5ace56 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SEEKFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SEEKFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SERVICE_NAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_SERVICE_NAME.3.gz
index 944f471ad..8c2a7aa00 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SERVICE_NAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SERVICE_NAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SHARE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SHARE.3.gz
index c2becdc96..c355cad87 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SHARE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SHARE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SOCKOPTDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_SOCKOPTDATA.3.gz
index 021018de8..bc4afd941 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SOCKOPTDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SOCKOPTDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz
index deaf7124a..ead6bf841 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3.gz
index e9a5be9ad..5876daa95 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3.gz b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3.gz
index 9a0962633..738ce5a17 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3.gz
index 177187e89..65b3ba8ec 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3.gz
index ab56a5015..9fb168c19 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3.gz
index 8113d44c4..b81b49728 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3.gz
index 591345868..3fa0a4292 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_KEYDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_KEYDATA.3.gz
index 85bd355d0..b0d9cb7a0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_KEYDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_KEYDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3.gz
index a1b94b2bc..dbdb10da6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3.gz
index 417558a34..e18735654 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3.gz
index 6446a1981..d8306b7a3 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz
index 757b215e0..405d04e64 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLCERT.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLCERT.3.gz
index 5d3e79a64..3adc1952a 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLCERT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLCERT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLCERTTYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLCERTTYPE.3.gz
index 971ef7746..ab6ad53ea 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLCERTTYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLCERTTYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLCERT_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLCERT_BLOB.3.gz
index 94b85940d..f55d6e5ed 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLCERT_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLCERT_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLENGINE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLENGINE.3.gz
index cc251f34a..dc7ff95a2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLENGINE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLENGINE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3.gz
index 6c471e36c..d0eb6a851 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLKEY.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLKEY.3.gz
index 94238c16f..24b988fc0 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLKEY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLKEY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLKEYTYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLKEYTYPE.3.gz
index 609242f29..7c89f2406 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLKEYTYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLKEYTYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLKEY_BLOB.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLKEY_BLOB.3.gz
index 0652ac6fc..fe1748278 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLKEY_BLOB.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLKEY_BLOB.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSLVERSION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSLVERSION.3.gz
index c71a05bbf..eaf8325d5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSLVERSION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSLVERSION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz
index 20048e855..c59932c69 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3.gz
index df85cbcc1..5996664ab 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz
index 1ed3a3d44..54ab334f6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3.gz
new file mode 100644
index 000000000..4c244358f
Binary files /dev/null and b/msys2/usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz
index 83b1dbad0..63549a3b6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz
index 17a67ae4b..35e0e2049 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_FALSESTART.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_FALSESTART.3.gz
index 4bfd924a9..257f1d1fc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_FALSESTART.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_FALSESTART.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_OPTIONS.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_OPTIONS.3.gz
index ed14b58bf..ab5cbc91c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_OPTIONS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_OPTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz
index 1137f9c4a..072540fa9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3.gz
index 53a2bc3ba..d268d8ac5 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3.gz
index 666d2f8c9..366a5dd4b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3.gz b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3.gz
index ca49c2f1a..4516b1937 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_STDERR.3.gz b/msys2/usr/share/man/man3/CURLOPT_STDERR.3.gz
index b6ae9faa3..844d72b95 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_STDERR.3.gz and b/msys2/usr/share/man/man3/CURLOPT_STDERR.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3.gz b/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3.gz
index 27c3e285a..10e12310c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz b/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz
index ac44db2d1..f72be9e64 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz and b/msys2/usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz b/msys2/usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz
index 2c7dac0b4..8892bc2a4 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz b/msys2/usr/share/man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz
index 1e5712319..f3f7094d9 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz b/msys2/usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz
index 40f266fed..88d4a4d75 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz
index 06fc5233b..6f7c45a1e 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz
index 37414d90c..11fee5e17 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz
index cf267ecf2..096e9fff3 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TCP_NODELAY.3.gz b/msys2/usr/share/man/man3/CURLOPT_TCP_NODELAY.3.gz
index bb194d8f7..877449f3d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TCP_NODELAY.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TCP_NODELAY.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TELNETOPTIONS.3.gz b/msys2/usr/share/man/man3/CURLOPT_TELNETOPTIONS.3.gz
index 7921edf2e..ec8b565a8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TELNETOPTIONS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TELNETOPTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3.gz
index 2b94bf301..f7de8c3cd 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3.gz b/msys2/usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3.gz
index 5392e977f..223f24678 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TIMECONDITION.3.gz b/msys2/usr/share/man/man3/CURLOPT_TIMECONDITION.3.gz
index c2acc665f..069c7d4e2 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TIMECONDITION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TIMECONDITION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TIMEOUT.3.gz b/msys2/usr/share/man/man3/CURLOPT_TIMEOUT.3.gz
index ec284e83b..e6869f9bc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TIMEOUT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TIMEOUT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TIMEOUT_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_TIMEOUT_MS.3.gz
index 7030c0fa9..ec2a11bea 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TIMEOUT_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TIMEOUT_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE.3.gz
index 1199f6a99..f042a62ee 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3.gz
index 20a18a52e..2c3428b0b 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3.gz b/msys2/usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3.gz
index 58e83381e..dcf2dbb1d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz
index b068276d9..a5107c50f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3.gz b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3.gz
index 463076ad2..db5108cb6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz
index 5e4def0c3..6faaacded 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TRAILERDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_TRAILERDATA.3.gz
index cbf1c3d09..c9da9a75f 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TRAILERDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TRAILERDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3.gz
index 7dc33264c..30bf643cc 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TRANSFERTEXT.3.gz b/msys2/usr/share/man/man3/CURLOPT_TRANSFERTEXT.3.gz
index 68560ad4b..10e8e50aa 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TRANSFERTEXT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TRANSFERTEXT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3.gz b/msys2/usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3.gz
index e3aa20f43..d5488ab05 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3.gz and b/msys2/usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz b/msys2/usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz
index 17d8bc680..5c2e918a7 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz b/msys2/usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz
index a24bc0587..b8302d26d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3.gz b/msys2/usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3.gz
index 3b8c16c62..27615bca8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3.gz and b/msys2/usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_UPLOAD.3.gz b/msys2/usr/share/man/man3/CURLOPT_UPLOAD.3.gz
index a4bb8ccea..fdfb4cec8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_UPLOAD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_UPLOAD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3.gz b/msys2/usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3.gz
index 43fd2cb27..96d96e101 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_URL.3.gz b/msys2/usr/share/man/man3/CURLOPT_URL.3.gz
index 587892384..bd6992003 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_URL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_URL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_USERAGENT.3.gz b/msys2/usr/share/man/man3/CURLOPT_USERAGENT.3.gz
index faa8c2aa9..f5a3683da 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_USERAGENT.3.gz and b/msys2/usr/share/man/man3/CURLOPT_USERAGENT.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_USERNAME.3.gz b/msys2/usr/share/man/man3/CURLOPT_USERNAME.3.gz
index a22015e69..b9240aad6 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_USERNAME.3.gz and b/msys2/usr/share/man/man3/CURLOPT_USERNAME.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_USERPWD.3.gz b/msys2/usr/share/man/man3/CURLOPT_USERPWD.3.gz
index a4b5c9573..61d860c81 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_USERPWD.3.gz and b/msys2/usr/share/man/man3/CURLOPT_USERPWD.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_USE_SSL.3.gz b/msys2/usr/share/man/man3/CURLOPT_USE_SSL.3.gz
index dc357104b..71480263d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_USE_SSL.3.gz and b/msys2/usr/share/man/man3/CURLOPT_USE_SSL.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_VERBOSE.3.gz b/msys2/usr/share/man/man3/CURLOPT_VERBOSE.3.gz
index 09565c51e..48beff8b1 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_VERBOSE.3.gz and b/msys2/usr/share/man/man3/CURLOPT_VERBOSE.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_WILDCARDMATCH.3.gz b/msys2/usr/share/man/man3/CURLOPT_WILDCARDMATCH.3.gz
index 206d75e50..21ab20f0c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_WILDCARDMATCH.3.gz and b/msys2/usr/share/man/man3/CURLOPT_WILDCARDMATCH.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_WRITEDATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_WRITEDATA.3.gz
index 98e062f90..ca461ec3d 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_WRITEDATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_WRITEDATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_WRITEFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_WRITEFUNCTION.3.gz
index 045c05d4b..48846c706 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_WRITEFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_WRITEFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_XFERINFODATA.3.gz b/msys2/usr/share/man/man3/CURLOPT_XFERINFODATA.3.gz
index 271831887..8b1689fb8 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_XFERINFODATA.3.gz and b/msys2/usr/share/man/man3/CURLOPT_XFERINFODATA.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3.gz b/msys2/usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3.gz
index e3cacc418..8678b3336 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3.gz and b/msys2/usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3.gz differ
diff --git a/msys2/usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3.gz b/msys2/usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3.gz
index 315d05308..705fac48c 100644
Binary files a/msys2/usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3.gz and b/msys2/usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_db_t.3.gz b/msys2/usr/share/man/man3/__alpm_db_t.3.gz
index 47006aa33..5ffd948be 100644
Binary files a/msys2/usr/share/man/man3/__alpm_db_t.3.gz and b/msys2/usr/share/man/man3/__alpm_db_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_graph_t.3.gz b/msys2/usr/share/man/man3/__alpm_graph_t.3.gz
index e4942470e..d29124fe4 100644
Binary files a/msys2/usr/share/man/man3/__alpm_graph_t.3.gz and b/msys2/usr/share/man/man3/__alpm_graph_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_handle_t.3.gz b/msys2/usr/share/man/man3/__alpm_handle_t.3.gz
index 600f3a5d6..1f9d6514e 100644
Binary files a/msys2/usr/share/man/man3/__alpm_handle_t.3.gz and b/msys2/usr/share/man/man3/__alpm_handle_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_list_t.3.gz b/msys2/usr/share/man/man3/__alpm_list_t.3.gz
index e539b39f3..3b3b4ee78 100644
Binary files a/msys2/usr/share/man/man3/__alpm_list_t.3.gz and b/msys2/usr/share/man/man3/__alpm_list_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_mountpoint_t.3.gz b/msys2/usr/share/man/man3/__alpm_mountpoint_t.3.gz
index 36395ab8f..033ab5b60 100644
Binary files a/msys2/usr/share/man/man3/__alpm_mountpoint_t.3.gz and b/msys2/usr/share/man/man3/__alpm_mountpoint_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_pkg_t.3.gz b/msys2/usr/share/man/man3/__alpm_pkg_t.3.gz
index f54b4eebb..c7ad03655 100644
Binary files a/msys2/usr/share/man/man3/__alpm_pkg_t.3.gz and b/msys2/usr/share/man/man3/__alpm_pkg_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_pkghash_t.3.gz b/msys2/usr/share/man/man3/__alpm_pkghash_t.3.gz
index 9bb4ace6a..28bb184ec 100644
Binary files a/msys2/usr/share/man/man3/__alpm_pkghash_t.3.gz and b/msys2/usr/share/man/man3/__alpm_pkghash_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/__alpm_trans_t.3.gz b/msys2/usr/share/man/man3/__alpm_trans_t.3.gz
index 0e3669745..73d66957b 100644
Binary files a/msys2/usr/share/man/man3/__alpm_trans_t.3.gz and b/msys2/usr/share/man/man3/__alpm_trans_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_backup_t.3.gz b/msys2/usr/share/man/man3/_alpm_backup_t.3.gz
index cbd9a2d87..1ee048a91 100644
Binary files a/msys2/usr/share/man/man3/_alpm_backup_t.3.gz and b/msys2/usr/share/man/man3/_alpm_backup_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_conflict_t.3.gz b/msys2/usr/share/man/man3/_alpm_conflict_t.3.gz
index 1428fccbe..ff4aa90dd 100644
Binary files a/msys2/usr/share/man/man3/_alpm_conflict_t.3.gz and b/msys2/usr/share/man/man3/_alpm_conflict_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_depend_t.3.gz b/msys2/usr/share/man/man3/_alpm_depend_t.3.gz
index 274bb0614..cd5df8313 100644
Binary files a/msys2/usr/share/man/man3/_alpm_depend_t.3.gz and b/msys2/usr/share/man/man3/_alpm_depend_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_depmissing_t.3.gz b/msys2/usr/share/man/man3/_alpm_depmissing_t.3.gz
index f03b3f1cf..7f6930392 100644
Binary files a/msys2/usr/share/man/man3/_alpm_depmissing_t.3.gz and b/msys2/usr/share/man/man3/_alpm_depmissing_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_any_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_any_t.3.gz
index 9b471ce58..35c33958c 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_any_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_any_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_database_missing_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_database_missing_t.3.gz
index ce6cde47a..a82911289 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_database_missing_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_database_missing_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_hook_run_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_hook_run_t.3.gz
index d252a4a47..924567f1c 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_hook_run_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_hook_run_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_hook_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_hook_t.3.gz
index ed709f423..dfd80862c 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_hook_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_hook_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_optdep_removal_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_optdep_removal_t.3.gz
index ea7163c24..9ba40f498 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_optdep_removal_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_optdep_removal_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_package_operation_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_package_operation_t.3.gz
index fd0768a16..2a06ffec1 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_package_operation_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_package_operation_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_pacnew_created_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_pacnew_created_t.3.gz
index 3ac11db41..0cdfcc1d1 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_pacnew_created_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_pacnew_created_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_pacsave_created_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_pacsave_created_t.3.gz
index d81a2ab8a..6e6868068 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_pacsave_created_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_pacsave_created_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_pkgdownload_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_pkgdownload_t.3.gz
index cc5ed92d8..33315b8ba 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_pkgdownload_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_pkgdownload_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_scriptlet_info_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_scriptlet_info_t.3.gz
index 4fe806e33..6b26d2871 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_scriptlet_info_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_scriptlet_info_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_event_t.3.gz b/msys2/usr/share/man/man3/_alpm_event_t.3.gz
index 788467ce9..c529cb328 100644
Binary files a/msys2/usr/share/man/man3/_alpm_event_t.3.gz and b/msys2/usr/share/man/man3/_alpm_event_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_file_t.3.gz b/msys2/usr/share/man/man3/_alpm_file_t.3.gz
index ab8c4e2fe..6cd423681 100644
Binary files a/msys2/usr/share/man/man3/_alpm_file_t.3.gz and b/msys2/usr/share/man/man3/_alpm_file_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_fileconflict_t.3.gz b/msys2/usr/share/man/man3/_alpm_fileconflict_t.3.gz
index 7a7ff10be..4433d72e4 100644
Binary files a/msys2/usr/share/man/man3/_alpm_fileconflict_t.3.gz and b/msys2/usr/share/man/man3/_alpm_fileconflict_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_filelist_t.3.gz b/msys2/usr/share/man/man3/_alpm_filelist_t.3.gz
index 82f9702f2..6f8a1a653 100644
Binary files a/msys2/usr/share/man/man3/_alpm_filelist_t.3.gz and b/msys2/usr/share/man/man3/_alpm_filelist_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_group_t.3.gz b/msys2/usr/share/man/man3/_alpm_group_t.3.gz
index c9d16b502..ecdd96789 100644
Binary files a/msys2/usr/share/man/man3/_alpm_group_t.3.gz and b/msys2/usr/share/man/man3/_alpm_group_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_hook_cb_ctx.3.gz b/msys2/usr/share/man/man3/_alpm_hook_cb_ctx.3.gz
index a084b2982..4d5f0e59d 100644
Binary files a/msys2/usr/share/man/man3/_alpm_hook_cb_ctx.3.gz and b/msys2/usr/share/man/man3/_alpm_hook_cb_ctx.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_hook_t.3.gz b/msys2/usr/share/man/man3/_alpm_hook_t.3.gz
index e1d0a371e..bec6100b4 100644
Binary files a/msys2/usr/share/man/man3/_alpm_hook_t.3.gz and b/msys2/usr/share/man/man3/_alpm_hook_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_pgpkey_t.3.gz b/msys2/usr/share/man/man3/_alpm_pgpkey_t.3.gz
index c323a4517..1d6a4cd33 100644
Binary files a/msys2/usr/share/man/man3/_alpm_pgpkey_t.3.gz and b/msys2/usr/share/man/man3/_alpm_pgpkey_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_any_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_any_t.3.gz
index 1ba8bf4e5..679b4936a 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_any_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_any_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_conflict_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_conflict_t.3.gz
index 36d7c9b18..cfbeadbc9 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_conflict_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_conflict_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_corrupted_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_corrupted_t.3.gz
index 7b3377c5b..b8609f1df 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_corrupted_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_corrupted_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_import_key_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_import_key_t.3.gz
index 047b2e736..4a50b0be1 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_import_key_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_import_key_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_install_ignorepkg_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_install_ignorepkg_t.3.gz
index 35b3bdd20..1c47681fb 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_install_ignorepkg_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_install_ignorepkg_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_remove_pkgs_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_remove_pkgs_t.3.gz
index 9f83ffc1e..e239e0f51 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_remove_pkgs_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_remove_pkgs_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_replace_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_replace_t.3.gz
index 3cf6184c7..45f469375 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_replace_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_replace_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_select_provider_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_select_provider_t.3.gz
index 055372094..ca342ccf2 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_select_provider_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_select_provider_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_question_t.3.gz b/msys2/usr/share/man/man3/_alpm_question_t.3.gz
index 47553db8b..d23924fcc 100644
Binary files a/msys2/usr/share/man/man3/_alpm_question_t.3.gz and b/msys2/usr/share/man/man3/_alpm_question_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_siglist_t.3.gz b/msys2/usr/share/man/man3/_alpm_siglist_t.3.gz
index 7e2f909dd..d2accca9f 100644
Binary files a/msys2/usr/share/man/man3/_alpm_siglist_t.3.gz and b/msys2/usr/share/man/man3/_alpm_siglist_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_sigresult_t.3.gz b/msys2/usr/share/man/man3/_alpm_sigresult_t.3.gz
index 40d407414..cd3596acd 100644
Binary files a/msys2/usr/share/man/man3/_alpm_sigresult_t.3.gz and b/msys2/usr/share/man/man3/_alpm_sigresult_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/_alpm_trigger_t.3.gz b/msys2/usr/share/man/man3/_alpm_trigger_t.3.gz
index 689b8063c..e6ea827d2 100644
Binary files a/msys2/usr/share/man/man3/_alpm_trigger_t.3.gz and b/msys2/usr/share/man/man3/_alpm_trigger_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api.3.gz b/msys2/usr/share/man/man3/alpm_api.3.gz
index 0ec4f6c14..a13fd6941 100644
Binary files a/msys2/usr/share/man/man3/alpm_api.3.gz and b/msys2/usr/share/man/man3/alpm_api.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_databases.3.gz b/msys2/usr/share/man/man3/alpm_api_databases.3.gz
index fb13b3bb5..66d37b0cb 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_databases.3.gz and b/msys2/usr/share/man/man3/alpm_api_databases.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_depends.3.gz b/msys2/usr/share/man/man3/alpm_api_depends.3.gz
index fc307224d..3c002ed8d 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_depends.3.gz and b/msys2/usr/share/man/man3/alpm_api_depends.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_errors.3.gz b/msys2/usr/share/man/man3/alpm_api_errors.3.gz
index 311524dbf..382d75cfd 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_errors.3.gz and b/msys2/usr/share/man/man3/alpm_api_errors.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_options.3.gz b/msys2/usr/share/man/man3/alpm_api_options.3.gz
index 93fbc576b..d89e6856f 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_options.3.gz and b/msys2/usr/share/man/man3/alpm_api_options.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_packages.3.gz b/msys2/usr/share/man/man3/alpm_api_packages.3.gz
index 32a57defb..38b8ebe04 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_packages.3.gz and b/msys2/usr/share/man/man3/alpm_api_packages.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_api_trans.3.gz b/msys2/usr/share/man/man3/alpm_api_trans.3.gz
index 04ea84074..d523b9bca 100644
Binary files a/msys2/usr/share/man/man3/alpm_api_trans.3.gz and b/msys2/usr/share/man/man3/alpm_api_trans.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_databases.3.gz b/msys2/usr/share/man/man3/alpm_databases.3.gz
index e10758af4..60e48eedc 100644
Binary files a/msys2/usr/share/man/man3/alpm_databases.3.gz and b/msys2/usr/share/man/man3/alpm_databases.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_interface.3.gz b/msys2/usr/share/man/man3/alpm_interface.3.gz
index d8546278f..cf582a6c9 100644
Binary files a/msys2/usr/share/man/man3/alpm_interface.3.gz and b/msys2/usr/share/man/man3/alpm_interface.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_list.3.gz b/msys2/usr/share/man/man3/alpm_list.3.gz
index b57e761bd..44ea14cb8 100644
Binary files a/msys2/usr/share/man/man3/alpm_list.3.gz and b/msys2/usr/share/man/man3/alpm_list.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_log.3.gz b/msys2/usr/share/man/man3/alpm_log.3.gz
index 43452e67b..372c7bc09 100644
Binary files a/msys2/usr/share/man/man3/alpm_log.3.gz and b/msys2/usr/share/man/man3/alpm_log.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_misc.3.gz b/msys2/usr/share/man/man3/alpm_misc.3.gz
index 3a348bcb0..e438609c1 100644
Binary files a/msys2/usr/share/man/man3/alpm_misc.3.gz and b/msys2/usr/share/man/man3/alpm_misc.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_packages.3.gz b/msys2/usr/share/man/man3/alpm_packages.3.gz
index c498f84d7..48411725f 100644
Binary files a/msys2/usr/share/man/man3/alpm_packages.3.gz and b/msys2/usr/share/man/man3/alpm_packages.3.gz differ
diff --git a/msys2/usr/share/man/man3/alpm_trans.3.gz b/msys2/usr/share/man/man3/alpm_trans.3.gz
index 2eb80145a..a04a306ef 100644
Binary files a/msys2/usr/share/man/man3/alpm_trans.3.gz and b/msys2/usr/share/man/man3/alpm_trans.3.gz differ
diff --git a/msys2/usr/share/man/man3/archive_read_buffer.3.gz b/msys2/usr/share/man/man3/archive_read_buffer.3.gz
index f0a399ea0..4bafce16f 100644
Binary files a/msys2/usr/share/man/man3/archive_read_buffer.3.gz and b/msys2/usr/share/man/man3/archive_read_buffer.3.gz differ
diff --git a/msys2/usr/share/man/man3/base64.h.3.gz b/msys2/usr/share/man/man3/base64.h.3.gz
index cf8809199..97d4deefa 100644
Binary files a/msys2/usr/share/man/man3/base64.h.3.gz and b/msys2/usr/share/man/man3/base64.h.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_cleanup.3.gz b/msys2/usr/share/man/man3/curl_easy_cleanup.3.gz
index e67e10416..49a98dea2 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_cleanup.3.gz and b/msys2/usr/share/man/man3/curl_easy_cleanup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_duphandle.3.gz b/msys2/usr/share/man/man3/curl_easy_duphandle.3.gz
index 1967f99ca..1d1b39c10 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_duphandle.3.gz and b/msys2/usr/share/man/man3/curl_easy_duphandle.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_escape.3.gz b/msys2/usr/share/man/man3/curl_easy_escape.3.gz
index 8afbb2c3d..b82910a14 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_escape.3.gz and b/msys2/usr/share/man/man3/curl_easy_escape.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_getinfo.3.gz b/msys2/usr/share/man/man3/curl_easy_getinfo.3.gz
index c92cec231..f8505a95e 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_getinfo.3.gz and b/msys2/usr/share/man/man3/curl_easy_getinfo.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_init.3.gz b/msys2/usr/share/man/man3/curl_easy_init.3.gz
index 911107a53..26c1cb03d 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_init.3.gz and b/msys2/usr/share/man/man3/curl_easy_init.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_option_by_id.3.gz b/msys2/usr/share/man/man3/curl_easy_option_by_id.3.gz
new file mode 100644
index 000000000..c044b917c
Binary files /dev/null and b/msys2/usr/share/man/man3/curl_easy_option_by_id.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_option_by_name.3.gz b/msys2/usr/share/man/man3/curl_easy_option_by_name.3.gz
new file mode 100644
index 000000000..5fbf28b3a
Binary files /dev/null and b/msys2/usr/share/man/man3/curl_easy_option_by_name.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_option_next.3.gz b/msys2/usr/share/man/man3/curl_easy_option_next.3.gz
new file mode 100644
index 000000000..99364cc6a
Binary files /dev/null and b/msys2/usr/share/man/man3/curl_easy_option_next.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_pause.3.gz b/msys2/usr/share/man/man3/curl_easy_pause.3.gz
index ed447c334..be2474947 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_pause.3.gz and b/msys2/usr/share/man/man3/curl_easy_pause.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_perform.3.gz b/msys2/usr/share/man/man3/curl_easy_perform.3.gz
index a82e1fd42..b5a186e47 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_perform.3.gz and b/msys2/usr/share/man/man3/curl_easy_perform.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_recv.3.gz b/msys2/usr/share/man/man3/curl_easy_recv.3.gz
index 068e187f3..7eacdf7ba 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_recv.3.gz and b/msys2/usr/share/man/man3/curl_easy_recv.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_reset.3.gz b/msys2/usr/share/man/man3/curl_easy_reset.3.gz
index a8c7d63b6..3490a64b2 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_reset.3.gz and b/msys2/usr/share/man/man3/curl_easy_reset.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_send.3.gz b/msys2/usr/share/man/man3/curl_easy_send.3.gz
index b65b3be40..ee0e14bef 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_send.3.gz and b/msys2/usr/share/man/man3/curl_easy_send.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_setopt.3.gz b/msys2/usr/share/man/man3/curl_easy_setopt.3.gz
index e00a4f521..f701e6361 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_setopt.3.gz and b/msys2/usr/share/man/man3/curl_easy_setopt.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_strerror.3.gz b/msys2/usr/share/man/man3/curl_easy_strerror.3.gz
index b88cee113..74e77e168 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_strerror.3.gz and b/msys2/usr/share/man/man3/curl_easy_strerror.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_unescape.3.gz b/msys2/usr/share/man/man3/curl_easy_unescape.3.gz
index 386b31603..d22720962 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_unescape.3.gz and b/msys2/usr/share/man/man3/curl_easy_unescape.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_easy_upkeep.3.gz b/msys2/usr/share/man/man3/curl_easy_upkeep.3.gz
index 69fa31b4c..6f648a3dd 100644
Binary files a/msys2/usr/share/man/man3/curl_easy_upkeep.3.gz and b/msys2/usr/share/man/man3/curl_easy_upkeep.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_escape.3.gz b/msys2/usr/share/man/man3/curl_escape.3.gz
index 32b68ab43..61703cbe4 100644
Binary files a/msys2/usr/share/man/man3/curl_escape.3.gz and b/msys2/usr/share/man/man3/curl_escape.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_formadd.3.gz b/msys2/usr/share/man/man3/curl_formadd.3.gz
index 493dd79fb..5b2bc7131 100644
Binary files a/msys2/usr/share/man/man3/curl_formadd.3.gz and b/msys2/usr/share/man/man3/curl_formadd.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_formfree.3.gz b/msys2/usr/share/man/man3/curl_formfree.3.gz
index 20304502a..561408f51 100644
Binary files a/msys2/usr/share/man/man3/curl_formfree.3.gz and b/msys2/usr/share/man/man3/curl_formfree.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_formget.3.gz b/msys2/usr/share/man/man3/curl_formget.3.gz
index 2386af91e..2994839d3 100644
Binary files a/msys2/usr/share/man/man3/curl_formget.3.gz and b/msys2/usr/share/man/man3/curl_formget.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_free.3.gz b/msys2/usr/share/man/man3/curl_free.3.gz
index c7b9d7703..cbab0ce83 100644
Binary files a/msys2/usr/share/man/man3/curl_free.3.gz and b/msys2/usr/share/man/man3/curl_free.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_getdate.3.gz b/msys2/usr/share/man/man3/curl_getdate.3.gz
index f6cf48dc9..dabfc3172 100644
Binary files a/msys2/usr/share/man/man3/curl_getdate.3.gz and b/msys2/usr/share/man/man3/curl_getdate.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_getenv.3.gz b/msys2/usr/share/man/man3/curl_getenv.3.gz
index 871648e01..c289929d9 100644
Binary files a/msys2/usr/share/man/man3/curl_getenv.3.gz and b/msys2/usr/share/man/man3/curl_getenv.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_global_cleanup.3.gz b/msys2/usr/share/man/man3/curl_global_cleanup.3.gz
index 71fe7b21d..123b5644f 100644
Binary files a/msys2/usr/share/man/man3/curl_global_cleanup.3.gz and b/msys2/usr/share/man/man3/curl_global_cleanup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_global_init.3.gz b/msys2/usr/share/man/man3/curl_global_init.3.gz
index 803b9054c..6b3526b76 100644
Binary files a/msys2/usr/share/man/man3/curl_global_init.3.gz and b/msys2/usr/share/man/man3/curl_global_init.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_global_init_mem.3.gz b/msys2/usr/share/man/man3/curl_global_init_mem.3.gz
index 2e51bbcb0..78aa55ac4 100644
Binary files a/msys2/usr/share/man/man3/curl_global_init_mem.3.gz and b/msys2/usr/share/man/man3/curl_global_init_mem.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_global_sslset.3.gz b/msys2/usr/share/man/man3/curl_global_sslset.3.gz
index 5f69edc79..7e5ae0fb3 100644
Binary files a/msys2/usr/share/man/man3/curl_global_sslset.3.gz and b/msys2/usr/share/man/man3/curl_global_sslset.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_addpart.3.gz b/msys2/usr/share/man/man3/curl_mime_addpart.3.gz
index b09a18aee..5e697c625 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_addpart.3.gz and b/msys2/usr/share/man/man3/curl_mime_addpart.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_data.3.gz b/msys2/usr/share/man/man3/curl_mime_data.3.gz
index feb42db75..09fca24d8 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_data.3.gz and b/msys2/usr/share/man/man3/curl_mime_data.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_data_cb.3.gz b/msys2/usr/share/man/man3/curl_mime_data_cb.3.gz
index 1b95b4f24..200a960df 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_data_cb.3.gz and b/msys2/usr/share/man/man3/curl_mime_data_cb.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_encoder.3.gz b/msys2/usr/share/man/man3/curl_mime_encoder.3.gz
index 661813818..0c77682a4 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_encoder.3.gz and b/msys2/usr/share/man/man3/curl_mime_encoder.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_filedata.3.gz b/msys2/usr/share/man/man3/curl_mime_filedata.3.gz
index 9a1268c61..1fd2f8422 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_filedata.3.gz and b/msys2/usr/share/man/man3/curl_mime_filedata.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_filename.3.gz b/msys2/usr/share/man/man3/curl_mime_filename.3.gz
index 92f8556b3..e1d2cc214 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_filename.3.gz and b/msys2/usr/share/man/man3/curl_mime_filename.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_free.3.gz b/msys2/usr/share/man/man3/curl_mime_free.3.gz
index 795785b4e..affe9abb6 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_free.3.gz and b/msys2/usr/share/man/man3/curl_mime_free.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_headers.3.gz b/msys2/usr/share/man/man3/curl_mime_headers.3.gz
index fdd705086..e753b12ea 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_headers.3.gz and b/msys2/usr/share/man/man3/curl_mime_headers.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_init.3.gz b/msys2/usr/share/man/man3/curl_mime_init.3.gz
index e8496f9f4..4a18b6e29 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_init.3.gz and b/msys2/usr/share/man/man3/curl_mime_init.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_name.3.gz b/msys2/usr/share/man/man3/curl_mime_name.3.gz
index 25d454cd4..ed31ea006 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_name.3.gz and b/msys2/usr/share/man/man3/curl_mime_name.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_subparts.3.gz b/msys2/usr/share/man/man3/curl_mime_subparts.3.gz
index 76c626ed0..bd38658d3 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_subparts.3.gz and b/msys2/usr/share/man/man3/curl_mime_subparts.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mime_type.3.gz b/msys2/usr/share/man/man3/curl_mime_type.3.gz
index 5a4fe8aad..a9fd5d0da 100644
Binary files a/msys2/usr/share/man/man3/curl_mime_type.3.gz and b/msys2/usr/share/man/man3/curl_mime_type.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_mprintf.3.gz b/msys2/usr/share/man/man3/curl_mprintf.3.gz
index 71dcadbae..13a18b5c1 100644
Binary files a/msys2/usr/share/man/man3/curl_mprintf.3.gz and b/msys2/usr/share/man/man3/curl_mprintf.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_add_handle.3.gz b/msys2/usr/share/man/man3/curl_multi_add_handle.3.gz
index cb2ffebcf..a9607cef9 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_add_handle.3.gz and b/msys2/usr/share/man/man3/curl_multi_add_handle.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_assign.3.gz b/msys2/usr/share/man/man3/curl_multi_assign.3.gz
index 6635b2bfb..743a4d46d 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_assign.3.gz and b/msys2/usr/share/man/man3/curl_multi_assign.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_cleanup.3.gz b/msys2/usr/share/man/man3/curl_multi_cleanup.3.gz
index 05fc6fbe7..6b5c931c9 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_cleanup.3.gz and b/msys2/usr/share/man/man3/curl_multi_cleanup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_fdset.3.gz b/msys2/usr/share/man/man3/curl_multi_fdset.3.gz
index 712d9d4d1..4cded9da7 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_fdset.3.gz and b/msys2/usr/share/man/man3/curl_multi_fdset.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_info_read.3.gz b/msys2/usr/share/man/man3/curl_multi_info_read.3.gz
index 29c8b736b..46be1b4f0 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_info_read.3.gz and b/msys2/usr/share/man/man3/curl_multi_info_read.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_init.3.gz b/msys2/usr/share/man/man3/curl_multi_init.3.gz
index 0909bfdb9..876e1a716 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_init.3.gz and b/msys2/usr/share/man/man3/curl_multi_init.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_perform.3.gz b/msys2/usr/share/man/man3/curl_multi_perform.3.gz
index 24e0366ba..e8343e819 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_perform.3.gz and b/msys2/usr/share/man/man3/curl_multi_perform.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_poll.3.gz b/msys2/usr/share/man/man3/curl_multi_poll.3.gz
index 4f9dc9969..9164aef4d 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_poll.3.gz and b/msys2/usr/share/man/man3/curl_multi_poll.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_remove_handle.3.gz b/msys2/usr/share/man/man3/curl_multi_remove_handle.3.gz
index 0fb8c0473..8d209f85a 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_remove_handle.3.gz and b/msys2/usr/share/man/man3/curl_multi_remove_handle.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_setopt.3.gz b/msys2/usr/share/man/man3/curl_multi_setopt.3.gz
index e8d42ad8c..d939f8220 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_setopt.3.gz and b/msys2/usr/share/man/man3/curl_multi_setopt.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_socket.3.gz b/msys2/usr/share/man/man3/curl_multi_socket.3.gz
index 2786c63b7..b56147874 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_socket.3.gz and b/msys2/usr/share/man/man3/curl_multi_socket.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_socket_action.3.gz b/msys2/usr/share/man/man3/curl_multi_socket_action.3.gz
index de6a35d9c..9ef4f6a9c 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_socket_action.3.gz and b/msys2/usr/share/man/man3/curl_multi_socket_action.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_strerror.3.gz b/msys2/usr/share/man/man3/curl_multi_strerror.3.gz
index 3c7a4be64..bc501d3a7 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_strerror.3.gz and b/msys2/usr/share/man/man3/curl_multi_strerror.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_timeout.3.gz b/msys2/usr/share/man/man3/curl_multi_timeout.3.gz
index 30fcbfff0..eed5c263d 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_timeout.3.gz and b/msys2/usr/share/man/man3/curl_multi_timeout.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_wait.3.gz b/msys2/usr/share/man/man3/curl_multi_wait.3.gz
index 1c6498b95..4d40142c9 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_wait.3.gz and b/msys2/usr/share/man/man3/curl_multi_wait.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_multi_wakeup.3.gz b/msys2/usr/share/man/man3/curl_multi_wakeup.3.gz
index 44b37bf3a..da106b985 100644
Binary files a/msys2/usr/share/man/man3/curl_multi_wakeup.3.gz and b/msys2/usr/share/man/man3/curl_multi_wakeup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_share_cleanup.3.gz b/msys2/usr/share/man/man3/curl_share_cleanup.3.gz
index b743d0538..c64323a7f 100644
Binary files a/msys2/usr/share/man/man3/curl_share_cleanup.3.gz and b/msys2/usr/share/man/man3/curl_share_cleanup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_share_init.3.gz b/msys2/usr/share/man/man3/curl_share_init.3.gz
index a97523f1c..78608670e 100644
Binary files a/msys2/usr/share/man/man3/curl_share_init.3.gz and b/msys2/usr/share/man/man3/curl_share_init.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_share_setopt.3.gz b/msys2/usr/share/man/man3/curl_share_setopt.3.gz
index 54890159c..0c4c8e5aa 100644
Binary files a/msys2/usr/share/man/man3/curl_share_setopt.3.gz and b/msys2/usr/share/man/man3/curl_share_setopt.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_share_strerror.3.gz b/msys2/usr/share/man/man3/curl_share_strerror.3.gz
index 4ff377126..9ec383e35 100644
Binary files a/msys2/usr/share/man/man3/curl_share_strerror.3.gz and b/msys2/usr/share/man/man3/curl_share_strerror.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_slist_append.3.gz b/msys2/usr/share/man/man3/curl_slist_append.3.gz
index 0fe28243b..7a6e169f6 100644
Binary files a/msys2/usr/share/man/man3/curl_slist_append.3.gz and b/msys2/usr/share/man/man3/curl_slist_append.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_slist_free_all.3.gz b/msys2/usr/share/man/man3/curl_slist_free_all.3.gz
index 261f99633..9f80bdbe4 100644
Binary files a/msys2/usr/share/man/man3/curl_slist_free_all.3.gz and b/msys2/usr/share/man/man3/curl_slist_free_all.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_strequal.3.gz b/msys2/usr/share/man/man3/curl_strequal.3.gz
index d43b7bebb..4ed96e848 100644
Binary files a/msys2/usr/share/man/man3/curl_strequal.3.gz and b/msys2/usr/share/man/man3/curl_strequal.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_unescape.3.gz b/msys2/usr/share/man/man3/curl_unescape.3.gz
index 0c993161d..09ae02a61 100644
Binary files a/msys2/usr/share/man/man3/curl_unescape.3.gz and b/msys2/usr/share/man/man3/curl_unescape.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_url.3.gz b/msys2/usr/share/man/man3/curl_url.3.gz
index f0c77da6e..82046cd19 100644
Binary files a/msys2/usr/share/man/man3/curl_url.3.gz and b/msys2/usr/share/man/man3/curl_url.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_url_cleanup.3.gz b/msys2/usr/share/man/man3/curl_url_cleanup.3.gz
index 3981d4b66..14b524032 100644
Binary files a/msys2/usr/share/man/man3/curl_url_cleanup.3.gz and b/msys2/usr/share/man/man3/curl_url_cleanup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_url_dup.3.gz b/msys2/usr/share/man/man3/curl_url_dup.3.gz
index 4227e52a8..503f9d129 100644
Binary files a/msys2/usr/share/man/man3/curl_url_dup.3.gz and b/msys2/usr/share/man/man3/curl_url_dup.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_url_get.3.gz b/msys2/usr/share/man/man3/curl_url_get.3.gz
index 9a0c518d3..3b538b8be 100644
Binary files a/msys2/usr/share/man/man3/curl_url_get.3.gz and b/msys2/usr/share/man/man3/curl_url_get.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_url_set.3.gz b/msys2/usr/share/man/man3/curl_url_set.3.gz
index ef442dfef..c47d7a1c7 100644
Binary files a/msys2/usr/share/man/man3/curl_url_set.3.gz and b/msys2/usr/share/man/man3/curl_url_set.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_version.3.gz b/msys2/usr/share/man/man3/curl_version.3.gz
index 187d70196..9346a13e4 100644
Binary files a/msys2/usr/share/man/man3/curl_version.3.gz and b/msys2/usr/share/man/man3/curl_version.3.gz differ
diff --git a/msys2/usr/share/man/man3/curl_version_info.3.gz b/msys2/usr/share/man/man3/curl_version_info.3.gz
index 9c6e562f3..40ca12423 100644
Binary files a/msys2/usr/share/man/man3/curl_version_info.3.gz and b/msys2/usr/share/man/man3/curl_version_info.3.gz differ
diff --git a/msys2/usr/share/man/man3/db_operations.3.gz b/msys2/usr/share/man/man3/db_operations.3.gz
index 2c08da89c..cd64d790f 100644
Binary files a/msys2/usr/share/man/man3/db_operations.3.gz and b/msys2/usr/share/man/man3/db_operations.3.gz differ
diff --git a/msys2/usr/share/man/man3/dload_payload.3.gz b/msys2/usr/share/man/man3/dload_payload.3.gz
index cf2dc912a..a7c174f2e 100644
Binary files a/msys2/usr/share/man/man3/dload_payload.3.gz and b/msys2/usr/share/man/man3/dload_payload.3.gz differ
diff --git a/msys2/usr/share/man/man3/gdbm.3.gz b/msys2/usr/share/man/man3/gdbm.3.gz
index aa80e543f..626dc848d 100644
Binary files a/msys2/usr/share/man/man3/gdbm.3.gz and b/msys2/usr/share/man/man3/gdbm.3.gz differ
diff --git a/msys2/usr/share/man/man3/history.3.gz b/msys2/usr/share/man/man3/history.3.gz
index 52d65a2ee..17c023ffd 100644
Binary files a/msys2/usr/share/man/man3/history.3.gz and b/msys2/usr/share/man/man3/history.3.gz differ
diff --git a/msys2/usr/share/man/man3/keyinfo_t.3.gz b/msys2/usr/share/man/man3/keyinfo_t.3.gz
index c0958776a..8a9162a0e 100644
Binary files a/msys2/usr/share/man/man3/keyinfo_t.3.gz and b/msys2/usr/share/man/man3/keyinfo_t.3.gz differ
diff --git a/msys2/usr/share/man/man3/libalpm.3.gz b/msys2/usr/share/man/man3/libalpm.3.gz
index a46951707..bdff98d93 100644
Binary files a/msys2/usr/share/man/man3/libalpm.3.gz and b/msys2/usr/share/man/man3/libalpm.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-easy.3.gz b/msys2/usr/share/man/man3/libcurl-easy.3.gz
index 4e29522a6..4e879a08a 100644
Binary files a/msys2/usr/share/man/man3/libcurl-easy.3.gz and b/msys2/usr/share/man/man3/libcurl-easy.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-env.3.gz b/msys2/usr/share/man/man3/libcurl-env.3.gz
index 62207f6e1..5b2a38c3f 100644
Binary files a/msys2/usr/share/man/man3/libcurl-env.3.gz and b/msys2/usr/share/man/man3/libcurl-env.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-errors.3.gz b/msys2/usr/share/man/man3/libcurl-errors.3.gz
index 562a3327b..41fb25056 100644
Binary files a/msys2/usr/share/man/man3/libcurl-errors.3.gz and b/msys2/usr/share/man/man3/libcurl-errors.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-multi.3.gz b/msys2/usr/share/man/man3/libcurl-multi.3.gz
index 8d91c1e2a..14fab5b85 100644
Binary files a/msys2/usr/share/man/man3/libcurl-multi.3.gz and b/msys2/usr/share/man/man3/libcurl-multi.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-security.3.gz b/msys2/usr/share/man/man3/libcurl-security.3.gz
index 79b817dd0..d0151f1a1 100644
Binary files a/msys2/usr/share/man/man3/libcurl-security.3.gz and b/msys2/usr/share/man/man3/libcurl-security.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-share.3.gz b/msys2/usr/share/man/man3/libcurl-share.3.gz
index 9f752f0b4..1189bf2f3 100644
Binary files a/msys2/usr/share/man/man3/libcurl-share.3.gz and b/msys2/usr/share/man/man3/libcurl-share.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-symbols.3.gz b/msys2/usr/share/man/man3/libcurl-symbols.3.gz
index 021479db1..4650fcd43 100644
Binary files a/msys2/usr/share/man/man3/libcurl-symbols.3.gz and b/msys2/usr/share/man/man3/libcurl-symbols.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-thread.3.gz b/msys2/usr/share/man/man3/libcurl-thread.3.gz
index edbb5cc39..ab25d25ba 100644
Binary files a/msys2/usr/share/man/man3/libcurl-thread.3.gz and b/msys2/usr/share/man/man3/libcurl-thread.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-tutorial.3.gz b/msys2/usr/share/man/man3/libcurl-tutorial.3.gz
index 150294c9a..3876d445a 100644
Binary files a/msys2/usr/share/man/man3/libcurl-tutorial.3.gz and b/msys2/usr/share/man/man3/libcurl-tutorial.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl-url.3.gz b/msys2/usr/share/man/man3/libcurl-url.3.gz
index 404a08de3..f60b1054b 100644
Binary files a/msys2/usr/share/man/man3/libcurl-url.3.gz and b/msys2/usr/share/man/man3/libcurl-url.3.gz differ
diff --git a/msys2/usr/share/man/man3/libcurl.3.gz b/msys2/usr/share/man/man3/libcurl.3.gz
index ca853c70b..529ac8755 100644
Binary files a/msys2/usr/share/man/man3/libcurl.3.gz and b/msys2/usr/share/man/man3/libcurl.3.gz differ
diff --git a/msys2/usr/share/man/man3/newctime.3.gz b/msys2/usr/share/man/man3/newctime.3.gz
index b3295e820..5eff9266a 100644
Binary files a/msys2/usr/share/man/man3/newctime.3.gz and b/msys2/usr/share/man/man3/newctime.3.gz differ
diff --git a/msys2/usr/share/man/man3/newtzset.3.gz b/msys2/usr/share/man/man3/newtzset.3.gz
index d02b61a3a..110e8847e 100644
Binary files a/msys2/usr/share/man/man3/newtzset.3.gz and b/msys2/usr/share/man/man3/newtzset.3.gz differ
diff --git a/msys2/usr/share/man/man3/package_changelog.3.gz b/msys2/usr/share/man/man3/package_changelog.3.gz
index 2005bbb30..6482b97cd 100644
Binary files a/msys2/usr/share/man/man3/package_changelog.3.gz and b/msys2/usr/share/man/man3/package_changelog.3.gz differ
diff --git a/msys2/usr/share/man/man3/pkg_operations.3.gz b/msys2/usr/share/man/man3/pkg_operations.3.gz
index a46cd383c..22c72057e 100644
Binary files a/msys2/usr/share/man/man3/pkg_operations.3.gz and b/msys2/usr/share/man/man3/pkg_operations.3.gz differ
diff --git a/msys2/usr/share/man/man3/readline.3.gz b/msys2/usr/share/man/man3/readline.3.gz
index 618eaeea0..4caba4e68 100644
Binary files a/msys2/usr/share/man/man3/readline.3.gz and b/msys2/usr/share/man/man3/readline.3.gz differ
diff --git a/msys2/usr/share/man/man5/BUILDINFO.5.gz b/msys2/usr/share/man/man5/BUILDINFO.5.gz
index 83ba3e4c2..701b7db3b 100644
Binary files a/msys2/usr/share/man/man5/BUILDINFO.5.gz and b/msys2/usr/share/man/man5/BUILDINFO.5.gz differ
diff --git a/msys2/usr/share/man/man5/PKGBUILD.5.gz b/msys2/usr/share/man/man5/PKGBUILD.5.gz
index f02842a86..8f77dcdc7 100644
Binary files a/msys2/usr/share/man/man5/PKGBUILD.5.gz and b/msys2/usr/share/man/man5/PKGBUILD.5.gz differ
diff --git a/msys2/usr/share/man/man5/alpm-hooks.5.gz b/msys2/usr/share/man/man5/alpm-hooks.5.gz
index d30024c2b..7a77fa3bc 100644
Binary files a/msys2/usr/share/man/man5/alpm-hooks.5.gz and b/msys2/usr/share/man/man5/alpm-hooks.5.gz differ
diff --git a/msys2/usr/share/man/man5/config.5ssl.gz b/msys2/usr/share/man/man5/config.5ssl.gz
index d5a925dfb..85bc2d914 100644
Binary files a/msys2/usr/share/man/man5/config.5ssl.gz and b/msys2/usr/share/man/man5/config.5ssl.gz differ
diff --git a/msys2/usr/share/man/man5/makepkg.conf.5.gz b/msys2/usr/share/man/man5/makepkg.conf.5.gz
index 4e071ad1b..2e19d0a11 100644
Binary files a/msys2/usr/share/man/man5/makepkg.conf.5.gz and b/msys2/usr/share/man/man5/makepkg.conf.5.gz differ
diff --git a/msys2/usr/share/man/man5/nanorc.5.gz b/msys2/usr/share/man/man5/nanorc.5.gz
new file mode 100644
index 000000000..04114a87b
Binary files /dev/null and b/msys2/usr/share/man/man5/nanorc.5.gz differ
diff --git a/msys2/usr/share/man/man5/pacman.conf.5.gz b/msys2/usr/share/man/man5/pacman.conf.5.gz
index 0d3743ca8..a7110f69b 100644
Binary files a/msys2/usr/share/man/man5/pacman.conf.5.gz and b/msys2/usr/share/man/man5/pacman.conf.5.gz differ
diff --git a/msys2/usr/share/man/man5/pkcs11.conf.5.gz b/msys2/usr/share/man/man5/pkcs11.conf.5.gz
new file mode 100644
index 000000000..41d4c51f3
Binary files /dev/null and b/msys2/usr/share/man/man5/pkcs11.conf.5.gz differ
diff --git a/msys2/usr/share/man/man5/tzfile.5.gz b/msys2/usr/share/man/man5/tzfile.5.gz
index 948d87b41..e016e4d00 100644
Binary files a/msys2/usr/share/man/man5/tzfile.5.gz and b/msys2/usr/share/man/man5/tzfile.5.gz differ
diff --git a/msys2/usr/share/man/man5/x509v3_config.5ssl.gz b/msys2/usr/share/man/man5/x509v3_config.5ssl.gz
index 23e6ff88b..791fa3dc9 100644
Binary files a/msys2/usr/share/man/man5/x509v3_config.5ssl.gz and b/msys2/usr/share/man/man5/x509v3_config.5ssl.gz differ
diff --git a/msys2/usr/share/man/man7/Ed25519.7ssl.gz b/msys2/usr/share/man/man7/Ed25519.7ssl.gz
index f44da76f8..d886055c7 100644
Binary files a/msys2/usr/share/man/man7/Ed25519.7ssl.gz and b/msys2/usr/share/man/man7/Ed25519.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/Ed448.7ssl.gz b/msys2/usr/share/man/man7/Ed448.7ssl.gz
index f44da76f8..d886055c7 100644
Binary files a/msys2/usr/share/man/man7/Ed448.7ssl.gz and b/msys2/usr/share/man/man7/Ed448.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/RAND.7ssl.gz b/msys2/usr/share/man/man7/RAND.7ssl.gz
index d9f68f350..5af8fa2ae 100644
Binary files a/msys2/usr/share/man/man7/RAND.7ssl.gz and b/msys2/usr/share/man/man7/RAND.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/RAND_DRBG.7ssl.gz b/msys2/usr/share/man/man7/RAND_DRBG.7ssl.gz
index 692ed8b15..5a21e5e58 100644
Binary files a/msys2/usr/share/man/man7/RAND_DRBG.7ssl.gz and b/msys2/usr/share/man/man7/RAND_DRBG.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/RSA-PSS.7ssl.gz b/msys2/usr/share/man/man7/RSA-PSS.7ssl.gz
index c42c282b5..d9124684e 100644
Binary files a/msys2/usr/share/man/man7/RSA-PSS.7ssl.gz and b/msys2/usr/share/man/man7/RSA-PSS.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/SM2.7ssl.gz b/msys2/usr/share/man/man7/SM2.7ssl.gz
index ba66f59ef..45a00d908 100644
Binary files a/msys2/usr/share/man/man7/SM2.7ssl.gz and b/msys2/usr/share/man/man7/SM2.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/X25519.7ssl.gz b/msys2/usr/share/man/man7/X25519.7ssl.gz
index 81745bf7f..dc10a38ce 100644
Binary files a/msys2/usr/share/man/man7/X25519.7ssl.gz and b/msys2/usr/share/man/man7/X25519.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/X448.7ssl.gz b/msys2/usr/share/man/man7/X448.7ssl.gz
index 81745bf7f..dc10a38ce 100644
Binary files a/msys2/usr/share/man/man7/X448.7ssl.gz and b/msys2/usr/share/man/man7/X448.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/bio.7ssl.gz b/msys2/usr/share/man/man7/bio.7ssl.gz
index fa0875d37..29c4ef7cf 100644
Binary files a/msys2/usr/share/man/man7/bio.7ssl.gz and b/msys2/usr/share/man/man7/bio.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/crypto.7ssl.gz b/msys2/usr/share/man/man7/crypto.7ssl.gz
index 3591591b4..6426a6558 100644
Binary files a/msys2/usr/share/man/man7/crypto.7ssl.gz and b/msys2/usr/share/man/man7/crypto.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/ct.7ssl.gz b/msys2/usr/share/man/man7/ct.7ssl.gz
index 8954d8d6a..70a25e4f7 100644
Binary files a/msys2/usr/share/man/man7/ct.7ssl.gz and b/msys2/usr/share/man/man7/ct.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/des_modes.7ssl.gz b/msys2/usr/share/man/man7/des_modes.7ssl.gz
index 5ecd603fb..0f6db66c0 100644
Binary files a/msys2/usr/share/man/man7/des_modes.7ssl.gz and b/msys2/usr/share/man/man7/des_modes.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/evp.7ssl.gz b/msys2/usr/share/man/man7/evp.7ssl.gz
index 547e808c1..75cc41751 100644
Binary files a/msys2/usr/share/man/man7/evp.7ssl.gz and b/msys2/usr/share/man/man7/evp.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/gnupg.7.gz b/msys2/usr/share/man/man7/gnupg.7.gz
index 72d42450e..116986554 100644
Binary files a/msys2/usr/share/man/man7/gnupg.7.gz and b/msys2/usr/share/man/man7/gnupg.7.gz differ
diff --git a/msys2/usr/share/man/man7/ossl_store-file.7ssl.gz b/msys2/usr/share/man/man7/ossl_store-file.7ssl.gz
index a31d3dd42..a8f599e2e 100644
Binary files a/msys2/usr/share/man/man7/ossl_store-file.7ssl.gz and b/msys2/usr/share/man/man7/ossl_store-file.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/ossl_store.7ssl.gz b/msys2/usr/share/man/man7/ossl_store.7ssl.gz
index 526587614..4ef4629e8 100644
Binary files a/msys2/usr/share/man/man7/ossl_store.7ssl.gz and b/msys2/usr/share/man/man7/ossl_store.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/passphrase-encoding.7ssl.gz b/msys2/usr/share/man/man7/passphrase-encoding.7ssl.gz
index 1de0bebf9..4b2adc3fc 100644
Binary files a/msys2/usr/share/man/man7/passphrase-encoding.7ssl.gz and b/msys2/usr/share/man/man7/passphrase-encoding.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/proxy-certificates.7ssl.gz b/msys2/usr/share/man/man7/proxy-certificates.7ssl.gz
index b3b5de8f9..60a1f21ae 100644
Binary files a/msys2/usr/share/man/man7/proxy-certificates.7ssl.gz and b/msys2/usr/share/man/man7/proxy-certificates.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/scrypt.7ssl.gz b/msys2/usr/share/man/man7/scrypt.7ssl.gz
index 71126492c..9976c7c1a 100644
Binary files a/msys2/usr/share/man/man7/scrypt.7ssl.gz and b/msys2/usr/share/man/man7/scrypt.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/ssl.7ssl.gz b/msys2/usr/share/man/man7/ssl.7ssl.gz
index d77bdaedc..9e4338ab4 100644
Binary files a/msys2/usr/share/man/man7/ssl.7ssl.gz and b/msys2/usr/share/man/man7/ssl.7ssl.gz differ
diff --git a/msys2/usr/share/man/man7/x509.7ssl.gz b/msys2/usr/share/man/man7/x509.7ssl.gz
index e2ac773eb..e55cb906c 100644
Binary files a/msys2/usr/share/man/man7/x509.7ssl.gz and b/msys2/usr/share/man/man7/x509.7ssl.gz differ
diff --git a/msys2/usr/share/man/man8/addgnupghome.8.gz b/msys2/usr/share/man/man8/addgnupghome.8.gz
index d14258674..4bce319cd 100644
Binary files a/msys2/usr/share/man/man8/addgnupghome.8.gz and b/msys2/usr/share/man/man8/addgnupghome.8.gz differ
diff --git a/msys2/usr/share/man/man8/applygnupgdefaults.8.gz b/msys2/usr/share/man/man8/applygnupgdefaults.8.gz
index 0fc6b74de..3291a6966 100644
Binary files a/msys2/usr/share/man/man8/applygnupgdefaults.8.gz and b/msys2/usr/share/man/man8/applygnupgdefaults.8.gz differ
diff --git a/msys2/usr/share/man/man8/checkupdates.8.gz b/msys2/usr/share/man/man8/checkupdates.8.gz
index da77c6d83..931f7c0d7 100644
Binary files a/msys2/usr/share/man/man8/checkupdates.8.gz and b/msys2/usr/share/man/man8/checkupdates.8.gz differ
diff --git a/msys2/usr/share/man/man8/dirmngr.8.gz b/msys2/usr/share/man/man8/dirmngr.8.gz
index e3d18d697..638744a20 100644
Binary files a/msys2/usr/share/man/man8/dirmngr.8.gz and b/msys2/usr/share/man/man8/dirmngr.8.gz differ
diff --git a/msys2/usr/share/man/man8/makepkg.8.gz b/msys2/usr/share/man/man8/makepkg.8.gz
index d01b5af62..6b1a076b2 100644
Binary files a/msys2/usr/share/man/man8/makepkg.8.gz and b/msys2/usr/share/man/man8/makepkg.8.gz differ
diff --git a/msys2/usr/share/man/man8/p11-kit.8.gz b/msys2/usr/share/man/man8/p11-kit.8.gz
new file mode 100644
index 000000000..c8c69822b
Binary files /dev/null and b/msys2/usr/share/man/man8/p11-kit.8.gz differ
diff --git a/msys2/usr/share/man/man8/paccache.8.gz b/msys2/usr/share/man/man8/paccache.8.gz
index 365d496ee..d64775321 100644
Binary files a/msys2/usr/share/man/man8/paccache.8.gz and b/msys2/usr/share/man/man8/paccache.8.gz differ
diff --git a/msys2/usr/share/man/man8/pacdiff.8.gz b/msys2/usr/share/man/man8/pacdiff.8.gz
index 5a6d3783a..e557764c9 100644
Binary files a/msys2/usr/share/man/man8/pacdiff.8.gz and b/msys2/usr/share/man/man8/pacdiff.8.gz differ
diff --git a/msys2/usr/share/man/man8/pacman-conf.8.gz b/msys2/usr/share/man/man8/pacman-conf.8.gz
index 748d228bd..c33ab6ac0 100644
Binary files a/msys2/usr/share/man/man8/pacman-conf.8.gz and b/msys2/usr/share/man/man8/pacman-conf.8.gz differ
diff --git a/msys2/usr/share/man/man8/pacman-key.8.gz b/msys2/usr/share/man/man8/pacman-key.8.gz
index be1b4b88a..26bc19d23 100644
Binary files a/msys2/usr/share/man/man8/pacman-key.8.gz and b/msys2/usr/share/man/man8/pacman-key.8.gz differ
diff --git a/msys2/usr/share/man/man8/pacman.8.gz b/msys2/usr/share/man/man8/pacman.8.gz
index 7f8d5e9da..5d57bb48f 100644
Binary files a/msys2/usr/share/man/man8/pacman.8.gz and b/msys2/usr/share/man/man8/pacman.8.gz differ
diff --git a/msys2/usr/share/man/man8/pacsort.8.gz b/msys2/usr/share/man/man8/pacsort.8.gz
index 817c31b18..021992aec 100644
Binary files a/msys2/usr/share/man/man8/pacsort.8.gz and b/msys2/usr/share/man/man8/pacsort.8.gz differ
diff --git a/msys2/usr/share/man/man8/pactree.8.gz b/msys2/usr/share/man/man8/pactree.8.gz
index 97b5fb4d1..b1303b8c9 100644
Binary files a/msys2/usr/share/man/man8/pactree.8.gz and b/msys2/usr/share/man/man8/pactree.8.gz differ
diff --git a/msys2/usr/share/man/man8/repo-add.8.gz b/msys2/usr/share/man/man8/repo-add.8.gz
index de104a1a4..7e13addfb 100644
Binary files a/msys2/usr/share/man/man8/repo-add.8.gz and b/msys2/usr/share/man/man8/repo-add.8.gz differ
diff --git a/msys2/usr/share/man/man8/repo-remove.8.gz b/msys2/usr/share/man/man8/repo-remove.8.gz
index de104a1a4..7e13addfb 100644
Binary files a/msys2/usr/share/man/man8/repo-remove.8.gz and b/msys2/usr/share/man/man8/repo-remove.8.gz differ
diff --git a/msys2/usr/share/man/man8/tzselect.8.gz b/msys2/usr/share/man/man8/tzselect.8.gz
index 256156ef8..ef5c5b5a0 100644
Binary files a/msys2/usr/share/man/man8/tzselect.8.gz and b/msys2/usr/share/man/man8/tzselect.8.gz differ
diff --git a/msys2/usr/share/man/man8/updpkgsums.8.gz b/msys2/usr/share/man/man8/updpkgsums.8.gz
index ac6129464..ca4ff7895 100644
Binary files a/msys2/usr/share/man/man8/updpkgsums.8.gz and b/msys2/usr/share/man/man8/updpkgsums.8.gz differ
diff --git a/msys2/usr/share/man/man8/vercmp.8.gz b/msys2/usr/share/man/man8/vercmp.8.gz
index 2602b26e5..b0169fec5 100644
Binary files a/msys2/usr/share/man/man8/vercmp.8.gz and b/msys2/usr/share/man/man8/vercmp.8.gz differ
diff --git a/msys2/usr/share/man/man8/zdump.8.gz b/msys2/usr/share/man/man8/zdump.8.gz
index 954782bbe..2f8e97b19 100644
Binary files a/msys2/usr/share/man/man8/zdump.8.gz and b/msys2/usr/share/man/man8/zdump.8.gz differ
diff --git a/msys2/usr/share/man/man8/zic.8.gz b/msys2/usr/share/man/man8/zic.8.gz
index 3229b3bde..5984b5d81 100644
Binary files a/msys2/usr/share/man/man8/zic.8.gz and b/msys2/usr/share/man/man8/zic.8.gz differ
diff --git a/msys2/usr/share/mintty/emojis/getemojis b/msys2/usr/share/mintty/emojis/getemojis
index cd434a132..4463eaadc 100644
--- a/msys2/usr/share/mintty/emojis/getemojis
+++ b/msys2/usr/share/mintty/emojis/getemojis
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 trace () {
 #	echo $* >&2
@@ -106,19 +106,21 @@ cat "$emojis0" | sed -e "s,<title>\(.*\)</title>,\1," -e t -e d >&2
 #	vendor     7    Sams
 
 seli=0
+styles=(common)
 for vendor in `cat "$emojis0" |
   sed -e "/^<\/tr/ q" -e "s/.*<th.*#col-vendor.>\([^.<]*\).*/\1/" -e t -e d |
   sed -e 7q`
 do	seli=`expr $seli + 1`
 	case "$vendor" in
-	Appl)	apple=$seli;;
-	Goog)	google=$seli;;
-	FB)	facebook=$seli;;
-	Wind)	windows=$seli;;
-	Twtr)	twitter=$seli;;
-	One|Joy) emojione=$seli;;
-	Sams)	samsung=$seli;;
+	Appl)	st=apple; apple=$seli;;
+	Goog)	st=google; google=$seli;;
+	FB)	st=facebook; facebook=$seli;;
+	Wind)	st=windows; windows=$seli;;
+	Twtr)	st=twitter; twitter=$seli;;
+	One|Joy) st=emojione; emojione=$seli;;
+	Sams)	st=samsung; samsung=$seli;;
 	esac
+	styles[$seli]=$st
 done
 
 case "$1" in
@@ -138,15 +140,13 @@ while	case "$1" in
 	esac
 do	sel="$sel$seli"
 	mkdir -p "$1"
-	[ -e "$seli" ] || ln -s "$1" "$seli"
 	shift
 done
 mkdir -p common
-[ -e 0 ] || ln -s common 0
 
 export sel
 
-echo "Warning: this may take a few hours on Cygwin" >&2
+echo "Warning: this may take a while on Cygwin" >&2
 
 LC_ALL=C
 export LC_ALL
@@ -161,6 +161,7 @@ echo LC_ALL=C
 echo export LC_ALL
 echo total=$total
 echo sel=$sel
+echo "styles=(${styles[*]})"
 
 cat <<\/EOS
 n=0
@@ -174,21 +175,21 @@ name () {
 }
 
 img0 () {
-  echo " common 0/$ename.png" >&2
-  echo "$1" | base64 -d > 0/$ename.png
+  echo " common $ename.png" >&2
+  echo "$1" | base64 -d > common/$ename.png
 }
 
 img () {
   style=$(( $style + 1 ))
   case $sel in
-  *$style*)	echo "$1" | base64 -d > $style/$ename.png;;
+  *$style*)	echo "$1" | base64 -d > ${styles[$style]}/$ename.png;;
   esac
 }
 
 imgskip () {
   style=$(( $style + 1 ))
   case $sel in
-  *$style*)	echo " skip $style/$ename.png" >&2;;
+  *$style*)	echo " skip ${styles[$style]}/$ename.png" >&2;;
   esac
 }
 
diff --git a/msys2/usr/share/mintty/lang/de.po b/msys2/usr/share/mintty/lang/de.po
index 2884f9d89..b99372573 100644
--- a/msys2/usr/share/mintty/lang/de.po
+++ b/msys2/usr/share/mintty/lang/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr ""
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr ""
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr ""
 
@@ -36,79 +36,79 @@ msgstr "Keine verfügbaren Terminals"
 msgid "Error: Could not open log file"
 msgstr "Fehler: Konnte Log-Datei nicht öffnen"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Fehler: Konnte Prozess nicht erzeugen"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "DLL rebasing vielleicht erforderlich; siehe 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Starten von '%s' fehlgeschlagen: %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Beendigung %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "BEENDET"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Fehler: Konnte Daemon-Prozess nicht starten"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "gedehnt"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "ausgerichtet"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "zentriert"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "voll"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Ignoriere unbekannte Option '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Interner Fehler: zu viele Optionen"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Interner Fehler: zu viele Optionen/Kommentare"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Ignoriere ungültigen Wert '%s' für Option '%s'"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Ignoriere Option '%s' – Wert fehlt"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -116,163 +116,163 @@ msgstr ""
 "Konnte Option nicht in '%s' schreiben:\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Keiner (Drucken deaktiviert) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Default-Drucker ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Keine –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windows-Sprache @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Locale-Umgebung *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= kfg. Text-Locale ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "einfacher Piep"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "kein Piep"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Default-Piep"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Fehler"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Frage"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Warnung"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Hinweis"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Keine (Systemklang) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Keins ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "runtergeladen / Namen geben!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Konnte Web-Schema nicht laden"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Kann Schema nicht schreiben"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Kann Schema nicht speichern"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Über..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Sichern"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Abbruch"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Anwenden"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Aha"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr ""
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Aussehen"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Aussehen im Terminal"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Farben"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Vordergrund.."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Hintergrund.."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "&Zeiger.."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Schema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr ""
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Sichern"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Transparenz"
 
@@ -280,253 +280,258 @@ msgstr "Transparenz"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "A&us"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Klein"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Mittel"
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Mittel"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "H&och"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "&Glas"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "Undurchsichtig wenn im &Fokus"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "U&nklar"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Zeiger"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "&Linie"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "&Block"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "Un&terstrich"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "Blinken&d"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Schrift"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Text und Schrift – Eigenschaften"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Schrift"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "Schriftsch&nitt:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "Schr.&grad:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "Zeige &fett als Schrift"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Zeige fett als F&arbe"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Zeige fett"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "als Schrift"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "als Farbe"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Schriftglättung"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Default"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Keine"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Teils"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Voll"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "&Blinken zulassen"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr ""
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Zeichensatz"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Tastatur"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Tastatur-Eigenschaften"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Rücktaste sendet ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Entf sendet DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Strg+LeftAlt ist Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr ist auch Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Kürzel"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "K&opieren/Einfügen (Strg/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Menü und Vollbildschirm (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Fenster wechseln (Strg+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Zoomen (Strg+plus/minus/zero)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "&Alt+Fn Kürzel"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "&Strg+Shift+letter Kürzel"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Compose-Taste"
 
@@ -535,7 +540,7 @@ msgstr "Compose-Taste"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr ""
 
@@ -544,7 +549,7 @@ msgstr ""
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "S&trg"
 
@@ -553,105 +558,112 @@ msgstr "S&trg"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr ""
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Maus"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Maus-Funktionen"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "K&opieren bei Auswahl"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Kopieren mit &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Kopieren als &Rich Text"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Kopieren als &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "&Klick platziert in Kommandozeile"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Klick-Aktionen"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Rechte Maustaste"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Einfügen"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "&Dehnen"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Menü"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ein&gabe"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Mittlere Maustaste"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Nichts"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Anwendungs-Maus-Modus"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Default-Klickziel"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Fenster"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "&Anwendung"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modifizierer zum Ändern des Defaults"
 
@@ -659,183 +671,183 @@ msgstr "Modifizierer zum Ändern des Defaults"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Auswahl"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Auswahl und Clipboard"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr ""
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr ""
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Fenster"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr ""
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Fenster-Eigenschaften"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Default-Größe"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "&Spalten"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "&Zeilen"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "&Aktuelle"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Zur&ückroll-Zeilen"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Rollbalken"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Links"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Rechts"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modifizierer für Rollen"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "&Bild↑ und Bild↓ rollen ohne Modifizierer"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Sprache"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr ""
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Terminal-Eigenschaften"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Typ"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "Rück&antwort"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Glocke"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► Abs&pielen"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "Klang"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "Blit&z"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "Blitz in Task&leiste"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr ""
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Drucker"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Vor &Schließen nach laufenden Prozessen fragen"
 
@@ -844,112 +856,112 @@ msgid "[Printing...] "
 msgstr "[Druckt...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Wählen..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Schriftart"
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Übernehmen"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Schriftart:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Beispiel"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr ""
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "S&kript:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Weitere Schriftarten anzeigen</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Farbe"
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Gru&ndfarben:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Ben&utzerdefinierte Farben:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "Farben &definieren >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Farbe"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|B&asis"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "Farb&t.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "S&ätt.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Hell.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Rot:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "&Grün:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Blau:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "Farben hin&zufügen"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Optionen"
 
@@ -959,11 +971,11 @@ msgid "available"
 msgstr "verfügbar"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr ""
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Fehler"
 
@@ -1030,158 +1042,158 @@ msgid "&Copy"
 msgstr "&Kopieren"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "&Einfügen"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Kopieren → Einfügen"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "S&uchen"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "&Log in Datei"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "Zeichen-&Info"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220-Tastatur"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "Zu&rücksetzen"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "Default-Gr&öße"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Roll&balken"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Vollbildschirm"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Anzeige &wechseln"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "&Titel kopieren"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Optionen..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "Ö&ffnen"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Kopieren als Text"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Kopieren als RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Kopieren als HTML-Text"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Kopieren als HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Kopieren als HTML-Bild"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Alles &auswählen"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Speichern als &Bild"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr ""
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Lösche Scrollback"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Sende Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Benutzer-Kommandos"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Laufende Prozesse:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Trotzdem schließen?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Versuche '--help' für mehr Information"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Konnte Symbol nicht laden"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr ""
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1248,39 +1260,39 @@ msgstr ""
 "  -V, --version         Zeige nur Versions-Information\n"
 "Siehe die Manual-Seite für weitere Optionen und Konfiguration.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "WSL-Distribution '%s' nicht gefunden"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Doppelte Option '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Unbekannte Option '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "Option '%s' benötigt einen Parameter"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Formatfehler in Positionsparameter '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Formatfehler in Größenparameter '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Formatfehler in Größen-/Positionsparameter '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty konnte nicht vom Aufrufer abkoppeln, startet trotzdem"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "Nehme Default-Titel wegen ungültiger Zeichen im Programmnamen"
 
diff --git a/msys2/usr/share/mintty/lang/es.po b/msys2/usr/share/mintty/lang/es.po
index e0bdeb95f..c41ce0624 100644
--- a/msys2/usr/share/mintty/lang/es.po
+++ b/msys2/usr/share/mintty/lang/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2019-01-29 16:00+0200\n"
 "Last-Translator: JSJ <jsj666@hotmail.com>\n"
 "Language-Team: JSJ\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(Defecto)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(Codificación OEM)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(Codificación ANSI)"
 
@@ -36,79 +36,79 @@ msgstr "No hay terminales disponibles"
 msgid "Error: Could not open log file"
 msgstr "Error: No se puede abrir fichero de log"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Error: No se puede lanzar proceso hijo"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "Se requiere rebasing de la DLL; más información 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Fallo al ejecutar '%s': %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Código de salida %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "FINALIZÓ"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Error: No se pudo lanzar demonio hijo"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr ""
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Ignorando opción desconocida '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Error interno: demasiadas opciones"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Error interno: demasiadas opciones/comentarios"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Ignorando valor no válido '%s' de la opción '%s'"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Ignorando opción '%s' sin valor"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -116,163 +116,163 @@ msgstr ""
 "No se pudieron guardar las opciones en '%s':\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ No (impresión desactivada) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Impresora predeterminada ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Ninguno –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Idioma de Windows @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Entorno local *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= cfg. Texto Local ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "Beep simple"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "Sin sonido"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Beep predeterminado"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Fallo Crítico"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Pregunta"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Aviso"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Importante"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Ninguno (sonido del sistema) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Ninguno ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "descargado / ¡renombra el tema!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "No se pudo cargar el tema web"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "No se ha podido escribir en el fichero del tema"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "No se ha podido guardar el tema"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Acerca de..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Guardar"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Aplicar"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Aceptar"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "Aceptar"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Visualización"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Visualización de la consola"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Colores"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Tinta..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Fondo..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "&Cursor..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Tema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Diseñador de Temas"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Guardar"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Transparencia"
 
@@ -280,253 +280,258 @@ msgstr "Transparencia"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "&No"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Baja"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Med."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Media"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Alta"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "&Cristal"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "&Opaca si seleccionada"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "&Desenfoque"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Cursor"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "&Linea"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "&Bloque"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "S&ubrayado"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "Parpa&deo"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Texto"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Propiedades del texto"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Tipo letra"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "Es&tilo de letra:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Tamaño:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "&Negrita: tipo letra"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Ne&grita: color"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Negrita"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "tipo letra"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "color"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Suavizado"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Defecto"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Ninguna"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Parcial"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Completo"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "&Parpadeo"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "&Idioma"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Juego caracteres"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Teclas"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Opciones de teclado"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Borrado envía ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Supr envía DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+Alt Izq es AltGr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr es también Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Atajos"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "Co&piar y pegar (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Menú y pantalla completa (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Cambiar de ventana (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Ampliar (Ctrl+más/menos/cero)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Atajos &Alt+Fn"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Atajos &Ctrl+Shift+letra"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Tecla compos."
 
@@ -535,7 +540,7 @@ msgstr "Tecla compos."
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -544,7 +549,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -553,105 +558,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Ratón"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Funciones del ratón"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "Co&piar al seleccionar"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Copiar con &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Copiar &formato texto"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Copiar formato &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "&Click coloca el cursor en línea"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Acciones del click"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Botón derecho"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Pegar"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "E&xtend."
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Menú"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Botón medio"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Nada"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Modo aplicación"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Objetivo del click"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Ventana"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "&Aplicación"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modificador ignorar opc. predeterminada"
 
@@ -659,183 +671,183 @@ msgstr "Modificador ignorar opc. predeterminada"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Seleccion"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Seleccion y clipboard"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr ""
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr ""
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Ventana"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr ""
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Propiedades de ventana"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Tamaño predeterminado"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Colu&mnas"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "&Filas"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "&Tam. actual"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Buffer &scroll"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Barra scroll"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Izquierda"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Derecha"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modificador para scroll"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "Scroll con &AvPag y RePag"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Idioma UI"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Consola"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Opciones de consola"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Tipo"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Respuesta"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Sonido"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► &Reprod."
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "&WAV"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Parpadeo"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "Parpadeo &barra tareas"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "&Popup"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Impresora"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Avisar sobre procesos en ejecución al &cerrar"
 
@@ -844,112 +856,112 @@ msgid "[Printing...] "
 msgstr "[Imprimiendo...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Selecc..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Tipo letra "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Aplicar"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Tipo letra:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Ejemplo"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "AáBbCçNñ"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "S&cript:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Mostrar más tipos letra</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Color "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Colores &básicos:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Colores &personalizados:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "Colores per&sonalizados >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Color"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|Sólid&o"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Tint.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Sat:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Lum:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Rojo:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "&Verde:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Azul:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "Aña&dir color personal."
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Opciones"
 
@@ -959,11 +971,11 @@ msgid "available"
 msgstr "disponible"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "100"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Error"
 
@@ -1030,158 +1042,158 @@ msgid "&Copy"
 msgstr "&Copiar"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "&Pegar"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Copiar → Pegar"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "B&uscar"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "&Log a fichero"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "&Info caracter"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "Teclado VT220"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "&Resetear"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "&Tam. predeterminado"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Barra scroll"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Pantalla completa"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "&Cambiar pantalla"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Copiar &título"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Opciones..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "A&brir"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Copiar &formato texto"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Copiar formato RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Copiar formato HTML texto"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Copiar formato HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Copiar formato HTML completo"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Selecc. &todo"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Guardar formato &imagen"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr ""
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Limpiar buffer scroll"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Enviar Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Comandos especiales"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Hay procesos ejecutándose:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "¿Cerrar?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Intenta usar '--help' para más información"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "No se pudo cargar icono"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Uso:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPCION]... [ PROGRAMA [ARG]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1255,39 +1267,39 @@ msgstr ""
 "Consultar el manual para más opciones de línea de comandos y "
 "configuraciones.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "No se ha encontrado la distribución WSL '%s'"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Opción duplicada '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Opción desconocida '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "Opción '%s' requiere un parámetro"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Error de sintaxis en arg. posición '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Error de sintaxis en arg. tamaño '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Error de sintaxis en arg. tamaño y posición '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty no se pudo liberar, inciando de todas formas"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr ""
 "Usando título predeterminado porque hay caracteres extraños en el nombre del "
diff --git a/msys2/usr/share/mintty/lang/fr.po b/msys2/usr/share/mintty/lang/fr.po
index 3950188d4..afa1c2854 100644
--- a/msys2/usr/share/mintty/lang/fr.po
+++ b/msys2/usr/share/mintty/lang/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2020-01-13 10:49+0100\n"
 "Last-Translator: Eric Lassauge <lassauge@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.0.9\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(défaut)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(codage OEM)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(codage ANSI)"
 
@@ -38,80 +38,80 @@ msgstr "Aucun terminal disponible"
 msgid "Error: Could not open log file"
 msgstr "Erreur : impossible d’ouvrir le fichier de trace"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Erreur : impossible de créer un process fils"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "Il peut être nécessaire de rebaser les DLL, voir « rebaseall / rebase --help "
 "»"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Impossible de lancer « %s » : %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s : sortie %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "TERMINÉ"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Erreur : impossible de créer un process démon fils"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "étendre"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "aligner"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "milieu"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "complet"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Option inconnue « %s » ignorée"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Erreur interne : trop d’options"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Erreur interne : trop d’options/commentaires"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Value inconnue ignorée « %s » pour l’option « %s »"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Option « %s » avec des valeurs manquantes ignorée"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -119,163 +119,163 @@ msgstr ""
 "Impossible d’enregistrer les options dans « %s » :\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Aucune (pas d’impression) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Imprimante par défaut ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Aucun –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Langue système @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Locale environ. *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= Langue caractères ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "Bip simple"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "Pas de son"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Bip par défaut"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Arrêt critique"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Question"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Exclamation"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Astérisque"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Aucun (son système) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Aucun ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "téléchargé / donnez-moi un nom !"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Impossible de télécharger le thème"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Impossible d’écrire le fichier de thème"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Impossible d’enregistrer le fichier de thème"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "À propos …"
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Enregistrer"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Annuler"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Appliquer"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Bien vu"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "Ok"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Apparence"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Apparence"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Couleurs"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "A&vant-plan…"
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "A&rrière-plan…"
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "&Curseur…"
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Thème"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Modèle de couleur"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Enreg."
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Transparence"
 
@@ -283,253 +283,258 @@ msgstr "Transparence"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "A&rrêt"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Basse"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Moy."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Moyen"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Haute"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "&Verre"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "Opa&que au focus"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "&Flou"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Curseur"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "Lig&ne"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "B&loc"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "&Tiret bas"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "Cli&gnotant"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Texte"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Taille et propriétés de la police de caractères"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Police de caractères"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "&Style de police :"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Taille :"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "&Gras comme fonte"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "G&ras comme couleur"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Gras"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "comme fonte"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "comme couleur"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Lissage des caractères"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Défaut"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "Aucu&n"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Partiel"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Complet"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "C&lignotement"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "&Langue"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Jeu de caractères"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "Émoticône"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Clavier"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Clavier"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Efface émet ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Suppr émet DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+AltGauche émet Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr émet également Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "Cop&ier et coller (Ctrl/Maj+Inser)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Menu et plein écran (Alt+Espace/Entrée)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Change de fenêtre (Ctrl+[Maj+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Zoom (Ctrl+plus/moins/zéro)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Raccourcis &Alt+Fn"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Raccourcis &Ctrl+Maj+lettre"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Touche compose"
 
@@ -538,7 +543,7 @@ msgstr "Touche compose"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Maj"
 
@@ -547,7 +552,7 @@ msgstr "&Maj"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -556,105 +561,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Souris"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Souris"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "Copier sur &sélection"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Copier (texte) avec &tabulations"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Copier en &Rich Text"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Copier en &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "Cli&c positionne le curseur"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Actions du cllic"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Bouton droit"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Coller"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "É&tendre"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Menu"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ent&ée"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Bouton du milieu"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Rien"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Souris en mode appli."
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "&Cible du clic"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Fenêtre"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "A&pplication"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modifieur"
 
@@ -662,183 +674,183 @@ msgstr "Modifieur"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Sélection"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Sélection et presse-papier"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "Effacer la sélection sur saisie"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "Presse-papier"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "Enlever les espaces de la sélection"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "Activer la sélection"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Fenêtre"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "Montrer la taille pendant la sélection (0..12)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "Suspendre l'affichage pendant la sélection"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Fenêtre"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Taille par défaut"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Colon&nes"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "Li&gnes"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "Taille a&ctuelle"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "&Lignes défilement ar."
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Barre de défilement"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Gauche"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Droite"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modifieur pour défilement"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "Défilement par &PgAr et PgAv "
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Langue"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Terminal"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Terminal"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Type"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Retour"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Son"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► &Lire"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "&Fichier"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Flash"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "Flash &tâche"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr ""
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Imprimante"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "&Demander si process en cours à la fermeture"
 
@@ -847,112 +859,112 @@ msgid "[Printing...] "
 msgstr "[Impression…]"
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Sélect.…"
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Police de caractères"
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Appliquer"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Police :"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Échantillon"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "AàBbCçÉéYz"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Sc&ript :"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Autres polices</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Couleur"
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Couleurs de b&ase :"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Couleurs &personnalisées :"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "&Définir les couleurs personnalisées >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Couleur"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|&Unie"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Teinte :"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Satur. :"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Lum. :"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Rouge :"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "&Vert :"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Bleu :"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "A&jouter aux couleurs personnalisées"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Options"
 
@@ -962,11 +974,11 @@ msgid "available"
 msgstr "disponible"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr ""
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Erreur"
 
@@ -1033,159 +1045,159 @@ msgid "&Copy"
 msgstr "&Copier"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "Co&ller"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Copier → Coller"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "Ch&ercher"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "Enregistrer fichier"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "&Info de caractères"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "Clavier VT220"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "&Reset"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "Taille &défaut"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Barre de défilement"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Plein écran"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Basculer l'&écran"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "&Copier le titre"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Options…"
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "Ouvr&ir"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Copier en text"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Copier en RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Copier en texte HTML"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Copier en HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Copier en HTML complet"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Tout &sélectionner"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Enregistrer comme &image"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "Copie écran en HTML"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Purger le défilement"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Émet Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Commandes utilisateur"
 
 # msgstr "Arrêter le défilement"
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Processus en cours dans la session :"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Forcer la fermeture ?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Essayez « --help » pour plus d’information"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Impossible de charger l’icône"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPTION]... [ PROGRAMME [ARG]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1260,39 +1272,39 @@ msgstr ""
 "Voir la page de manuel pour les autres options de la ligne de commande et la "
 "configuration.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "Distribution WSL « %s » non trouvée"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Option « %s » en double"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Option inconnue « %s »"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "L’option « %s » requiert un argument"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Erreur de syntaxe pour l’argument de position « %s »"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Erreur de syntaxe pour l’argument de taille « %s »"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Erreur de syntaxe pour l’argument de taille et position « %s »"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty ne peut se détacher de l’appelant, on démarre quand même"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr ""
 "Utilisation du titre par défaut à cause d’un caractère invalide dans le nom "
diff --git a/msys2/usr/share/mintty/lang/hr.po b/msys2/usr/share/mintty/lang/hr.po
index 8c57a5149..f312c7b15 100644
--- a/msys2/usr/share/mintty/lang/hr.po
+++ b/msys2/usr/share/mintty/lang/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2020-05-07 13:12+0200\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: \n"
@@ -20,15 +20,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(Standardno)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(Kodna stranica proizvođača)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSI kodna stranica)"
 
@@ -40,79 +40,79 @@ msgstr "Nema dostupnih terminala"
 msgid "Error: Could not open log file"
 msgstr "Greška: Nije bilo moguće otvoriti datoteku zapisa"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Greška: Nije bilo moguće napraviti kopiju podređenog procesa"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "Možda će biti potrebno premjesiti DLL; pogledaj „rebaseall / rebase --help”"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Neuspjelo pokretanje „%s”: %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Izlaz %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "PREKINUTO"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Greška: Nije bilo moguće napraviti kopiju podređenog demona"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "rastegni"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "poravnaj"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "sredina"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "potpuno"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Zanemaruje se nepoznata opcija „%s”"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Interna greška: previše opcija"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Interna greška: previše opcija/komentara"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Zanemaruje se nevaljana vrijednost „%s” za opciju „%s”"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Zanemaruje se opcija „%s” s nedostajućom vrijednosti"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -120,163 +120,163 @@ msgstr ""
 "Nije bilo moguće spremiti opcije u „%s”:\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Bez (ispisivanje deaktivirano) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Standardni pisač ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Neodređeno –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Jezik Windowsa @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Jezik okruženja *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= postavi jezik teksta ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "jednostavni zvučni signal"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "bez zvučnog signala"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Standardni zvučni signal"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Kritično zaustavljanje"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Pitanje"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Upozorenje"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Važno"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Bez (zvuk sustava) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Bez ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "preuzeto / zadaj ime!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Nije bilo moguće učitati temu"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Nije moguće zapisati datoteku teme"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Nije moguće spremiti datoteku teme"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Informacije …"
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Spremi"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Odustani"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Primijeni"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Vidim"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "U redu"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Izgled"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Izgled u terminalu"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Boje"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Prednja …"
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Stražnja …"
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "Po&kazivač …"
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Tema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Color Scheme Designer"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Spremi"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Prozirnost"
 
@@ -284,253 +284,258 @@ msgstr "Prozirnost"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "&Isklj."
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Niska"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Srednja"
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Srednja"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Visoka"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "Sta&klo"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "&Neprozirno pri fokusu"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "&Zamuti"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Pokazivač"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "&Crta"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "Pravo&kutnik"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "&Podvlaka"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "&Treperenje"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Tekst"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Svojstva teksta i fonta"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Font"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "St&il fonta:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Veličina:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "Pri&kaži podebljano kao font"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Prikaži pode&bljano kao boju"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Prikaži podebljano"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "kao font"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "kao boja"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr "xterm"
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Zaglađivanje fonta"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Standardno"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Bez"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Djelomično"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Potpuno"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "Dozvoli &treperenje"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "&Jezik"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Skup znakova"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "Emoji znakovi"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "Stil"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "Smještaj"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Tipke"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Funkcije tipki"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Pozadine šalje ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Brisanje šalje DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+LijeviAlt je Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr je također Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Prečaci"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "&Kopiraj i umetni (Ctrl/Shift+umetni)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Izbornik i cjeloekranski prikaz (Alt+razmaknica/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Mijenjanje prozora (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Zumiranje (Ctrl+plus/minus/nula)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "&Alt+Fn prečaci"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "&Ctrl+Shift+slovo prečaci"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Modifikator"
 
@@ -539,7 +544,7 @@ msgstr "Modifikator"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -548,7 +553,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -557,105 +562,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Miš"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Funkcije miša"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "&Kopiraj pri odabiru"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Kopiraj &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Kopi&raj kao formatirani tekst"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Kopiraj kao &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "&Pritiskanje miša postavlja kursor u naredbenom retku"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Radnje pritiskom miša"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Desna tipka miša"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Umetni"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "&Proširi"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Izbornik"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Srednja tipka miša"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Ništa"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Modus miša u programu"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Standardni cilj pritiskanja miša"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "Pro&zor"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "&Program"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modifikator za zaobilaženje standarda"
 
@@ -663,183 +675,183 @@ msgstr "Modifikator za zaobilaženje standarda"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr "&Win"
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr "&Sup"
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr "&Hyp"
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Odabir"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Odabir i međuspremnik"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "Ukloni odabir pri unosu"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "Međuspremnik"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "Ukloni razmak iz odabira"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "Dozvoli postavljanje odabira"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Prozor"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "Prikaži veličinu tijekom označavanja (0 … 12)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "Odgodi rezultat tijekom označavanja"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Svojstva prozora"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Standardna veličina"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "&Stupaca"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "&Redaka"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "Trenutačna veličina"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Redaka za klizanje unatrag"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Traka klizača"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Lijevo"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Desno"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modifikator za klizanje"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "&PgUp↑ i PgDn↓ pomicanje bez modifikatora"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Jezik sučelja"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Terminal"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Funkcije terminala"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Vrsta"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Odgovor"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Zvono"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► &Sviraj"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "&Zvuk"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Zabljesni"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "&Istakni u programskoj traci"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "&Skočni prozor"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Pisač"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Upozori o aktivnim procesima pri &zatvaranju"
 
@@ -848,112 +860,112 @@ msgid "[Printing...] "
 msgstr "[Ispisivanje …] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Odaberi …"
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Font "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Primjeni"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Font:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Primjer"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "Hamburgefonštiv;046"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Pi&smo:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Prikaži više fontova</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Boja "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "&Osnovne boje:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "&Prilagođene boje:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "Odredi prilagođene &boje: >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Boja"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|P&una"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Nijansa:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Zasić.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Osvijet.:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Crvena:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "&Zelena:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Plava:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "Do&daj u prilagođene boje"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Opcije"
 
@@ -963,11 +975,11 @@ msgid "available"
 msgstr "dostupno"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "130"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Greška"
 
@@ -1034,158 +1046,158 @@ msgid "&Copy"
 msgstr "&Kopiraj"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "&Umetni "
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Kopiraj → Umetni"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "&Traži"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "Spremi log-zapise u datoteku"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "&Podaci znaka"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "Tipkovnica VT220"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "&Vrati na izvorno"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "&Standardna veličina"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Traka &klizača"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Cjeloekranski prikaz"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Preokreni &ekran"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Kopiraj &naslov"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Opcije …"
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "O&tvori"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Kopiraj kao tekst"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Kopiraj kao RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Kopiraj kao HTML tekst"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Kopiraj kao HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Kopiraj kao HTML kompletno"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Odaberi &sve"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Spremi kao kép"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "Spremi sadržaj u HTML"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Izbriši prijašnje retke"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Pošalji prekid retka"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Korisničke naredbe"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "U sesiji se izvode procesi:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Svejedno zatvoriti?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Koristi „--help” za daljnje informacije"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Nije bilo moguće učitati ikonu"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPCIJA]… [ PROGRAM [PARAMETAR]… | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1260,39 +1272,39 @@ msgstr ""
 "  -V, --verzija             Ispisuje podatke o verziji i izlazi\n"
 "Pogledaj priručnik za dodatne opcije u naredbenom retku i konfiguraciju.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "WSL distribucija „%s” nije pronađena"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Dupliciraj opciju „%s”"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Nepoznata opcija „%s”"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "Opcija „%s” zahtijeva argument"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Greška u sintaksi za argument položaja „%s”"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Greška u sintaksi za argument veličine „%s”"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Greška u sintaksi za argument geometrije „%s”"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty se nije mogao odvojiti od pozivatelja, svejedno se pokreče"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr ""
 "Koristi se standardni naslov, jer ime programa sadrži nevaljane znakove"
diff --git a/msys2/usr/share/mintty/lang/ja.po b/msys2/usr/share/mintty/lang/ja.po
index 48cfbc36e..5c25ac5f9 100644
--- a/msys2/usr/share/mintty/lang/ja.po
+++ b/msys2/usr/share/mintty/lang/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2017-02-27 18:11+0900\n"
 "Last-Translator: Ken Takata <kentkt@csc.jp>\n"
 "Language-Team: \n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(既定)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(OEMコードページ)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSIコードページ)"
 
@@ -36,78 +36,78 @@ msgstr "使用可能な端末がありません"
 msgid "Error: Could not open log file"
 msgstr "エラー: ログファイルを開けません"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "エラー: 子プロセスをforkできません"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr "DLLのリベースが必要です; 'rebaseall / rebase --help' を参照"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "実行に失敗 '%s': %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: 終了コード %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "終了しました"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "エラー: 子デーモンをforkできません"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "伸張"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "整列"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "中央"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "全体"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "不明なオプション '%s' を無視します"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "内部エラー: オプションが多すぎます"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "内部エラー: オプション/コメントが多すぎます"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "オプション '%2$s' 用の不正な値 '%1$s' を無視します"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "値のないオプション '%s' を無視します"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -115,163 +115,163 @@ msgstr ""
 "オプションを '%s' に保存できません:\n"
 "%s。"
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ なし (印刷できません) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ 既定のプリンター ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– なし –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windowsの言語 @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* ロケール環境変数 *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= テキストロケール設定 ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "単純なビープ"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "ビープなし"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "既定のビープ"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "致命的停止"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "クエスチョン"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "エクスクラメーション"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "アスタリスク"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ なし (システムのサウンド) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ なし ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "ダウンロード完了 / 名前を指定してください!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "webテーマをロードできません"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "テーマファイルを書き込めません"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "テーマファイルを保存できません"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "About..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "保存"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "適用"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "了解"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "OK"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "外観"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "端末の外観"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "色"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "前景色(&F)..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "背景色(&B)..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "カーソル(&C)..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "テーマ(&T)"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "カラースキームデザイナー"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "保存"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "透明度"
 
@@ -279,253 +279,258 @@ msgstr "透明度"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "オフ(&O)"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "低(&L)"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "中(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "中間(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "高(&H)"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "Glass(&S)"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "フォーカス時は不透明(&Q)"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "ぼかし(&R)"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "カーソル"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "線(&N)"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "四角(&K)"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "下線(&U)"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "点滅(&G)"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "テキスト"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "テキストとフォントの設定"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "フォント"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "フォントスタイル(&Y):"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "サイズ(&S):"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "ボールドフォントを使用(&W)"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "ボールドをカラー表示(&B)"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "ボールド"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "フォントを使用"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "カラー表示"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "フォントスムージング"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "既定(&D)"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "なし(&N)"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "部分的(&P)"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "完全(&F)"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "点滅を許可(&A)"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "ロケール(&L)"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "文字セット(&C)"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "絵文字"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "スタイル"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "配置"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "キー"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "キーボード設定"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "BSは^Hを送信(&B)"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "DeleteはDELを送信(&D)"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+左AltはAltGr(&G)"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGrをAltとしても扱う"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "ショートカット"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "コピー&&ペースト(&Y) (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "メニューと全画面(&M) (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "ウィンドウの切り替え(&S) (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "ズーム(&Z) (Ctrl+plus/minus/zero)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Alt+Fnショートカット(&A)"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Ctrl+Shift+文字 ショートカット(&C)"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "組み合わせキー"
 
@@ -534,7 +539,7 @@ msgstr "組み合わせキー"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "Shift(&S)"
 
@@ -543,7 +548,7 @@ msgstr "Shift(&S)"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "Ctrl(&C)"
 
@@ -552,105 +557,112 @@ msgstr "Ctrl(&C)"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "Alt(&A)"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "マウス"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "マウス設定"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "選択時にコピー(&Y)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "タブ付きで(テキストとして)コピー"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "リッチテキストとしてコピー(&R)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "HTMLとしてコピー(&H)"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "クリックでコマンドラインカーソルを移動(&K)"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "クリック動作"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "右マウスボタン"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "ペースト(&P)"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "拡張(&X)"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "メニュー(&M)"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Enter(&R)"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "中マウスボタン"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "なし(&N)"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "アプリケーションマウスモード"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "既定のクリック先"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "ウィンドウ(&W)"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "アプリケーション(&A)"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "既定を上書きするための修飾子"
 
@@ -658,183 +670,183 @@ msgstr "既定を上書きするための修飾子"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr "Win(&W)"
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr "Sup(&S)"
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr "Hyp(&H)"
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "選択"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "選択とクリップボード"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "入力時に選択を解除する"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "クリップボード"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "選択から空白を取り除く"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "選択の設定を許可する"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "ウィンドウ"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "選択中にサイズを表示する (0..12)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "選択中に一時停止する"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "ウィンドウ設定"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "既定のサイズ"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "桁(&M)"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "行(&W)"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "現在のサイズ(&U)"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "スクロール行数(&B)"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "スクロールバー"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "左(&L)"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "右(&R)"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "スクロール用修飾子"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "修飾子なしでPgUpとPgDnでスクロール(&P)"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "UI言語"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "端末"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "端末設定"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "タイプ(&T)"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "応答(&A)"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "ベル"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► 再生(&P)"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "音声(&S)"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "点滅(&F)"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "タスクバーで強調表示(&H)"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "ポップアップ(&P)"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "プリンター"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "クローズ時に動作中のプロセスがあると尋ねる(&C)"
 
@@ -843,112 +855,112 @@ msgid "[Printing...] "
 msgstr "[印刷中...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "選択(&S)..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "フォント "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "適用(&A)"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "フォント(&F):"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "サンプル"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "Aaあぁアァ亜宇"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "文字セット(&R):"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>他のフォントを表示</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "色"
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "基本色:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "作成した色:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "色の作成 >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "色"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "| 純色"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "色合い:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "鮮やかさ:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "明るさ:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "赤:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "緑:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "青:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "色の追加"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "オプション"
 
@@ -958,11 +970,11 @@ msgid "available"
 msgstr "が利用可能"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "121"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "エラー"
 
@@ -1029,158 +1041,158 @@ msgid "&Copy"
 msgstr "コピー(&C)"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "ペースト(&P)"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "コピー → ペースト"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "検索(&E)"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "ログをファイルに出力(&L)"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "文字情報(&I)"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220キーボード"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "リセット(&R)"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "既定のサイズ(&D)"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "スクロールバー(&B)"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "全画面(&F)"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "スクリーン切り替え(&S)"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "タイトルをコピー(&T)"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "オプション(&O)..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "開く(&N)"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "テキストとしてコピー"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "RTFとしてコピー"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "HTMLテキストとしてコピー"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "HTMLとしてコピー"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "完全なHTMLとしてコピー"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "すべてを選択(&A)"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "画像として保存(&I)"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "HTML画面ダンプ"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "スクロールバックをクリア"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Breakを送信"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "ユーザーコマンド"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "セッションでプロセスが動作中です:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "構わず閉じますか？"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "さらなる情報には '--help' を試してください"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "アイコンをロードできません"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "使用法:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[オプション]... [ プログラム [引数]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1249,39 +1261,39 @@ msgstr ""
 "さらなるコマンドラインオプションと設定についてはマニュアルページを参照してく"
 "ださい。\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "WSL ディストリビューション '%s' が見つかりません"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "オプションが重複しています '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "未知のオプションです '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "オプション '%s' は引数が必要です"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "position引数に文法エラーがあります '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "size引数に文法エラーがあります '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "geometry引数に文法エラーがあります '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "minttyは呼び出し元からデタッチできません、とにかく起動します"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "プログラム名に不正な文字があるため既定のタイトルを使用します"
 
diff --git a/msys2/usr/share/mintty/lang/messages.pot b/msys2/usr/share/mintty/lang/messages.pot
index 9c63df005..05d2e24fb 100644
--- a/msys2/usr/share/mintty/lang/messages.pot
+++ b/msys2/usr/share/mintty/lang/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:38+0200\n"
+"POT-Creation-Date: 2020-12-20 23:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr ""
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr ""
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr ""
 
@@ -37,240 +37,240 @@ msgstr ""
 msgid "Error: Could not open log file"
 msgstr ""
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr ""
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr ""
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr ""
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr ""
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr ""
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr ""
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr ""
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr ""
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr ""
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr ""
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
 msgstr ""
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr ""
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr ""
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr ""
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr ""
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr ""
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr ""
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr ""
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr ""
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr ""
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr ""
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr ""
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr ""
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr ""
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr ""
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr ""
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr ""
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr ""
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr ""
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr ""
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr ""
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr ""
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr ""
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr ""
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr ""
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr ""
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr ""
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr ""
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr ""
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr ""
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr ""
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr ""
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr ""
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr ""
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr ""
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr ""
 
@@ -278,253 +278,258 @@ msgstr ""
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr ""
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr ""
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr ""
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr ""
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr ""
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr ""
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr ""
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr ""
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr ""
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr ""
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr ""
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr ""
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr ""
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr ""
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr ""
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr ""
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr ""
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr ""
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr ""
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr ""
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr ""
 
@@ -533,7 +538,7 @@ msgstr ""
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr ""
 
@@ -542,7 +547,7 @@ msgstr ""
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr ""
 
@@ -551,105 +556,112 @@ msgstr ""
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr ""
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr ""
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr ""
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr ""
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr ""
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr ""
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr ""
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr ""
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr ""
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr ""
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr ""
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr ""
 
@@ -657,183 +669,183 @@ msgstr ""
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr ""
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr ""
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr ""
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr ""
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr ""
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr ""
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr ""
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr ""
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr ""
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr ""
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr ""
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr ""
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr ""
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr ""
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr ""
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr ""
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr ""
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr ""
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr ""
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr ""
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr ""
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr ""
 
@@ -842,112 +854,112 @@ msgid "[Printing...] "
 msgstr ""
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr ""
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr ""
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr ""
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr ""
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr ""
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr ""
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr ""
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr ""
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr ""
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr ""
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr ""
 
@@ -957,11 +969,11 @@ msgid "available"
 msgstr ""
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr ""
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr ""
 
@@ -1028,158 +1040,158 @@ msgid "&Copy"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr ""
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr ""
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr ""
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr ""
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr ""
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr ""
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr ""
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr ""
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr ""
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr ""
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr ""
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr ""
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr ""
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr ""
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1212,39 +1224,39 @@ msgid ""
 "See manual page for further command line options and configuration.\n"
 msgstr ""
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr ""
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr ""
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr ""
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr ""
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr ""
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr ""
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr ""
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr ""
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr ""
 
diff --git a/msys2/usr/share/mintty/lang/nb.po b/msys2/usr/share/mintty/lang/nb.po
index 99a475a46..5888199bf 100644
--- a/msys2/usr/share/mintty/lang/nb.po
+++ b/msys2/usr/share/mintty/lang/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2019-09-06 18:08+0200\n"
 "Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(Standard)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(OEM-kodeside)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSI-kodeside)"
 
@@ -38,78 +38,78 @@ msgstr "Det er ingen tilgjengelige terminaler"
 msgid "Error: Could not open log file"
 msgstr "Feil: Klarte ikke å åpne loggfilen"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Feil: Klarte ikke å adskille underprosessen"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr "DLL-rebasing kan være nødvendig; se 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Klarte ikke å kjøre '%s': %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Avslutt %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "AVSLUTTET"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Feil: Klarte ikke å adskille underdaemonen"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr ""
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Ignorerer det ukjente alternativet '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Intern feil: For mange innstillinger"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Intern feil: For mange innstillinger/kommentarer"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Ignorerer den ukjente verdien '%s' for '%s'-innstillingen"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Ignorerer '%s'-innstillingen som mangler en verdi"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -117,163 +117,163 @@ msgstr ""
 "Klarte ikke å lagre innstillingene til '%s':\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Ingen (utskriving er skrudd av) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Standardskriver ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Ingen –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windows-språk @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Regionsområde *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= Oppsatt tekstregion ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "enkelt bipp"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "ingen bipp"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Standardbipp"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Kritisk stopp"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Spørsmål"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Utropstegn"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Asterisk"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Ingen (systemlyd) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Ingen ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "lastet ned / gi meg et navn!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Klarte ikke å laste ned nett-temaet"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Klarte ikke å skrive til temafilen"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Klarte ikke å lagre temafilen"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Om …"
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Lagre"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Avbrytt"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Bruk"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Jeg skjønner"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "OK"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Utseende"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Utseende i terminalen"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Farger"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Forgrunn …"
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Bakgrunn …"
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "&Musepeker …"
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Tema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Fargepalettutformer"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Lagre"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
@@ -281,253 +281,258 @@ msgstr "Gjennomsiktighet"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "&Av"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Lav"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Mid."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Middels"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Høy"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "Gla&ss"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "Fast&het ved fokus"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "Ukla&rhet"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Musepeker"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "Li&nje"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "Blok&kmerking"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "&Understreking"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "Blinkin&g"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Tekst"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Tekst- og skrifttypeegenskaper"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Skrift"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "Skrifttypest&il:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Størrelse:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "Vi&s fet tekst som skrifttype"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Vis &fet tekst som farge"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Vis fet tekst"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "som skrifttype"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "som farge"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Skrifttypeutjevning"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Standard"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Ingen"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Delvis"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Full"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "&Tillat blinking"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "&Region"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Tegnsett"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "Emojier"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "Stil"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "Plassering"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Nøkler"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Tastaturegenskaper"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Bakoverpil sender ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Delete sender DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+LeftAlt er Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr er også Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Snarveier"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "Kop&ier og lim inn (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Meny og fullskjerm (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Bytt vindu (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Forstørr (Ctrl+pluss/minus/null)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "&Alt+Fn-snarveier"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "&Ctrl+Shift+bokstav-snarveier"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Compose-tast"
 
@@ -536,7 +541,7 @@ msgstr "Compose-tast"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -545,7 +550,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -554,105 +559,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Mus"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Musefunksjoner"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "Kop&ier ved velging"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Kopier som &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Kopier som &rik tekst"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Kopier som &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "Kli&kk plasserer ledetekstmusepekeren"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Klikkhandlinger"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Høyre museknapp"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Lim inn"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "U&tvid"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Meny"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Midtre museknapp"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Ingenting"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Programmusemodus"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Standard klikkmålpunkt"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Vindu"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "&Program"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modifikator for å overstyre standardene"
 
@@ -660,183 +672,183 @@ msgstr "Modifikator for å overstyre standardene"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr "&Win"
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr "&Sup"
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr "&Hyp"
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Markering"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Utvalg og utklippstavle"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "Tøm utvalget ved inndata"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "Utklippstavle"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "Trim vekk mellomrom fra utvalg"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "Tillat å fastsette utvalg"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Vindu"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "Vis størrelsen under utvelging (0..12)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "Suspender utdata ved utvelging"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Vindusegenskaper"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Standardstørrelse"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Kolo&nner"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "Ra&der"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "Nå&værende størrelse"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Antall skrolle&historikklinjer"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Rullefelt"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Venstre"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Høyre"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modifikator for skrolling"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "&PgUp- og PgDn-skrolling uten modifikator"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Grensesnittsspråk"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Terminal"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Terminalegenskaper"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Type"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Tilbakemelding"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Bjelle"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► &Ring"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "&Vink"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Blink"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "&Fremhev i verktøylinjen"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "&Oppsprett"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Skriver"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Spør om pågående prosesser ved &avslutning"
 
@@ -845,112 +857,112 @@ msgid "[Printing...] "
 msgstr "[Skriver …] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Velg …"
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Skrifttype "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Anvend"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Skrifttype:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Prøveeksemplar"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "AaBbZzØø"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Sk&ript:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Vis flere skrifttyper</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Farge "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "G&runnleggende farger:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "&Tilpassede farger:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "De&finer tilpassede farger >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Farge"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|S&olid"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Sky:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Met:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Lys:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Rød:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "&Grønn:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Blå:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "L&egg til i de tilpassede fargene"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Innstillinger"
 
@@ -960,11 +972,11 @@ msgid "available"
 msgstr "tilgjengelig"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "100"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Feil"
 
@@ -1031,158 +1043,158 @@ msgid "&Copy"
 msgstr "&Kopier"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "&Lim inn "
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Kopier → Lim inn"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "S&øk"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "&Loggfør til fil"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "Tegn&info"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220-tastatur"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "&Tilbakestill"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "&Standardstørrelse"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Skrolle&linje"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Fullskjerm"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Speilvend &skjermen"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Kopier &tittelen"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Innstillinger …"
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "Åp&ne"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Kopier som tekst"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Kopier som RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Kopier som HTML-tekst"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Kopier som HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Kopier som full HTML"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Velg &alle"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Lagre som &bilde"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "HTML-skjermdump"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Tøm skrollehistorikkbufferen"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Send «Break»"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Brukerkommandoer"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Prosesser som pågår i denne økten:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Vil du lukke det likevel?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Prøv med '--help' for mere informasjon"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Klarte ikke å laste inn ikonet"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPTION]... [ PROGRAM [ARG]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1253,40 +1265,40 @@ msgstr ""
 "  -V, --version     Skriv versjonsinformasjon og avslutt\n"
 "Se bruksanvisningssiden for ytterligere ledetekstinnstillinger og oppsett.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "WSL-distribusjonen '%s' ble ikke funnet"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Duplikatinnstilling '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Ukjent alternativ '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "'%s'-innstillingen krever et argument"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Syntaksfeil i posisjonsargumentet '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Syntaksfeil i størrelsesargumentet '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Syntaksfeil i geometriargumentet '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr ""
 "Mintty klarte ikke å løsrive seg fra påkalleren, men starter opp likevel"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "Benytter standardtittelen på grunn av ugyldige tegn i programnavnet"
 
diff --git a/msys2/usr/share/mintty/lang/pt_BR.po b/msys2/usr/share/mintty/lang/pt_BR.po
index 13501be77..d4d14c444 100644
--- a/msys2/usr/share/mintty/lang/pt_BR.po
+++ b/msys2/usr/share/mintty/lang/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2018-06-24 00:19-0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(Padrão)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(Página de código OEM)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(Página de código ANSI)"
 
@@ -38,79 +38,79 @@ msgstr "Não há terminais disponíveis"
 msgid "Error: Could not open log file"
 msgstr "Erro: Não foi possível abrir o arquivo de log"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Erro: Não foi possível bifurcar o processo filho"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "Pode ser necessário um rebasing do DLL; veja 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Falha ao executar '%s': %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Saiu com código %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "FINALIZADO"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Erro: Não foi possível bifurcar o daemon filho"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr ""
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Ignorando opção desconhecida '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Erro interno: opções em excesso"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Erro interno: opções/comentários em excesso"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Ignorando valor inválido '%s' para a opção '%s'"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Ignorando opção '%s' com valor faltando"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -118,163 +118,163 @@ msgstr ""
 "Não foi possível salvar as opções em '%s':\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Nenhuma (impressão desativada) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Impressora padrão ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Nenhuma –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Idioma do Windows @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Variável amb. de locale *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= Cfg. de locale em Texto ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "Bipe simples"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "Sem bipe"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Bipe padrão"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Parada crítica"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Pergunta"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Exclamação"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Asterisco"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Nenhum (som do sistema) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Nenhum ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "baixado / me dê um nome!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Não foi possível carregar o tema web"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Não é possível gravar o tema web"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Não é possível salvar o tema web"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Sobre..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Salvar"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Aplicar"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Entendi"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "OK"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Aparência"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Aparência no terminal"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Cores"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Prim. plano..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Fundo..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "&Cursor..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Tema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Criar esquema de cores"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Salvar"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Transparência"
 
@@ -282,253 +282,258 @@ msgstr "Transparência"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "&Desat."
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Baixa"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Méd."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Média"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Alta"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "&Vidro"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "&Opaca quando em primeiro plano"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "&Desfoque"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Cursor"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "L&inha"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "Blo&co"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "&Sublinhado"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "&Piscar"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Texto"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Propriedades de texto e fonte"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Fonte"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "E&stilo de fonte:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Tamanho:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "Most. n&eg. como fonte"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Most. ne&g. como cor"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Most. negrita"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "como fonte"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "como cor"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Suavização da fonte"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Padrão"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Desat."
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Parcial"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Total"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "Pe&rmitir piscar"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "&Locale"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "&Conjunto de caracteres"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Teclado"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Funcionalidades do teclado"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Backspace envia ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Delete envia DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+AltEsq. vira Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr vira também Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Atalhos"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "C&opiar e colar (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Menu e tela cheia (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "&Trocar janela (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Zoom (Ctrl+mais/menos/zero)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Atalhos &Alt+Fn"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Atalhos &Ctrl+Shift+letra"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Tecla de composição"
 
@@ -537,7 +542,7 @@ msgstr "Tecla de composição"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -546,7 +551,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "Ct&rl"
 
@@ -555,105 +560,112 @@ msgstr "Ct&rl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "A&lt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Mouse"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Funções do mouse"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "&Copiar ao selecionar"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Copiar com &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Cop. como texto &rico"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Copiar como &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "Cliques &posicionam o cursor na linha de com."
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Ações de clique"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Botão direito do mouse"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "C&olar"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "E&stender"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Menu"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Botão do meio do mouse"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Nada"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Modo de mouse de aplicativo"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Alvo padrão do clique"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Janela"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "&Aplicativo"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modificador para sobrescrever o padrão"
 
@@ -661,183 +673,183 @@ msgstr "Modificador para sobrescrever o padrão"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr ""
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr ""
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr ""
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Janela"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr ""
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Propriedades da janela"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Tamanho padrão"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Col&unas"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "&Linhas"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "&Tam. atual"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Linhas de &rol."
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Barra de rolagem"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Esquerda"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "&Direita"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modificador para rolagem"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "&PgUp e PgDn rolam sem modificador"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Idioma da interface"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Terminal"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Recursos do terminal"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Tipo"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Answerback"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Aviso"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► T&ocar"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "&Wave"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Piscar"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "&Destac. na bar. de tar."
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "&Saltar"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Impressora"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Confirmar &fechar com processos ativos"
 
@@ -846,112 +858,112 @@ msgid "[Printing...] "
 msgstr "[Imprimindo...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "Selec&..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Fonte "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Aplicar"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Fonte:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Exemplo"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "AaBbYyZz"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Sc&ript:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Mostrar mais fontes</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Cor "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Cores &básicas:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Cores &personalizadas:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "De&finir cores personalizadas >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Cor"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|Só&lida"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Hue:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Sat:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Lum:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Vermelho:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "V&erde:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Azul:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "A&dicionar às cores personalizadas"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Opções"
 
@@ -961,11 +973,11 @@ msgid "available"
 msgstr "disponível"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "100"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Erro"
 
@@ -1032,158 +1044,158 @@ msgid "&Copy"
 msgstr "&Copiar"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "Co&lar "
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Copiar → Colar"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "P&rocurar"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "&Registrar em arquivo"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "In&formações do caractere"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "Teclado VT220"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "R&edefinir"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "&Tamanho padrão"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "&Barra de rolagem"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "Tela &cheia"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Al&ternar tela"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Copiar tít&ulo"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "O&pções..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "A&brir"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Copiar como texto"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Copiar como RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Cop. como HTML texto"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Cop. como HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Cop. como HTML total"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Se&lecionar tudo"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Salvar como &imagem"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "Salvar tela como HTML"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Limpar tela"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Enviar break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Comandos do usuário"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Processos rodando na sessão:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Fechar mesmo assim?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Tente '--help' para mais informações"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Não foi possível carregar o ícone"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Uso:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPÇÃO]... [ PROGRAMA [ARG]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1256,39 +1268,39 @@ msgstr ""
 "Veja a página do manual para mais opções de linha de comando e "
 "configurações.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "Distribuição WSL '%s' não encontrada"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Opção repetida: '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Opção desconhecida: '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "A opção '%s' precisa de um argumento"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Erro de sintaxe no argumento de posição '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Erro de sintaxe no argumento de tamanho '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Erro de sintaxe no argumento de geometria '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "O Mintty não pôde se desanexar do chamador, iniciando mesmo assim"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "Usando título padrão devido a caracteres inválidos no nome do programa"
 
diff --git a/msys2/usr/share/mintty/lang/ru.po b/msys2/usr/share/mintty/lang/ru.po
index 897dd90aa..989e21bb2 100644
--- a/msys2/usr/share/mintty/lang/ru.po
+++ b/msys2/usr/share/mintty/lang/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2016-12-19 04:18+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(по умолчанию)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(OEM русская)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSI кириллица)"
 
@@ -36,79 +36,79 @@ msgstr "Нет доступных панелей"
 msgid "Error: Could not open log file"
 msgstr "Ошибка: не удалось открыть файл журнала"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Ошибка: не удалось запустить дочерний процесс"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "Может потребоваться перебазировка библиотек, см. 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Не удалось выполнить '%s': %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s остановлено: %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "ЗАВЕРШЕНИЕ"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Ошибка: не удалось запустить фоновый дочерний процесс"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr ""
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr ""
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Игнорирование неизвестного параметра '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Внутренняя ошибка: слишком много параметров"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Внутренняя ошибка: слишком много параметров/комментариев"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Игнорирование неправильного значения '%s' для параметра '%s'"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Игнорирование параметра '%s' отсутствует значение"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -116,163 +116,163 @@ msgstr ""
 "Не удалось сохранить параметр '%s':\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Нет (печать выключена) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Принтер по умолчанию ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Отсутствует –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Из Windows @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Из окружения *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= Файл конфигурации ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "Простой сигнал"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "Без звука"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Стандартный звук"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Критическая ошибка"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Вопрос"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Восклицание"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Звездочка"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Нет (системный звук) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Отсутствует ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "загружено / сохранить как"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Не удалось загрузить веб-тему"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Невозможно записать файл темы"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Не удается сохранить файл темы"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "О нас"
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Сохранить"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Отмена"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Применить"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Хорошо"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr ""
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Вид"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Внешний вид"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Цвета"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "Текст..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "Фон..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "Каретка..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "Тема"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Онлайн генератор тем"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "В набор"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Прозрачность"
 
@@ -280,253 +280,258 @@ msgstr "Прозрачность"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "Нет"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "Низ."
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "Сред."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "Средняя"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "Выс."
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "Проз."
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "Непрозрачно при фокусировке"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "Размытие"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Каретка"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "Слеш "
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "Блок"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "Подчеркивание"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "Мерцание"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Текст"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Текст и шрифт"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Шрифт"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "Начертание:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "Размер:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "Разреш. жир. текст"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "Разреш. цвет. текст"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Разреш. текст"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "жир. текст"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "цвет. текст"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Сглаживание шрифта"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "Система"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "Нет"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "Среднее"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "Полное"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "Разреш. мерцание"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "Формат"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "Набор символов"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr ""
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr ""
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Клавиатура"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Клавиатура"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Backarrow как ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "DEL удаляет слева"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+LeftAlt заменяет Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr заменяет или Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Клавиши быстрого доступа"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "Копировать и Вставить (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "Меню и полный экран (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "Переключить окно (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "Масштаб (Ctrl+plus/minus/zero)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "&Alt+F(n) сочетания"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "&Ctrl+Shift+(n) сочетания"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Модификатор клавиатуры"
 
@@ -535,7 +540,7 @@ msgstr "Модификатор клавиатуры"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr ""
 
@@ -544,7 +549,7 @@ msgstr ""
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr ""
 
@@ -553,105 +558,112 @@ msgstr ""
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr ""
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Мышь"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Свойства мыши"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "Копир. выделеное"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Копировать &TABs"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Копир. как таблицу"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Копировать как HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "Устанавливать каретку мышкой"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Действия при нажатии кнопок"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Правая кнопка мыши"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "Вставка"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "Выбрать"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "Меню"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Запуск"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Средняя кнопка мыши"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "Нет"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Режим отслеживания мыши"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "События мыши передаются"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Window"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "Приложению"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Модификатор отмены захвата мыши"
 
@@ -659,185 +671,185 @@ msgstr "Модификатор отмены захвата мыши"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr ""
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr ""
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr ""
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Окно"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr ""
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr ""
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Свойства окна"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Размер по умолчанию"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Колонны"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "Ряды"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "Текущие"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "Буфер строк"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Полоса прокрутки"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "Слева"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "Справа"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Модификатор прокрутки"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "&PgUp и PgDn прокрутка без модификатора"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Язык интерфейса"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Консоль"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Свойства консоли"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "Тип"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "Автоответ "
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Оповещения"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► Воспр."
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "Звук"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "Вспл."
 
 # msgstr "Всплывающее"
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "Подсветка"
 
 # msgstr "Статус в панели"
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "Всплывающее"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Принтер"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "При закрытии подсказывать о процессах"
 
@@ -846,112 +858,112 @@ msgid "[Printing...] "
 msgstr "[Печать ...]"
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "Выбрать"
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Шрифт"
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "Применить"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "Шрифт:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Образец"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "АаБбВвГг"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Набор символов:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Показать дополнительные шрифты</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Цвет"
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Основные цвета:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Дополнительные цвета:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "Определить цвет >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Цвет"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|Заливка"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "Оттенок:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "Контраст:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "Яркость:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "Красный:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "Зеленый:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "Синий:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "Добавить в набор"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Настройки"
 
@@ -961,11 +973,11 @@ msgid "available"
 msgstr "доступен"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr ""
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1032,158 +1044,158 @@ msgid "&Copy"
 msgstr "Копировать"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "Вставить"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Копировать → Вставить"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "Поиск"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "Сохранять логи в файл"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "Информация символов"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220 Клавиатура"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "Сброс"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "Стандартный размер"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "Полоса прокрутки"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "На весь экран"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Альтернативный экран"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Копировать заголовок"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "Настройки ..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "Открыть"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Копировать как текст"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Копировать как RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Копировать текст как HTML"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Копировать как HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Копировать все как HTML"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Выбрать все"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Сохранить как карти́на"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "Сохранить снимок экрана в HTML"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Сброс полосы прокрутки"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Прервать текущую задачу"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Пользовательские команды"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Имеются запущенные процессы:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Закрыть все равно?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Используйте '--help' для получения дополнительной информации"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Не удалось загрузить иконку"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Применение:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[ОПЦИЙ]... [ ПРОГРАММА [АРГУМЕНТЫ]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1251,40 +1263,40 @@ msgstr ""
 "Смотрите страницу руководства для параметров командной строки и "
 "конфигурации.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "Подсистема WSL '%s' не найдена"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Дублирование параметра '%s'"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Неизвестный параметр '%s'"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "Параметр '%s' требует аргумент"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Ошибка синтаксиса в позиции аргумента '%s'"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Ошибка синтаксиса в размере аргумента '%s'"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Ошибка синтаксиса в размере аргумента '%s'"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr ""
 "Mintty не может отключится от вызывающего метода, запуск в любом случае"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr ""
 "Использование заголовка по умолчанию из-за недопустимых символов в имени "
diff --git a/msys2/usr/share/mintty/lang/sv.po b/msys2/usr/share/mintty/lang/sv.po
index 5df88b00a..31a3ed27b 100644
--- a/msys2/usr/share/mintty/lang/sv.po
+++ b/msys2/usr/share/mintty/lang/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2020-03-14 13:53+0100\n"
 "Last-Translator: A Regnander <anton_r_3 at hotmail dot com>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(standard)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(OEM-teckentabell)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSI-teckentabell)"
 
@@ -38,78 +38,78 @@ msgstr "Det finns inga tillgängliga terminaler"
 msgid "Error: Could not open log file"
 msgstr "Fel: Kunde inte öppna loggfilen"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "Fel: Kunde inte förgrena underprocess"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr "Ombasering av DLL-filer kanske krävs; se \"rebaseall / rebase --help\""
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "Misslyckades att köra \"%s\": %s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s: Avsluta %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "AVSLUTAD"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "Fel: Kunde inte förgrena underdemon"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "sträck ut"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "justera"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "centrerad"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "fullständig"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "Ignorera det okända alternativet \"%s\""
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "Internt fel: För många alternativ"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "Internt fel: För många alternativ/kommentarer"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "Ignorerar det okänt värdet \"%s\" för alternativet \"%s\""
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "Ignorerar alternativet \"%s\" som saknar värde"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -117,163 +117,163 @@ msgstr ""
 "Kunde inte spara alternativ till \"%s\":\n"
 "%s."
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ Ingen (utskrift inaktiverat) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ Standardskrivare ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– Inget –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windowsspråk @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Miljöspråk *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= Konfigurerat språk ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "enkel ljudsignal"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "ingen ljudsignal"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "Standardljudsignal"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "Kritiskt stopp"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "Fråga"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "Varning"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "Asterisk"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ Inget (systemljud) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ Inget ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "nedladdad / namnge mig!"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "Kunde inte läsa in webbtema"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "Kan inte skriva temafil"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "Kan inte lagra temafil"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "Om..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "Spara"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "Verkställ"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "Jag förstår"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "OK"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "Utseende"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "Terminalutseende"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "Färger"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "&Förgrund..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "&Bakgrund..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "Mark&ör..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "&Tema"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "Färgtemadesigner"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "Lagra"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
@@ -281,253 +281,258 @@ msgstr "Genomskinlighet"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "A&v"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "&Låg"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "&Med."
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "&Medel"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "&Hög"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "Gla&s"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "&Ingen genomskinlighet vid fokus"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "S&uddighet"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "Markör"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "Li&nje"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "Blo&ck"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "&Understreck"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "B&linkande markör"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "Text"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "Text- och teckensnittsegenskaper"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "Teckensnitt"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "St&il:"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "&Storlek:"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "&Visa fetstil som teckensnitt"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "&Visa fetstil som färg"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "Visa fetstil som"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "teckensnitt"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "färg"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr "xterm"
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "Teckensnittsutjämning"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "&Standard"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "&Ingen"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "&Delvis"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "&Full"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "&Blinka"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "Spr&åk"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "Tecken&uppsättning"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "Uttrycksymboler"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "Stil"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "Placering"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "Tangenter"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "Tangentbordsfunktioner"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "&Bakåtpil skriver ^H"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "&Delete skriver DEL"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+VänsterAlt fungerar likadant som Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "AltGr fungerar även likadant som Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "Kortkommandon"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "Ko&piera och klistra in (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "&Meny och helskärm (Alt+Mellanslag/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "B&yt fönster (Ctrl+[Shift+]Tabb)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "&Zooma (Ctrl+plus/minus/noll)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Kortkommandon för Alt+&Fn"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Kortkommandon för C&trl+Shift+bokstav"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "Kombinationstangent"
 
@@ -536,7 +541,7 @@ msgstr "Kombinationstangent"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -545,7 +550,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -554,105 +559,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "Mus"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "Musfunktioner"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "Kopiera vid &markering"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "Kopiera (som text) med &TABB"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "Kopiera som &RTF-text"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "Kopiera som &HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "&Placera kommandotolkens markör vid musklick"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "Klickåtgärder"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "Höger musknapp"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "&Klistra in"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "&Utvidga"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "&Meny"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "Mittenmusknapp"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "&Inget"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "Applikationens musläge"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "Standardklickmål"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "&Fönster"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "App&likation"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "Modifierare för att överskrida standardvärden"
 
@@ -660,183 +672,183 @@ msgstr "Modifierare för att överskrida standardvärden"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr "&Win"
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr "S&up"
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr "&Hyp"
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "Markering"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "Markering och urklipp"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "Rensa markering vid inmatning"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "Urklipp"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "Rensa omgivande mellanrum från markering"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "Låt kontrollsekvenser ändra markeringar"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "Fönster"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "Visa storlek vid markering (0..12)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "Förhindra utmatning vid markering"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "Fönsteregenskaper"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "Standardstorlek"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "Kolu&mner"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "Ra&der"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "&Nuvarande"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "&Radbuffert"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "Rullningslist"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "&Vänster"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "H&öger"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "Modifierare för rullning"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "Rulla med &PgUp och PgDn utan modifierare"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "Gränssnittsspråk"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "Terminal"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "Terminalfunktioner"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "&Typ"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "Svarstr&äng"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "Ljud"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► &Spela upp"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr ".&wav-fil"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "&Blinka"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "&Visa i aktivitetsfältet"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "&Popupp"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "Skrivare"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "Fråga om pågående processer vid &avslut"
 
@@ -845,112 +857,112 @@ msgid "[Printing...] "
 msgstr "[Skriver ut...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "&Tecken..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "Teckensnitt "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "&Verkställ"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "&Teckensnitt:"
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "Exempel"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "Flygande bäckasiner söka hwila 0123456789"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "Sk&ript:"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>Visa fler teckensnitt</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "Redigera färger "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "Gr&undfärger:"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "Anpassade f&ärger:"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "&Definiera anpassade färger >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "Färg"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|R&en färg"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "&Nyans:"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "&Mättnad:"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "&Ljusstyrka:"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "&Röd:"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "Gr&ön:"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "&Blå:"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "Lägg &till anpassade färger"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "Alternativ"
 
@@ -960,11 +972,11 @@ msgid "available"
 msgstr "är tillgänglig"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "100"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "Fel"
 
@@ -1031,158 +1043,158 @@ msgid "&Copy"
 msgstr "&Kopiera"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "K&listra in "
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "Kopiera → Klistra in"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "S&ök"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "&Logga till fil"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "Tecken&information"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220-tangentbord"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "&Nollställ"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "&Standardstorlek"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "&Rullningslist"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "&Helskärm"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "Vänd &skärm"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "Kopiera &namnlisten"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "&Alternativ..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "&Öppna"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "Kopiera som text"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "Kopiera som RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "Kopiera som HTML-text"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "Kopiera som HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "Kopiera som fullständig HTML"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "Markera &allt"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "Spara som &bild"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "HTML-skärmdump"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "Rensa radbuffert"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "Skriv Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "Användarkommandon"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "Processer som körs i sessionen:"
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "Vill du stänga fönstret ändå?"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "Prova att skriva \"--help\" för mer information"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "Kunde inte läsa in ikon"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "Användning:"
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[ALTERNATIV]... [ PROGRAM [ARGUMENT]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1248,39 +1260,39 @@ msgstr ""
 "Se manualsidan för ytterligare alternativ och konfigurationer av "
 "kommandotolken.\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "WSL-distributionen \"%s\" hittades inte"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "Alternativet \"%s\" är en dubblett"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "Alternativet \"%s\" är okänt"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "Alternativet \"%s\" kräver ett argument"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Syntaxfel vid positionsargumentet \"%s\""
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Syntaxfel i storleksargumentet \"%s\""
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Syntaxfel i geometriargumentet \"%s\""
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty kunde inte frigöras från anroparen, men startas ändå"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "Standardnamnlisten används p.g.a. ogiltiga tecken i programmets namn"
 
diff --git a/msys2/usr/share/mintty/lang/zh_CN.po b/msys2/usr/share/mintty/lang/zh_CN.po
index 8128d49e8..24c6c34ea 100644
--- a/msys2/usr/share/mintty/lang/zh_CN.po
+++ b/msys2/usr/share/mintty/lang/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2017-10-23 17:09+0800\n"
 "Last-Translator: Gore Liu <goreliu@126.com>\n"
 "Language-Team: \n"
@@ -19,15 +19,15 @@ msgstr ""
 "X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "(默认)"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "(OEM 代码页)"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "(ANSI 代码页)"
 
@@ -39,79 +39,79 @@ msgstr "没有可用的终端"
 msgid "Error: Could not open log file"
 msgstr "错误：无法打开日志文件"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "错误：无法创建子进程"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr ""
 "可能需要 DLL 地址重定位，运行此命令查看帮助 'rebaseall / rebase --help'"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "运行 '%s' 失败：%s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s：退出 %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "已终止"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "错误：无法创建子进程"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "拉伸"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "适应"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "居中"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "填充"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "忽略未知选项 '%s'"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "内部错误：过多选项"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "内部错误：过多选项/注释"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "忽略 '%s' 无效值，属于该选项 '%s'"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "忽略 '%s' 选项，因为缺少值"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -119,163 +119,163 @@ msgstr ""
 "无法将选项保存到 '%s'：\n"
 "%s。"
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ 无 (禁用打印) ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ 默认打印机 ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– 无 –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windows 语言 @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Locale 环境变量 *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= 已配置的 Locale ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "简单的嘟声"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "无提示音"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "默认的嘟声"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "错误提示音"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "疑问提示音"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "惊叹提示音"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "星号提示音"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ 无 (系统声音) ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ 无 ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "已下载 / 给我起名！"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "无法加载网络主题"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "无法写入主题文件"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "无法储存主题文件"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "关于..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "保存"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "取消"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "应用"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "我了解了"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "确定"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "外观"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "终端外观"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "颜色"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "前景(&F)..."
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "背景(&B)..."
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "光标(&C)..."
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "主题(&T)"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "颜色样式设计工具"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "保存"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "透明度"
 
@@ -283,253 +283,258 @@ msgstr "透明度"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "关(&O)"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "低(&L)"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "中(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "中(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "高(&H)"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "玻璃"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "获得焦点后变为不透明(&Q)"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "模糊(&R)"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "光标"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "竖线"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "方块"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "下划线"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "闪烁(&G)"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "文本"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "文本和字体属性"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "字体"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "字体样式(&Y)"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "大小(&S)"
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "显示粗体字形(&W)"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "显示粗体颜色(&B)"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "显示粗体的"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "字形"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "颜色"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "字体平滑"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "默认(&D)"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "无(&N)"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "部分(&P)"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "全部(&F)"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "允许闪烁(&A)"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "本地 &Locale"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "字符集(&C)"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "Emoji"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "风格"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "位置"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "按键"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "键盘特性"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "退格键发送 ^H (&B)"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "删除键发送 DEL (&D)"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "将 Ctrl+左Alt 设置为 Alt&Gr"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "将 AltGr 也视为 Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "快捷键"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "复制和粘贴(&Y) (Ctrl/Shift+Ins)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "显示菜单和全屏(&M) (Alt+Space/Enter)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "切换窗口(&S) (Ctrl+[Shift+]Tab)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "缩放(&Z) (Ctrl + +/-/0)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Alt+Fn 快捷键(&A)"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Ctrl+Shift+字母快捷键(&C)"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "组合按键"
 
@@ -538,7 +543,7 @@ msgstr "组合按键"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr ""
 
@@ -547,7 +552,7 @@ msgstr ""
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr ""
 
@@ -556,105 +561,112 @@ msgstr ""
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr ""
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "鼠标"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "鼠标功能"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "选中后立即复制(&Y)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "以纯文本复制（包括 &Tab）"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "以富文本复制(&R)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "以 HTML 复制"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "使用鼠标点击来定位光标(&K)"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "单击动作"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "扩展(&E)"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "菜单(&M)"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "回车(&E)"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "无(&N)"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "应用程序鼠标模式"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "默认点击目标"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "窗口(&W)"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "应用程序(&A)"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "覆盖默认配置的修饰键"
 
@@ -662,183 +674,183 @@ msgstr "覆盖默认配置的修饰键"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr ""
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr ""
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr ""
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "选中"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "选中字符和剪切板功能"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "输入后取消选中"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "剪切板"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "移除不必要的空格"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "允许使用 OSC 52 转义字符设置剪切板内容"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "窗口"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "选择时显示尺寸 (0:关闭/1-12:方位)"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "选择时暂停屏幕输出"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "窗口属性"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "默认大小"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "列数"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "行数"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "当前大小(&U)"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "保存历史行数"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "滚动条"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "左(&L)"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "右(&R)"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "用于滚动的修饰键"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "即使不按修饰键，也用 PgUp 和 PgDn 滚动"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "界面语言"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "终端"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "终端特性"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "终端类型(&T)"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "应答(&A)"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "响铃"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► 播放(&P)"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "声音"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "闪屏(&F)"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "任务栏高亮(&H)"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "弹出(&P)"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "打印机"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "退出时提示还在运行的进程(&C)"
 
@@ -847,112 +859,112 @@ msgid "[Printing...] "
 msgstr "[打印中...] "
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "选择(&S)..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "字体 "
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "应用(&A)"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "字体(&F)："
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "实例"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "ABC abc 文字实例"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "字符集："
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>显示更多字体</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "颜色 "
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "基本颜色(&B)："
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "自定义颜色(&C)："
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "定义当前颜色(&F)>>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "颜色"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|纯色(&O)"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "色调(&H)"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "饱和度(&S)"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "亮度(&L)"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "红色(&R)："
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "绿色(&G)："
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "蓝色(&B)："
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "添加到自定义颜色(&D)"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "选项"
 
@@ -962,11 +974,11 @@ msgid "available"
 msgstr "可用"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr ""
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "错误"
 
@@ -1033,158 +1045,158 @@ msgid "&Copy"
 msgstr "复制(&C)"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "粘贴(&P) "
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "复制 → 粘贴"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "搜索(&E)"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "写入到日志文件(&L)"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "字符详情(&I)"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT200 键盘"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "重置(&R)"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "默认大小(&D)"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "滚动条"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "全屏(&F)"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "翻转屏幕(&S)"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "复制标题(&T)"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "选项(&O)..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "打开(&O)"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "以纯文本复制"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "以 RTF 复制"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "以 HTML 文本复制"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "以 HTML 复制"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "以 HTML 全部复制"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "全选(&A)"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "保存截图(&I)"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "HTML 屏幕转储"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "清除滚动历史"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "发送 Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "用户命令"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "在当前会话中还运行着进程："
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "确认关闭？"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "使用 --help 参数运行来了解如何使用"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "无法加载图标"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "用法："
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[选项]... [ 程序名 [参数]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1242,39 +1254,39 @@ msgstr ""
 "  -V, --version         打印版本信息然后退出\n"
 "请查阅 man 手册了解更多命令行选项和配置相关帮助内容。\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "找不到 '%s' WSL 发行版"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "重复的选项 %s"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "未知的选项 %s"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "选项 %s 需要一个参数"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "position 选项的参数 '%s' 有语法错误"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "size 选项的参数 '%s' 有语法错误"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "geometry 选项的参数 '%s' 有语法错误"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty 不能从调用者分离，但继续启动"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "使用默认的标题栏文字，因为程序名中有无效字符"
 
diff --git a/msys2/usr/share/mintty/lang/zh_TW.po b/msys2/usr/share/mintty/lang/zh_TW.po
index 3fecebda3..9e6d3a742 100644
--- a/msys2/usr/share/mintty/lang/zh_TW.po
+++ b/msys2/usr/share/mintty/lang/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 15:34+0200\n"
+"POT-Creation-Date: 2020-12-20 22:57+0100\n"
 "PO-Revision-Date: 2019-10-16 12:32+0800\n"
 "Last-Translator: lcy0321 <u900011@gmail.com>\n"
 "Language-Team: \n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: charset.c:240 charset.c:251 winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: charset.c:242 charset.c:253 winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "(Default)"
 msgstr "（預設）"
 
-#: charset.c:262
+#: charset.c:264
 msgid "(OEM codepage)"
 msgstr "（OEM codepage）"
 
-#: charset.c:266
+#: charset.c:268
 msgid "(ANSI codepage)"
 msgstr "（ANSI codepage）"
 
@@ -36,78 +36,78 @@ msgstr "沒有可用的終端機"
 msgid "Error: Could not open log file"
 msgstr "錯誤：無法開啟紀錄檔案"
 
-#: child.c:239
+#: child.c:238
 msgid "Error: Could not fork child process"
 msgstr "錯誤：無法建立子程序"
 
-#: child.c:241
+#: child.c:240
 msgid "DLL rebasing may be required; see 'rebaseall / rebase --help'"
 msgstr "可能需要進行 DLL 重定位；見「rebaseall / rebase --help」"
 
 #. __ %1$s: client command (e.g. shell) to be run; %2$s: error message
-#: child.c:322
+#: child.c:330
 msgid "Failed to run '%s': %s"
 msgstr "無法執行「%s」：%s"
 
 #. __ %1$s: client command (e.g. shell) terminated, %2$i: exit code
-#: child.c:446
+#: child.c:454
 msgid "%s: Exit %i"
 msgstr "%s：Exit %i"
 
 #. __ default inline notification if ExitWrite=yes
-#: child.c:453
+#: child.c:461
 msgid "TERMINATED"
 msgstr "已終止"
 
-#: child.c:1049
+#: child.c:1059
 msgid "Error: Could not fork child daemon"
 msgstr "錯誤：無法建立子背景程序"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:566
+#: config.c:591
 msgid "stretch"
 msgstr "延展"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:568
+#: config.c:593
 msgid "align"
 msgstr "對齊"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:570
+#: config.c:595
 msgid "middle"
 msgstr "置中"
 
 #. __ Options - Text - Emojis - Placement
-#: config.c:572
+#: config.c:597
 msgid "full"
 msgstr "完整"
 
 #. __ %s: unknown option name
-#: config.c:689
+#: config.c:724
 msgid "Ignoring unknown option '%s'"
 msgstr "忽略未知選項「%s」"
 
-#: config.c:734 config.c:763
+#: config.c:769 config.c:798
 msgid "Internal error: too many options"
 msgstr "內部錯誤：選項過多"
 
-#: config.c:750
+#: config.c:785
 msgid "Internal error: too many options/comments"
 msgstr "內部錯誤：選項／註解過多"
 
 #. __ %2$s: option name, %1$s: invalid value
-#: config.c:896
+#: config.c:939
 msgid "Ignoring invalid value '%s' for option '%s'"
 msgstr "忽略無效值「%s」（「%s」選項）"
 
 #. __ %s: option name
-#: config.c:908
+#: config.c:951
 msgid "Ignoring option '%s' with missing value"
 msgstr "忽略「%s」選項（遺漏值）"
 
 #. __ %1$s: config file name, %2$s: error message
-#: config.c:1531
+#: config.c:1612
 msgid ""
 "Could not save options to '%s':\n"
 "%s."
@@ -115,163 +115,163 @@ msgstr ""
 "無法儲存選項至「%s」：\n"
 "%s。"
 
-#: config.c:1928
+#: config.c:2039
 msgid "◇ None (printing disabled) ◇"
 msgstr "◇ 無（停用列印） ◇"
 
-#: config.c:1930
+#: config.c:2041
 msgid "◆ Default printer ◆"
 msgstr "◆ 預設印表機 ◆"
 
 #. __ UI language
-#: config.c:2039
+#: config.c:2150
 msgid "– None –"
 msgstr "– 無 –"
 
-#: config.c:2040
+#: config.c:2151
 msgid "@ Windows language @"
 msgstr "@ Windows 語言 @"
 
-#: config.c:2041
+#: config.c:2152
 msgid "* Locale environm. *"
 msgstr "* Locale 環境變數 *"
 
-#: config.c:2042
+#: config.c:2153
 msgid "= cfg. Text Locale ="
 msgstr "= 已設定的語言 ="
 
-#: config.c:2124
+#: config.c:2235
 msgid "simple beep"
 msgstr "簡單的嗶聲"
 
-#: config.c:2125
+#: config.c:2236
 msgid "no beep"
 msgstr "無嗶聲"
 
-#: config.c:2126
+#: config.c:2237
 msgid "Default Beep"
 msgstr "預設嗶聲"
 
-#: config.c:2127
+#: config.c:2238
 msgid "Critical Stop"
 msgstr "緊急停止"
 
-#: config.c:2128
+#: config.c:2239
 msgid "Question"
 msgstr "問題"
 
-#: config.c:2129
+#: config.c:2240
 msgid "Exclamation"
 msgstr "驚嘆聲"
 
-#: config.c:2130
+#: config.c:2241
 msgid "Asterisk"
 msgstr "星號"
 
-#: config.c:2173
+#: config.c:2284
 msgid "◇ None (system sound) ◇"
 msgstr "◇ 無（系統音效） ◇"
 
 #. __ terminal theme / colour scheme
 #. __ emojis style
-#: config.c:2429 config.c:2958
+#: config.c:2540 config.c:3074
 msgid "◇ None ◇"
 msgstr "◇ 無 ◇"
 
 #. __ indicator of unsaved downloaded colour scheme
-#: config.c:2432
+#: config.c:2543
 msgid "downloaded / give me a name!"
 msgstr "已下載／給我個名字！"
 
-#: config.c:2521
+#: config.c:2632
 msgid "Could not load web theme"
 msgstr "無法載入網路主題"
 
-#: config.c:2573
+#: config.c:2689
 msgid "Cannot write theme file"
 msgstr "無法寫入主題檔案"
 
-#: config.c:2578
+#: config.c:2694
 msgid "Cannot store theme file"
 msgstr "無法儲存主題檔案"
 
 #. __ Dialog button - show About text
-#: config.c:3085
+#: config.c:3207
 msgid "About..."
 msgstr "關於..."
 
 #. __ Dialog button - save changes
-#: config.c:3088
+#: config.c:3210
 msgid "Save"
 msgstr "儲存"
 
 #. __ Dialog button - cancel
-#: config.c:3092 winctrls.c:1188 windialog.c:863
+#: config.c:3214 winctrls.c:1254 windialog.c:872
 msgid "Cancel"
 msgstr "取消"
 
 #. __ Dialog button - apply changes
-#: config.c:3096
+#: config.c:3218
 msgid "Apply"
 msgstr "套用"
 
 #. __ Dialog button - take notice
-#: config.c:3100 windialog.c:860
+#: config.c:3222 windialog.c:869
 msgid "I see"
 msgstr "了解"
 
 #. __ Dialog button - confirm action
-#: config.c:3102 winctrls.c:1187 windialog.c:862
+#: config.c:3224 winctrls.c:1253 windialog.c:871
 msgid "OK"
 msgstr "確認"
 
 #. __ Options - Looks: treeview label
-#: config.c:3109 config.c:3140 config.c:3181
+#: config.c:3231 config.c:3262 config.c:3303
 msgid "Looks"
 msgstr "外觀"
 
 #. __ Options - Looks: panel title
-#: config.c:3111
+#: config.c:3233
 msgid "Looks in Terminal"
 msgstr "終端機外觀"
 
 #. __ Options - Looks: section title
-#: config.c:3113
+#: config.c:3235
 msgid "Colours"
 msgstr "色彩"
 
 #. __ Options - Looks:
-#: config.c:3117
+#: config.c:3239
 msgid "&Foreground..."
 msgstr "前景(&F)"
 
 #. __ Options - Looks:
-#: config.c:3121
+#: config.c:3243
 msgid "&Background..."
 msgstr "背景(&B)"
 
 #. __ Options - Looks:
-#: config.c:3125
+#: config.c:3247
 msgid "&Cursor..."
 msgstr "色彩(&C)"
 
 #. __ Options - Looks:
-#: config.c:3129
+#: config.c:3251
 msgid "&Theme"
 msgstr "主題(&T)"
 
 #. __ Options - Looks: name of web service
-#: config.c:3134
+#: config.c:3256
 msgid "Color Scheme Designer"
 msgstr "色彩樣式設計工具"
 
 #. __ Options - Looks: store colour scheme
-#: config.c:3137 winctrls.c:405
+#: config.c:3259 winctrls.c:461
 msgid "Store"
 msgstr "保存"
 
 #. __ Options - Looks: section title
-#: config.c:3142
+#: config.c:3264
 msgid "Transparency"
 msgstr "透明度"
 
@@ -279,253 +279,258 @@ msgstr "透明度"
 #. __ Options - Keys:
 #. __ Options - Mouse:
 #. __ Options - Window:
-#: config.c:3148 config.c:3455 config.c:3599 config.c:3785
+#: config.c:3270 config.c:3582 config.c:3745 config.c:3936
 msgid "&Off"
 msgstr "關(&O)"
 
 #. __ Options - Looks: transparency
-#: config.c:3150
+#: config.c:3272
 msgid "&Low"
 msgstr "低(&L)"
 
 #. __ Options - Looks: transparency, short form of radio button label "Medium"
-#: config.c:3152
+#: config.c:3274
 msgid "&Med."
 msgstr "中(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3154
+#: config.c:3276
 msgid "&Medium"
 msgstr "中(&M)"
 
 #. __ Options - Looks: transparency
-#: config.c:3156
+#: config.c:3278
 msgid "&High"
 msgstr "高(&H)"
 
 #. __ Options - Looks: transparency
-#: config.c:3158
+#: config.c:3280
 msgid "Gla&ss"
 msgstr "玻璃(&S)"
 
 #. __ Options - Looks: transparency
-#: config.c:3165 config.c:3176
+#: config.c:3287 config.c:3298
 msgid "Opa&que when focused"
 msgstr "使用中不透明(&Q)"
 
 #. __ Options - Looks: transparency
-#: config.c:3170
+#: config.c:3292
 msgid "Blu&r"
 msgstr "模糊(&R)"
 
 #. __ Options - Looks: section title
-#: config.c:3183
+#: config.c:3305
 msgid "Cursor"
 msgstr "游標"
 
 #. __ Options - Looks: cursor type
-#: config.c:3188
+#: config.c:3310
 msgid "Li&ne"
 msgstr "豎線(&N)"
 
 #. __ Options - Looks: cursor type
-#: config.c:3190
+#: config.c:3312
 msgid "Bloc&k"
 msgstr "方塊(K)"
 
 #. __ Options - Looks: cursor type
-#: config.c:3192
+#: config.c:3315
+msgid "Bo&x"
+msgstr ""
+
+#. __ Options - Looks: cursor type
+#: config.c:3318
 msgid "&Underscore"
 msgstr "下劃線(&U)"
 
 #. __ Options - Looks: cursor feature
-#: config.c:3197
+#: config.c:3323
 msgid "Blinkin&g"
 msgstr "閃爍(&G)"
 
 #. __ Options - Text: treeview label
-#: config.c:3204 config.c:3229 config.c:3243 config.c:3272 config.c:3321
-#: config.c:3343 config.c:3356 config.c:3364
+#: config.c:3330 config.c:3355 config.c:3369 config.c:3398 config.c:3447
+#: config.c:3469 config.c:3482 config.c:3490
 msgid "Text"
 msgstr "文字"
 
 #. __ Options - Text: panel title
-#: config.c:3206
+#: config.c:3332
 msgid "Text and Font properties"
 msgstr "文字與字型屬性"
 
 #. __ Options - Text: section title
-#: config.c:3208
+#: config.c:3334
 msgid "Font"
 msgstr "字型"
 
 #. __ Options - Text:
 #. __ Font chooser:
-#: config.c:3216 winctrls.c:1198
+#: config.c:3342 winctrls.c:1264
 msgid "Font st&yle:"
 msgstr "字型樣式(&Y)"
 
 #. __ Font chooser:
-#: config.c:3221 winctrls.c:1200
+#: config.c:3347 winctrls.c:1266
 msgid "&Size:"
 msgstr "大小(&S)："
 
 #. __ Options - Text:
-#: config.c:3233 config.c:3291
+#: config.c:3359 config.c:3417
 msgid "Sho&w bold as font"
 msgstr "以字型顯示粗體字(&W)"
 
 #. __ Options - Text:
-#: config.c:3238 config.c:3296
+#: config.c:3364 config.c:3422
 msgid "Show &bold as colour"
 msgstr "以顏色顯示粗體字(&B)"
 
 #. __ Options - Text:
-#: config.c:3245 config.c:3323
+#: config.c:3371 config.c:3449
 msgid "Show bold"
 msgstr "以字型顯"
 
 #. __ Options - Text:
-#: config.c:3249 config.c:3327
+#: config.c:3375 config.c:3453
 msgid "as font"
 msgstr "示粗體字"
 
 #. __ Options - Text:
-#: config.c:3254 config.c:3332
+#: config.c:3380 config.c:3458
 msgid "as colour"
 msgstr "示粗體字"
 
 #. __ Options - Text:
-#: config.c:3259 config.c:3337
+#: config.c:3385 config.c:3463
 msgid "xterm"
 msgstr ""
 
 #. __ Options - Text:
-#: config.c:3276 config.c:3308
+#: config.c:3402 config.c:3434
 msgid "Font smoothing"
 msgstr "字體平滑"
 
 #. __ Options - Text:
-#: config.c:3279 config.c:3311 config.c:3493 config.c:3526 config.c:3676
-#: config.c:3689
+#: config.c:3405 config.c:3437 config.c:3633 config.c:3672 config.c:3827
+#: config.c:3840
 msgid "&Default"
 msgstr "預設(&D)"
 
 #. __ Options - Text:
 #. __ Options - Window: scrollbar
-#: config.c:3281 config.c:3313 config.c:3491 config.c:3524 config.c:3674
-#: config.c:3687 config.c:3766
+#: config.c:3407 config.c:3439 config.c:3631 config.c:3670 config.c:3825
+#: config.c:3838 config.c:3917
 msgid "&None"
 msgstr "無(&N)"
 
 #. __ Options - Text:
-#: config.c:3283 config.c:3315 config.c:3492 config.c:3525 config.c:3675
-#: config.c:3688
+#: config.c:3409 config.c:3441 config.c:3632 config.c:3671 config.c:3826
+#: config.c:3839
 msgid "&Partial"
 msgstr "部分(&P)"
 
 #. __ Options - Text:
-#: config.c:3285 config.c:3317 config.c:3494 config.c:3527 config.c:3677
-#: config.c:3690
+#: config.c:3411 config.c:3443 config.c:3634 config.c:3673 config.c:3828
+#: config.c:3841
 msgid "&Full"
 msgstr "完整(&F)"
 
 #. __ Options - Text:
-#: config.c:3301
+#: config.c:3427
 msgid "&Allow blinking"
 msgstr "允許閃爍(&A)"
 
-#: config.c:3346
+#: config.c:3472
 msgid "&Locale"
 msgstr "語言(&L)"
 
-#: config.c:3349
+#: config.c:3475
 msgid "&Character set"
 msgstr "字元集(C)"
 
 #. __ Options - Text - Emojis:
 #. __ Options - Text:
-#: config.c:3360 config.c:3366
+#: config.c:3486 config.c:3492
 msgid "Emojis"
 msgstr "表情符號"
 
 #. __ Options - Text - Emojis:
-#: config.c:3370
+#: config.c:3496
 msgid "Style"
 msgstr "風格"
 
 #. __ Options - Text - Emojis:
-#: config.c:3375
+#: config.c:3501
 msgid "Placement"
 msgstr "顯示方式"
 
 #. __ Options - Keys: treeview label
-#: config.c:3383 config.c:3408 config.c:3442
+#: config.c:3509 config.c:3534 config.c:3569 config.c:3587
 msgid "Keys"
 msgstr "按鍵"
 
 #. __ Options - Keys: panel title
-#: config.c:3385
+#: config.c:3511
 msgid "Keyboard features"
 msgstr "鍵盤功能"
 
 #. __ Options - Keys:
-#: config.c:3389
+#: config.c:3515
 msgid "&Backarrow sends ^H"
 msgstr "後退鍵傳送^H(&B)"
 
 #. __ Options - Keys:
-#: config.c:3394
+#: config.c:3520
 msgid "&Delete sends DEL"
 msgstr "刪除鍵傳送DEL(&D)"
 
 #. __ Options - Keys:
-#: config.c:3399
+#: config.c:3525
 msgid "Ctrl+LeftAlt is Alt&Gr"
 msgstr "Ctrl+左Alt為AltGr(&G)"
 
 #. __ Options - Keys:
-#: config.c:3404
+#: config.c:3530
 msgid "AltGr is also Alt"
 msgstr "將 AltGr 也視為 Alt"
 
 #. __ Options - Keys: section title
-#: config.c:3410
+#: config.c:3536
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
 #. __ Options - Keys:
-#: config.c:3413
+#: config.c:3539
 msgid "Cop&y and Paste (Ctrl/Shift+Ins)"
 msgstr "複製與貼上（Ctrl/Shift+Ins）(&Y)"
 
 #. __ Options - Keys:
-#: config.c:3418
+#: config.c:3544
 msgid "&Menu and Full Screen (Alt+Space/Enter)"
 msgstr "選單與全螢幕（Alt+Space/Enter）(&M)"
 
 #. __ Options - Keys:
-#: config.c:3423
+#: config.c:3549
 msgid "&Switch window (Ctrl+[Shift+]Tab)"
 msgstr "切換視窗（Ctrl+[Shift+]Tab）(&S)"
 
 #. __ Options - Keys:
-#: config.c:3428
+#: config.c:3554
 msgid "&Zoom (Ctrl+plus/minus/zero)"
 msgstr "縮放（Ctrl+plus/minus/zero）(&Z)"
 
 #. __ Options - Keys:
-#: config.c:3433
+#: config.c:3559
 msgid "&Alt+Fn shortcuts"
 msgstr "Alt+Fn 快捷鍵(&A)"
 
 #. __ Options - Keys:
-#: config.c:3438
+#: config.c:3564
 msgid "&Ctrl+Shift+letter shortcuts"
 msgstr "Ctrl+Shift+字母 快捷鍵(&C)"
 
 #. __ Options - Keys: section title
-#: config.c:3444
+#: config.c:3571 config.c:3589
 msgid "Compose key"
 msgstr "組合鍵"
 
@@ -534,7 +539,7 @@ msgstr "組合鍵"
 #. __ Options - Modifier - Shift:
 #. __ Options - Window:
 #. __ Options - Modifier - Shift:
-#: config.c:3449 config.c:3591 config.c:3610 config.c:3777 config.c:3796
+#: config.c:3576 config.c:3737 config.c:3756 config.c:3928 config.c:3947
 msgid "&Shift"
 msgstr "&Shift"
 
@@ -543,7 +548,7 @@ msgstr "&Shift"
 #. __ Options - Modifier - Control:
 #. __ Options - Window:
 #. __ Options - Modifier - Control:
-#: config.c:3451 config.c:3593 config.c:3618 config.c:3779 config.c:3804
+#: config.c:3578 config.c:3739 config.c:3764 config.c:3930 config.c:3955
 msgid "&Ctrl"
 msgstr "&Ctrl"
 
@@ -552,105 +557,112 @@ msgstr "&Ctrl"
 #. __ Options - Modifier - Alt:
 #. __ Options - Window:
 #. __ Options - Modifier - Alt:
-#: config.c:3453 config.c:3595 config.c:3614 config.c:3781 config.c:3800
+#: config.c:3580 config.c:3741 config.c:3760 config.c:3932 config.c:3951
 msgid "&Alt"
 msgstr "&Alt"
 
 #. __ Options - Mouse: treeview label
-#: config.c:3463 config.c:3539 config.c:3571
+#: config.c:3596 config.c:3685 config.c:3717
 msgid "Mouse"
 msgstr "滑鼠"
 
 #. __ Options - Mouse: panel title
-#: config.c:3465
+#: config.c:3598
 msgid "Mouse functions"
 msgstr "滑鼠功能"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3471 config.c:3499 config.c:3510 config.c:3659
+#: config.c:3606 config.c:3639 config.c:3655 config.c:3805
 msgid "Cop&y on select"
 msgstr "選取時複製(&Y)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3476 config.c:3504 config.c:3515 config.c:3666
+#. __ Context menu:
+#: config.c:3611 config.c:3644 config.c:3810 wininput.c:661
+msgid "Copy with TABs"
+msgstr "以純文字複製（包含 &Tab）"
+
+#. __ Options - Mouse:
+#. __ Options - Selection:
+#: config.c:3616 config.c:3649 config.c:3661 config.c:3817
 msgid "Copy as &rich text"
 msgstr "以格式化文字複製(&R)"
 
 #. __ Options - Mouse:
 #. __ Options - Selection:
-#: config.c:3482 config.c:3489 config.c:3522 config.c:3672 config.c:3685
+#: config.c:3622 config.c:3629 config.c:3668 config.c:3823 config.c:3836
 msgid "Copy as &HTML"
 msgstr "複製&HTML"
 
 #. __ Options - Mouse:
-#: config.c:3535
+#: config.c:3681
 msgid "Clic&ks place command line cursor"
 msgstr "點擊定位游標(&K)"
 
 #. __ Options - Mouse: section title
-#: config.c:3541
+#: config.c:3687
 msgid "Click actions"
 msgstr "點擊動作"
 
 #. __ Options - Mouse:
-#: config.c:3544
+#: config.c:3690
 msgid "Right mouse button"
 msgstr "滑鼠右鍵"
 
 #. __ Options - Mouse:
-#: config.c:3547 config.c:3561
+#: config.c:3693 config.c:3707
 msgid "&Paste"
 msgstr "貼上(&P)"
 
 #. __ Options - Mouse:
-#: config.c:3549 config.c:3563
+#: config.c:3695 config.c:3709
 msgid "E&xtend"
 msgstr "擴展(&X)"
 
 #. __ Options - Mouse:
-#: config.c:3551
+#: config.c:3697
 msgid "&Menu"
 msgstr "選單(&M)"
 
 #. __ Options - Mouse:
-#: config.c:3553 config.c:3567
+#: config.c:3699 config.c:3713
 msgid "Ente&r"
 msgstr "Ente&r"
 
 #. __ Options - Mouse:
-#: config.c:3558
+#: config.c:3704
 msgid "Middle mouse button"
 msgstr "滑鼠中鍵"
 
 #. __ Options - Mouse:
-#: config.c:3565
+#: config.c:3711
 msgid "&Nothing"
 msgstr "無(&N)"
 
 #. __ Options - Mouse: section title
-#: config.c:3573
+#: config.c:3719
 msgid "Application mouse mode"
 msgstr "應用程式滑鼠模式"
 
 #. __ Options - Mouse:
-#: config.c:3576
+#: config.c:3722
 msgid "Default click target"
 msgstr "預設點擊目標"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3579
+#: config.c:3725
 msgid "&Window"
 msgstr "視窗(&W)"
 
 #. __ Options - Mouse: application mouse mode click target
-#: config.c:3581
+#: config.c:3727
 msgid "&Application"
 msgstr "應用程式(&A)"
 
 #. __ Options - Mouse:
-#: config.c:3588 config.c:3606
+#: config.c:3734 config.c:3752
 msgid "Modifier for overriding default"
 msgstr "覆蓋預設設定的修飾鍵"
 
@@ -658,183 +670,183 @@ msgstr "覆蓋預設設定的修飾鍵"
 #. __ Options - Modifier - Win:
 #. __ Options - Window:
 #. __ Options - Modifier - Win:
-#: config.c:3597 config.c:3622 config.c:3783 config.c:3808
+#: config.c:3743 config.c:3768 config.c:3934 config.c:3959
 msgid "&Win"
 msgstr "&Win"
 
 #. __ Options - Modifier - Super:
-#: config.c:3626 config.c:3812
+#: config.c:3772 config.c:3963
 msgid "&Sup"
 msgstr "&Sup"
 
 #. __ Options - Modifier - Hyper:
-#: config.c:3630 config.c:3816
+#: config.c:3776 config.c:3967
 msgid "&Hyp"
 msgstr "&Hyp"
 
 #. __ Options - Selection: treeview label
-#: config.c:3640 config.c:3653 config.c:3709
+#: config.c:3786 config.c:3799 config.c:3860
 msgid "Selection"
 msgstr "選取"
 
 #. __ Options - Selection: panel title
-#: config.c:3642
+#: config.c:3788
 msgid "Selection and clipboard"
 msgstr "選取與剪貼簿"
 
 #. __ Options - Selection:
-#: config.c:3646
+#: config.c:3792
 msgid "Clear selection on input"
 msgstr "輸入時解除選取"
 
 #. __ Options - Selection: section title
-#: config.c:3655
+#: config.c:3801
 msgid "Clipboard"
 msgstr "剪貼簿"
 
 #. __ Options - Selection:
-#: config.c:3699
+#: config.c:3850
 msgid "Trim space from selection"
 msgstr "修剪選取範圍前後的空白"
 
 #. __ Options - Selection:
-#: config.c:3704
+#: config.c:3855
 msgid "Allow setting selection"
 msgstr "允許調整選取的設定值"
 
 #. __ Options - Selection: section title
 #. __ Options - Window: treeview label
-#: config.c:3711 config.c:3733 config.c:3752 config.c:3825
+#: config.c:3862 config.c:3884 config.c:3903 config.c:3976
 msgid "Window"
 msgstr "視窗"
 
 #. __ Options - Selection:
-#: config.c:3716
+#: config.c:3867
 msgid "Show size while selecting (0..12)"
 msgstr "選取時顯示長度"
 
 #. __ Options - Selection:
-#: config.c:3723
+#: config.c:3874
 msgid "Suspend output while selecting"
 msgstr "選取時暫停輸出"
 
 #. __ Options - Window: panel title
-#: config.c:3735
+#: config.c:3886
 msgid "Window properties"
 msgstr "視窗屬性"
 
 #. __ Options - Window: section title
-#: config.c:3737
+#: config.c:3888
 msgid "Default size"
 msgstr "預設大小"
 
 #. __ Options - Window:
-#: config.c:3741
+#: config.c:3892
 msgid "Colu&mns"
 msgstr "欄(&M)"
 
 #. __ Options - Window:
-#: config.c:3745
+#: config.c:3896
 msgid "Ro&ws"
 msgstr "列(&W)"
 
 #. __ Options - Window:
-#: config.c:3749
+#: config.c:3900
 msgid "C&urrent size"
 msgstr "目前大小(&U)"
 
 #. __ Options - Window:
-#: config.c:3756
+#: config.c:3907
 msgid "Scroll&back lines"
 msgstr "螢幕緩衝區行數(&B)"
 
 #. __ Options - Window:
-#: config.c:3761
+#: config.c:3912
 msgid "Scrollbar"
 msgstr "捲軸"
 
 #. __ Options - Window: scrollbar
-#: config.c:3764
+#: config.c:3915
 msgid "&Left"
 msgstr "左(&L)"
 
 #. __ Options - Window: scrollbar
-#: config.c:3768
+#: config.c:3919
 msgid "&Right"
 msgstr "右(&R)"
 
 #. __ Options - Window:
-#: config.c:3774 config.c:3792
+#: config.c:3925 config.c:3943
 msgid "Modifier for scrolling"
 msgstr "滾動的修飾鍵"
 
 #. __ Options - Window:
-#: config.c:3821
+#: config.c:3972
 msgid "&PgUp and PgDn scroll without modifier"
 msgstr "PgUp 與 PgDn 滾動不需修飾鍵(&P)"
 
 #. __ Options - Window: section title
-#: config.c:3827
+#: config.c:3978
 msgid "UI language"
 msgstr "介面語言"
 
 #. __ Options - Terminal: treeview label
-#: config.c:3837 config.c:3850 config.c:3911 config.c:3925
+#: config.c:3988 config.c:4001 config.c:4062 config.c:4076
 msgid "Terminal"
 msgstr "終端機"
 
 #. __ Options - Terminal: panel title
-#: config.c:3839
+#: config.c:3990
 msgid "Terminal features"
 msgstr "終端機功能"
 
 #. __ Options - Terminal:
-#: config.c:3843
+#: config.c:3994
 msgid "&Type"
 msgstr "類型(&T)"
 
 #. __ Options - Terminal:
-#: config.c:3847
+#: config.c:3998
 msgid "&Answerback"
 msgstr "&Answerback"
 
 #. __ Options - Terminal: section title
-#: config.c:3852
+#: config.c:4003
 msgid "Bell"
 msgstr "提示音"
 
 #. __ Options - Terminal: bell
-#: config.c:3859
+#: config.c:4010
 msgid "► &Play"
 msgstr "► 播放(&P)"
 
 #. __ Options - Terminal: bell
-#: config.c:3865
+#: config.c:4016
 msgid "&Wave"
 msgstr "聲音(&W)"
 
 #. __ Options - Terminal: bell
-#: config.c:3887 config.c:3900
+#: config.c:4038 config.c:4051
 msgid "&Flash"
 msgstr "閃爍(&F)"
 
 #. __ Options - Terminal: bell
-#: config.c:3889 config.c:3904
+#: config.c:4040 config.c:4055
 msgid "&Highlight in taskbar"
 msgstr "於工作列醒目提示(&H)"
 
 #. __ Options - Terminal: bell
-#: config.c:3891 config.c:3908
+#: config.c:4042 config.c:4059
 msgid "&Popup"
 msgstr "彈出視窗(&P)"
 
 #. __ Options - Terminal: section title
-#: config.c:3913
+#: config.c:4064
 msgid "Printer"
 msgstr "印表機"
 
 #. __ Options - Terminal:
-#: config.c:3928
+#: config.c:4079
 msgid "Prompt about running processes on &close"
 msgstr "離開時提示執行中的程式(&C)"
 
@@ -843,112 +855,112 @@ msgid "[Printing...] "
 msgstr "［列印中...］"
 
 #. __ Options - Text: font chooser activation button
-#: winctrls.c:857
+#: winctrls.c:912
 msgid "&Select..."
 msgstr "選擇(&S)..."
 
 #. __ Font chooser: title bar label
-#: winctrls.c:1192
+#: winctrls.c:1258
 msgid "Font "
 msgstr "字型"
 
 #. __ Font chooser: button
-#: winctrls.c:1194
+#: winctrls.c:1260
 msgid "&Apply"
 msgstr "套用(&A)"
 
 #. __ Font chooser:
-#: winctrls.c:1196
+#: winctrls.c:1262
 msgid "&Font:"
 msgstr "字型(&F)："
 
 #. __ Font chooser:
-#: winctrls.c:1202
+#: winctrls.c:1268
 msgid "Sample"
 msgstr "範例"
 
 #. __ Font chooser: text sample ("AaBbYyZz" by default)
-#: winctrls.c:1206 winctrls.c:1446 winctrls.c:1611
+#: winctrls.c:1272 winctrls.c:1531 winctrls.c:1696
 msgid "Ferqœm’4€"
 msgstr "ABC abc 文字"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1223
+#: winctrls.c:1289
 msgid "Sc&ript:"
 msgstr "字符集(&R)"
 
 #. __ Font chooser: this field is only shown with FontMenu=1
-#: winctrls.c:1225
+#: winctrls.c:1291
 msgid "<A>Show more fonts</A>"
 msgstr "<A>顯示更多字型</A>"
 
 #. __ Colour chooser: title bar label
-#: winctrls.c:1230
+#: winctrls.c:1296
 msgid "Colour "
 msgstr "色彩"
 
 #. __ Colour chooser:
-#: winctrls.c:1243 winctrls.c:1255
+#: winctrls.c:1309 winctrls.c:1321
 msgid "B&asic colours:"
 msgstr "基本色彩(&A)"
 
 #. __ Colour chooser:
-#: winctrls.c:1264
+#: winctrls.c:1330
 msgid "&Custom colours:"
 msgstr "自訂色彩(&C)"
 
 #. __ Colour chooser:
-#: winctrls.c:1271
+#: winctrls.c:1337
 msgid "De&fine Custom Colours >>"
 msgstr "定義自訂色彩(&F) >>"
 
 #. __ Colour chooser:
-#: winctrls.c:1274
+#: winctrls.c:1340
 msgid "Colour"
 msgstr "色彩"
 
 #. __ Colour chooser:
-#: winctrls.c:1276
+#: winctrls.c:1342
 msgid "|S&olid"
 msgstr "|原色(&O)"
 
 #. __ Colour chooser:
-#: winctrls.c:1278
+#: winctrls.c:1344
 msgid "&Hue:"
 msgstr "色調(&H):"
 
 #. __ Colour chooser:
-#: winctrls.c:1281
+#: winctrls.c:1347
 msgid "&Sat:"
 msgstr "濃度(&S):"
 
 #. __ Colour chooser:
-#: winctrls.c:1283
+#: winctrls.c:1349
 msgid "&Lum:"
 msgstr "亮度(&L):"
 
 #. __ Colour chooser:
-#: winctrls.c:1285
+#: winctrls.c:1351
 msgid "&Red:"
 msgstr "紅(&R):"
 
 #. __ Colour chooser:
-#: winctrls.c:1287
+#: winctrls.c:1353
 msgid "&Green:"
 msgstr "綠(&G):"
 
 #. __ Colour chooser:
-#: winctrls.c:1289
+#: winctrls.c:1355
 msgid "&Blue:"
 msgstr "藍(&B):"
 
 #. __ Colour chooser:
-#: winctrls.c:1292
+#: winctrls.c:1358
 msgid "A&dd to Custom Colours"
 msgstr "新增自訂色彩(&D)"
 
 #. __ Options: dialog title
-#: windialog.c:243 windialog.c:807
+#: windialog.c:243 windialog.c:816
 msgid "Options"
 msgstr "選項"
 
@@ -958,11 +970,11 @@ msgid "available"
 msgstr "可用"
 
 #. __ Options: dialog width scale factor (80...200)
-#: windialog.c:754
+#: windialog.c:760
 msgid "100"
 msgstr "115"
 
-#: windialog.c:892 windialog.c:919
+#: windialog.c:901 windialog.c:928
 msgid "Error"
 msgstr "錯誤"
 
@@ -1029,158 +1041,158 @@ msgid "&Copy"
 msgstr "複製(&C)"
 
 #. __ Context menu:
-#: wininput.c:491
+#: wininput.c:493
 msgid "&Paste "
 msgstr "貼上(&P)"
 
 #. __ Context menu:
-#: wininput.c:496
+#: wininput.c:498
 msgid "Copy → Paste"
 msgstr "複製 → 貼上"
 
 #. __ Context menu:
-#: wininput.c:501
+#: wininput.c:503
 msgid "S&earch"
 msgstr "搜尋(&E)"
 
 #. __ Context menu:
-#: wininput.c:508
+#: wininput.c:510
 msgid "&Log to File"
 msgstr "記錄至檔案(&L)"
 
 #. __ Context menu:
-#: wininput.c:514
+#: wininput.c:516
 msgid "Character &Info"
 msgstr "字元資訊(&I)"
 
 #. __ Context menu:
-#: wininput.c:520
+#: wininput.c:522
 msgid "VT220 Keyboard"
 msgstr "VT220 鍵盤"
 
 #. __ Context menu:
-#: wininput.c:525
+#: wininput.c:527
 msgid "&Reset"
 msgstr "重設(&R)"
 
 #. __ Context menu:
-#: wininput.c:533
+#: wininput.c:535
 msgid "&Default Size"
 msgstr "預設大小(&D)"
 
 #. __ Context menu:
-#: wininput.c:543
+#: wininput.c:545
 msgid "Scroll&bar"
 msgstr "捲軸(&B)"
 
 #. __ Context menu:
-#: wininput.c:549
+#: wininput.c:551
 msgid "&Full Screen"
 msgstr "全螢幕(&F)"
 
 #. __ Context menu:
-#: wininput.c:555
+#: wininput.c:557
 msgid "Flip &Screen"
 msgstr "切換螢幕(&S)"
 
 #. __ System menu:
-#: wininput.c:565 wininput.c:734
+#: wininput.c:567 wininput.c:738
 msgid "Copy &Title"
 msgstr "複製標題(&T)"
 
 #. __ System menu:
 #. __ Context menu:
 #. __ System menu:
-#: wininput.c:567 wininput.c:718 wininput.c:736
+#: wininput.c:569 wininput.c:722 wininput.c:740
 msgid "&Options..."
 msgstr "選項(&O)..."
 
 #. __ Context menu:
-#: wininput.c:652
+#: wininput.c:654
 msgid "Ope&n"
 msgstr "開啟(&N)"
 
 #. __ Context menu:
-#: wininput.c:657
+#: wininput.c:659
 msgid "Copy as text"
 msgstr "複製text"
 
 #. __ Context menu:
-#: wininput.c:659
+#: wininput.c:663
 msgid "Copy as RTF"
 msgstr "複製RTF"
 
 #. __ Context menu:
-#: wininput.c:661
+#: wininput.c:665
 msgid "Copy as HTML text"
 msgstr "複製HTML text"
 
 #. __ Context menu:
-#: wininput.c:663
+#: wininput.c:667
 msgid "Copy as HTML"
 msgstr "複製HTML"
 
 #. __ Context menu:
-#: wininput.c:665
+#: wininput.c:669
 msgid "Copy as HTML full"
 msgstr "複製HTML完整"
 
 #. __ Context menu:
-#: wininput.c:672
+#: wininput.c:676
 msgid "Select &All"
 msgstr "全選(&A)"
 
 #. __ Context menu:
-#: wininput.c:674
+#: wininput.c:678
 msgid "Save as &Image"
 msgstr "儲存成圖片(&I)"
 
 #. __ Context menu: write terminal window contents as HTML file
-#: wininput.c:686
+#: wininput.c:690
 msgid "HTML Screen Dump"
 msgstr "將螢幕內容存為 HTML"
 
 #. __ Context menu: clear scrollback buffer (lines scrolled off the window)
-#: wininput.c:694
+#: wininput.c:698
 msgid "Clear Scrollback"
 msgstr "清除螢幕緩衝區"
 
 #. __ Context menu: generate a TTY BRK condition (tty line interrupt)
-#: wininput.c:704
+#: wininput.c:708
 msgid "Send Break"
 msgstr "傳送 Break"
 
 #. __ Context menu, user commands
-#: wininput.c:801
+#: wininput.c:805
 msgid "User commands"
 msgstr "使用者指令"
 
-#: winmain.c:2329
+#: winmain.c:2406
 msgid "Processes are running in session:"
 msgstr "有程式正在執行於 Session："
 
-#: winmain.c:2330
+#: winmain.c:2407
 msgid "Close anyway?"
 msgstr "仍要關閉？"
 
-#: winmain.c:2448
+#: winmain.c:2543
 msgid "Try '--help' for more information"
 msgstr "嘗試「--help」以獲得更多資訊"
 
-#: winmain.c:2456
+#: winmain.c:2551
 msgid "Could not load icon"
 msgstr "無法載入圖示"
 
-#: winmain.c:4210
+#: winmain.c:4444
 msgid "Usage:"
 msgstr "使用方式："
 
-#: winmain.c:4211
+#: winmain.c:4445
 msgid "[OPTION]... [ PROGRAM [ARG]... | - ]"
 msgstr "[OPTION]... [ PROGRAM [ARG]... | - ]"
 
 #. __ help text (output of -H / --help), after initial line ("synopsis")
-#: winmain.c:4214
+#: winmain.c:4448
 msgid ""
 "Start a new terminal session running the specified program or the user's "
 "shell.\n"
@@ -1238,39 +1250,39 @@ msgstr ""
 "    -V, --version         輸出版本資訊並離開\n"
 "參閱說明頁面以取得進一步的命令列選項與設定。\n"
 
-#: winmain.c:4370 winmain.c:4482 winmain.c:4489
+#: winmain.c:4605 winmain.c:4717 winmain.c:4724
 msgid "WSL distribution '%s' not found"
 msgstr "找不到 WSL 發行版 %s"
 
-#: winmain.c:4520
+#: winmain.c:4755
 msgid "Duplicate option '%s'"
 msgstr "重複的選項「%s」"
 
-#: winmain.c:4528 winmain.c:4596
+#: winmain.c:4763 winmain.c:4834
 msgid "Unknown option '%s'"
 msgstr "未知的選項「%s」"
 
-#: winmain.c:4530
+#: winmain.c:4765
 msgid "Option '%s' requires an argument"
 msgstr "選項「%s」需要一個參數"
 
-#: winmain.c:4557
+#: winmain.c:4792
 msgid "Syntax error in position argument '%s'"
 msgstr "Position 參數「%s」有語法錯誤"
 
-#: winmain.c:4568
+#: winmain.c:4803
 msgid "Syntax error in size argument '%s'"
 msgstr "Size 參數「%s」有語法錯誤"
 
-#: winmain.c:4705
+#: winmain.c:4943
 msgid "Syntax error in geometry argument '%s'"
 msgstr "Geometry 參數「%s」有語法錯誤"
 
-#: winmain.c:4785
+#: winmain.c:5026
 msgid "Mintty could not detach from caller, starting anyway"
 msgstr "Mintty 無法自 caller 分離，仍開始啟動"
 
-#: winmain.c:5067
+#: winmain.c:5317
 msgid "Using default title due to invalid characters in program name"
 msgstr "由於程式名稱中有不合法的字元，使用預設標題"
 
diff --git a/msys2/usr/share/mintty/themes/gruvbox b/msys2/usr/share/mintty/themes/gruvbox
new file mode 100644
index 000000000..d5cc752e6
--- /dev/null
+++ b/msys2/usr/share/mintty/themes/gruvbox
@@ -0,0 +1,19 @@
+ForegroundColour=235,219,178
+BackgroundColour=29,32,33
+CursorColour=253,157,79
+Black=40,40,40
+BoldBlack=146,131,116
+Red=204,36,29
+BoldRed=251,73,52
+Green=152,151,26
+BoldGreen=184,187,38
+Yellow=215,153,33
+BoldYellow=250,189,47
+Blue=69,133,136
+BoldBlue=131,165,152
+Magenta=177,98,134
+BoldMagenta=211,134,155
+Cyan=104,157,106
+BoldCyan=142,192,124
+White=168,153,132
+BoldWhite=235,219,178
diff --git a/msys2/usr/share/misc/magic b/msys2/usr/share/misc/magic
index 4c67adcaf..03c912b71 100644
--- a/msys2/usr/share/misc/magic
+++ b/msys2/usr/share/misc/magic
@@ -6002,113 +6002,6 @@
 >12	belong		1003			HCI BCSP
 >12	belong		1004			HCI Serial (H5)
 >>12	belong		x			type %d
-#------------------------------------------------------------------------------
-# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
-# c-lang:  file(1) magic for C and related languages programs
-#
-# The strength is to beat standard HTML
-
-# BCPL
-0	search/8192	"libhdr"	BCPL source text
-!:mime	text/x-bcpl
-0	search/8192	"LIBHDR"	BCPL source text
-!:mime	text/x-bcpl
-
-# C
-# Check for class if include is found, otherwise class is beaten by include because of lowered strength
-0	search/8192	#include
->0	regex	\^#include			C
->>0	regex	\^class[[:space:]]+
->>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
->>&0	clear	x				source text
-!:strength + 13
-!:mime	text/x-c
-0	search/8192	pragma
->0	regex	\^#[[:space:]]*pragma	C source text
-!:mime	text/x-c
-0	search/8192	endif
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*endif$	C source text
-!:mime	text/x-c
-0	search/8192	define
->0	regex	\^#[[:space:]]*(if\|ifn)def
->>&0	regex	\^#[[:space:]]*define	C source text
-!:mime	text/x-c
-0	search/8192	char
->0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	double
->0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	extern
->0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	float
->0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
-!:mime	text/x-c
-0	search/8192	struct
->0	regex	\^struct[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	union
->0	regex	\^union[[:space:]]+		C source text
-!:mime	text/x-c
-0	search/8192	main(
->&0 regex	\\)[[:space:]]*\\{		C source text
-!:mime	text/x-c
-
-# C++
-# The strength of these rules is increased so they beat the C rules above
-0	search/8192	namespace
->0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# using namespace [namespace] or using std::[lib]
-0	search/8192	using
->0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	template
->0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	virtual
->0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-# But class alone is reduced to avoid beating php (Jens Schleusener)
-0	search/8192	class
->0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
-!:strength + 13
-!:mime	text/x-c++
-0	search/8192	public
->0	regex	\^[[:space:]]*public:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	private
->0	regex	\^[[:space:]]*private:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-0	search/8192	protected
->0	regex	\^[[:space:]]*protected:		C++ source text
-!:strength + 30
-!:mime	text/x-c++
-
-# Objective-C
-0	search/8192	#import
->0	regex	\^#import			Objective-C source text
-!:strength + 25
-!:mime	text/x-objective-c
-
-# From: Mikhail Teterin <mi@aldan.algebra.com>
-0	string		cscope		cscope reference data
->7	string		x		version %.2s
-# We skip the path here, because it is often long (so file will
-# truncate it) and mostly redundant.
-# The inverted index functionality was added some time between
-# versions 11 and 15, so look for -q if version is above 14:
->7	string		>14
->>10	search/100	\ -q\ 		with inverted index
->10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: c64,v 1.7 2017/11/15 12:19:06 christos Exp $
@@ -6631,6 +6524,113 @@
 
 0	string		RuneCT		Citrus locale declaration for LC_CTYPE
 
+#------------------------------------------------------------------------------
+# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $
+# c-lang:  file(1) magic for C and related languages programs
+#
+# The strength is to beat standard HTML
+
+# BCPL
+0	search/8192	"libhdr"	BCPL source text
+!:mime	text/x-bcpl
+0	search/8192	"LIBHDR"	BCPL source text
+!:mime	text/x-bcpl
+
+# C
+# Check for class if include is found, otherwise class is beaten by include because of lowered strength
+0	search/8192	#include
+>0	regex	\^#include			C
+>>0	regex	\^class[[:space:]]+
+>>>&0	regex 	\\{[\.\*]\\}(;)?$			\b++
+>>&0	clear	x				source text
+!:strength + 13
+!:mime	text/x-c
+0	search/8192	pragma
+>0	regex	\^#[[:space:]]*pragma	C source text
+!:mime	text/x-c
+0	search/8192	endif
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*endif$	C source text
+!:mime	text/x-c
+0	search/8192	define
+>0	regex	\^#[[:space:]]*(if\|ifn)def
+>>&0	regex	\^#[[:space:]]*define	C source text
+!:mime	text/x-c
+0	search/8192	char
+>0	regex	\^[[:space:]]*char(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	double
+>0	regex	\^[[:space:]]*double(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	extern
+>0	regex	\^[[:space:]]*extern[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	float
+>0	regex	\^[[:space:]]*float(\ \\*|\\*)(.+)(=.*)?;[[:space:]]*$			C source text
+!:mime	text/x-c
+0	search/8192	struct
+>0	regex	\^struct[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	union
+>0	regex	\^union[[:space:]]+		C source text
+!:mime	text/x-c
+0	search/8192	main(
+>&0 regex	\\)[[:space:]]*\\{		C source text
+!:mime	text/x-c
+
+# C++
+# The strength of these rules is increased so they beat the C rules above
+0	search/8192	namespace
+>0	regex	\^namespace[[:space:]]+[_[:alpha:]]{1,30}[[:space:]]*\\{	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# using namespace [namespace] or using std::[lib]
+0	search/8192	using
+>0	regex	\^using[[:space:]]+(namespace\ )?std(::)?[[:alpha:]]*[[:space:]]*;		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	template
+>0	regex	\^[[:space:]]*template[[:space:]]*<.*>[[:space:]]*$	C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	virtual
+>0	regex	\^[[:space:]]*virtual[[:space:]]+.*[};][[:space:]]*$		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+# But class alone is reduced to avoid beating php (Jens Schleusener)
+0	search/8192	class
+>0	regex	\^[[:space:]]*class[[:space:]]+[[:digit:][:alpha:]:_]+[[:space:]]*\\{(.*[\n]*)*\\}(;)?$		C++ source text
+!:strength + 13
+!:mime	text/x-c++
+0	search/8192	public
+>0	regex	\^[[:space:]]*public:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	private
+>0	regex	\^[[:space:]]*private:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+0	search/8192	protected
+>0	regex	\^[[:space:]]*protected:		C++ source text
+!:strength + 30
+!:mime	text/x-c++
+
+# Objective-C
+0	search/8192	#import
+>0	regex	\^#import			Objective-C source text
+!:strength + 25
+!:mime	text/x-objective-c
+
+# From: Mikhail Teterin <mi@aldan.algebra.com>
+0	string		cscope		cscope reference data
+>7	string		x		version %.2s
+# We skip the path here, because it is often long (so file will
+# truncate it) and mostly redundant.
+# The inverted index functionality was added some time between
+# versions 11 and 15, so look for -q if version is above 14:
+>7	string		>14
+>>10	search/100	\ -q\ 		with inverted index
+>10	search/100	\ -c\ 		text (non-compressed)
 
 #------------------------------------------------------------------------------
 # $File: clarion,v 1.5 2014/04/30 21:41:02 christos Exp $
diff --git a/msys2/usr/share/nano/asm.nanorc b/msys2/usr/share/nano/asm.nanorc
new file mode 100644
index 000000000..8bc217eb8
--- /dev/null
+++ b/msys2/usr/share/nano/asm.nanorc
@@ -0,0 +1,22 @@
+## Syntax highlighting for assembler.
+
+syntax asm "\.(S|s|asm)$"
+magic "assembler source"
+comment "//"
+
+color red "\<[A-Z_]{2,}\>"
+color brightgreen "\.(data|subsection|text)"
+color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
+color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
+color brightred "^[[:space:]]*[.0-9A-Za-z_]*:"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+
+# Strings.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/autoconf.nanorc b/msys2/usr/share/nano/autoconf.nanorc
new file mode 100644
index 000000000..918cfb9db
--- /dev/null
+++ b/msys2/usr/share/nano/autoconf.nanorc
@@ -0,0 +1,35 @@
+## Syntax highlighting for Autoconf.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
+
+syntax autoconf "\.(ac|m4)$"
+comment "#"
+
+# Keywords:
+color yellow "\<(if|test|then|elif|else|fi|for|in|do|done)\>"
+color yellow "=|!=|&&|\|\|"
+
+# Macros:
+color cyan "\<[[:upper:]_[:digit:]]+\>"
+
+# Version numbers:
+color red "\<[-_.0-9]+\>"
+
+# Strings:
+color red ""[^"]*""  "'[^']*'"
+
+# Backticks:
+color green "`[^`]*`"
+
+# Error lines:
+color brightred "^[[:space:]]*\*\*\*.*"
+
+# Brackets:
+color magenta "\[|\]|\(|\)"
+
+# Comments:
+color blue "^[[:blank:]]*#.*"  "\<dnl.*"
+
+# Trailing whitespace:
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/awk.nanorc b/msys2/usr/share/nano/awk.nanorc
new file mode 100644
index 000000000..9d5a5cb9e
--- /dev/null
+++ b/msys2/usr/share/nano/awk.nanorc
@@ -0,0 +1,37 @@
+## Syntax highlighting for AWK scripts.
+
+syntax awk "\.awk$"
+header "^#!.*awk"
+magic "awk script"
+comment "#"
+
+# Records.
+color brightred "\$[0-9A-Za-z_!@#$*?-]+"
+# Awk-set variables.
+color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
+color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
+color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
+# Function declarations and special patterns.
+color brightgreen "\<(function|extension|BEGIN|END)\>"
+# Operators.
+color green "\{|\}|\(|\)|\;|\[|\]|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|"
+# Flow control.
+color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
+color brightyellow "\<(break|continue|return)\>"
+# I/O statements.
+color brightgreen "\<(close|fflush|getline|next|nextfile|print|printf|system)\>"
+# Standard functions.
+color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
+color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
+color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
+color magenta "\<(mktime|strftime|systime)\>"
+color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
+color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
+
+# Strings.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+# Comments.
+color brightblue "(^|[[:space:]])#.*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/c.nanorc b/msys2/usr/share/nano/c.nanorc
new file mode 100644
index 000000000..32c5b63d0
--- /dev/null
+++ b/msys2/usr/share/nano/c.nanorc
@@ -0,0 +1,46 @@
+## Syntax highlighting for C and C++ files.
+
+syntax c "\.([ch](pp|xx)?|C|cc|c\+\+|cu|H|hh|ii?)$"
+header "-\*-.*\<C(\+\+)?((;|\s).*)?-\*-"
+magic "^(C|C\+\+) (source|program)"
+comment "//"
+
+# Constants.
+color brightred "\<[A-Z_][0-9A-Z_]*\>"
+# Labels.
+color brightmagenta "^[[:space:]]*[A-Z_a-z]+:[[:space:]]*$"
+
+# Types and related keywords.
+color green "\<(auto|bool|char|const|double|enum|extern|float|inline|int|long|restrict|short|signed|sizeof|static|struct|typedef|union|unsigned|void)\>"
+color green "\<([[:lower:]][[:lower:]_]*|(u_?)?int(8|16|32|64))_t\>"
+color green "\<(_(Alignas|Alignof|Atomic|Bool|Complex|Generic|Imaginary|Noreturn|Static_assert|Thread_local))\>"
+color green "\<(class|explicit|friend|mutable|namespace|override|private|protected|public|register|template|this|typename|using|virtual|volatile)\>"
+
+# Flow control.
+color brightyellow "\<(if|else|for|while|do|switch|case|default)\>"
+color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
+color magenta "\<(break|continue|goto|return)\>"
+
+# Single-quoted stuff (characters, backslash escapes, hex and octal byte codes).
+color brightmagenta "'([^'\]|\\(["'\abfnrtv]|x[0-9A-Fa-f]{1,2}|[0-3]?[0-7]{1,2}))'"
+
+# GCC builtins.
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+# Strings.  (In general you will want your strings and comments to come last,
+# because highlighting rules are applied in the order they are read in.)
+color brightyellow ""([^"]|\\")*"" "#[[:space:]]*include[[:space:]]+<[^[:blank:]=]*>"
+
+# Preprocessor directives.
+color brightcyan start="^[[:space:]]*#[[:space:]]*(if(n?def)?|elif|warning|error|pragma)\>" end="(\`|[^\\])$"
+color brightcyan "^[[:space:]]*#[[:space:]]*((define|else|endif|include(_next)?|line|undef)\>|$)"
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Reminders.
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/changelog.nanorc b/msys2/usr/share/nano/changelog.nanorc
new file mode 100644
index 000000000..46272380d
--- /dev/null
+++ b/msys2/usr/share/nano/changelog.nanorc
@@ -0,0 +1,31 @@
+## Syntax highlighting for Changelogs.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
+
+syntax changelog "Change[Ll]og[^/]*$"
+
+# Author lines.
+color green "^(19|20).*"
+# Dates.
+color red "^(19|20)[0-9-]{8}"
+# Email addresses.
+color yellow "<[^>]*@[^>]*>"
+
+# Command-line options.
+color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
+# Bug and patch numbers.
+color cyan "(BZ|bug|patch)[ ]#[0-9]+" "PR [[:alnum:]]+/[0-9]+"
+# Probable constants, for variety.
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+# Key sequences.
+color brightblue "\^[A-Z^\]" "\<M-." "\<F1?[0-9]" "(\^|M-)Space"
+
+# Changed files.
+color magenta start="^(	| {8})\* " end="(:( |$)|^$)"
+
+# Release markers.
+color brightblue "^(GNU )?nano[- ][0-9]\.[0-9]\.[^ ]+"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/cmake.nanorc b/msys2/usr/share/nano/cmake.nanorc
new file mode 100644
index 000000000..cadeb5126
--- /dev/null
+++ b/msys2/usr/share/nano/cmake.nanorc
@@ -0,0 +1,19 @@
+## Syntax highlighting for CMake files.
+
+syntax cmake "(CMakeLists\.txt|\.cmake)$"
+comment "#"
+
+color green "^[[:space:]]*[0-9A-Za-z_]+"
+icolor brightyellow "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
+
+icolor brightgreen "^[[:space:]]*((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color brightgreen "\<(NOT|COMMAND|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)[[:space:]]"
+color brightgreen "[[:space:]](OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))[[:space:]]"
+
+icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
+
+icolor cyan start="\$(ENV)?\{" end="\}"
+color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|MSYS|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
+
+color brightblue "(^|[[:space:]])#.*"
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/css.nanorc b/msys2/usr/share/nano/css.nanorc
new file mode 100644
index 000000000..be014bff4
--- /dev/null
+++ b/msys2/usr/share/nano/css.nanorc
@@ -0,0 +1,20 @@
+## Syntax highlighting for CSS files.
+
+syntax css "\.css$"
+comment "/*|*/"
+
+# First make everything red:
+color brightred     "."
+# Then everything between braces yellow:
+color brightyellow  start="\{" end="\}"
+# Then everything after a colon white:
+color brightwhite   start=":" end="([;^{]|$)"
+
+# Pseudo-classes:
+color brightcyan   ":(active|checked|focus|hover|link|visited|after|before)\>"
+
+# Comments:
+color brightblue    start="/\*" end="\*/"
+
+# Syntactic characters:
+color green         ";|:|\{|\}"
diff --git a/msys2/usr/share/nano/default.nanorc b/msys2/usr/share/nano/default.nanorc
new file mode 100644
index 000000000..d444e2db1
--- /dev/null
+++ b/msys2/usr/share/nano/default.nanorc
@@ -0,0 +1,23 @@
+## This is an example of a default syntax.  The default syntax is used for
+## files that do not match any other syntax.
+
+syntax default
+comment "#"
+
+# Comments.
+color cyan "^[[:space:]]*#.*"
+
+# Spaces in front of tabs.
+color ,red " +	+"
+
+# Nano's name, including version.
+color brightred "(GNU )?[Nn]ano [1-5]\.[0-9][-.[:alnum:]]*\>"
+
+# Email addresses.
+color magenta "<[[:alnum:].%_+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,}>"
+
+# Bracketed captions in certain config files.
+color brightgreen "^\[[^][]+\]$"
+
+# Control codes.
+color latte "[[:cntrl:]]"
diff --git a/msys2/usr/share/nano/elisp.nanorc b/msys2/usr/share/nano/elisp.nanorc
new file mode 100644
index 000000000..473b93bbd
--- /dev/null
+++ b/msys2/usr/share/nano/elisp.nanorc
@@ -0,0 +1,33 @@
+## Syntax highlighting for Emacs Lisp.
+
+syntax elisp "\.el$"
+magic "Lisp/Scheme program"
+comment ";"
+
+# Basic functions/macros
+color brightcyan "\<(if|when|unless|cond|and|or|lambda|let|progn|while|dolist|dotimes)\>"
+color brightcyan "\<save-((window-)?excursion|restriction)\>"
+color brightcyan "\<eval-(and|when)-compile\>"
+# Defining functions
+color brightcyan "\<def(un|macro|subst|generic|alias)\>"
+color brightcyan "\<cl-def(un|macro|subst|generic|struct|type)\>"
+color brightcyan "\<define-(derived|minor|generic)-mode\>"
+# Defining variables
+color brightcyan "\<def(class|const|var(-local|alias)?)\>"
+# Customization functions
+color brightcyan "\<def(custom|face|group|theme)\>"
+# Setting values
+color brightcyan "\<(setq(-default|-local)?|setf|push|pop|declare(-function)?)\>"
+# Feature functions
+color brightcyan "\<(require|provide)\>"
+# Quoted symbols
+color brightyellow "#?'\<(\w|-)+\>"
+# Booleans
+color brightred "\<(t|nil)\>"
+# Keywords
+color blue ":(\w|[?-])+"
+# Strings
+color yellow start="^[[:blank:]]+"" end="[^\]""
+color yellow ""(\\.|[^"])*""
+# Comments
+color cyan "(^|[[:space:]]);.*"
diff --git a/msys2/usr/share/nano/email.nanorc b/msys2/usr/share/nano/email.nanorc
new file mode 100644
index 000000000..6818d2ff9
--- /dev/null
+++ b/msys2/usr/share/nano/email.nanorc
@@ -0,0 +1,17 @@
+## Syntax highlighting for emails.
+
+syntax email "\.eml$"
+
+# Quoted lines.
+color green "^>.*"
+color cyan "^> ?>.*"
+color yellow "^> ?> ?>.*"
+
+# Email addresses.
+color brightmagenta "<[^@]+@[^@]+>"
+
+# URLs.
+color brightblue "(https?|ftp)://\S+\.\S+[^\s.)]"
+
+# Signatures, even quoted ones.
+color yellow start="^>* ?-- $" end="^>* ?$"
diff --git a/msys2/usr/share/nano/extra/ada.nanorc b/msys2/usr/share/nano/extra/ada.nanorc
new file mode 100644
index 000000000..e0cf5aeac
--- /dev/null
+++ b/msys2/usr/share/nano/extra/ada.nanorc
@@ -0,0 +1,39 @@
+## Syntax highlighting for Ada.
+
+## Original author:  Andreas K. Foerster
+## License:  GPL version 3 or newer
+
+## Language reference: http://www.ada-auth.org/standards/12rm/html/RM-TTL.html
+
+syntax ada "\.ad[abcs]$"
+comment "--"
+
+# This linter command leaves an ALI file in the working directory.
+linter gcc -c -gnatc
+
+# Reserved Words (RM 2.9)
+icolor yellow "\<(abort|abs|abstract|accept|access|aliased|all|and|array|at)\>"
+icolor yellow "\<(begin|body|case|constant|declare|delay|delta|do)\>"
+icolor yellow "\<(else|elsif|end|entry|exception|exit|for|function|generic|goto)\>"
+icolor yellow "\<(if|in|interface|is|limited|loop|mod|new|not|null|of|or|others|out|overriding)\>"
+icolor yellow "\<(package|pragma|private|procedure|protected|raise|range|record|rem|renames)\>"
+icolor yellow "\<(requeue|return|reverse|select|separate|some|subtype|synchronized)\>"
+icolor yellow "\<(tagged|task|terminate|then|type|until|use|when|while|with|xor)\>"
+
+# Separators / Operators
+color magenta "'|&|\*|\+|\-|\.|\,|\/|:|;|\(|\)|<|>|\||="
+
+# Attributes
+color cyan "'[[:alnum:]]+"
+
+# Numbers (RM 2.4)
+color green "\<[0-9][0-9A-Fa-f_#.+-]*"
+
+# Characters / Strings
+color red "'.'" ""[^"]*""
+
+# Comments
+color brightblue "--.*"
+
+# Trailing whitespace
+color ,blue "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/extra/debian.nanorc b/msys2/usr/share/nano/extra/debian.nanorc
new file mode 100644
index 000000000..db770b122
--- /dev/null
+++ b/msys2/usr/share/nano/extra/debian.nanorc
@@ -0,0 +1,21 @@
+## Syntax highlighting for apt's sources.list.
+
+syntax sources.list "sources\.list(\.d/.*\.list)?(~|\.old|\.save)?$"
+comment "#"
+
+# Coloring the deb lines, working from tail to head.  First the
+# components -- well, everything, and thus also the components.
+color brightmagenta "^deb.*"
+# Distribution -- well, everything, except the components.
+color brightred "^deb(-src)?\s+.*((ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+|cdrom:\[.+\]/)\s+\S+"
+# URIs.
+color brightgreen "^deb(-src)?\s+.*(ftp|https?|rsh|ssh|copy|file|spacewalk|tor):/\S+"
+# CDroms.
+color brightgreen "^deb(-src)?\s+.*cdrom:\[.+\]/"
+# Options.
+color brightcyan "^deb(-src)?\s+\[.+\]\s+"
+# And finally the initial deb tag.
+color yellow "^deb(-src)?"
+
+# Comments.
+color brightblue "#.*"
diff --git a/msys2/usr/share/nano/extra/fortran.nanorc b/msys2/usr/share/nano/extra/fortran.nanorc
new file mode 100644
index 000000000..7704ab92f
--- /dev/null
+++ b/msys2/usr/share/nano/extra/fortran.nanorc
@@ -0,0 +1,40 @@
+## Syntax highlighting for Fortran 90/95.
+
+syntax fortran "\.(f|for|f90|f95)$"
+comment "!"
+
+color red "\<[0-9]+\>"
+
+icolor green "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
+icolor green "\<(append|asis|assign|assignment|associated|character|common)\>"
+icolor green "\<(complex|data|default|delim|dimension|double precision)\>"
+icolor green "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
+icolor green "\<(implicit|include|index|inquire|integer|intent|interface)\>"
+icolor green "\<(intrinsic|iostat|kind|logical|module|none|null|only)>"
+icolor green "\<(operator|optional|pack|parameter|pointer|position|private)\>"
+icolor green "\<(program|public|real|recl|recursive|selected_int_kind)\>"
+icolor green "\<(selected_real_kind|subroutine|status)\>"
+
+icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>"
+icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>"
+icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>"
+icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>"
+icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>"
+icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>"
+icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>"
+icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>"
+icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>"
+icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>"
+icolor cyan "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+
+icolor yellow "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
+icolor yellow "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
+icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
+
+icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
+
+# Strings.
+color yellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+# Comments.
+color blue "!.*"
diff --git a/msys2/usr/share/nano/extra/gentoo.nanorc b/msys2/usr/share/nano/extra/gentoo.nanorc
new file mode 100644
index 000000000..9b4c50971
--- /dev/null
+++ b/msys2/usr/share/nano/extra/gentoo.nanorc
@@ -0,0 +1,74 @@
+## Syntax highlighting for Gentoo ebuilds/eclasses,
+## and (further down) for Portage control files.
+
+syntax ebuild "\.e(build|class|blit)$"
+comment "#"
+
+## All the standard portage functions:
+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
+color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
+## Bash-related syntax:
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le)\>"
+## Variables... official portage ones in red, all others in bright red:
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BHPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<EBUILD_PHASE(_FUNC)?\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
+## Portage commands:
+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<version_is_at_least\>"
+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(compress|header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)\>"
+color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
+color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
+## Common commands used in ebuilds:
+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
+## Comments (doesn't work that well):
+color yellow "(^|[[:space:]])#.*"
+## Strings (doesn't work that well):
+color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
+
+
+syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+comment "#"
+
+## Base text:
+color green ".+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Use flags (must come after version/slot):
+color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
+color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
+## Accepted arches:
+color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|m68k|mips|nios2|ppc(64)?|riscv|s390|sh|sparc|x86)(-(aix|(f|free|net|open)bsd|cygwin|hpux|interix|linux|macos|mint|solaris|winnt))?\>"
+color white "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*[^/]*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
+## Comments:
+color yellow "#.*"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+## Mixed whitespace is also bad.
+color ,green " 	"
diff --git a/msys2/usr/share/nano/extra/haskell.nanorc b/msys2/usr/share/nano/extra/haskell.nanorc
new file mode 100644
index 000000000..7acf35c4c
--- /dev/null
+++ b/msys2/usr/share/nano/extra/haskell.nanorc
@@ -0,0 +1,40 @@
+## Syntax highlighting for Haskell files.
+
+## Original author:  Alex Taber
+## License:  GPL version 3
+
+syntax "haskell" "\.hs$"
+comment "--"
+
+# Keywords
+color red "\<(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix(l|r)?|instance|let|in|mdo|module|newtype|qualified|type|where)\>"
+
+# Various symbols
+color cyan "\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\}"
+
+# Operators
+color magenta "==|/=|&&|\|\||<|>|<=|>="
+
+# More symbols
+color cyan "->|<-|=>"
+color magenta "\.|\$"
+
+# Data constructors
+color magenta "\<(True|False|Nothing|Just|Left|Right|LT|EQ|GT)\>"
+# Data classes
+color magenta "\<(Bounded|Data|Enum|Eq|Floating|Fractional|Functor|Integral|Monad|MonadPlus|Num|Ord|Read|Real|RealFloat|RealFrac|Show|Typeable)\>"
+
+# Special keyword
+color brightred "undefined"
+
+# Strings
+color yellow ""([^\"]|\\.)*""
+# Characters
+color brightyellow "'([^\']|\\.)'"
+
+# Comments
+color green "--.*"
+color green start="\{-" end="-\}"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/extra/povray.nanorc b/msys2/usr/share/nano/extra/povray.nanorc
new file mode 100644
index 000000000..db0a1c44c
--- /dev/null
+++ b/msys2/usr/share/nano/extra/povray.nanorc
@@ -0,0 +1,16 @@
+## Syntax highlighting for POV-Ray files.
+
+syntax pov "\.(pov|POV|povray|POVRAY)$"
+comment "//"
+
+color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
+color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+color brightred "\<(background|camera|fog|light_source|object|texture)\>"
+color green "\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|"
+color brightmagenta "\<(union|group|subgroup)\>"
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
diff --git a/msys2/usr/share/nano/extra/spec.nanorc b/msys2/usr/share/nano/extra/spec.nanorc
new file mode 100644
index 000000000..8c561fb00
--- /dev/null
+++ b/msys2/usr/share/nano/extra/spec.nanorc
@@ -0,0 +1,41 @@
+## Syntax highlighting for RPM spec files.
+
+syntax spec "\.spec(\.[^/]+)?$"
+comment "#"
+
+# Main tags.
+color brightblue "\<(Name|Version|Release|Summary|Group|URL|Url|Epoch|Icon|Serial)[[:space:]]*:"
+color brightblue "\<(BuildArch(itectures)?|Exclusive(Arch|OS)|Exclude(Arch|OS))[[:space:]]*:"
+color brightblue "\<(Provides|Requires(\(.*\))?|Obsoletes|Conflicts|Recommends|Suggests|Supplements|Enhances|PreReq)[[:space:]]*:"
+color brightblue "\<(BuildRoot|BuildRequires|BuildConflicts|Prefix|RemovePathPostfixes)[[:space:]]*:"
+color brightblue "\<(AutoReq|AutoProv|AutoReqProv)[[:space:]]*:"
+color brightblue "\<(License|Copyright|Distribution|Vendor|Packager)[[:space:]]*:"
+color brightblue "\<((Source|Patch)[0-9]*|Nosource|Nopatch)[[:space:]]*:"
+# Architectures.
+color brightred "\<(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppciseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x?|noarch)\>"
+# Architecture and OS conditionals.
+color brightred "%(ifarch|elifarch|ifnarch|ifos|elifos|ifnos)\>"
+# %* strings.
+color green "%([A-Z_a-z_0-9_]*)"
+color magenta "%_([A-Z_a-z_0-9_]*)"
+color yellow start="%__" end="\ "
+color magenta start="%\{" end="\}"
+color yellow start="%\{__" end="\}"
+# Sections.
+color red "^%((prep|build|install|check|clean)$|(description|files|package|changelog)\>)"
+color red "^%((pre|post)(trans|un)?|trigger(prein|in|un|postun)?)\>"
+color red "^%(trans)?filetrigger(in|un|postun)\>"
+color red "^%(sourcelist|patchlist|generate_buildrequires|verifyscript)\>"
+# Conditionals and defines.
+color brightred "%(if|elif|else|endif|define|global|undefine)\>"
+
+# Comments.
+color cyan "(#|%dnl[[:space:]]).*"
+# Special case: "# norootforbuild" is handled as main tag.
+color brightblue "^# norootforbuild"
+# For %changelog entries: first the author, then just the date.
+color yellow "^\* .+>"
+color brightyellow "^\* [[:alnum:] ]+ [0-9]{4} "
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/go.nanorc b/msys2/usr/share/nano/go.nanorc
new file mode 100644
index 000000000..c63114396
--- /dev/null
+++ b/msys2/usr/share/nano/go.nanorc
@@ -0,0 +1,46 @@
+## Syntax highlighting for Go.
+
+syntax go "\.go$"
+comment "//"
+
+formatter gofmt -w
+
+# Types.
+color green "\<(bool|u?int(8|16|32|64)?|float(32|64)|complex(64|128)|byte|rune|uintptr|string|error)\>"
+color green "\<(chan|const|func|interface|map|struct|type|var)\>"
+color green "<-[[:space:]]*chan\>|\<chan[[:space:]]*<-"
+
+# Predefined functions.
+color blue "\<(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)\>"
+
+# Control structures.
+color brightyellow "\<(case|default|defer|else|for|go|if|range|select|switch)\>"
+
+# Control flow.
+color magenta "\<(break|continue|fallthrough|goto|return)\>"
+
+# Declarations.
+color brightcyan "\<(package|import)\>"
+
+# Literals.
+color red "\<([1-9][0-9]*|0[0-7]*|0[xX][0-9A-Fa-f]+)\>"
+color red "\<[0-9]+\.[0-9]*([eE][+-]?[0-9]+)?i?\>"
+color red "\<[0-9]+[eE][+-]?[0-9]+i?\>"
+color red "\B\.[0-9]+([eE][+-]?[0-9]+)?i?\>"
+color red "\<[0-9]+i\>"
+
+# Strings and characters; slightly fuzzy.
+color red "\<(true|false|nil|iota|_)\>"
+color red "'(\\.|[^'])+'"
+color red ""(\\.|[^"])*""
+color red start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Special comments.
+color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/groff.nanorc b/msys2/usr/share/nano/groff.nanorc
new file mode 100644
index 000000000..3559ac304
--- /dev/null
+++ b/msys2/usr/share/nano/groff.nanorc
@@ -0,0 +1,26 @@
+## Syntax highlighting for groff.
+
+syntax groff "(/tmac\.[^/]+$|\.(m[ems]|rof|tmac)$)"
+comment ".\""
+
+# The argument of .ds or .nr
+color cyan "^\.(ds|nr) [^[:space:]]*"
+# Single-character escapes
+color brightmagenta "\\."
+# The argument of \f or \s in the same color
+color brightmagenta "\\f(.|\(..)" "\\s(\+|\-)?[0-9]"
+# Newlines
+color cyan "\\(\\)?n(.|\(..)"
+color cyan start="\\(\\)?n\[" end="]"
+# Requests
+color brightgreen "^\.[[:space:]]*[^[:space:]]*"
+# Comments
+color yellow "^\.\\".*"
+# Strings
+color green "\\(\\)?\*(.|\(..)"
+color green start="\\(\\)?\*\[" end="]"
+# Characters
+color brightred "\\\(.."
+color brightred start="\\\[" end="]"
+# Macro arguments
+color brightcyan "\\\\\$[1-9]"
diff --git a/msys2/usr/share/nano/guile.nanorc b/msys2/usr/share/nano/guile.nanorc
new file mode 100644
index 000000000..5d5e4e043
--- /dev/null
+++ b/msys2/usr/share/nano/guile.nanorc
@@ -0,0 +1,24 @@
+## Syntax highlighting for Guile Scheme.
+
+syntax guile "\.scm$"
+header "^#!.*guile"
+comment ";"
+
+# Basic scheme functions
+color green "\<(do|if|lambda|let(rec)?|map|unless|when)\>"
+# Defining things
+color brightcyan "\<define(-macro|-module|-public|-syntax)?\>"
+# Quoted symbols
+color brightyellow "'\<(\w|-)+\>"
+# Chars
+color brightmagenta "#\\."
+color brightmagenta "#\\\w+\>"
+# Booleans
+color brightred "(#t|#f)\>"
+# Keywords
+color blue "#?:(\w|[?-])+"
+# Strings
+color yellow start="^[[:blank:]]+"" end="[^\]""
+color yellow ""(\\.|[^"])*""
+# Comments
+color cyan "(^|[[:space:]]);.*"
diff --git a/msys2/usr/share/nano/html.nanorc b/msys2/usr/share/nano/html.nanorc
new file mode 100644
index 000000000..d34fe5a9e
--- /dev/null
+++ b/msys2/usr/share/nano/html.nanorc
@@ -0,0 +1,31 @@
+## Syntax highlighting for HTML.
+
+syntax html "\.html?$"
+magic "HTML document"
+comment "<!--|-->"
+
+formatter tidy -m -q
+
+# Tags:
+color cyan "<[[:alpha:]/!?][^>]*>"
+# Bold, italic, and underlined:
+color brightmagenta "</?[biu]>"
+
+# Named character references:
+color red "&[^;[:space:]]*;"
+
+# Attributes:
+color red "\<(abbr|accept(-charset)?|accesskey|action|alink|align|alt|archive|axis|background|bgcolor|border)="
+color red "\<(cell(padding|spacing)|char(off|set)?|checked|cite|class(id)?|compact|code(base|tag)?|cols(pan)?)="
+color red "\<(content(editable)?|contextmenu|coords|data|datetime|declare|defer|dir|disabled|enctype)="
+color red "\<(for|frame(border)?|headers|height|hidden|href(lang)?|hspace|http-equiv|id|ismap)="
+color red "\<(label|lang|link|longdesc|margin(height|width)|maxlength|media|method|multiple)="
+color red "\<(name|nohref|noresize|noshade|object|onclick|onfocus|onload|onmouseover|profile|readonly|rel|rev)="
+color red "\<(rows(pan)?|rules|scheme|scope|scrolling|selected|shape|size|span|src|standby|start|style|summary)="
+color red "\<(tabindex|target|text|title|type|usemap|valign|value(type)?|vlink|vspace|width|xmlns|xml:space)="
+
+# Strings:
+color green ""(\\.|[^"])*""
+
+# Comments:
+color yellow start="<!--" end="-->"
diff --git a/msys2/usr/share/nano/java.nanorc b/msys2/usr/share/nano/java.nanorc
new file mode 100644
index 000000000..e431b6d72
--- /dev/null
+++ b/msys2/usr/share/nano/java.nanorc
@@ -0,0 +1,16 @@
+## Syntax highlighting for Java.
+
+syntax java "\.java$"
+magic "Java "
+comment "//"
+
+color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
+color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
+color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native)\>"
+color cyan "\<(package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color red ""[^"]*""
+color yellow "\<(true|false|null)\>"
+color blue "//.*"
+color blue start="/\*" end="\*/"
+color brightblue start="/\*\*" end="\*/"
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/javascript.nanorc b/msys2/usr/share/nano/javascript.nanorc
new file mode 100644
index 000000000..10925477b
--- /dev/null
+++ b/msys2/usr/share/nano/javascript.nanorc
@@ -0,0 +1,26 @@
+## Syntax highlighting for Javascript.
+
+syntax javascript "\.js$"
+comment "//"
+
+# Declarational stuff.
+color green "\<(async|class|const|extends|function|let|this|typeof|var|void)\>"
+# Flow control and special keywords.
+color brightyellow "\<(do|while|if|else|switch|case|default|for|each|in|of|with)\>"
+color brightyellow "\<(await|export|import|throw|try|catch|finally|new|delete)\>"
+# "Exit" points.
+color magenta "\<(break|continue|return|yield)\>"
+
+# Octal/decimal and hexadecimal numbers.
+color cyan "\<([0-9]+|0x[0-9A-Fa-f]+)\>"
+# Special values.
+color cyan "\<(true|false|null|undefined)\>"
+
+# Strings.
+color brightmagenta ""(\\.|[^"])*"" "'(\\.|[^'])*'" "`(\\.|[^`])*`"
+# Comments.
+color brightblue "(^|[[:space:]])//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/json.nanorc b/msys2/usr/share/nano/json.nanorc
new file mode 100644
index 000000000..39262963b
--- /dev/null
+++ b/msys2/usr/share/nano/json.nanorc
@@ -0,0 +1,33 @@
+## Syntax highlighting for JSON files.
+
+## Original author:  Aapo Rantalainen
+## License:  GPL version 3 or newer
+
+syntax json "\.json$"
+# No comments are permitted in JSON.
+comment ""
+
+# Numbers (used as value).
+color green ":[[:space:]]*\-?(0|[1-9][0-9]*)(\.[0-9]+)?([Ee]?[-+]?[0-9]+)?"
+# Values (well, any string).
+color brightmagenta "".+""
+# Hex numbers (used as value).
+color green ":[[:space:]]*"#[0-9abcdefABCDEF]+""
+# Escapes.
+color green "\\\\" "\\"" "\\[bfnrt]" "\\u[0-9abcdefABCDEF]{4})"
+# Special words.
+color green "\<(true|false|null)\>"
+
+# Names (very unlikely to contain a quote).
+color brightblue ""[^"]+"[[:space:]]*:"
+
+# Brackets, braces, and separators.
+color brightblue "\[" "\]"
+color brightred "\{" "\}"
+color brightred "," ":"
+
+# Comments.
+color cyan "(^|[[:space:]]+)(//|#).*"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/lua.nanorc b/msys2/usr/share/nano/lua.nanorc
new file mode 100644
index 000000000..e7e3ac165
--- /dev/null
+++ b/msys2/usr/share/nano/lua.nanorc
@@ -0,0 +1,61 @@
+## Syntax highlighting for Lua.
+
+## Original author:  Matthew Wild
+## License:  GPL version 3 or newer
+
+syntax lua "\.lua$"
+magic "Lua script"
+comment "--"
+
+linter luacheck --no-color
+
+color brightwhite "\[\[.*\]\]"
+
+# Operators
+color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|#|\<(not|and|or)\>"
+# Don't partially color ... as an operator
+color normal "\.\.\."
+
+# Statements
+color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>"
+
+# Keywords
+color brightyellow "\<(_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawlen|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\("
+
+# Standard library
+color brightyellow "\<coroutine\.(create|isyieldable|resume|running|status|wrap|yield)\>"
+color brightyellow "\<debug\.(debug|(get|set)(fenv|hook|local|metatable|(up|user)value)|getinfo|getregistry|traceback|upvalue(id|join))\>"
+color brightyellow "\<io\.(close|flush|input|lines|output|p?open|read|tmpfile|type|write|std(in|out|err))\>"
+color brightyellow "\<math\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log)\>"
+color brightyellow "\<math\.((max|min)(integer)?|modf?|pi|pow|rad|random(seed)?|sinh?|sqrt|tan|tointeger|type|ult)\>"
+color brightyellow "\<os\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\>"
+color brightyellow "\<package\.(config|cpath|loaded|loadlib|path|preload|searchers|searchpath|seeall)\>"
+color brightyellow "\<string\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)\>"
+color brightyellow "\<table\.(concat|insert|maxn|move|pack|remove|sort|unpack)\>"
+color brightyellow "\<utf8\.(char|charpattern|codepoint|codes|len|offset)\>"
+
+# File handle methods
+color brightyellow ":(close|flush|lines|read|seek|setvbuf|write)\>"
+
+# External files
+color brightgreen "\<(dofile|require)\>"
+
+# Special words
+color brightmagenta "\<(false|nil|true)\>"
+
+# Decimal and hexadecimal numbers
+color red "\<[0-9]+(\.[0-9]*)?([Ee][+-]?[0-9]+)?\>"
+color red "\<0x[0-9A-Fa-f]+(\.[0-9A-Fa-f]*)?([Pp][+-]?[0-9]+)?\>"
+
+# Brackets
+color brightmagenta "\(|\)|\[|\]|\{|\}"
+
+# Shebang
+color brightcyan "^#!.*"
+
+# Strings
+color red ""(\\.|[^"\])*"|'(\\.|[^'\])*'"
+
+# Simple comments and multiline comments
+color green "--.*"
+color green start="--\[\[" end="\]\]"
diff --git a/msys2/usr/share/nano/makefile.nanorc b/msys2/usr/share/nano/makefile.nanorc
new file mode 100644
index 000000000..c1f487ffd
--- /dev/null
+++ b/msys2/usr/share/nano/makefile.nanorc
@@ -0,0 +1,24 @@
+## Syntax highlighting for Makefiles.
+
+syntax makefile "(/((GNU)?m|M)akefile[^/]*$|\.(make|mk)$)"
+magic "makefile script"
+comment "#"
+
+# Assignments.
+color red " (:?:|\+|\?)?= "
+
+# Keywords.
+color magenta "^(if|ifn?def|ifn?eq|else|endif|(-|s)?include)\>"
+color magenta "^((override +)?(un)?define|endef|(un)?export|private|vpath)\>"
+
+# Variable expansions.
+color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
+
+# Targets.
+color brightblue "^[^ 	]+:"
+
+# Comments.
+color green "(^|[[:space:]]+)#.*"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/man.nanorc b/msys2/usr/share/nano/man.nanorc
new file mode 100644
index 000000000..811aa1b98
--- /dev/null
+++ b/msys2/usr/share/nano/man.nanorc
@@ -0,0 +1,23 @@
+## Syntax highlighting for man pages.
+
+syntax man "\.[1-9]x?$"
+magic "troff or preprocessor input"
+comment ".\""
+
+# Section headers, title line, and indented paragraphs.
+color green "^\.(SH|SS|TH) .*"
+color brightgreen "^\.(SH|SS|TH) " "^\.([HIT]P)"
+# Type faces, and normal paragraphs.
+color brightred "^\.(B[IR]?|I[BR]?|R[BI]|S[BM]) .*"
+color brightblue "^\.(B[IR]?|I[BR]?|R[BI]|S[BM]) " "^\.([LP]?P)$"
+# Inline type faces.
+color magenta "\\f[BIPR]"
+# Relative margins, hyperlinks, and various other stuff.
+color yellow "^\.(RS|RE|UR|UE|PD|DT)"
+color yellow "^\.(ad|bp|br|ce|de|ds|el|ie|if|fi|ft|hy|ig|in|na|ne|nf|nh|ps|so|sp|ti|tr)"
+
+# Comments.
+color cyan "(^\.)?\\".*"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/markdown.nanorc b/msys2/usr/share/nano/markdown.nanorc
new file mode 100644
index 000000000..9e497683e
--- /dev/null
+++ b/msys2/usr/share/nano/markdown.nanorc
@@ -0,0 +1,40 @@
+## Syntax highlighting for Markdown files.
+
+## Original authors:  Ryan Westlund and Benno Schulenberg
+## License:  GPL version 3 or newer
+
+syntax markdown "\.md$"
+comment "<!--|-->"
+
+# Quoted:
+color magenta "^[ 	]*>.*"
+
+# List-item markers:
+color brightmagenta "^(    |	)* ? ? ?(\*|\+|-|[1-9]+\.)( +|	)"
+
+# Emphasis and strong:
+color green "\*[^* 	][^*]*\*|_[^_ 	][^_]*_"
+color brightgreen "\*\*[^*]+\*\*|__[^_]+__"
+
+# Strikethrough:
+color red "~~[^~]+~~"
+
+# Line breaks:
+color ,blue "  $"
+
+# URLs and links:
+color brightblue "\[[^]]+\]\([^)]+\)"
+color brightmagenta "!?\[[^]]+\]"
+
+# Code snippet, indented code, and fenced code:
+color brightcyan "`[^`]+`"
+color brightcyan "^(    |	)+ *([^*+0-9> 	-]|[*+-]\S|[0-9][^.]).*"
+color brightcyan start="```" end="```$"
+
+# Headings and the underlining of headings:
+color brightyellow "^#.*"
+color brightyellow "^(=+|-+)$"
+
+# HTML tags and comments:
+color cyan "<[^>]+>"
+color cyan start="<!--" end="-->"
diff --git a/msys2/usr/share/nano/nanohelp.nanorc b/msys2/usr/share/nano/nanohelp.nanorc
new file mode 100644
index 000000000..4295ba793
--- /dev/null
+++ b/msys2/usr/share/nano/nanohelp.nanorc
@@ -0,0 +1,11 @@
+## This is meant for highlighting key combos in a nano help text.
+
+# It should not apply to any normal file, so no fileregex.
+syntax nanohelp
+
+# Key combos:
+color cyan "\^[]/4-8@A-Z\^_`◀▶▲▼]"  "[◀▶▲▼]"  "\<(M|S[Hh]-[Mm])-."  "\<F([1-9]|1[0-9]|2[0-4])"
+color cyan "\<((Sh-)?Tab|Enter|Ins|(Sh-\^?)?Del|Space|Bsp|Up|Down|Left|Right|Home|End|PgUp|PgDn)\>"
+
+# Quoted indicators:
+color brightred "'(\^|M-)'"
diff --git a/msys2/usr/share/nano/nanorc.nanorc b/msys2/usr/share/nano/nanorc.nanorc
new file mode 100644
index 000000000..891fd942f
--- /dev/null
+++ b/msys2/usr/share/nano/nanorc.nanorc
@@ -0,0 +1,32 @@
+## Syntax highlighting for nanorc files.
+
+syntax nanorc "\.?nanorc$"
+comment "#"
+
+# Everything that does not get recolored is invalid
+color brightred ".*"
+
+# Keywords
+color brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|boldtext|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|historylog|indicator|jumpyscrolling|linenumbers|locking|magic|mouse|multibuffer|noconvert|nohelp|nonewlines|positionlog|preserve|quickblank|rawsequences|rebinddelete|regexp|saveonexit|showcursor|smarthome|softwrap|stateflags|suspendable|tabstospaces|trimblanks|unix|wordbounds|zap)\>"
+color yellow "^[[:space:]]*set[[:space:]]+((error|function|key|number|scroller|selected|status|stripe|title)color)[[:space:]]+(bold,)?(italic,)?(bright|light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte)?(,(light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte))?\>"
+color brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|punct|quotestr|scrollercolor|selectedcolor|speller|statuscolor|stripecolor|titlecolor|whitespace|wordchars)[[:space:]]+"
+color brightgreen "^[[:space:]]*set[[:space:]]+(fill[[:space:]]+-?[[:digit:]]+|(guidestripe|tabsize)[[:space:]]+[1-9][0-9]*)\>"
+color brightgreen "^[[:space:]]*bind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+([a-z]+|".*")[[:space:]]+(main|help|search|replace(with)?|yesno|gotoline|writeout|insert|browser|whereisfile|gotodir|execute|spell|linter|all)([[:space:]]+#|[[:space:]]*$)"
+color brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|yesno|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
+color brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|formatter|linter|tabgives)[[:space:]]+.*"
+color brightgreen "^[[:space:]]*(syntax[[:space:]]+[^[:blank:]]+|(formatter|linter)[[:space:]]+.+)"
+color green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|formatter|linter|tabgives|extendsyntax)\>"
+
+# Strings
+color brightmagenta "([[:space:]]|(start|end)=)".+"([[:space:]]|$)"
+
+# Colors
+color yellow "^[[:space:]]*i?color[[:space:]]*(bold,)?(italic,)?(bright|light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte)?(,(light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte))?\>"
+color magenta "^[[:space:]]*i?color\>" "\<(start|end)="
+
+# Comments
+color brightblue "(^|[[:space:]]+)#.*"
+color cyan "^[[:space:]]*##.*"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/nftables.nanorc b/msys2/usr/share/nano/nftables.nanorc
new file mode 100644
index 000000000..f3ccc96d1
--- /dev/null
+++ b/msys2/usr/share/nano/nftables.nanorc
@@ -0,0 +1,33 @@
+## Syntax highlighting for the packet-filtering rules of Netfilter.
+
+## Original author:  Arturo Borrero González <arturo@debian.org>
+## License:  GPL version 3 or newer
+
+syntax nftables "\.(nft|nftables)$"
+header "^#!.*(nft|nftables)"
+comment "#"
+
+# Objects and operations
+color green "\<(chain|hook|policy|priority|ruleset|set|table|type|v?map)\>"
+color green "\<(define|include)\>"
+color red "\<(add|delete|flush|insert|remove|replace)\>"
+
+# Families
+color yellow "\<(arp|bridge|inet|ingress|ip6?|netdev)\>"
+
+# Terminal statements
+color red "\<(drop|reject)\>"
+color brightblue "\<(accept|continue|(d|s)nat|goto|jump|masquerade|return)\>"
+
+# Comments
+color cyan "(^|[[:space:]])#.*"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"
+
+# Strings and others
+color yellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+
+# Basic variable names
+color brightred "(\$|@)[[:alpha:]_-][[:alnum:]_.-]*"
diff --git a/msys2/usr/share/nano/objc.nanorc b/msys2/usr/share/nano/objc.nanorc
new file mode 100644
index 000000000..f35f60db1
--- /dev/null
+++ b/msys2/usr/share/nano/objc.nanorc
@@ -0,0 +1,39 @@
+## Syntax highlighting for C/C++/Obj-C files.
+
+syntax m "\.m$"
+magic "Objective-C source"
+comment "//"
+
+# Stuffs,
+color brightwhite "\<[A-Z_][0-9A-Z_]+\>"
+color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<[[:alpha:]_][[:alnum:]_]*_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
+color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
+color brightgreen "\<(goto|continue|break|return)\>"
+color brightgreen "@(encode|end|implementation|interface)|selector)\>"
+
+# GCC builtins.
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+# Selector/method.
+color brightmagenta "(^|[[:space:]])\[.*[[:space:]].*\]"
+color white ":[[:alnum:]]*"
+color magenta "[[:alnum:]]*:"
+color white "\[[^][:space:]]*\]"
+
+# Strings.
+color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
+color brightblue "@"(\\.|[^"])*""
+
+# Preprocessor commands.
+color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+# Comments.
+color yellow "//.*"
+color yellow start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/ocaml.nanorc b/msys2/usr/share/nano/ocaml.nanorc
new file mode 100644
index 000000000..26b20b931
--- /dev/null
+++ b/msys2/usr/share/nano/ocaml.nanorc
@@ -0,0 +1,30 @@
+## Syntax highlighting for OCaml.
+
+syntax ocaml "\.mli?$"
+magic "OCaml"
+comment "(*|*)"
+
+# Uid:
+color red "\<[A-Z][0-9a-z_]{2,}\>"
+# Declarations:
+color green "\<(let|val|method|in|and|rec|private|virtual|constraint)\>"
+# Structure items:
+color red "\<(type|open|class|module|exception|external)\>"
+# Patterns:
+color blue "\<(fun|function|functor|match|try|with)\>"
+# Pattern modifiers:
+color yellow "\<(as|when|of)\>"
+# Conditions:
+color cyan "\<(if|then|else)\>"
+# Blocks:
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+# Constants:
+color green "\<(true|false)\>"
+# Modules/classes:
+color green "\<(include|inherit|initializer)\>"
+# Expression modifiers:
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+# Comments:
+color white start="\(\*" end="\*\)"
+# Strings: (no multiline handling yet)
+color brightblack ""[^\"]*""
diff --git a/msys2/usr/share/nano/patch.nanorc b/msys2/usr/share/nano/patch.nanorc
new file mode 100644
index 000000000..13bbb5a06
--- /dev/null
+++ b/msys2/usr/share/nano/patch.nanorc
@@ -0,0 +1,26 @@
+## Syntax highlighting for patch and diff files.
+
+syntax patch "\.(patch|diff|debdiff)$"
+magic "diff output"
+# There is no official support for comments in patch files.
+comment ""
+
+# Added lines.
+color brightgreen "^\+.*"
+# Show trailing whitespace only on added lines.
+color ,green "[[:space:]]+$"
+# Context lines.
+color brightblue "^ .*"
+# Deleted lines.
+color brightred "^-.*"
+
+# Header lines.
+color magenta "^(Index:|diff)[[:blank:]].*"
+# File names and dates.
+color red "^---.*"
+color green "^\+\+\+.*"
+# Line numbers.
+color brightyellow "^@@.*"
+
+# Statistics.
+color cyan start="^---$" end="^$"
diff --git a/msys2/usr/share/nano/perl.nanorc b/msys2/usr/share/nano/perl.nanorc
new file mode 100644
index 000000000..1457d7db9
--- /dev/null
+++ b/msys2/usr/share/nano/perl.nanorc
@@ -0,0 +1,24 @@
+## Syntax highlighting for Perl.
+
+syntax perl "\.p[lm]$"
+header "^#!.*perl"
+magic "Perl script"
+comment "#"
+
+color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+
+# Variable names.
+color cyan "[$%&@]([A-Za-z_][0-9A-Za-z_]*|\^[][A-Z?\^_]|[0-9]+)\>"
+color cyan "[$%&@]\{(\^?[A-Za-z_][0-9A-Za-z_]*|\^[][?\^][0-9]+)\}"
+color cyan "[$%&@]([][!"#'()*+,.:;<=>?`|~-]|\{[][!-/:-@\`|~]\})|\$[$%&@]"
+color cyan "(^|[[:space:]])[$%@][/\]"
+
+color yellow "".*"|qq\|.*\|"
+color white "[sm]/.*/"
+color white start="(^use| = new)" end=";"
+
+# Comments.
+color green "(^|[[:space:]])#.*"
+
+color yellow start="<< 'STOP'" end="STOP"
diff --git a/msys2/usr/share/nano/php.nanorc b/msys2/usr/share/nano/php.nanorc
new file mode 100644
index 000000000..668b9d3a4
--- /dev/null
+++ b/msys2/usr/share/nano/php.nanorc
@@ -0,0 +1,35 @@
+## Syntax highlighting for PHP.
+
+syntax php "\.(php[23457s~]?|phtml|ctp)$"
+magic "PHP script"
+comment "//"
+
+# PHP markings.
+color brightgreen "(<\?(php)?|\?>)"
+
+# Function names.
+color white "\<[A-Za-z_][A-Za-z_0-9]*\("
+# Variable names.
+color cyan "\$[A-Za-z_][A-Za-z_0-9]*"
+
+# Types.
+color green "\<(array|bool|callable|const|float|global|int|object|string|var)\>"
+
+# Directives and structure.
+color brightcyan "\<(abstract|as|class|clone|(end)?declare|extends|function|implements|include(_once)?|inst(ance|ead)of|interface|namespace|new|private|protected|public|require(_once)?|static|trait|use|yield)\>"
+color brightcyan "\<(case|catch|default|do|echo|else(if)?|end(for(each)?|if|switch|while)|final(ly)?|for(each)?|if|print|switch|throw|try|while)\>"
+# Operators.
+color brightcyan "\<(and|or|xor)\>"
+
+# Control flow.
+color magenta "\<(break|continue|goto|return)\>"
+
+# Strings.
+color brightyellow ""(\.|[^"])*"" "'(\.|[^'])*'"
+
+# Comments.
+color brightblue "(^|[[:space:]]+)//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/po.nanorc b/msys2/usr/share/nano/po.nanorc
new file mode 100644
index 000000000..42b703f73
--- /dev/null
+++ b/msys2/usr/share/nano/po.nanorc
@@ -0,0 +1,36 @@
+## Syntax highlighting for PO files.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
+
+syntax po "\.pot?$"
+comment "#"
+
+# Comments.
+color green "^#.*$"
+color yellow "Copyright|\(C\)"
+# Header fields.
+color brightred "^"X-Bugs:.*"$"
+color brightmagenta "\<(Project-Id-Version|Report-Msgid-Bugs-To|Last-Translator|Language(-Team)?|X-Bugs|X-Generator|Plural-Forms)\>"
+color cyan "\<(POT-Creation-Date|PO-Revision-Date|MIME-Version|Content-Type|Content-Transfer-Encoding)\>"
+# Encodings and numbers.
+color yellow "\<(UTF|ISO|Windows|Mac|IBM)-[0-9]+"
+color yellow "\<((pre|rc)?[0-9]+|[0-9]bit)\>"
+# Msgids.
+color brightblue "^(msgid|msgid_plural|msgstr)\>"
+# Tags.
+color red " fuzzy(,|$)"
+color yellow " (no-)?[-[:alpha:]]+-format(,|$)"
+# Format specifiers.
+color brightmagenta "%([1-9]\$)?[a-z]*"
+# Quotes and escaped characters.
+color yellow """
+color cyan "\\([abcefnrtv"\]|x[0-9abcdefABCDEF]{2}|[0-7]{3})"
+# Reminders.
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"
+# Obsolete strings.
+color red "#~.*"
+# Stray control codes.
+color bold,pink,red "[[:cntrl:]]"
+# Tabs.
+color mint "[[:blank:]]"
diff --git a/msys2/usr/share/nano/python.nanorc b/msys2/usr/share/nano/python.nanorc
new file mode 100644
index 000000000..8fbac146e
--- /dev/null
+++ b/msys2/usr/share/nano/python.nanorc
@@ -0,0 +1,40 @@
+## Syntax highlighting for Python.
+
+syntax python "\.py$"
+header "^#!.*python"
+magic "Python script"
+comment "#"
+
+linter pyflakes
+
+# Function definitions.
+color brightblue "def [0-9A-Za-z_]+"
+# Keywords.
+color brightcyan "\<(and|as|assert|async|await|break|class|continue)\>"
+color brightcyan "\<(def|del|elif|else|except|finally|for|from)\>"
+color brightcyan "\<(global|if|import|in|is|lambda|nonlocal|not|or)\>"
+color brightcyan "\<(pass|raise|return|try|while|with|yield)\>"
+
+# These two are keywords in Python 2, but functions in Python 3,
+# so only color them when they are followed by whitespace, assuming
+# that print(x) is a function invocation and print (x) is a statement.
+color brightcyan "\<(exec|print)([[:blank:]]|$)"
+
+# Special values.
+color brightmagenta "\<(False|None|True)\>"
+
+# Mono-quoted strings.
+color brightgreen "'([^'\]|\\.)*'|'''"
+color brightgreen ""([^"\]|\\.)*"|""""
+color normal "'''|""""
+# Comments.
+color brightred "(^|[[:blank:]])#.*"
+# Triple-quoted strings.
+color brightgreen    start="'''([^'),]|$)" end="(^|[^(\])'''"
+color brightgreen    start=""""([^"),]|$)" end="(^|[^(\])""""
+
+# Reminders.
+color brightwhite,yellow "\<(FIXME|TODO|XXX)\>"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/ruby.nanorc b/msys2/usr/share/nano/ruby.nanorc
new file mode 100644
index 000000000..9398b1ddb
--- /dev/null
+++ b/msys2/usr/share/nano/ruby.nanorc
@@ -0,0 +1,37 @@
+## Syntax highlighting for Ruby.
+
+syntax ruby "\.rb$"
+header "^#!.*ruby"
+magic "Ruby script"
+comment "#"
+
+linter ruby -w -c
+
+# Constants.
+color brightblue "\<[A-Z]+[0-9A-Z_a-z]*|(\$|@|@@)[0-9A-Z_a-z]+"
+# Reserved words.
+color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module)\>"
+color yellow "\<(next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+# Ruby "symbols".
+color magenta "([ 	]|^):[0-9A-Za-z_]+\>"
+# Some unique things we want to stand out.
+color brightyellow "\<(__FILE__|__LINE__)\>"
+# Regular expressions.
+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+# Shell command expansion is in `backticks` or like %x{this}.  These are
+# "double-quotish" (to use a perlism).
+color brightblue "`[^`]*`" "%x\{[^}]*\}"
+# Strings, double-quoted.
+color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+# Expression substitution.  These go inside double-quoted strings,
+# "like #{this}".
+color brightgreen "#\{[^}]*\}"
+# Strings, single-quoted.
+color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+# Comments.
+color cyan "#[^{].*" "#$"
+color brightcyan "##[^{].*" "##$"
+# "Here" docs.
+color green start="<<-?'?EOT'?" end="^EOT"
+# Some common markers.
+color brightcyan "XXX|TODO|FIXME|\?\?\?"
diff --git a/msys2/usr/share/nano/rust.nanorc b/msys2/usr/share/nano/rust.nanorc
new file mode 100644
index 000000000..6863dd8a9
--- /dev/null
+++ b/msys2/usr/share/nano/rust.nanorc
@@ -0,0 +1,38 @@
+## Syntax highlighting for Rust.
+
+## Copyright 2015 Luke Francl.
+## Licensed under GPL version 3.
+
+syntax rust "\.(rlib|rs)$"
+comment "//"
+
+# Function definitions
+color magenta "fn [a-z_0-9]+"
+
+# Reserved words
+color yellow "\<(abstract|as|async|await|become|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|override|priv|pub|ref|return|self|static|struct|super|trait|true|try|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\>"
+
+# Macros
+color red "[a-z_]+!"
+
+# Constants
+color magenta "[A-Z][A-Z_0-9]+"
+
+# Traits/Enums/Structs/Types/...
+color magenta "[A-Z][A-Za-z0-9]+"
+
+# Strings
+color green "".*""
+color green start="".*\\$" end=".*""
+## NOTE: This isn't accurate, but matching "#{0,} for the end of the string is too liberal.
+color green start="r#+"" end=""#+"
+
+# Comments
+color blue "//.*"
+color blue start="/\*" end="\*/"
+
+# Attributes
+color magenta start="#!\[" end="\]"
+
+# Some common markers
+color brightcyan "XXX|TODO|FIXME|\?\?\?"
diff --git a/msys2/usr/share/nano/sh.nanorc b/msys2/usr/share/nano/sh.nanorc
new file mode 100644
index 000000000..773a87d1e
--- /dev/null
+++ b/msys2/usr/share/nano/sh.nanorc
@@ -0,0 +1,39 @@
+## Syntax highlighting for Bourne shell scripts.
+
+syntax sh "(\.sh|(\.|/)(a|ba|c|da|k|mk|pdk|tc|z)sh(rc|_profile)?|/(etc/|\.)profile)$"
+header "^#!.*/(((a|ba|c|da|k|mk|pdk|tc|z)?sh)|(busybox|env) +sh|openrc-run|runscript)"
+header "-\*-.*shell-script.*-\*-"
+magic "(POSIX|Bourne-Again) shell script.*text"
+comment "#"
+
+linter dash -n
+
+# Function declarations.
+color brightgreen "^[A-Za-z0-9_-]+\(\)"
+
+# Keywords, symbols, and comparisons.
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>"
+
+# Short and long options.
+color brightmagenta "[[:blank:]]-[A-Za-z]\>" "[[:blank:]]--[A-Za-z-]+\>"
+
+# Common commands.
+color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|cut|echo|env|grep|head|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|sort|tail|tar|touch|umask|unset)\>"
+color normal "[.-]tar\>"
+
+# Basic variable names (no braces).
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+# More complicated variable names; handles braces and replacements and arrays.
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:space:]]*[[:alnum:]_]+[[:space:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+
+# Comments.
+color cyan "(^|[[:space:]])#.*"
+
+# Strings.
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/sql.nanorc b/msys2/usr/share/nano/sql.nanorc
new file mode 100644
index 000000000..ea7fcf680
--- /dev/null
+++ b/msys2/usr/share/nano/sql.nanorc
@@ -0,0 +1,72 @@
+## Syntax highlighting for (Postgres) SQL scripts.
+
+syntax sql "\.sql[2345s~]?$"
+comment "-- "
+
+# Functions.
+color white "\<[a-z_]*\("
+
+# Types.
+color green "\<(int2|smallint|int4|int|integer|int8|bigint|decimal|numeric|real|double precision|(small|big)?serial)\>"
+color green "\<(bit( varying)?|boolean|bytea|enum|money|tsvector|uuid)\>"
+color green "\<(char|varchar|character( varying)?|text)\>"
+color green "\<(date|interval|time(stamp)?( with time zone| without time zone)?)\>"
+color green "\<(point|line|lseg|path|box|polygon|circle)\>"
+color green "\<(cidr|inet|macaddr)\>"
+color green "\<(daterange|int4range|int8range|numrange|tsrange|tstzrange)\>"
+
+# Structure.
+color brightyellow "\<(CASE|CLASS|DEFAULT|DO|ELSE|ELSEIF|FOR|FOREACH|FUNCTION|IF|IS NULL)\>"
+color brightyellow "\<(NEW|PRIVATE|PUBLIC|RETURN|RETURNS|SETOF|SWITCH|THEN|WHEN|WHILE)>"
+
+# Control flow.
+color magenta "\<(EXCEPTION|NOTICE|RAISE|RETURN)\>"
+
+# SQL keywords.
+color blue "\<(ABORT|AGGREGATE|ALTER|ANALYZE|AND|AS|AUTHORIZATION|BEGIN|CAST|CHECKPOINT|CLASS|CLOSE)\>"
+color blue "\<(CLUSTER|COLLATION|COMMENT|COMMIT|CONFIGURATION|CONSTRAINTS|CONVERSION|COPY|CREATE)\>"
+color blue "\<(DATA|DATABASE|DEALLOCATE|DECLARE|DEFAULT|DELETE|DICTIONARY|DISCARD|DO|DOMAIN|DROP)\>"
+color blue "\<(END|EVENT|EXECUTE|EXPLAIN|EXTENSION|FAMILY|FETCH|FOREIGN|FROM|FUNCTION)\>"
+color blue "\<(GRANT|GROUP|IF NOT EXISTS|IMMUTABLE|INDEX|INSERT|INTO|LABEL|LANGUAGE|LARGE|LOAD|LOCK)\>"
+color blue "\<(MAPPING FOR|MATERIALIZED|MOVE|NOTIFY|OBJECT|OPERATOR|OPTIONS|OWNED|OWNER)\>"
+color blue "\<(PARSER|PREPARED?|PRIVILEGES|REASSIGN|REFRESH|RELEASE|RESET|REVOKE|ROLE|ROLLBACK|RULE)\>"
+color blue "\<(SAVEPOINT|SCHEMA|SEARCH|SECURITY|SELECT|SEQUENCE|SERVER|SESSION|SET|SHOW|SPACE|START|SYSTEM)\>"
+color blue "\<(TABLE|TEXT|TO|TRANSACTION|TYPE|UPDATE|USER|VACUUM|VALUES|VIEW|WHERE|WITH|WRAPPER)\>"
+
+# Strings.
+color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
+
+# Regular expressions.
+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+
+# Shell command expansion, between `backticks` or like %x{this}.
+color brightblue "`[^`]*`" "%x\{[^}]*\}"
+
+# Strings, double-quoted.
+color green ""([^"]|(\\"))*"" "%[QW]?(![^!]*!|\$[^$]*\$|\^[^^]*\^)"
+color green "%[QW]?(\([^)]*\)|<[^>]*>|\[[^]]*\]|\{[^}]*\})"
+
+# Expression substitution for inside double-quoted strings, "like #{this}".
+color brightgreen "#\{[^}]*\}"
+
+# Strings, single-quoted.
+color green "'([^']|(\\'))*'" "%[qw](![^!]*!|\$[^$]*\$|\^[^^]*\^)"
+color green "%[qw](\([^)]*\)|<[^>]*>|\[[^]]*\]|\{[^}]*\})"
+
+# Comments.
+color red "##?([^{].*|$)"
+color red "--([^{].*|$)"
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# PostgreSQL markings.
+color red "--"
+
+# PostgreSQL default schemas.
+color brightred "\<(pg_catalog|public)\>"
+
+# PostgreSQL PLs.
+color brightblue "\<pl(java|perlu?|pgsql|py|pythonu?|r|ruby|scheme|sh|tcl)\>"
diff --git a/msys2/usr/share/nano/tcl.nanorc b/msys2/usr/share/nano/tcl.nanorc
new file mode 100644
index 000000000..b9a8c611c
--- /dev/null
+++ b/msys2/usr/share/nano/tcl.nanorc
@@ -0,0 +1,22 @@
+## Syntax highlighting for Tcl files.
+
+syntax tcl "\.tcl$"
+magic "Tcl(/Tk)? script"
+comment "#"
+
+# Standard Tcl [info commands]:
+color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
+# Basic Tcl subcommands:
+color green "\<array (anymore|donesearch|exists|get|names|nextelement|set|size|startsearch|statistics|unset)\>"
+color green "\<string (bytelength|compare|equal|first|index|is|last|length|map|match|range|repeat|replace|to|tolower|totitle|toupper|trim|trimleft|trimright|will|wordend|wordstart)\>"
+# Extended TclX [info commands]:
+color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
+# Syntax:
+color brightblue "\<proc[[:space:]]|\{|\}"
+color green "\(|\)|\;|`|\\|\$|<|>|!|=|&|\|"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color brightred "\$\{?[0-9A-Za-z_!@#$*?-]+\}?"
+# Trailing whitespace:
+color ,green "[[:space:]]+$"
+# Comments:
+color cyan "^[[:space:]]*#.*"
diff --git a/msys2/usr/share/nano/tex.nanorc b/msys2/usr/share/nano/tex.nanorc
new file mode 100644
index 000000000..30bbd3728
--- /dev/null
+++ b/msys2/usr/share/nano/tex.nanorc
@@ -0,0 +1,11 @@
+## Syntax highlighting for TeX files.
+
+syntax tex "\.tex$"
+magic "(La)?TeX document"
+comment "%"
+
+linter chktex -v0 -q -I
+
+color green "\\.|\\[A-Za-z]*"
+color magenta "[{}]"
+color blue "(^|[^\])%.*"
diff --git a/msys2/usr/share/nano/texinfo.nanorc b/msys2/usr/share/nano/texinfo.nanorc
new file mode 100644
index 000000000..5fdc1cad4
--- /dev/null
+++ b/msys2/usr/share/nano/texinfo.nanorc
@@ -0,0 +1,24 @@
+## Syntax highlighting for Texinfo files.
+
+## Original author:  Benno Schulenberg
+## License:  GPL version 3 or newer
+
+syntax texinfo "\.texi$"
+header "^\\input texinfo"
+magic "Texinfo source"
+comment "@c "
+
+# Command arguments, trailing and enclosed.
+color cyan "^@[a-z]+[[:space:]]+.*$"
+color brightmagenta "@[a-zA-Z]+\{[^}]*\}"
+# Commands themselves.
+color yellow "@[a-zA-Z]+\{?" "\}"
+
+# Menu items.
+color brightred "^\*[[:space:]]+.*::.*"
+
+# Comments.
+color green "@c[[:space:]]+.*"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/msys2/usr/share/nano/xml.nanorc b/msys2/usr/share/nano/xml.nanorc
new file mode 100644
index 000000000..8aab9f469
--- /dev/null
+++ b/msys2/usr/share/nano/xml.nanorc
@@ -0,0 +1,22 @@
+## Syntax highlighting for XML files.
+
+syntax xml "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$"
+header "<\?xml.*version=.*\?>"
+magic "(XML|SGML) (sub)?document"
+comment "<!--|-->"
+
+# The entire content of the tag:
+color green  start="<" end=">"
+
+# The start and the end of the tag:
+color cyan   "<[^> ]+" ">"
+
+# The strings inside the tag:
+color magenta ""[^"]*""
+
+# Comments:
+color yellow start="<!DOCTYPE" end="[/]?>"
+color yellow start="<!--" end="-->"
+
+# Escapes:
+color red    "&[^;]*;"
diff --git a/msys2/usr/share/pacman/keyrings/msys2.gpg b/msys2/usr/share/pacman/keyrings/msys2.gpg
index 139810e58..f317a9ab9 100644
--- a/msys2/usr/share/pacman/keyrings/msys2.gpg
+++ b/msys2/usr/share/pacman/keyrings/msys2.gpg
@@ -444,18 +444,18 @@ RhtZa5AajEUP7p4WifSZNLxt0snvsqKlvbaebNBHalMfzEtynB8UhnN3ouumM0xH
 kyI/6y6iao66LbbAgiOcTlLUZI2t7M18EF1vGKU9ZFW3UKHxkyRJgKubDQARAQAB
 tCVEYXZpZCBNYWNlayA8ZGF2aWQubWFjZWsuMEBnbWFpbC5jb20+iQJSBBMBCgA8
 AhsDBAsJCAcEFQoJCAUWAgMBAAIeAQIXgBYhBId3EzGz8f9SY4VqbZdMi+SQePUy
-BQJe7MouBQkGcsJkAAoJEJdMi+SQePUyqxkP/Al2ERmQeNA4W7lVQbdZMrjiiuB8
-9Z4x/GbMAHuA72egJPKDG00yTZ+wDxnh8smBmljR3CGEkbpLc3eF+hnRa7jO8YXX
-fms28LZeJ5VKRTYQUk1XSREnKjjxzyaW0cqEb4l6yAziezspBMMmg8ny4ITOYDBj
-Rnw6MYaztiU5HZ0uInoniazg+edDyBTkWx1zzozbMTxpVVTcO45VJ6sss6Za9CbA
-igLd3vGHRtu6+OvF0UEeZgwOx1qhtC13MMPtKUMqn6iB6ipu7N2SlD1Ghov/vF6S
-gJErC06uhJyn2am1GOjZ2O9iakdhGRTxPQbhs1eR0oYykL+XKnem1cjQ7+WQ/4VC
-Dku9/NTwlJQP0wAR4gThUcZGAKWIfUQ1eM/gXpz5PYS9T2xZghpP9P2SHRzTLVHL
-ieNfBhcsmCVPVb1wbxVIWF6k1tkFIDmk9F3LT5TlH2G9Fst0Ggl6Knza5BuKDspY
-s8biPT5vSS0dG7lVmH7ojBZdRHZHWZJeCleSywIPqWaSoyMXTuysnY+0ovyBcvmL
-nTisbaBbkrwcN4AegLAtm2fPvhHVnEdsWgbStlkl2UlO5wpTG2QDb6hHsZ8buKVM
-7c8ShlTGqtD4Q+SnpFwSxxKGIVamJHcPlqbJ4j8YbEGrOXry9SEROmzJfbn2ff7N
-+u7ul6Ajy/Bnv3JGiQIzBBABCgAdFiEEbo/q/5ZE9U7tkO6geQrlah08/dwFAl7s
+BQJgDCT7BQkHkh0xAAoJEJdMi+SQePUywwAP/31t+69d21YTdpelKMIMgFb4jauf
+uq0xLe5kZGj86ItXrI9uB03NNsUr9iDAwSVqRht4Zb3ODCXXfTT+8PmIQnEifTNq
+UtYQM6m39h6ekgmbncn6IuspE12yDxUusaMntvIE5mNGVW8kcxLwGhfsh0jxoHxm
+1tY192hc1Wstbxca94rsbJW4xpER7SYOFbK5pJOBDG8kfmt/uEFl7k5hGwM+fkNN
+aSDseYqpwmxi5P/xbERvdqEdMvPlMm1CA1IdSRtyBTFYR6nlDCYHaKjwgtRmGgxv
+bpC35x8Wfm3EnK0evNwBsvhJGARU7oo1/F8s6gCEtfYepQKyEVsU88ALjL38FHZL
+ectkx8GSuYXSQv3biRCj2JwwLy0le64grTzunh3HfD91YEMgV3Toy1Gkd364cRUt
+Jfpd2wyqgvbia69nT1ymb5QlN2TiCU5KRx6tkvoSNIJ8jKZOTxKiaYb7jDdjpUP9
+DVX+gJKtILdGisycf3zbS4vMaQD0mMtLXrBbybP2jZpsm1nERnCSKfFJ4s+BHZ6B
+MF2P8SMpJM3LYV9R0NwWUlpvis9QcN39NOKtl1qWCKx22A35o1QkieN8bbTXTfdZ
+o+k44XJtzLif0DDk0mpAsuPwGnBGMuZJrlUYs9oBg70ix0xYII4mFxSanly7C6Gm
+hCmsPUrMDEDIKXiwiQIzBBABCgAdFiEEbo/q/5ZE9U7tkO6geQrlah08/dwFAl7s
 25wACgkQeQrlah08/dxxDBAArRUV8SuJF55XNzDU7x5JL2LkR+Wi8yk/pKtqWJ5p
 rvGT3y/FVTAaBScTbEF9MRFOal1fku/Hq4uHKJFpI4KfjDeR8+YgHF8XU6sXLWli
 pd/x0O3XvVQMV7sN6zTbsHDHSQEmLfcOk5jZAbAU7J75nGI20Hfk38LiqsfGxCC9
@@ -467,27 +467,27 @@ pjQ/RIjyr6VwwHCH9FbWNwDfICq+ZSLN1AlkST5r6/yVKuN/f1l7v13qC+gGBu20
 clPGtqHy+0Zra2iAbb0RDvXPuX5A01KB0gWBzANSzZcdGnBctVwHN4jyafSzZy0K
 eEfXrHVqV/KTyeXom8cnxkv2Yqs8SZ4fYhL3vs7Xx13uY41ypX2Pa3/yElnEcphc
 API51VnxEEoXp2524RUAhJjAfjKJPR58Ers5JKN3aMmh16ruQot3qgcJAV5xZTYF
-unGJAjMEEAEIAB0WIQRpmFxes1EBHHjff211W4GCrNIoeQUCXvRQwAAKCRB1W4GC
-rNIoebt7EACcmBLCj/h4qNQnVKpO/d3xg1rtpwEpXlEfPVoSXUdoZfpdddZEMuaK
-XlMAyf2JkUVYChAtf1lQuhLKXGdau1KS878N+bFidCtRh5gYYu0qSYIX1FWbO0aM
-AFRATKl+mhRoL/7scw/KmSI8b63+yiH0ttC9sElbmuKxESY0G8e40sF+rnj97S8Z
-Bz+PKySrH7DTPEppr613x/enfwzj1zJV+5J2VKz0ARX4uzWIiM1h6FmFEdxAxA+9
-dUTaZbipHmECn2xJmwOn3PlTCxpkUxt8Z3+zDmkRRXMutL422kPfv7lSm258+E24
-yAjccSByyGglA3lDhmOaVcoWTaYxjakg6EfH72KIuLOmgBKB0Ozip2xQe+Q1rhNG
-F3cZm3phWYF1u63HNx7V+1bE6GArNCJqJ8jd2TC0zj7Yt7mW1TUhrfsVL7wdloOz
-i60T4lSgJDpOrq8QYArsuL2iLzXxlNnPjr2oHo4eBlSsRnPhku88Mh/aQAE6w16P
-5WIHQx8TInvarfFn/hps2UFLtK3wHuK9P2yE4lcAMB6eKV+UzbLEJkl7nmoMxr1s
-ypB2MmFdH25YVGjo6l0aE5R8SbQoHHD81QHEYvfnuimshx43qHXKIzVRoBWgKMbd
-k64AKXtUA3QgKaoPJIdfC8L6GFWAgjmPpMRloyf379/v2LyjRDJzQoh1BBARCAAd
-FiEErTUcUK4IV3XrWTM7X5LvwaR9RaEFAl7xjKkACgkQX5LvwaR9RaEqfgD/drBG
-8rp4UjeeX2St+U8vJUnIyPSvFHXPEZYEoE3I7vUA/2hr1nEuwD4YkdfOs0N31G9M
-Eog+1N3Uucd3HnQ3kCH3iQEzBBABCAAdFiEE1V56bXzpuhWHwKys9A0mPsolZ4oF
-Al70hckACgkQ9A0mPsolZ4pSUwf/ZiqeHFa/VlN1igDXi0PJIHJafr74DtOYvSi9
-5rghZQ37k1ekfAhZnctZeDVtAyeFoBRHvYOQOSH63vXtTV9JcQmJVaItNPLtQ3kj
-A7M7gT3sbbl8Ejt6rzanXQHNqAEh/YGyQ8NpDe3RtQgcawY0gwb6uWKqpBUNoiFK
-731+SW1+ldjJabgmOPH//cH3Txd52gYjOhaJhGBu9DZdtbR1Bl1AQnDXcFK4h68H
-hZYOb4un/poNaUtVsiz9+N+bKrPY0QnBLw8eI6GpYWX5Tl5ZILdhlvQwaelTL5Jt
-oW24xboHODoEiFFsHLvo6kd+XolTPpSrNowiofE6E2XGiQbRRbkCDQRaWztKARAA
+unGIdQQQEQgAHRYhBK01HFCuCFd161kzO1+S78GkfUWhBQJe8YypAAoJEF+S78Gk
+fUWhKn4A/3awRvK6eFI3nl9krflPLyVJyMj0rxR1zxGWBKBNyO71AP9oa9ZxLsA+
+GJHXzrNDd9RvTBKIPtTd1LnHdx50N5Ah94kBMwQQAQgAHRYhBNVeem186boVh8Cs
+rPQNJj7KJWeKBQJe9IXJAAoJEPQNJj7KJWeKUlMH/2YqnhxWv1ZTdYoA14tDySBy
+Wn6++A7TmL0ovea4IWUN+5NXpHwIWZ3LWXg1bQMnhaAUR72DkDkh+t717U1fSXEJ
+iVWiLTTy7UN5IwOzO4E97G25fBI7eq82p10BzagBIf2BskPDaQ3t0bUIHGsGNIMG
++rliqqQVDaIhSu99fkltfpXYyWm4Jjjx//3B908XedoGIzoWiYRgbvQ2XbW0dQZd
+QEJw13BSuIevB4WWDm+Lp/6aDWlLVbIs/fjfmyqz2NEJwS8PHiOhqWFl+U5eWSC3
+YZb0MGnpUy+SbaFtuMW6Bzg6BIhRbBy76OpHfl6JUz6UqzaMIqHxOhNlxokG0UWJ
+AjMEEAEIAB0WIQRpmFxes1EBHHjff211W4GCrNIoeQUCXvRQwAAKCRB1W4GCrNIo
+ebt7EACcmBLCj/h4qNQnVKpO/d3xg1rtpwEpXlEfPVoSXUdoZfpdddZEMuaKXlMA
+yf2JkUVYChAtf1lQuhLKXGdau1KS878N+bFidCtRh5gYYu0qSYIX1FWbO0aMAFRA
+TKl+mhRoL/7scw/KmSI8b63+yiH0ttC9sElbmuKxESY0G8e40sF+rnj97S8ZBz+P
+KySrH7DTPEppr613x/enfwzj1zJV+5J2VKz0ARX4uzWIiM1h6FmFEdxAxA+9dUTa
+ZbipHmECn2xJmwOn3PlTCxpkUxt8Z3+zDmkRRXMutL422kPfv7lSm258+E24yAjc
+cSByyGglA3lDhmOaVcoWTaYxjakg6EfH72KIuLOmgBKB0Ozip2xQe+Q1rhNGF3cZ
+m3phWYF1u63HNx7V+1bE6GArNCJqJ8jd2TC0zj7Yt7mW1TUhrfsVL7wdloOzi60T
+4lSgJDpOrq8QYArsuL2iLzXxlNnPjr2oHo4eBlSsRnPhku88Mh/aQAE6w16P5WIH
+Qx8TInvarfFn/hps2UFLtK3wHuK9P2yE4lcAMB6eKV+UzbLEJkl7nmoMxr1sypB2
+MmFdH25YVGjo6l0aE5R8SbQoHHD81QHEYvfnuimshx43qHXKIzVRoBWgKMbdk64A
+KXtUA3QgKaoPJIdfC8L6GFWAgjmPpMRloyf379/v2LyjRDJzQrkCDQRaWztKARAA
 zNo0YHb8Nnb9h/Rf1E/MwEpfdqAQeiye4PCiP/XawVtVq2ldXYjpkqOM+L0zclPR
 I5p9wP+W2Lu7xq9lrTc79Xi4Zu6nhETrja/8MC5a87wxSC23EIK5zZlGReLsy/IA
 T33fc9YhsNM6+ALlLthImzDMRoeAxjFh4f1VAtQ6dUY+q539afBaWIQyoopmyWPM
@@ -499,18 +499,18 @@ i+ZU9tMzR9jqYPvK0kMllHuz3P3EBlb58Z41yT53dsY4idKO3Hb66OUHNL9Jak0q
 r9M4xBJSnPk2Yh2F/2lRLggtizSV9uRWp5F56oeN7F3DKKr4yrgRlwQ/0jIRjmZT
 diKKXL+xFI5sz8HzuInUgNr4aIyQ3HqxTLNiFGwBlBjjN8dnrzULAsyq/PEcU8E3
 XWUi5c1djlKeCUQ4DWZa5qhdu4EyUZjD6E+HegePtbMAEQEAAYkCPAQYAQoAJgIb
-DBYhBId3EzGz8f9SY4VqbZdMi+SQePUyBQJe7MqFBQkGcsK7AAoJEJdMi+SQePUy
-b5oP/iwJtxEGnzafvw+ulezODC+U5+G5f0XgtoulqMDziIEesBEoaojuQW+gzwuZ
-58QePUkfe/Ui1Rfuu5MYC74TI20rfvRtWL7Jw48xvEB6LPRDQJWHC6J7ionJYa9S
-c3DHkY0BpXq6CwyDSOoFJZY0Wr3eajziYBI+PRaQqCq73BZxHEEFc05PZs1hrdIz
-73uUODMLeNpFtK4iKJagqmufF88NUcmZ/gUpQAPFHwgGQZ+hV9LhoPZ3hRWE53Zs
-yGPBssKcRsXKhoKh7VQJnkt6z+HX89zb3TbEetKZr0QHh2Dizup9ItRDeogFcpmH
-WxW8kVgwGyF/SBd/51RncwxBdDcq9/wUfA4eR6eDXVQjgDaxeXzmPUj+u2cHHkAF
-C8cUfdSPuAW4uQwcZfGta1Z1UTENj32L7vDYg2ARdl/tm1Ppls7FZkYpsLsl2EIs
-aV9jgxAeSPJQL+mMELDGvdoK5Vbyg43y0O4oa3BvImJs10zL/9vqbph1HHsvNu5b
-tJTFGr6VaKmotIrbtihJi17ChcrFdNgZ1auXJHc+egonwUKdCEQyKjIcdSJ/HONB
-T7wWbrpq5Wz3X5MWo/CZh8R5K43x4wKUBFNJV6Sxl7ljZalcLNgZfOV5yp1SCRA9
-8XFDebrMS2/ijJ1eDaVvdsowwdb4D08xfXziTxp/gik095iguQGNBFpbO6EBDADD
+DBYhBId3EzGz8f9SY4VqbZdMi+SQePUyBQJgDCUVBQkHkh1LAAoJEJdMi+SQePUy
+bmsP/0n7TNwYwIYNsCiRfsbm4MysYkDNtAKGS0N0UVit0vjISJ35xuqCRbkLlw1P
+bMrCtnCa2DJXuGJ0b3FFEF9Jr2wbTJlVIL2Qc0yt3Nf+EXmXJ1o51cXwDBi7U/3S
+UuSUn+rgG9L093ZrE+Si4bkGKfvH1r4miK0BF9EkSAlVDVnSB4NZp1ono1r8W+1g
+kMclRO03ZjWrdfl+bgTvmwtQdoSkbj8AFWCWYCL6Elxiku/ifh4FLoh7X+mwDkVL
+YDA9aVmlO4LnoI1Nymfedkh1AA0hyttvZh9AA2OWDdG2Mni/9IFOfoqsPhTqsg1r
+5MmuTqVUznAkQlW86as2VDKsF3ZcS0JjgyKzze9FxJ0MJLzo31t9ga155ui8A0LS
+KYYjB94ghBwH4WIockxm5oxCGeU/+MIHoyjmpbTygc8aSbpc7DAxEki2pUVTUzlo
+8al3ZFqjW86RjrgCM0FGCUZxGEA8qSQsyvJ4M6lawi0V6xF9ckBElNNzDBt+fv/q
+ttp23kfy4bZdWorPeZQA6gZxxzd1XKvWd95F3mWNwv71cdEUW0r5uLWh/X5VXrOV
+bis3sVNi9v2Ill4EI1L1V5yCXSrRkIuSmsQZorj6HDjBT5m5ML/rXqmRtB/9bBbr
+qXVESY8nKkuC5s61AN2bxDT3GdU4d5Z/H+L030eO3Y0Y6LAzuQGNBFpbO6EBDADD
 LhDkYK9XisbtbQqH+XjuU/idBCRm0N+tDPWF1tDFy6L7Lc7LXH9Hgj0+uB0W2FJB
 sWl5nITlkM8CrnjgI9hC2LbvMbdcWHI/3F4VMOgwv/kKYDnm4xGqcZY0TIsjTtS8
 M2IrAmyzHe0Iu6HRkoeUSkOij9T5nZmK/tAT9DON0Lr4upC03d77VZLOtxUh0tLs
@@ -519,8 +519,8 @@ wNX2so8Fy11Q0qEIFXHUaglgLAfzzCPnmrZqzWF9MYYu2myYtcQeqNqCvWI6NaVK
 UyMybazL9BHae/j10USu/JVR6Q8/POo1Fmu/WQ2QCFCwTjcwNJ+is/6CCPoh62Zt
 OiqTB63ZwlbErTTBuh5pR3ucG7ptXr9MPRq6qG7JtxdVDSWlcKOpPErLOEhikrBv
 4lB+c8zbl8H7HCgejJFoBWb9wI6NCEMROHiRwazoQ0CMcsEk1XdKOw9dVLI4WckA
-EQEAAYkD2wQYAQoAJgIbAhYhBId3EzGz8f9SY4VqbZdMi+SQePUyBQJe7MqgBQkG
-csJ/AanA3SAEGQEKAAYFAlpbO6EACgkQYo9SjPMFPgRRtwv/dTE0yUCHXMZ16mKi
+EQEAAYkD2wQYAQoAJgIbAhYhBId3EzGz8f9SY4VqbZdMi+SQePUyBQJgDCUnBQkH
+kh0GAanA3SAEGQEKAAYFAlpbO6EACgkQYo9SjPMFPgRRtwv/dTE0yUCHXMZ16mKi
 39715hPyXSMm4LMbBNuiRV0ZwEtCnkKj8DVndnmgVot5u6NcTxIvJoDMaNljlH4s
 uCR6vbGNKLJWLhEFBtdwulixyA7BZfT+8mFPkRmf19cBoiK+AT4Fdse71eZNSQK4
 mFr7nJ8yFQWeZ0NJr9sFb+VTvu3ODAEyC5YtWSLtG1BdpgzveCBe/Mz/QhIQlP45
@@ -528,19 +528,19 @@ pQZNWJcTRM3nIhsQFg7klAQ8bGCqZhOqPr+PFBQRo73R+e/5dHqRnya3/3c/PYKt
 2KVzR2ZQUyqDXV/SzMQotnyI19iLmtddeCXaymI08yiPcb2pNFB2uzlZXsB1AZvL
 Ric4yX5CYyu2owKkUSOmW2KGUW1fxvSL6L3bc17qE/lwEGVFYMulfebWIjdxcHcf
 QiZ+h12F/0515F4aYj/78/wwsW2gu7ZHFQN7q6kp6KExqvkMuQtpVgx5yMQ9/yjv
-tvDCSuLvzwT3aEeO2mOch9U1pE0FKsePLsDVCrwRcpQIlDzcCRCXTIvkkHj1Mqg6
-EACHPoxtJYHsApF3xEs4torMRuJw1V668i1KeMHpC3W9MRRrYhUe7dsOwEnib1Ji
-XI8f0UMQoVLphsas/fT/pc4tTzoZxf4L/CNFodGFBsmXIXWhh13OWjFzqyh8U53N
-8ftdnmRVBcHhUxEvzf6sQ/B2BRm0LLtd0ikhC+XsCENV+0QcaNWkSK/692olX1Ch
-swxuUgIqon+F+D020dvaRp79RCM1koVogP1e2Pgb13qFLJXx+EsbPPtDxwEUZTcy
-K2cSsqEbcuzJcNu6Su1QKTiYzfJ2EI6UtecLcfEtmmJSGuWkffofLFpjl29e4K2x
-4fi/67L/ljaNIOAOlivRuS3EJvxiVhea/eLubvVT2u4BfHpoUofRlMjZXWtABG61
-CTSCOgJoki2GBFcb5vb7WODBl3BklsgxAZzZ9Hk5fxc2yuGPNu1tuoytgqgAzhgx
-+INAJ62HRt9z994kxQpcjEjIbPZ1S/yY85z6Na3zwSCJbhkkbW5pSTP7/o98EQto
-Cr79GbAdAn4p2ezUPRDd1Uv3ufVx63dFxOhV1RPYuehO/Y3/4/dxQSZ8/vQnQAAr
-u2iXp3hJsU7t9LKWm0qH3hYwzcjKzOCOKQ03QT8eMUg9iy+kauCfKLAHzsYKnym2
-UYrvgg8ZM6Hh4W9iGj81DioaOllBisWWN5dyCEvtcl8RQQ==
-=fGkK
+tvDCSuLvzwT3aEeO2mOch9U1pE0FKsePLsDVCrwRcpQIlDzcCRCXTIvkkHj1MvJ2
+D/4ytxnPyYnSySpxbUkGlyKj9sFcUwTOxt+5F5wy1xiNhXaKNQFkHV9OKt2q02PS
+JxcIFYRsfCUCGDtrARIOtae4MnQ3PlJreyAvxlot9G4SgH4iD26wkM035LQU5zCJ
+XPsvO9GzIJnY6tXAI94szv2TMR/+x0FWm5LswdiApvO8E6qLmETdhDkZcdZ42CLs
+wKRAY9vb+cEgElDpPJwXsNSMUE73NBTKA/2j27seBBJSHc9BBmhylCxfXXoBhfnh
+rxOlE+1QV867BrjqWREEJ4fTu+v54Tl4MEyT8HHf51BEjsV1BKB61yLlApddpA+3
+71EjGsIR6P5Q6b3AQkeoytAYOW52CCx9xm1F95B6gT+mf9MWKeHRjSnL2VK+zfvG
+GwP742lCagsV2j+RKcbdlFsE6PronCHia5LMvA3ZODtaOJGVaF9SRTkz4SaZaW5n
+Y6I0OGZdYjBOD54uQzJSgcYOCKluBveVS8/ki8y/tkgjhDaNoJ7YN4vfdVYBbmFW
+SEGMZkM+edKIaS6eBuu847pYckLW7yrZJ35m09dk5eqgfm2CfpZfFwiehHcYc7DH
+DrZynAYZF//ORBsdX1Cyktr779cw1cELNJ7EIjGnddNEN+3SYqtyzWlFLFy2h6HF
+FPYr6IvEvDCXIMWNvJsq8aC9YEC+VAkycnGyUZgdJMG9iw==
+=2psr
 -----END PGP PUBLIC KEY BLOCK-----
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: packager: Martell (C65EC8966983541D52B97A16D595C9AB2C51581E)
diff --git a/msys2/usr/share/pkgconfig/bash-completion.pc b/msys2/usr/share/pkgconfig/bash-completion.pc
index 2a57581b1..dd72f2a13 100644
--- a/msys2/usr/share/pkgconfig/bash-completion.pc
+++ b/msys2/usr/share/pkgconfig/bash-completion.pc
@@ -9,4 +9,4 @@ helpersdir=${datadir}/bash-completion/helpers
 Name: bash-completion
 Description: programmable completion for the bash shell
 URL: https://github.com/scop/bash-completion
-Version: 2.10
+Version: 2.11
diff --git a/msys2/usr/share/readline/fileman.c b/msys2/usr/share/readline/fileman.c
index c821df033..f8d0be73e 100644
--- a/msys2/usr/share/readline/fileman.c
+++ b/msys2/usr/share/readline/fileman.c
@@ -377,11 +377,11 @@ com_stat (arg)
 
   printf ("Statistics for `%s':\n", arg);
 
-  printf ("%s has %d link%s, and is %d byte%s in length.\n",
+  printf ("%s has %d link%s, and is %lu byte%s in length.\n",
 	  arg,
           finfo.st_nlink,
           (finfo.st_nlink == 1) ? "" : "s",
-          finfo.st_size,
+          (unsigned long)finfo.st_size,
           (finfo.st_size == 1) ? "" : "s");
   printf ("Inode Last Change at: %s", ctime (&finfo.st_ctime));
   printf ("      Last access at: %s", ctime (&finfo.st_atime));
diff --git a/msys2/usr/share/vim/vimfiles/syntax/PKGBUILD.vim b/msys2/usr/share/vim/vimfiles/syntax/PKGBUILD.vim
index 070161ae6..2ba6b72de 100644
--- a/msys2/usr/share/vim/vimfiles/syntax/PKGBUILD.vim
+++ b/msys2/usr/share/vim/vimfiles/syntax/PKGBUILD.vim
@@ -328,6 +328,9 @@ hi def link pbIllegalSha384sums Error
 hi def link pb_k_sha512sums pbKeywords
 hi def link pbIllegalSha512sums Error
 
+hi def link pb_k_b2sums pbKeywords
+hi def link pbIllegalb2sums Error
+
 hi def link pb_k_options pbKeywords
 hi def link pbOptionsDeprec Todo
 hi def link pbIllegalOption Error
diff --git a/msys2/usr/share/zoneinfo/Africa/Abidjan b/msys2/usr/share/zoneinfo/Africa/Abidjan
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Abidjan and b/msys2/usr/share/zoneinfo/Africa/Abidjan differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Accra b/msys2/usr/share/zoneinfo/Africa/Accra
index 697b9933e..c39ae382b 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Accra and b/msys2/usr/share/zoneinfo/Africa/Accra differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Addis_Ababa b/msys2/usr/share/zoneinfo/Africa/Addis_Ababa
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Addis_Ababa and b/msys2/usr/share/zoneinfo/Africa/Addis_Ababa differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Algiers b/msys2/usr/share/zoneinfo/Africa/Algiers
index ae0434231..56a4dd2a1 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Algiers and b/msys2/usr/share/zoneinfo/Africa/Algiers differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Asmara b/msys2/usr/share/zoneinfo/Africa/Asmara
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Asmara and b/msys2/usr/share/zoneinfo/Africa/Asmara differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Asmera b/msys2/usr/share/zoneinfo/Africa/Asmera
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Asmera and b/msys2/usr/share/zoneinfo/Africa/Asmera differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Bamako b/msys2/usr/share/zoneinfo/Africa/Bamako
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Bamako and b/msys2/usr/share/zoneinfo/Africa/Bamako differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Bangui b/msys2/usr/share/zoneinfo/Africa/Bangui
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Bangui and b/msys2/usr/share/zoneinfo/Africa/Bangui differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Banjul b/msys2/usr/share/zoneinfo/Africa/Banjul
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Banjul and b/msys2/usr/share/zoneinfo/Africa/Banjul differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Bissau b/msys2/usr/share/zoneinfo/Africa/Bissau
index 82ea5aaf0..0da1d1e21 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Bissau and b/msys2/usr/share/zoneinfo/Africa/Bissau differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Blantyre b/msys2/usr/share/zoneinfo/Africa/Blantyre
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Blantyre and b/msys2/usr/share/zoneinfo/Africa/Blantyre differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Brazzaville b/msys2/usr/share/zoneinfo/Africa/Brazzaville
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Brazzaville and b/msys2/usr/share/zoneinfo/Africa/Brazzaville differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Bujumbura b/msys2/usr/share/zoneinfo/Africa/Bujumbura
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Bujumbura and b/msys2/usr/share/zoneinfo/Africa/Bujumbura differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Cairo b/msys2/usr/share/zoneinfo/Africa/Cairo
index d3f819623..ea38c9700 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Cairo and b/msys2/usr/share/zoneinfo/Africa/Cairo differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Casablanca b/msys2/usr/share/zoneinfo/Africa/Casablanca
index d39016b89..0263c90bd 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Casablanca and b/msys2/usr/share/zoneinfo/Africa/Casablanca differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Ceuta b/msys2/usr/share/zoneinfo/Africa/Ceuta
index 850c8f06f..a461dceaa 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Ceuta and b/msys2/usr/share/zoneinfo/Africa/Ceuta differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Conakry b/msys2/usr/share/zoneinfo/Africa/Conakry
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Conakry and b/msys2/usr/share/zoneinfo/Africa/Conakry differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Dakar b/msys2/usr/share/zoneinfo/Africa/Dakar
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Dakar and b/msys2/usr/share/zoneinfo/Africa/Dakar differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Dar_es_Salaam b/msys2/usr/share/zoneinfo/Africa/Dar_es_Salaam
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Dar_es_Salaam and b/msys2/usr/share/zoneinfo/Africa/Dar_es_Salaam differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Djibouti b/msys2/usr/share/zoneinfo/Africa/Djibouti
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Djibouti and b/msys2/usr/share/zoneinfo/Africa/Djibouti differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Douala b/msys2/usr/share/zoneinfo/Africa/Douala
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Douala and b/msys2/usr/share/zoneinfo/Africa/Douala differ
diff --git a/msys2/usr/share/zoneinfo/Africa/El_Aaiun b/msys2/usr/share/zoneinfo/Africa/El_Aaiun
index 066fbed00..772e23c4c 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/El_Aaiun and b/msys2/usr/share/zoneinfo/Africa/El_Aaiun differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Freetown b/msys2/usr/share/zoneinfo/Africa/Freetown
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Freetown and b/msys2/usr/share/zoneinfo/Africa/Freetown differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Gaborone b/msys2/usr/share/zoneinfo/Africa/Gaborone
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Gaborone and b/msys2/usr/share/zoneinfo/Africa/Gaborone differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Harare b/msys2/usr/share/zoneinfo/Africa/Harare
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Harare and b/msys2/usr/share/zoneinfo/Africa/Harare differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Johannesburg b/msys2/usr/share/zoneinfo/Africa/Johannesburg
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Johannesburg and b/msys2/usr/share/zoneinfo/Africa/Johannesburg differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Juba b/msys2/usr/share/zoneinfo/Africa/Juba
index 625b1accc..36b05220a 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Juba and b/msys2/usr/share/zoneinfo/Africa/Juba differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Kampala b/msys2/usr/share/zoneinfo/Africa/Kampala
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Kampala and b/msys2/usr/share/zoneinfo/Africa/Kampala differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Khartoum b/msys2/usr/share/zoneinfo/Africa/Khartoum
index 8ee8cb92e..3f8e44b8a 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Khartoum and b/msys2/usr/share/zoneinfo/Africa/Khartoum differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Kigali b/msys2/usr/share/zoneinfo/Africa/Kigali
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Kigali and b/msys2/usr/share/zoneinfo/Africa/Kigali differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Kinshasa b/msys2/usr/share/zoneinfo/Africa/Kinshasa
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Kinshasa and b/msys2/usr/share/zoneinfo/Africa/Kinshasa differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Lagos b/msys2/usr/share/zoneinfo/Africa/Lagos
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Lagos and b/msys2/usr/share/zoneinfo/Africa/Lagos differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Libreville b/msys2/usr/share/zoneinfo/Africa/Libreville
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Libreville and b/msys2/usr/share/zoneinfo/Africa/Libreville differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Lome b/msys2/usr/share/zoneinfo/Africa/Lome
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Lome and b/msys2/usr/share/zoneinfo/Africa/Lome differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Luanda b/msys2/usr/share/zoneinfo/Africa/Luanda
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Luanda and b/msys2/usr/share/zoneinfo/Africa/Luanda differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Lubumbashi b/msys2/usr/share/zoneinfo/Africa/Lubumbashi
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Lubumbashi and b/msys2/usr/share/zoneinfo/Africa/Lubumbashi differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Lusaka b/msys2/usr/share/zoneinfo/Africa/Lusaka
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Lusaka and b/msys2/usr/share/zoneinfo/Africa/Lusaka differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Malabo b/msys2/usr/share/zoneinfo/Africa/Malabo
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Malabo and b/msys2/usr/share/zoneinfo/Africa/Malabo differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Maputo b/msys2/usr/share/zoneinfo/Africa/Maputo
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Maputo and b/msys2/usr/share/zoneinfo/Africa/Maputo differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Maseru b/msys2/usr/share/zoneinfo/Africa/Maseru
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Maseru and b/msys2/usr/share/zoneinfo/Africa/Maseru differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Mbabane b/msys2/usr/share/zoneinfo/Africa/Mbabane
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Mbabane and b/msys2/usr/share/zoneinfo/Africa/Mbabane differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Mogadishu b/msys2/usr/share/zoneinfo/Africa/Mogadishu
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Mogadishu and b/msys2/usr/share/zoneinfo/Africa/Mogadishu differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Monrovia b/msys2/usr/share/zoneinfo/Africa/Monrovia
index 6d688502a..837780922 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Monrovia and b/msys2/usr/share/zoneinfo/Africa/Monrovia differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Nairobi b/msys2/usr/share/zoneinfo/Africa/Nairobi
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Nairobi and b/msys2/usr/share/zoneinfo/Africa/Nairobi differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Ndjamena b/msys2/usr/share/zoneinfo/Africa/Ndjamena
index a968845e2..ecbc0966d 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Ndjamena and b/msys2/usr/share/zoneinfo/Africa/Ndjamena differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Niamey b/msys2/usr/share/zoneinfo/Africa/Niamey
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Niamey and b/msys2/usr/share/zoneinfo/Africa/Niamey differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Nouakchott b/msys2/usr/share/zoneinfo/Africa/Nouakchott
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Nouakchott and b/msys2/usr/share/zoneinfo/Africa/Nouakchott differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Ouagadougou b/msys2/usr/share/zoneinfo/Africa/Ouagadougou
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Ouagadougou and b/msys2/usr/share/zoneinfo/Africa/Ouagadougou differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Porto-Novo b/msys2/usr/share/zoneinfo/Africa/Porto-Novo
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Porto-Novo and b/msys2/usr/share/zoneinfo/Africa/Porto-Novo differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Sao_Tome b/msys2/usr/share/zoneinfo/Africa/Sao_Tome
index 59f3759c4..425ad3fda 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Sao_Tome and b/msys2/usr/share/zoneinfo/Africa/Sao_Tome differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Timbuktu b/msys2/usr/share/zoneinfo/Africa/Timbuktu
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Timbuktu and b/msys2/usr/share/zoneinfo/Africa/Timbuktu differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Tripoli b/msys2/usr/share/zoneinfo/Africa/Tripoli
index 07b393bb7..e0c89971a 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Tripoli and b/msys2/usr/share/zoneinfo/Africa/Tripoli differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Tunis b/msys2/usr/share/zoneinfo/Africa/Tunis
index 427fa5630..ca324cb4c 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Tunis and b/msys2/usr/share/zoneinfo/Africa/Tunis differ
diff --git a/msys2/usr/share/zoneinfo/Africa/Windhoek b/msys2/usr/share/zoneinfo/Africa/Windhoek
index abecd137b..0edc52b9b 100644
Binary files a/msys2/usr/share/zoneinfo/Africa/Windhoek and b/msys2/usr/share/zoneinfo/Africa/Windhoek differ
diff --git a/msys2/usr/share/zoneinfo/America/Adak b/msys2/usr/share/zoneinfo/America/Adak
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Adak and b/msys2/usr/share/zoneinfo/America/Adak differ
diff --git a/msys2/usr/share/zoneinfo/America/Anchorage b/msys2/usr/share/zoneinfo/America/Anchorage
index 9bbb2fd3b..cdf0572be 100644
Binary files a/msys2/usr/share/zoneinfo/America/Anchorage and b/msys2/usr/share/zoneinfo/America/Anchorage differ
diff --git a/msys2/usr/share/zoneinfo/America/Anguilla b/msys2/usr/share/zoneinfo/America/Anguilla
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Anguilla and b/msys2/usr/share/zoneinfo/America/Anguilla differ
diff --git a/msys2/usr/share/zoneinfo/America/Antigua b/msys2/usr/share/zoneinfo/America/Antigua
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Antigua and b/msys2/usr/share/zoneinfo/America/Antigua differ
diff --git a/msys2/usr/share/zoneinfo/America/Araguaina b/msys2/usr/share/zoneinfo/America/Araguaina
index 49381b410..f66c9f79d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Araguaina and b/msys2/usr/share/zoneinfo/America/Araguaina differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Buenos_Aires b/msys2/usr/share/zoneinfo/America/Argentina/Buenos_Aires
index 260f86a91..d6f999b86 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Buenos_Aires and b/msys2/usr/share/zoneinfo/America/Argentina/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Catamarca b/msys2/usr/share/zoneinfo/America/Argentina/Catamarca
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Catamarca and b/msys2/usr/share/zoneinfo/America/Argentina/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/ComodRivadavia b/msys2/usr/share/zoneinfo/America/Argentina/ComodRivadavia
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/ComodRivadavia and b/msys2/usr/share/zoneinfo/America/Argentina/ComodRivadavia differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Cordoba b/msys2/usr/share/zoneinfo/America/Argentina/Cordoba
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Cordoba and b/msys2/usr/share/zoneinfo/America/Argentina/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Jujuy b/msys2/usr/share/zoneinfo/America/Argentina/Jujuy
index 604b85663..b275f27c0 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Jujuy and b/msys2/usr/share/zoneinfo/America/Argentina/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/La_Rioja b/msys2/usr/share/zoneinfo/America/Argentina/La_Rioja
index 2218e36bf..23fca1220 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/La_Rioja and b/msys2/usr/share/zoneinfo/America/Argentina/La_Rioja differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Mendoza b/msys2/usr/share/zoneinfo/America/Argentina/Mendoza
index f9e677f17..691c56978 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Mendoza and b/msys2/usr/share/zoneinfo/America/Argentina/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Rio_Gallegos b/msys2/usr/share/zoneinfo/America/Argentina/Rio_Gallegos
index c36587e1c..991d1fae6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Rio_Gallegos and b/msys2/usr/share/zoneinfo/America/Argentina/Rio_Gallegos differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Salta b/msys2/usr/share/zoneinfo/America/Argentina/Salta
index 0e797f221..58863e043 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Salta and b/msys2/usr/share/zoneinfo/America/Argentina/Salta differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/San_Juan b/msys2/usr/share/zoneinfo/America/Argentina/San_Juan
index 2698495bb..7eba33c1c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/San_Juan and b/msys2/usr/share/zoneinfo/America/Argentina/San_Juan differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/San_Luis b/msys2/usr/share/zoneinfo/America/Argentina/San_Luis
index fe50f6211..0a81cbddf 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/San_Luis and b/msys2/usr/share/zoneinfo/America/Argentina/San_Luis differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Tucuman b/msys2/usr/share/zoneinfo/America/Argentina/Tucuman
index c954000ba..10556d5d8 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Tucuman and b/msys2/usr/share/zoneinfo/America/Argentina/Tucuman differ
diff --git a/msys2/usr/share/zoneinfo/America/Argentina/Ushuaia b/msys2/usr/share/zoneinfo/America/Argentina/Ushuaia
index 3643628a2..e03175027 100644
Binary files a/msys2/usr/share/zoneinfo/America/Argentina/Ushuaia and b/msys2/usr/share/zoneinfo/America/Argentina/Ushuaia differ
diff --git a/msys2/usr/share/zoneinfo/America/Aruba b/msys2/usr/share/zoneinfo/America/Aruba
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Aruba and b/msys2/usr/share/zoneinfo/America/Aruba differ
diff --git a/msys2/usr/share/zoneinfo/America/Asuncion b/msys2/usr/share/zoneinfo/America/Asuncion
index 2f3bbda6d..622503674 100644
Binary files a/msys2/usr/share/zoneinfo/America/Asuncion and b/msys2/usr/share/zoneinfo/America/Asuncion differ
diff --git a/msys2/usr/share/zoneinfo/America/Atikokan b/msys2/usr/share/zoneinfo/America/Atikokan
index 629ed4231..c82871528 100644
Binary files a/msys2/usr/share/zoneinfo/America/Atikokan and b/msys2/usr/share/zoneinfo/America/Atikokan differ
diff --git a/msys2/usr/share/zoneinfo/America/Atka b/msys2/usr/share/zoneinfo/America/Atka
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Atka and b/msys2/usr/share/zoneinfo/America/Atka differ
diff --git a/msys2/usr/share/zoneinfo/America/Bahia b/msys2/usr/share/zoneinfo/America/Bahia
index 15808d30f..7969e3076 100644
Binary files a/msys2/usr/share/zoneinfo/America/Bahia and b/msys2/usr/share/zoneinfo/America/Bahia differ
diff --git a/msys2/usr/share/zoneinfo/America/Bahia_Banderas b/msys2/usr/share/zoneinfo/America/Bahia_Banderas
index 896af3f56..cbe22a762 100644
Binary files a/msys2/usr/share/zoneinfo/America/Bahia_Banderas and b/msys2/usr/share/zoneinfo/America/Bahia_Banderas differ
diff --git a/msys2/usr/share/zoneinfo/America/Barbados b/msys2/usr/share/zoneinfo/America/Barbados
index 9b90e306a..9d3afa6a5 100644
Binary files a/msys2/usr/share/zoneinfo/America/Barbados and b/msys2/usr/share/zoneinfo/America/Barbados differ
diff --git a/msys2/usr/share/zoneinfo/America/Belem b/msys2/usr/share/zoneinfo/America/Belem
index 60b5924dc..e0d7653c6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Belem and b/msys2/usr/share/zoneinfo/America/Belem differ
diff --git a/msys2/usr/share/zoneinfo/America/Belize b/msys2/usr/share/zoneinfo/America/Belize
index 851051ae9..bfc19f4e5 100644
Binary files a/msys2/usr/share/zoneinfo/America/Belize and b/msys2/usr/share/zoneinfo/America/Belize differ
diff --git a/msys2/usr/share/zoneinfo/America/Blanc-Sablon b/msys2/usr/share/zoneinfo/America/Blanc-Sablon
index f9f13a167..7096b69a5 100644
Binary files a/msys2/usr/share/zoneinfo/America/Blanc-Sablon and b/msys2/usr/share/zoneinfo/America/Blanc-Sablon differ
diff --git a/msys2/usr/share/zoneinfo/America/Boa_Vista b/msys2/usr/share/zoneinfo/America/Boa_Vista
index 978c33100..fca97207b 100644
Binary files a/msys2/usr/share/zoneinfo/America/Boa_Vista and b/msys2/usr/share/zoneinfo/America/Boa_Vista differ
diff --git a/msys2/usr/share/zoneinfo/America/Bogota b/msys2/usr/share/zoneinfo/America/Bogota
index b2647d7a8..6cb53d4e6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Bogota and b/msys2/usr/share/zoneinfo/America/Bogota differ
diff --git a/msys2/usr/share/zoneinfo/America/Boise b/msys2/usr/share/zoneinfo/America/Boise
index f8d54e274..72fec9e8c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Boise and b/msys2/usr/share/zoneinfo/America/Boise differ
diff --git a/msys2/usr/share/zoneinfo/America/Buenos_Aires b/msys2/usr/share/zoneinfo/America/Buenos_Aires
index 260f86a91..d6f999b86 100644
Binary files a/msys2/usr/share/zoneinfo/America/Buenos_Aires and b/msys2/usr/share/zoneinfo/America/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/America/Cambridge_Bay b/msys2/usr/share/zoneinfo/America/Cambridge_Bay
index f8db4b6eb..0a2225244 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cambridge_Bay and b/msys2/usr/share/zoneinfo/America/Cambridge_Bay differ
diff --git a/msys2/usr/share/zoneinfo/America/Campo_Grande b/msys2/usr/share/zoneinfo/America/Campo_Grande
index 81206247d..6855e4e9f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Campo_Grande and b/msys2/usr/share/zoneinfo/America/Campo_Grande differ
diff --git a/msys2/usr/share/zoneinfo/America/Cancun b/msys2/usr/share/zoneinfo/America/Cancun
index f907f0a5b..640b259fd 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cancun and b/msys2/usr/share/zoneinfo/America/Cancun differ
diff --git a/msys2/usr/share/zoneinfo/America/Caracas b/msys2/usr/share/zoneinfo/America/Caracas
index eedf725e8..8dbe6ff74 100644
Binary files a/msys2/usr/share/zoneinfo/America/Caracas and b/msys2/usr/share/zoneinfo/America/Caracas differ
diff --git a/msys2/usr/share/zoneinfo/America/Catamarca b/msys2/usr/share/zoneinfo/America/Catamarca
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/America/Catamarca and b/msys2/usr/share/zoneinfo/America/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/America/Cayenne b/msys2/usr/share/zoneinfo/America/Cayenne
index e5bc06fdb..cd49f0534 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cayenne and b/msys2/usr/share/zoneinfo/America/Cayenne differ
diff --git a/msys2/usr/share/zoneinfo/America/Cayman b/msys2/usr/share/zoneinfo/America/Cayman
index 9964b9a33..9154643f4 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cayman and b/msys2/usr/share/zoneinfo/America/Cayman differ
diff --git a/msys2/usr/share/zoneinfo/America/Chicago b/msys2/usr/share/zoneinfo/America/Chicago
index a5b1617c7..b01688065 100644
Binary files a/msys2/usr/share/zoneinfo/America/Chicago and b/msys2/usr/share/zoneinfo/America/Chicago differ
diff --git a/msys2/usr/share/zoneinfo/America/Chihuahua b/msys2/usr/share/zoneinfo/America/Chihuahua
index 8ed5f93b0..e1780a575 100644
Binary files a/msys2/usr/share/zoneinfo/America/Chihuahua and b/msys2/usr/share/zoneinfo/America/Chihuahua differ
diff --git a/msys2/usr/share/zoneinfo/America/Coral_Harbour b/msys2/usr/share/zoneinfo/America/Coral_Harbour
index 629ed4231..c82871528 100644
Binary files a/msys2/usr/share/zoneinfo/America/Coral_Harbour and b/msys2/usr/share/zoneinfo/America/Coral_Harbour differ
diff --git a/msys2/usr/share/zoneinfo/America/Cordoba b/msys2/usr/share/zoneinfo/America/Cordoba
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cordoba and b/msys2/usr/share/zoneinfo/America/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/America/Costa_Rica b/msys2/usr/share/zoneinfo/America/Costa_Rica
index 37cb85e4d..08f0128ee 100644
Binary files a/msys2/usr/share/zoneinfo/America/Costa_Rica and b/msys2/usr/share/zoneinfo/America/Costa_Rica differ
diff --git a/msys2/usr/share/zoneinfo/America/Creston b/msys2/usr/share/zoneinfo/America/Creston
index ca648573e..9d69a0ab8 100644
Binary files a/msys2/usr/share/zoneinfo/America/Creston and b/msys2/usr/share/zoneinfo/America/Creston differ
diff --git a/msys2/usr/share/zoneinfo/America/Cuiaba b/msys2/usr/share/zoneinfo/America/Cuiaba
index 9bea3d407..c09a87558 100644
Binary files a/msys2/usr/share/zoneinfo/America/Cuiaba and b/msys2/usr/share/zoneinfo/America/Cuiaba differ
diff --git a/msys2/usr/share/zoneinfo/America/Curacao b/msys2/usr/share/zoneinfo/America/Curacao
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Curacao and b/msys2/usr/share/zoneinfo/America/Curacao differ
diff --git a/msys2/usr/share/zoneinfo/America/Danmarkshavn b/msys2/usr/share/zoneinfo/America/Danmarkshavn
index 9549adcb6..8718efcce 100644
Binary files a/msys2/usr/share/zoneinfo/America/Danmarkshavn and b/msys2/usr/share/zoneinfo/America/Danmarkshavn differ
diff --git a/msys2/usr/share/zoneinfo/America/Dawson b/msys2/usr/share/zoneinfo/America/Dawson
index 2b6c3eeab..07e4c5f4a 100644
Binary files a/msys2/usr/share/zoneinfo/America/Dawson and b/msys2/usr/share/zoneinfo/America/Dawson differ
diff --git a/msys2/usr/share/zoneinfo/America/Dawson_Creek b/msys2/usr/share/zoneinfo/America/Dawson_Creek
index db9e33965..761d1d9af 100644
Binary files a/msys2/usr/share/zoneinfo/America/Dawson_Creek and b/msys2/usr/share/zoneinfo/America/Dawson_Creek differ
diff --git a/msys2/usr/share/zoneinfo/America/Denver b/msys2/usr/share/zoneinfo/America/Denver
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/America/Denver and b/msys2/usr/share/zoneinfo/America/Denver differ
diff --git a/msys2/usr/share/zoneinfo/America/Detroit b/msys2/usr/share/zoneinfo/America/Detroit
index e104faa46..6eb3ac46e 100644
Binary files a/msys2/usr/share/zoneinfo/America/Detroit and b/msys2/usr/share/zoneinfo/America/Detroit differ
diff --git a/msys2/usr/share/zoneinfo/America/Dominica b/msys2/usr/share/zoneinfo/America/Dominica
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Dominica and b/msys2/usr/share/zoneinfo/America/Dominica differ
diff --git a/msys2/usr/share/zoneinfo/America/Edmonton b/msys2/usr/share/zoneinfo/America/Edmonton
index cd78a6f8b..645ee9453 100644
Binary files a/msys2/usr/share/zoneinfo/America/Edmonton and b/msys2/usr/share/zoneinfo/America/Edmonton differ
diff --git a/msys2/usr/share/zoneinfo/America/Eirunepe b/msys2/usr/share/zoneinfo/America/Eirunepe
index 39d6daeb9..7da4b98fe 100644
Binary files a/msys2/usr/share/zoneinfo/America/Eirunepe and b/msys2/usr/share/zoneinfo/America/Eirunepe differ
diff --git a/msys2/usr/share/zoneinfo/America/El_Salvador b/msys2/usr/share/zoneinfo/America/El_Salvador
index e2f22304a..43484117e 100644
Binary files a/msys2/usr/share/zoneinfo/America/El_Salvador and b/msys2/usr/share/zoneinfo/America/El_Salvador differ
diff --git a/msys2/usr/share/zoneinfo/America/Ensenada b/msys2/usr/share/zoneinfo/America/Ensenada
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/America/Ensenada and b/msys2/usr/share/zoneinfo/America/Ensenada differ
diff --git a/msys2/usr/share/zoneinfo/America/Fort_Nelson b/msys2/usr/share/zoneinfo/America/Fort_Nelson
index 5a0b7f1ca..2a49c6c50 100644
Binary files a/msys2/usr/share/zoneinfo/America/Fort_Nelson and b/msys2/usr/share/zoneinfo/America/Fort_Nelson differ
diff --git a/msys2/usr/share/zoneinfo/America/Fort_Wayne b/msys2/usr/share/zoneinfo/America/Fort_Wayne
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/America/Fort_Wayne and b/msys2/usr/share/zoneinfo/America/Fort_Wayne differ
diff --git a/msys2/usr/share/zoneinfo/America/Fortaleza b/msys2/usr/share/zoneinfo/America/Fortaleza
index be57dc20b..092e40d70 100644
Binary files a/msys2/usr/share/zoneinfo/America/Fortaleza and b/msys2/usr/share/zoneinfo/America/Fortaleza differ
diff --git a/msys2/usr/share/zoneinfo/America/Glace_Bay b/msys2/usr/share/zoneinfo/America/Glace_Bay
index 48412a4cb..f85eb3415 100644
Binary files a/msys2/usr/share/zoneinfo/America/Glace_Bay and b/msys2/usr/share/zoneinfo/America/Glace_Bay differ
diff --git a/msys2/usr/share/zoneinfo/America/Godthab b/msys2/usr/share/zoneinfo/America/Godthab
index 0160308bf..4ddc99d8b 100644
Binary files a/msys2/usr/share/zoneinfo/America/Godthab and b/msys2/usr/share/zoneinfo/America/Godthab differ
diff --git a/msys2/usr/share/zoneinfo/America/Goose_Bay b/msys2/usr/share/zoneinfo/America/Goose_Bay
index a3f299079..820e0dd2c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Goose_Bay and b/msys2/usr/share/zoneinfo/America/Goose_Bay differ
diff --git a/msys2/usr/share/zoneinfo/America/Grand_Turk b/msys2/usr/share/zoneinfo/America/Grand_Turk
index b9bb063b6..9d90e745b 100644
Binary files a/msys2/usr/share/zoneinfo/America/Grand_Turk and b/msys2/usr/share/zoneinfo/America/Grand_Turk differ
diff --git a/msys2/usr/share/zoneinfo/America/Grenada b/msys2/usr/share/zoneinfo/America/Grenada
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Grenada and b/msys2/usr/share/zoneinfo/America/Grenada differ
diff --git a/msys2/usr/share/zoneinfo/America/Guadeloupe b/msys2/usr/share/zoneinfo/America/Guadeloupe
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Guadeloupe and b/msys2/usr/share/zoneinfo/America/Guadeloupe differ
diff --git a/msys2/usr/share/zoneinfo/America/Guatemala b/msys2/usr/share/zoneinfo/America/Guatemala
index 407138caf..8aa8e588e 100644
Binary files a/msys2/usr/share/zoneinfo/America/Guatemala and b/msys2/usr/share/zoneinfo/America/Guatemala differ
diff --git a/msys2/usr/share/zoneinfo/America/Guayaquil b/msys2/usr/share/zoneinfo/America/Guayaquil
index 0559a7a4a..381ae6c46 100644
Binary files a/msys2/usr/share/zoneinfo/America/Guayaquil and b/msys2/usr/share/zoneinfo/America/Guayaquil differ
diff --git a/msys2/usr/share/zoneinfo/America/Guyana b/msys2/usr/share/zoneinfo/America/Guyana
index d5dab1496..ebd85d0f3 100644
Binary files a/msys2/usr/share/zoneinfo/America/Guyana and b/msys2/usr/share/zoneinfo/America/Guyana differ
diff --git a/msys2/usr/share/zoneinfo/America/Halifax b/msys2/usr/share/zoneinfo/America/Halifax
index 756099abe..9fa850a7d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Halifax and b/msys2/usr/share/zoneinfo/America/Halifax differ
diff --git a/msys2/usr/share/zoneinfo/America/Havana b/msys2/usr/share/zoneinfo/America/Havana
index b69ac4510..e06629d36 100644
Binary files a/msys2/usr/share/zoneinfo/America/Havana and b/msys2/usr/share/zoneinfo/America/Havana differ
diff --git a/msys2/usr/share/zoneinfo/America/Hermosillo b/msys2/usr/share/zoneinfo/America/Hermosillo
index 791a9fa2b..8283239ec 100644
Binary files a/msys2/usr/share/zoneinfo/America/Hermosillo and b/msys2/usr/share/zoneinfo/America/Hermosillo differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Indianapolis b/msys2/usr/share/zoneinfo/America/Indiana/Indianapolis
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Indianapolis and b/msys2/usr/share/zoneinfo/America/Indiana/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Knox b/msys2/usr/share/zoneinfo/America/Indiana/Knox
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Knox and b/msys2/usr/share/zoneinfo/America/Indiana/Knox differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Marengo b/msys2/usr/share/zoneinfo/America/Indiana/Marengo
index 1abf75e7e..a730fe666 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Marengo and b/msys2/usr/share/zoneinfo/America/Indiana/Marengo differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Petersburg b/msys2/usr/share/zoneinfo/America/Indiana/Petersburg
index 0133548ec..341a0235e 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Petersburg and b/msys2/usr/share/zoneinfo/America/Indiana/Petersburg differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Tell_City b/msys2/usr/share/zoneinfo/America/Indiana/Tell_City
index 7bbb653cd..76e1f6285 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Tell_City and b/msys2/usr/share/zoneinfo/America/Indiana/Tell_City differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Vevay b/msys2/usr/share/zoneinfo/America/Indiana/Vevay
index d236b7c07..f2acf6cbb 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Vevay and b/msys2/usr/share/zoneinfo/America/Indiana/Vevay differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Vincennes b/msys2/usr/share/zoneinfo/America/Indiana/Vincennes
index c818929d1..c255f89b6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Vincennes and b/msys2/usr/share/zoneinfo/America/Indiana/Vincennes differ
diff --git a/msys2/usr/share/zoneinfo/America/Indiana/Winamac b/msys2/usr/share/zoneinfo/America/Indiana/Winamac
index 630935c1e..8700ed9f0 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indiana/Winamac and b/msys2/usr/share/zoneinfo/America/Indiana/Winamac differ
diff --git a/msys2/usr/share/zoneinfo/America/Indianapolis b/msys2/usr/share/zoneinfo/America/Indianapolis
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/America/Indianapolis and b/msys2/usr/share/zoneinfo/America/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/America/Inuvik b/msys2/usr/share/zoneinfo/America/Inuvik
index 87bb35529..af3107db5 100644
Binary files a/msys2/usr/share/zoneinfo/America/Inuvik and b/msys2/usr/share/zoneinfo/America/Inuvik differ
diff --git a/msys2/usr/share/zoneinfo/America/Iqaluit b/msys2/usr/share/zoneinfo/America/Iqaluit
index c8138bdbb..eb2c99cca 100644
Binary files a/msys2/usr/share/zoneinfo/America/Iqaluit and b/msys2/usr/share/zoneinfo/America/Iqaluit differ
diff --git a/msys2/usr/share/zoneinfo/America/Jamaica b/msys2/usr/share/zoneinfo/America/Jamaica
index 2a9b7fd52..be6b1b6f1 100644
Binary files a/msys2/usr/share/zoneinfo/America/Jamaica and b/msys2/usr/share/zoneinfo/America/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/America/Jujuy b/msys2/usr/share/zoneinfo/America/Jujuy
index 604b85663..b275f27c0 100644
Binary files a/msys2/usr/share/zoneinfo/America/Jujuy and b/msys2/usr/share/zoneinfo/America/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/America/Juneau b/msys2/usr/share/zoneinfo/America/Juneau
index 451f34900..e347b369f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Juneau and b/msys2/usr/share/zoneinfo/America/Juneau differ
diff --git a/msys2/usr/share/zoneinfo/America/Kentucky/Louisville b/msys2/usr/share/zoneinfo/America/Kentucky/Louisville
index 177836e4f..f2136d6ed 100644
Binary files a/msys2/usr/share/zoneinfo/America/Kentucky/Louisville and b/msys2/usr/share/zoneinfo/America/Kentucky/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/America/Kentucky/Monticello b/msys2/usr/share/zoneinfo/America/Kentucky/Monticello
index 438e3eab4..d9f54a18b 100644
Binary files a/msys2/usr/share/zoneinfo/America/Kentucky/Monticello and b/msys2/usr/share/zoneinfo/America/Kentucky/Monticello differ
diff --git a/msys2/usr/share/zoneinfo/America/Knox_IN b/msys2/usr/share/zoneinfo/America/Knox_IN
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Knox_IN and b/msys2/usr/share/zoneinfo/America/Knox_IN differ
diff --git a/msys2/usr/share/zoneinfo/America/Kralendijk b/msys2/usr/share/zoneinfo/America/Kralendijk
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Kralendijk and b/msys2/usr/share/zoneinfo/America/Kralendijk differ
diff --git a/msys2/usr/share/zoneinfo/America/La_Paz b/msys2/usr/share/zoneinfo/America/La_Paz
index a10137243..68ddaae76 100644
Binary files a/msys2/usr/share/zoneinfo/America/La_Paz and b/msys2/usr/share/zoneinfo/America/La_Paz differ
diff --git a/msys2/usr/share/zoneinfo/America/Lima b/msys2/usr/share/zoneinfo/America/Lima
index 3c6529b75..b643c5517 100644
Binary files a/msys2/usr/share/zoneinfo/America/Lima and b/msys2/usr/share/zoneinfo/America/Lima differ
diff --git a/msys2/usr/share/zoneinfo/America/Los_Angeles b/msys2/usr/share/zoneinfo/America/Los_Angeles
index 9dad4f4c7..aaf07787a 100644
Binary files a/msys2/usr/share/zoneinfo/America/Los_Angeles and b/msys2/usr/share/zoneinfo/America/Los_Angeles differ
diff --git a/msys2/usr/share/zoneinfo/America/Louisville b/msys2/usr/share/zoneinfo/America/Louisville
index 177836e4f..f2136d6ed 100644
Binary files a/msys2/usr/share/zoneinfo/America/Louisville and b/msys2/usr/share/zoneinfo/America/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/America/Lower_Princes b/msys2/usr/share/zoneinfo/America/Lower_Princes
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Lower_Princes and b/msys2/usr/share/zoneinfo/America/Lower_Princes differ
diff --git a/msys2/usr/share/zoneinfo/America/Maceio b/msys2/usr/share/zoneinfo/America/Maceio
index bc8b951d2..dbb8d57d9 100644
Binary files a/msys2/usr/share/zoneinfo/America/Maceio and b/msys2/usr/share/zoneinfo/America/Maceio differ
diff --git a/msys2/usr/share/zoneinfo/America/Managua b/msys2/usr/share/zoneinfo/America/Managua
index e0242bff6..86ef76bf2 100644
Binary files a/msys2/usr/share/zoneinfo/America/Managua and b/msys2/usr/share/zoneinfo/America/Managua differ
diff --git a/msys2/usr/share/zoneinfo/America/Manaus b/msys2/usr/share/zoneinfo/America/Manaus
index 63d58f80f..59c952ebc 100644
Binary files a/msys2/usr/share/zoneinfo/America/Manaus and b/msys2/usr/share/zoneinfo/America/Manaus differ
diff --git a/msys2/usr/share/zoneinfo/America/Marigot b/msys2/usr/share/zoneinfo/America/Marigot
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Marigot and b/msys2/usr/share/zoneinfo/America/Marigot differ
diff --git a/msys2/usr/share/zoneinfo/America/Martinique b/msys2/usr/share/zoneinfo/America/Martinique
index 8df43dcf1..25c0232d9 100644
Binary files a/msys2/usr/share/zoneinfo/America/Martinique and b/msys2/usr/share/zoneinfo/America/Martinique differ
diff --git a/msys2/usr/share/zoneinfo/America/Matamoros b/msys2/usr/share/zoneinfo/America/Matamoros
index 047968dff..722751b20 100644
Binary files a/msys2/usr/share/zoneinfo/America/Matamoros and b/msys2/usr/share/zoneinfo/America/Matamoros differ
diff --git a/msys2/usr/share/zoneinfo/America/Mazatlan b/msys2/usr/share/zoneinfo/America/Mazatlan
index e4a785743..4c819fab0 100644
Binary files a/msys2/usr/share/zoneinfo/America/Mazatlan and b/msys2/usr/share/zoneinfo/America/Mazatlan differ
diff --git a/msys2/usr/share/zoneinfo/America/Mendoza b/msys2/usr/share/zoneinfo/America/Mendoza
index f9e677f17..691c56978 100644
Binary files a/msys2/usr/share/zoneinfo/America/Mendoza and b/msys2/usr/share/zoneinfo/America/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/America/Menominee b/msys2/usr/share/zoneinfo/America/Menominee
index 314613866..28d2c56e1 100644
Binary files a/msys2/usr/share/zoneinfo/America/Menominee and b/msys2/usr/share/zoneinfo/America/Menominee differ
diff --git a/msys2/usr/share/zoneinfo/America/Merida b/msys2/usr/share/zoneinfo/America/Merida
index ea852da33..d3b0ca12c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Merida and b/msys2/usr/share/zoneinfo/America/Merida differ
diff --git a/msys2/usr/share/zoneinfo/America/Metlakatla b/msys2/usr/share/zoneinfo/America/Metlakatla
index 1e94be3d5..9fefee388 100644
Binary files a/msys2/usr/share/zoneinfo/America/Metlakatla and b/msys2/usr/share/zoneinfo/America/Metlakatla differ
diff --git a/msys2/usr/share/zoneinfo/America/Mexico_City b/msys2/usr/share/zoneinfo/America/Mexico_City
index e7fb6f295..ffcf8bee1 100644
Binary files a/msys2/usr/share/zoneinfo/America/Mexico_City and b/msys2/usr/share/zoneinfo/America/Mexico_City differ
diff --git a/msys2/usr/share/zoneinfo/America/Miquelon b/msys2/usr/share/zoneinfo/America/Miquelon
index b924b7100..3b62585d0 100644
Binary files a/msys2/usr/share/zoneinfo/America/Miquelon and b/msys2/usr/share/zoneinfo/America/Miquelon differ
diff --git a/msys2/usr/share/zoneinfo/America/Moncton b/msys2/usr/share/zoneinfo/America/Moncton
index 9df8d0f2e..ecb69ef2c 100644
Binary files a/msys2/usr/share/zoneinfo/America/Moncton and b/msys2/usr/share/zoneinfo/America/Moncton differ
diff --git a/msys2/usr/share/zoneinfo/America/Monterrey b/msys2/usr/share/zoneinfo/America/Monterrey
index a8928c8dc..dea9e3f58 100644
Binary files a/msys2/usr/share/zoneinfo/America/Monterrey and b/msys2/usr/share/zoneinfo/America/Monterrey differ
diff --git a/msys2/usr/share/zoneinfo/America/Montevideo b/msys2/usr/share/zoneinfo/America/Montevideo
index 2f357bcf5..4b2fb3e56 100644
Binary files a/msys2/usr/share/zoneinfo/America/Montevideo and b/msys2/usr/share/zoneinfo/America/Montevideo differ
diff --git a/msys2/usr/share/zoneinfo/America/Montreal b/msys2/usr/share/zoneinfo/America/Montreal
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/America/Montreal and b/msys2/usr/share/zoneinfo/America/Montreal differ
diff --git a/msys2/usr/share/zoneinfo/America/Montserrat b/msys2/usr/share/zoneinfo/America/Montserrat
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Montserrat and b/msys2/usr/share/zoneinfo/America/Montserrat differ
diff --git a/msys2/usr/share/zoneinfo/America/Nassau b/msys2/usr/share/zoneinfo/America/Nassau
index 33cc6c626..2ef2aa897 100644
Binary files a/msys2/usr/share/zoneinfo/America/Nassau and b/msys2/usr/share/zoneinfo/America/Nassau differ
diff --git a/msys2/usr/share/zoneinfo/America/New_York b/msys2/usr/share/zoneinfo/America/New_York
index 2f75480e0..2b6c2eea1 100644
Binary files a/msys2/usr/share/zoneinfo/America/New_York and b/msys2/usr/share/zoneinfo/America/New_York differ
diff --git a/msys2/usr/share/zoneinfo/America/Nipigon b/msys2/usr/share/zoneinfo/America/Nipigon
index f6a856e69..b9f67a9f9 100644
Binary files a/msys2/usr/share/zoneinfo/America/Nipigon and b/msys2/usr/share/zoneinfo/America/Nipigon differ
diff --git a/msys2/usr/share/zoneinfo/America/Nome b/msys2/usr/share/zoneinfo/America/Nome
index 10998df3b..23ead1c00 100644
Binary files a/msys2/usr/share/zoneinfo/America/Nome and b/msys2/usr/share/zoneinfo/America/Nome differ
diff --git a/msys2/usr/share/zoneinfo/America/Noronha b/msys2/usr/share/zoneinfo/America/Noronha
index f140726f2..9e74745ca 100644
Binary files a/msys2/usr/share/zoneinfo/America/Noronha and b/msys2/usr/share/zoneinfo/America/Noronha differ
diff --git a/msys2/usr/share/zoneinfo/America/North_Dakota/Beulah b/msys2/usr/share/zoneinfo/America/North_Dakota/Beulah
index 246345dde..becf43833 100644
Binary files a/msys2/usr/share/zoneinfo/America/North_Dakota/Beulah and b/msys2/usr/share/zoneinfo/America/North_Dakota/Beulah differ
diff --git a/msys2/usr/share/zoneinfo/America/North_Dakota/Center b/msys2/usr/share/zoneinfo/America/North_Dakota/Center
index 1fa070377..d03bda045 100644
Binary files a/msys2/usr/share/zoneinfo/America/North_Dakota/Center and b/msys2/usr/share/zoneinfo/America/North_Dakota/Center differ
diff --git a/msys2/usr/share/zoneinfo/America/North_Dakota/New_Salem b/msys2/usr/share/zoneinfo/America/North_Dakota/New_Salem
index 123f2aeec..ecefc15d8 100644
Binary files a/msys2/usr/share/zoneinfo/America/North_Dakota/New_Salem and b/msys2/usr/share/zoneinfo/America/North_Dakota/New_Salem differ
diff --git a/msys2/usr/share/zoneinfo/America/Nuuk b/msys2/usr/share/zoneinfo/America/Nuuk
index 0160308bf..4ddc99d8b 100644
Binary files a/msys2/usr/share/zoneinfo/America/Nuuk and b/msys2/usr/share/zoneinfo/America/Nuuk differ
diff --git a/msys2/usr/share/zoneinfo/America/Ojinaga b/msys2/usr/share/zoneinfo/America/Ojinaga
index fc4a03e36..da0909cb2 100644
Binary files a/msys2/usr/share/zoneinfo/America/Ojinaga and b/msys2/usr/share/zoneinfo/America/Ojinaga differ
diff --git a/msys2/usr/share/zoneinfo/America/Panama b/msys2/usr/share/zoneinfo/America/Panama
index 9964b9a33..9154643f4 100644
Binary files a/msys2/usr/share/zoneinfo/America/Panama and b/msys2/usr/share/zoneinfo/America/Panama differ
diff --git a/msys2/usr/share/zoneinfo/America/Pangnirtung b/msys2/usr/share/zoneinfo/America/Pangnirtung
index 3e4e0db6a..5be6f9b01 100644
Binary files a/msys2/usr/share/zoneinfo/America/Pangnirtung and b/msys2/usr/share/zoneinfo/America/Pangnirtung differ
diff --git a/msys2/usr/share/zoneinfo/America/Paramaribo b/msys2/usr/share/zoneinfo/America/Paramaribo
index bc8a6edf1..24f925a2d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Paramaribo and b/msys2/usr/share/zoneinfo/America/Paramaribo differ
diff --git a/msys2/usr/share/zoneinfo/America/Phoenix b/msys2/usr/share/zoneinfo/America/Phoenix
index ac6bb0c78..c2bd2f949 100644
Binary files a/msys2/usr/share/zoneinfo/America/Phoenix and b/msys2/usr/share/zoneinfo/America/Phoenix differ
diff --git a/msys2/usr/share/zoneinfo/America/Port-au-Prince b/msys2/usr/share/zoneinfo/America/Port-au-Prince
index 287f14392..3e75731ba 100644
Binary files a/msys2/usr/share/zoneinfo/America/Port-au-Prince and b/msys2/usr/share/zoneinfo/America/Port-au-Prince differ
diff --git a/msys2/usr/share/zoneinfo/America/Port_of_Spain b/msys2/usr/share/zoneinfo/America/Port_of_Spain
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Port_of_Spain and b/msys2/usr/share/zoneinfo/America/Port_of_Spain differ
diff --git a/msys2/usr/share/zoneinfo/America/Porto_Acre b/msys2/usr/share/zoneinfo/America/Porto_Acre
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Porto_Acre and b/msys2/usr/share/zoneinfo/America/Porto_Acre differ
diff --git a/msys2/usr/share/zoneinfo/America/Porto_Velho b/msys2/usr/share/zoneinfo/America/Porto_Velho
index 2e873a5aa..7f8047d93 100644
Binary files a/msys2/usr/share/zoneinfo/America/Porto_Velho and b/msys2/usr/share/zoneinfo/America/Porto_Velho differ
diff --git a/msys2/usr/share/zoneinfo/America/Puerto_Rico b/msys2/usr/share/zoneinfo/America/Puerto_Rico
index a662a5713..47b4dc341 100644
Binary files a/msys2/usr/share/zoneinfo/America/Puerto_Rico and b/msys2/usr/share/zoneinfo/America/Puerto_Rico differ
diff --git a/msys2/usr/share/zoneinfo/America/Punta_Arenas b/msys2/usr/share/zoneinfo/America/Punta_Arenas
index a5a8af52c..5c9a20b94 100644
Binary files a/msys2/usr/share/zoneinfo/America/Punta_Arenas and b/msys2/usr/share/zoneinfo/America/Punta_Arenas differ
diff --git a/msys2/usr/share/zoneinfo/America/Rainy_River b/msys2/usr/share/zoneinfo/America/Rainy_River
index ea6609915..d6ddda482 100644
Binary files a/msys2/usr/share/zoneinfo/America/Rainy_River and b/msys2/usr/share/zoneinfo/America/Rainy_River differ
diff --git a/msys2/usr/share/zoneinfo/America/Rankin_Inlet b/msys2/usr/share/zoneinfo/America/Rankin_Inlet
index 3a7058747..92e2ed2db 100644
Binary files a/msys2/usr/share/zoneinfo/America/Rankin_Inlet and b/msys2/usr/share/zoneinfo/America/Rankin_Inlet differ
diff --git a/msys2/usr/share/zoneinfo/America/Recife b/msys2/usr/share/zoneinfo/America/Recife
index d7abb168a..305abcb8a 100644
Binary files a/msys2/usr/share/zoneinfo/America/Recife and b/msys2/usr/share/zoneinfo/America/Recife differ
diff --git a/msys2/usr/share/zoneinfo/America/Regina b/msys2/usr/share/zoneinfo/America/Regina
index 20c9c84df..a3f8217a5 100644
Binary files a/msys2/usr/share/zoneinfo/America/Regina and b/msys2/usr/share/zoneinfo/America/Regina differ
diff --git a/msys2/usr/share/zoneinfo/America/Resolute b/msys2/usr/share/zoneinfo/America/Resolute
index 0a73b753b..a84d1dfdb 100644
Binary files a/msys2/usr/share/zoneinfo/America/Resolute and b/msys2/usr/share/zoneinfo/America/Resolute differ
diff --git a/msys2/usr/share/zoneinfo/America/Rio_Branco b/msys2/usr/share/zoneinfo/America/Rio_Branco
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/America/Rio_Branco and b/msys2/usr/share/zoneinfo/America/Rio_Branco differ
diff --git a/msys2/usr/share/zoneinfo/America/Rosario b/msys2/usr/share/zoneinfo/America/Rosario
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Rosario and b/msys2/usr/share/zoneinfo/America/Rosario differ
diff --git a/msys2/usr/share/zoneinfo/America/Santa_Isabel b/msys2/usr/share/zoneinfo/America/Santa_Isabel
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/America/Santa_Isabel and b/msys2/usr/share/zoneinfo/America/Santa_Isabel differ
diff --git a/msys2/usr/share/zoneinfo/America/Santarem b/msys2/usr/share/zoneinfo/America/Santarem
index c28f36063..f81d14420 100644
Binary files a/msys2/usr/share/zoneinfo/America/Santarem and b/msys2/usr/share/zoneinfo/America/Santarem differ
diff --git a/msys2/usr/share/zoneinfo/America/Santiago b/msys2/usr/share/zoneinfo/America/Santiago
index 816a04281..8d6032264 100644
Binary files a/msys2/usr/share/zoneinfo/America/Santiago and b/msys2/usr/share/zoneinfo/America/Santiago differ
diff --git a/msys2/usr/share/zoneinfo/America/Santo_Domingo b/msys2/usr/share/zoneinfo/America/Santo_Domingo
index 4fe36fd4c..3e0785086 100644
Binary files a/msys2/usr/share/zoneinfo/America/Santo_Domingo and b/msys2/usr/share/zoneinfo/America/Santo_Domingo differ
diff --git a/msys2/usr/share/zoneinfo/America/Sao_Paulo b/msys2/usr/share/zoneinfo/America/Sao_Paulo
index 13ff08386..a16da2c4d 100644
Binary files a/msys2/usr/share/zoneinfo/America/Sao_Paulo and b/msys2/usr/share/zoneinfo/America/Sao_Paulo differ
diff --git a/msys2/usr/share/zoneinfo/America/Scoresbysund b/msys2/usr/share/zoneinfo/America/Scoresbysund
index e20e9e1c4..6db49124e 100644
Binary files a/msys2/usr/share/zoneinfo/America/Scoresbysund and b/msys2/usr/share/zoneinfo/America/Scoresbysund differ
diff --git a/msys2/usr/share/zoneinfo/America/Shiprock b/msys2/usr/share/zoneinfo/America/Shiprock
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/America/Shiprock and b/msys2/usr/share/zoneinfo/America/Shiprock differ
diff --git a/msys2/usr/share/zoneinfo/America/Sitka b/msys2/usr/share/zoneinfo/America/Sitka
index 31f706137..36681ed78 100644
Binary files a/msys2/usr/share/zoneinfo/America/Sitka and b/msys2/usr/share/zoneinfo/America/Sitka differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Barthelemy b/msys2/usr/share/zoneinfo/America/St_Barthelemy
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Barthelemy and b/msys2/usr/share/zoneinfo/America/St_Barthelemy differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Johns b/msys2/usr/share/zoneinfo/America/St_Johns
index 65a5b0c72..e5f2aec2b 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Johns and b/msys2/usr/share/zoneinfo/America/St_Johns differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Kitts b/msys2/usr/share/zoneinfo/America/St_Kitts
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Kitts and b/msys2/usr/share/zoneinfo/America/St_Kitts differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Lucia b/msys2/usr/share/zoneinfo/America/St_Lucia
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Lucia and b/msys2/usr/share/zoneinfo/America/St_Lucia differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Thomas b/msys2/usr/share/zoneinfo/America/St_Thomas
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Thomas and b/msys2/usr/share/zoneinfo/America/St_Thomas differ
diff --git a/msys2/usr/share/zoneinfo/America/St_Vincent b/msys2/usr/share/zoneinfo/America/St_Vincent
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/St_Vincent and b/msys2/usr/share/zoneinfo/America/St_Vincent differ
diff --git a/msys2/usr/share/zoneinfo/America/Swift_Current b/msys2/usr/share/zoneinfo/America/Swift_Current
index 8e9ef255e..bdbb49448 100644
Binary files a/msys2/usr/share/zoneinfo/America/Swift_Current and b/msys2/usr/share/zoneinfo/America/Swift_Current differ
diff --git a/msys2/usr/share/zoneinfo/America/Tegucigalpa b/msys2/usr/share/zoneinfo/America/Tegucigalpa
index 2adacb2e5..38036a328 100644
Binary files a/msys2/usr/share/zoneinfo/America/Tegucigalpa and b/msys2/usr/share/zoneinfo/America/Tegucigalpa differ
diff --git a/msys2/usr/share/zoneinfo/America/Thule b/msys2/usr/share/zoneinfo/America/Thule
index 6f802f1c2..f38dc56bf 100644
Binary files a/msys2/usr/share/zoneinfo/America/Thule and b/msys2/usr/share/zoneinfo/America/Thule differ
diff --git a/msys2/usr/share/zoneinfo/America/Thunder_Bay b/msys2/usr/share/zoneinfo/America/Thunder_Bay
index e504c9acf..fcb032804 100644
Binary files a/msys2/usr/share/zoneinfo/America/Thunder_Bay and b/msys2/usr/share/zoneinfo/America/Thunder_Bay differ
diff --git a/msys2/usr/share/zoneinfo/America/Tijuana b/msys2/usr/share/zoneinfo/America/Tijuana
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/America/Tijuana and b/msys2/usr/share/zoneinfo/America/Tijuana differ
diff --git a/msys2/usr/share/zoneinfo/America/Toronto b/msys2/usr/share/zoneinfo/America/Toronto
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/America/Toronto and b/msys2/usr/share/zoneinfo/America/Toronto differ
diff --git a/msys2/usr/share/zoneinfo/America/Tortola b/msys2/usr/share/zoneinfo/America/Tortola
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Tortola and b/msys2/usr/share/zoneinfo/America/Tortola differ
diff --git a/msys2/usr/share/zoneinfo/America/Vancouver b/msys2/usr/share/zoneinfo/America/Vancouver
index bb60cbced..c99849111 100644
Binary files a/msys2/usr/share/zoneinfo/America/Vancouver and b/msys2/usr/share/zoneinfo/America/Vancouver differ
diff --git a/msys2/usr/share/zoneinfo/America/Virgin b/msys2/usr/share/zoneinfo/America/Virgin
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/America/Virgin and b/msys2/usr/share/zoneinfo/America/Virgin differ
diff --git a/msys2/usr/share/zoneinfo/America/Whitehorse b/msys2/usr/share/zoneinfo/America/Whitehorse
index 062b58ced..878b6a92f 100644
Binary files a/msys2/usr/share/zoneinfo/America/Whitehorse and b/msys2/usr/share/zoneinfo/America/Whitehorse differ
diff --git a/msys2/usr/share/zoneinfo/America/Winnipeg b/msys2/usr/share/zoneinfo/America/Winnipeg
index ac40299f6..7e646d18e 100644
Binary files a/msys2/usr/share/zoneinfo/America/Winnipeg and b/msys2/usr/share/zoneinfo/America/Winnipeg differ
diff --git a/msys2/usr/share/zoneinfo/America/Yakutat b/msys2/usr/share/zoneinfo/America/Yakutat
index da209f9f0..773feba89 100644
Binary files a/msys2/usr/share/zoneinfo/America/Yakutat and b/msys2/usr/share/zoneinfo/America/Yakutat differ
diff --git a/msys2/usr/share/zoneinfo/America/Yellowknife b/msys2/usr/share/zoneinfo/America/Yellowknife
index e6afa390e..c779cef92 100644
Binary files a/msys2/usr/share/zoneinfo/America/Yellowknife and b/msys2/usr/share/zoneinfo/America/Yellowknife differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Casey b/msys2/usr/share/zoneinfo/Antarctica/Casey
index f100f4746..30315cc07 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Casey and b/msys2/usr/share/zoneinfo/Antarctica/Casey differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Davis b/msys2/usr/share/zoneinfo/Antarctica/Davis
index 916f2c259..3ec32224f 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Davis and b/msys2/usr/share/zoneinfo/Antarctica/Davis differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/DumontDUrville b/msys2/usr/share/zoneinfo/Antarctica/DumontDUrville
index a71b39c00..c0cfc85a2 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/DumontDUrville and b/msys2/usr/share/zoneinfo/Antarctica/DumontDUrville differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Macquarie b/msys2/usr/share/zoneinfo/Antarctica/Macquarie
index 616afd9c8..3fc1f231c 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Macquarie and b/msys2/usr/share/zoneinfo/Antarctica/Macquarie differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Mawson b/msys2/usr/share/zoneinfo/Antarctica/Mawson
index b32e7fd6c..05e4c6c58 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Mawson and b/msys2/usr/share/zoneinfo/Antarctica/Mawson differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/McMurdo b/msys2/usr/share/zoneinfo/Antarctica/McMurdo
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/McMurdo and b/msys2/usr/share/zoneinfo/Antarctica/McMurdo differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Palmer b/msys2/usr/share/zoneinfo/Antarctica/Palmer
index 3dd85f84f..32c194163 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Palmer and b/msys2/usr/share/zoneinfo/Antarctica/Palmer differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Rothera b/msys2/usr/share/zoneinfo/Antarctica/Rothera
index 8b2430a20..ea49c00b2 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Rothera and b/msys2/usr/share/zoneinfo/Antarctica/Rothera differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/South_Pole b/msys2/usr/share/zoneinfo/Antarctica/South_Pole
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/South_Pole and b/msys2/usr/share/zoneinfo/Antarctica/South_Pole differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Syowa b/msys2/usr/share/zoneinfo/Antarctica/Syowa
index 254af7d12..97d80d752 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Syowa and b/msys2/usr/share/zoneinfo/Antarctica/Syowa differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Troll b/msys2/usr/share/zoneinfo/Antarctica/Troll
index 5e565da2f..4e31affb5 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Troll and b/msys2/usr/share/zoneinfo/Antarctica/Troll differ
diff --git a/msys2/usr/share/zoneinfo/Antarctica/Vostok b/msys2/usr/share/zoneinfo/Antarctica/Vostok
index 728305305..6e3290717 100644
Binary files a/msys2/usr/share/zoneinfo/Antarctica/Vostok and b/msys2/usr/share/zoneinfo/Antarctica/Vostok differ
diff --git a/msys2/usr/share/zoneinfo/Arctic/Longyearbyen b/msys2/usr/share/zoneinfo/Arctic/Longyearbyen
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/Arctic/Longyearbyen and b/msys2/usr/share/zoneinfo/Arctic/Longyearbyen differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Aden b/msys2/usr/share/zoneinfo/Asia/Aden
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Aden and b/msys2/usr/share/zoneinfo/Asia/Aden differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Almaty b/msys2/usr/share/zoneinfo/Asia/Almaty
index a4b007790..3ec4fc89f 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Almaty and b/msys2/usr/share/zoneinfo/Asia/Almaty differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Amman b/msys2/usr/share/zoneinfo/Asia/Amman
index c9e870791..1bd09fef2 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Amman and b/msys2/usr/share/zoneinfo/Asia/Amman differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Anadyr b/msys2/usr/share/zoneinfo/Asia/Anadyr
index 6ed8b7cb0..551884d32 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Anadyr and b/msys2/usr/share/zoneinfo/Asia/Anadyr differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Aqtau b/msys2/usr/share/zoneinfo/Asia/Aqtau
index e2d0f9195..3a40d1175 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Aqtau and b/msys2/usr/share/zoneinfo/Asia/Aqtau differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Aqtobe b/msys2/usr/share/zoneinfo/Asia/Aqtobe
index 06f0a13a6..62c5840a8 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Aqtobe and b/msys2/usr/share/zoneinfo/Asia/Aqtobe differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ashgabat b/msys2/usr/share/zoneinfo/Asia/Ashgabat
index 73891af1e..848216726 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ashgabat and b/msys2/usr/share/zoneinfo/Asia/Ashgabat differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ashkhabad b/msys2/usr/share/zoneinfo/Asia/Ashkhabad
index 73891af1e..848216726 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ashkhabad and b/msys2/usr/share/zoneinfo/Asia/Ashkhabad differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Atyrau b/msys2/usr/share/zoneinfo/Asia/Atyrau
index 8b5153e05..cb2c82f65 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Atyrau and b/msys2/usr/share/zoneinfo/Asia/Atyrau differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Baghdad b/msys2/usr/share/zoneinfo/Asia/Baghdad
index f7162edf9..a3ce97599 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Baghdad and b/msys2/usr/share/zoneinfo/Asia/Baghdad differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Bahrain b/msys2/usr/share/zoneinfo/Asia/Bahrain
index 63188b269..7409d7498 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Bahrain and b/msys2/usr/share/zoneinfo/Asia/Bahrain differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Baku b/msys2/usr/share/zoneinfo/Asia/Baku
index a0de74b95..96203d7a4 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Baku and b/msys2/usr/share/zoneinfo/Asia/Baku differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Bangkok b/msys2/usr/share/zoneinfo/Asia/Bangkok
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Bangkok and b/msys2/usr/share/zoneinfo/Asia/Bangkok differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Barnaul b/msys2/usr/share/zoneinfo/Asia/Barnaul
index 759592a25..ff976dd3b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Barnaul and b/msys2/usr/share/zoneinfo/Asia/Barnaul differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Beirut b/msys2/usr/share/zoneinfo/Asia/Beirut
index fb266ede2..55dce5722 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Beirut and b/msys2/usr/share/zoneinfo/Asia/Beirut differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Bishkek b/msys2/usr/share/zoneinfo/Asia/Bishkek
index f6e20dd3a..fe7832cdf 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Bishkek and b/msys2/usr/share/zoneinfo/Asia/Bishkek differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Brunei b/msys2/usr/share/zoneinfo/Asia/Brunei
index 3dab0abf4..e67b411b9 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Brunei and b/msys2/usr/share/zoneinfo/Asia/Brunei differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Calcutta b/msys2/usr/share/zoneinfo/Asia/Calcutta
index 0014046d2..00bc80a65 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Calcutta and b/msys2/usr/share/zoneinfo/Asia/Calcutta differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Chita b/msys2/usr/share/zoneinfo/Asia/Chita
index c4149c05c..9d49cd35c 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Chita and b/msys2/usr/share/zoneinfo/Asia/Chita differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Choibalsan b/msys2/usr/share/zoneinfo/Asia/Choibalsan
index e48daa824..0a948c2ea 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Choibalsan and b/msys2/usr/share/zoneinfo/Asia/Choibalsan differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Chongqing b/msys2/usr/share/zoneinfo/Asia/Chongqing
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Chongqing and b/msys2/usr/share/zoneinfo/Asia/Chongqing differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Chungking b/msys2/usr/share/zoneinfo/Asia/Chungking
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Chungking and b/msys2/usr/share/zoneinfo/Asia/Chungking differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Colombo b/msys2/usr/share/zoneinfo/Asia/Colombo
index 62c64d85d..3eeb1b72b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Colombo and b/msys2/usr/share/zoneinfo/Asia/Colombo differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Dacca b/msys2/usr/share/zoneinfo/Asia/Dacca
index b11c92841..28136808b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Dacca and b/msys2/usr/share/zoneinfo/Asia/Dacca differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Damascus b/msys2/usr/share/zoneinfo/Asia/Damascus
index d9104a7ab..168ef9baa 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Damascus and b/msys2/usr/share/zoneinfo/Asia/Damascus differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Dhaka b/msys2/usr/share/zoneinfo/Asia/Dhaka
index b11c92841..28136808b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Dhaka and b/msys2/usr/share/zoneinfo/Asia/Dhaka differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Dili b/msys2/usr/share/zoneinfo/Asia/Dili
index 30943bbd0..bb7be9f3a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Dili and b/msys2/usr/share/zoneinfo/Asia/Dili differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Dubai b/msys2/usr/share/zoneinfo/Asia/Dubai
index fc0a589e2..58d75bc26 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Dubai and b/msys2/usr/share/zoneinfo/Asia/Dubai differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Dushanbe b/msys2/usr/share/zoneinfo/Asia/Dushanbe
index 82d85b8c1..d83fb076a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Dushanbe and b/msys2/usr/share/zoneinfo/Asia/Dushanbe differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Famagusta b/msys2/usr/share/zoneinfo/Asia/Famagusta
index 653b146a6..cc4417956 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Famagusta and b/msys2/usr/share/zoneinfo/Asia/Famagusta differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Gaza b/msys2/usr/share/zoneinfo/Asia/Gaza
index 592b63260..58e9fdf42 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Gaza and b/msys2/usr/share/zoneinfo/Asia/Gaza differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Harbin b/msys2/usr/share/zoneinfo/Asia/Harbin
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Harbin and b/msys2/usr/share/zoneinfo/Asia/Harbin differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Hebron b/msys2/usr/share/zoneinfo/Asia/Hebron
index ae82f9b54..aeda06b52 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Hebron and b/msys2/usr/share/zoneinfo/Asia/Hebron differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ho_Chi_Minh b/msys2/usr/share/zoneinfo/Asia/Ho_Chi_Minh
index e2934e371..7ca997250 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ho_Chi_Minh and b/msys2/usr/share/zoneinfo/Asia/Ho_Chi_Minh differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Hong_Kong b/msys2/usr/share/zoneinfo/Asia/Hong_Kong
index 23d0375fb..c80e36480 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Hong_Kong and b/msys2/usr/share/zoneinfo/Asia/Hong_Kong differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Hovd b/msys2/usr/share/zoneinfo/Asia/Hovd
index 4cb800a91..6e08a2612 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Hovd and b/msys2/usr/share/zoneinfo/Asia/Hovd differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Irkutsk b/msys2/usr/share/zoneinfo/Asia/Irkutsk
index 4dcbbb7ea..550e2a087 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Irkutsk and b/msys2/usr/share/zoneinfo/Asia/Irkutsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Istanbul b/msys2/usr/share/zoneinfo/Asia/Istanbul
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Istanbul and b/msys2/usr/share/zoneinfo/Asia/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Jakarta b/msys2/usr/share/zoneinfo/Asia/Jakarta
index 5baa3a8f2..c9752d2f2 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Jakarta and b/msys2/usr/share/zoneinfo/Asia/Jakarta differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Jayapura b/msys2/usr/share/zoneinfo/Asia/Jayapura
index 3002c8202..7c22f539d 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Jayapura and b/msys2/usr/share/zoneinfo/Asia/Jayapura differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Jerusalem b/msys2/usr/share/zoneinfo/Asia/Jerusalem
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Jerusalem and b/msys2/usr/share/zoneinfo/Asia/Jerusalem differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kabul b/msys2/usr/share/zoneinfo/Asia/Kabul
index d19b9bd51..660ce4cf6 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kabul and b/msys2/usr/share/zoneinfo/Asia/Kabul differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kamchatka b/msys2/usr/share/zoneinfo/Asia/Kamchatka
index 3e80b4e09..c65155402 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kamchatka and b/msys2/usr/share/zoneinfo/Asia/Kamchatka differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Karachi b/msys2/usr/share/zoneinfo/Asia/Karachi
index ba65c0e8d..e56d5afda 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Karachi and b/msys2/usr/share/zoneinfo/Asia/Karachi differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kashgar b/msys2/usr/share/zoneinfo/Asia/Kashgar
index faa14d92d..69ff7f6fb 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kashgar and b/msys2/usr/share/zoneinfo/Asia/Kashgar differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kathmandu b/msys2/usr/share/zoneinfo/Asia/Kathmandu
index a5d510753..3a0d330ff 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kathmandu and b/msys2/usr/share/zoneinfo/Asia/Kathmandu differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Katmandu b/msys2/usr/share/zoneinfo/Asia/Katmandu
index a5d510753..3a0d330ff 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Katmandu and b/msys2/usr/share/zoneinfo/Asia/Katmandu differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Khandyga b/msys2/usr/share/zoneinfo/Asia/Khandyga
index 72bea64ba..aeb733202 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Khandyga and b/msys2/usr/share/zoneinfo/Asia/Khandyga differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kolkata b/msys2/usr/share/zoneinfo/Asia/Kolkata
index 0014046d2..00bc80a65 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kolkata and b/msys2/usr/share/zoneinfo/Asia/Kolkata differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Krasnoyarsk b/msys2/usr/share/zoneinfo/Asia/Krasnoyarsk
index 30c6f1650..e0d4fcb5c 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Krasnoyarsk and b/msys2/usr/share/zoneinfo/Asia/Krasnoyarsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kuala_Lumpur b/msys2/usr/share/zoneinfo/Asia/Kuala_Lumpur
index 612b01e71..e93dd5141 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kuala_Lumpur and b/msys2/usr/share/zoneinfo/Asia/Kuala_Lumpur differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kuching b/msys2/usr/share/zoneinfo/Asia/Kuching
index c86750cb7..59bc6e40b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kuching and b/msys2/usr/share/zoneinfo/Asia/Kuching differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Kuwait b/msys2/usr/share/zoneinfo/Asia/Kuwait
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Kuwait and b/msys2/usr/share/zoneinfo/Asia/Kuwait differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Macao b/msys2/usr/share/zoneinfo/Asia/Macao
index cac65063d..c22f75e42 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Macao and b/msys2/usr/share/zoneinfo/Asia/Macao differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Macau b/msys2/usr/share/zoneinfo/Asia/Macau
index cac65063d..c22f75e42 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Macau and b/msys2/usr/share/zoneinfo/Asia/Macau differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Magadan b/msys2/usr/share/zoneinfo/Asia/Magadan
index b4fcac18e..16bac8444 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Magadan and b/msys2/usr/share/zoneinfo/Asia/Magadan differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Makassar b/msys2/usr/share/zoneinfo/Asia/Makassar
index 556ba8669..5990010b6 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Makassar and b/msys2/usr/share/zoneinfo/Asia/Makassar differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Manila b/msys2/usr/share/zoneinfo/Asia/Manila
index f4f4b04ef..3c3584e09 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Manila and b/msys2/usr/share/zoneinfo/Asia/Manila differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Muscat b/msys2/usr/share/zoneinfo/Asia/Muscat
index fc0a589e2..58d75bc26 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Muscat and b/msys2/usr/share/zoneinfo/Asia/Muscat differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Nicosia b/msys2/usr/share/zoneinfo/Asia/Nicosia
index f7f10ab76..c210d0a59 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Nicosia and b/msys2/usr/share/zoneinfo/Asia/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Novokuznetsk b/msys2/usr/share/zoneinfo/Asia/Novokuznetsk
index d98327611..9378d5053 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Novokuznetsk and b/msys2/usr/share/zoneinfo/Asia/Novokuznetsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Novosibirsk b/msys2/usr/share/zoneinfo/Asia/Novosibirsk
index e0ee5fcea..65a9fa2cd 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Novosibirsk and b/msys2/usr/share/zoneinfo/Asia/Novosibirsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Omsk b/msys2/usr/share/zoneinfo/Asia/Omsk
index b29b76931..dc0ed422f 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Omsk and b/msys2/usr/share/zoneinfo/Asia/Omsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Oral b/msys2/usr/share/zoneinfo/Asia/Oral
index ad1f9ca1c..25a63ec8b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Oral and b/msys2/usr/share/zoneinfo/Asia/Oral differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Phnom_Penh b/msys2/usr/share/zoneinfo/Asia/Phnom_Penh
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Phnom_Penh and b/msys2/usr/share/zoneinfo/Asia/Phnom_Penh differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Pontianak b/msys2/usr/share/zoneinfo/Asia/Pontianak
index 12ce24cbe..285bed2c6 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Pontianak and b/msys2/usr/share/zoneinfo/Asia/Pontianak differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Pyongyang b/msys2/usr/share/zoneinfo/Asia/Pyongyang
index 7ad7e0b2c..57240cf89 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Pyongyang and b/msys2/usr/share/zoneinfo/Asia/Pyongyang differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Qatar b/msys2/usr/share/zoneinfo/Asia/Qatar
index 63188b269..7409d7498 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Qatar and b/msys2/usr/share/zoneinfo/Asia/Qatar differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Qostanay b/msys2/usr/share/zoneinfo/Asia/Qostanay
index 73b9d963e..ff6fe61d5 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Qostanay and b/msys2/usr/share/zoneinfo/Asia/Qostanay differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Qyzylorda b/msys2/usr/share/zoneinfo/Asia/Qyzylorda
index c2fe4c144..fe4d6c6d6 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Qyzylorda and b/msys2/usr/share/zoneinfo/Asia/Qyzylorda differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Rangoon b/msys2/usr/share/zoneinfo/Asia/Rangoon
index dd77395b0..14b2ad09e 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Rangoon and b/msys2/usr/share/zoneinfo/Asia/Rangoon differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Riyadh b/msys2/usr/share/zoneinfo/Asia/Riyadh
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Riyadh and b/msys2/usr/share/zoneinfo/Asia/Riyadh differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Saigon b/msys2/usr/share/zoneinfo/Asia/Saigon
index e2934e371..7ca997250 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Saigon and b/msys2/usr/share/zoneinfo/Asia/Saigon differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Sakhalin b/msys2/usr/share/zoneinfo/Asia/Sakhalin
index 485459ce0..69f0faad1 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Sakhalin and b/msys2/usr/share/zoneinfo/Asia/Sakhalin differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Samarkand b/msys2/usr/share/zoneinfo/Asia/Samarkand
index 030d47ce0..c43e27c5d 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Samarkand and b/msys2/usr/share/zoneinfo/Asia/Samarkand differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Seoul b/msys2/usr/share/zoneinfo/Asia/Seoul
index 96199e73e..1755147fa 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Seoul and b/msys2/usr/share/zoneinfo/Asia/Seoul differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Shanghai b/msys2/usr/share/zoneinfo/Asia/Shanghai
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Shanghai and b/msys2/usr/share/zoneinfo/Asia/Shanghai differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Singapore b/msys2/usr/share/zoneinfo/Asia/Singapore
index 2364b2178..350d77e28 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Singapore and b/msys2/usr/share/zoneinfo/Asia/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Srednekolymsk b/msys2/usr/share/zoneinfo/Asia/Srednekolymsk
index 261a9832b..7fdee5cbe 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Srednekolymsk and b/msys2/usr/share/zoneinfo/Asia/Srednekolymsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Taipei b/msys2/usr/share/zoneinfo/Asia/Taipei
index 24c43444b..35d89d036 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Taipei and b/msys2/usr/share/zoneinfo/Asia/Taipei differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tashkent b/msys2/usr/share/zoneinfo/Asia/Tashkent
index 32a9d7d0c..65ee428ce 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tashkent and b/msys2/usr/share/zoneinfo/Asia/Tashkent differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tbilisi b/msys2/usr/share/zoneinfo/Asia/Tbilisi
index b608d7974..166e4341d 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tbilisi and b/msys2/usr/share/zoneinfo/Asia/Tbilisi differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tehran b/msys2/usr/share/zoneinfo/Asia/Tehran
index 8cec5ad7d..f1555f003 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tehran and b/msys2/usr/share/zoneinfo/Asia/Tehran differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tel_Aviv b/msys2/usr/share/zoneinfo/Asia/Tel_Aviv
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tel_Aviv and b/msys2/usr/share/zoneinfo/Asia/Tel_Aviv differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Thimbu b/msys2/usr/share/zoneinfo/Asia/Thimbu
index fe409c7a2..0edc72cfe 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Thimbu and b/msys2/usr/share/zoneinfo/Asia/Thimbu differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Thimphu b/msys2/usr/share/zoneinfo/Asia/Thimphu
index fe409c7a2..0edc72cfe 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Thimphu and b/msys2/usr/share/zoneinfo/Asia/Thimphu differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tokyo b/msys2/usr/share/zoneinfo/Asia/Tokyo
index 26f4d34d6..1aa066ce3 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tokyo and b/msys2/usr/share/zoneinfo/Asia/Tokyo differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Tomsk b/msys2/usr/share/zoneinfo/Asia/Tomsk
index 670e2ad2c..c3c307d7b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Tomsk and b/msys2/usr/share/zoneinfo/Asia/Tomsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ujung_Pandang b/msys2/usr/share/zoneinfo/Asia/Ujung_Pandang
index 556ba8669..5990010b6 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ujung_Pandang and b/msys2/usr/share/zoneinfo/Asia/Ujung_Pandang differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ulaanbaatar b/msys2/usr/share/zoneinfo/Asia/Ulaanbaatar
index 2e20cc3a4..6f5d3a15a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ulaanbaatar and b/msys2/usr/share/zoneinfo/Asia/Ulaanbaatar differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ulan_Bator b/msys2/usr/share/zoneinfo/Asia/Ulan_Bator
index 2e20cc3a4..6f5d3a15a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ulan_Bator and b/msys2/usr/share/zoneinfo/Asia/Ulan_Bator differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Urumqi b/msys2/usr/share/zoneinfo/Asia/Urumqi
index faa14d92d..69ff7f6fb 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Urumqi and b/msys2/usr/share/zoneinfo/Asia/Urumqi differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Ust-Nera b/msys2/usr/share/zoneinfo/Asia/Ust-Nera
index 9e4a78f6a..c39331e3a 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Ust-Nera and b/msys2/usr/share/zoneinfo/Asia/Ust-Nera differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Vientiane b/msys2/usr/share/zoneinfo/Asia/Vientiane
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Vientiane and b/msys2/usr/share/zoneinfo/Asia/Vientiane differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Vladivostok b/msys2/usr/share/zoneinfo/Asia/Vladivostok
index 8ab253ce7..72a3d4e87 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Vladivostok and b/msys2/usr/share/zoneinfo/Asia/Vladivostok differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Yakutsk b/msys2/usr/share/zoneinfo/Asia/Yakutsk
index c815e99b1..336f932e8 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Yakutsk and b/msys2/usr/share/zoneinfo/Asia/Yakutsk differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Yangon b/msys2/usr/share/zoneinfo/Asia/Yangon
index dd77395b0..14b2ad09e 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Yangon and b/msys2/usr/share/zoneinfo/Asia/Yangon differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Yekaterinburg b/msys2/usr/share/zoneinfo/Asia/Yekaterinburg
index 6958d7edd..a3bf7f29b 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Yekaterinburg and b/msys2/usr/share/zoneinfo/Asia/Yekaterinburg differ
diff --git a/msys2/usr/share/zoneinfo/Asia/Yerevan b/msys2/usr/share/zoneinfo/Asia/Yerevan
index 250bfe020..6dd927cb9 100644
Binary files a/msys2/usr/share/zoneinfo/Asia/Yerevan and b/msys2/usr/share/zoneinfo/Asia/Yerevan differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Azores b/msys2/usr/share/zoneinfo/Atlantic/Azores
index 56593dbff..b7f75a9cf 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Azores and b/msys2/usr/share/zoneinfo/Atlantic/Azores differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Bermuda b/msys2/usr/share/zoneinfo/Atlantic/Bermuda
index 419c660ba..abc75ea7e 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Bermuda and b/msys2/usr/share/zoneinfo/Atlantic/Bermuda differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Canary b/msys2/usr/share/zoneinfo/Atlantic/Canary
index f3192156f..5ab3243a5 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Canary and b/msys2/usr/share/zoneinfo/Atlantic/Canary differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Cape_Verde b/msys2/usr/share/zoneinfo/Atlantic/Cape_Verde
index e2a49d248..8f7de1c0a 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Cape_Verde and b/msys2/usr/share/zoneinfo/Atlantic/Cape_Verde differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Faeroe b/msys2/usr/share/zoneinfo/Atlantic/Faeroe
index 4dab7ef08..9558bf718 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Faeroe and b/msys2/usr/share/zoneinfo/Atlantic/Faeroe differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Faroe b/msys2/usr/share/zoneinfo/Atlantic/Faroe
index 4dab7ef08..9558bf718 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Faroe and b/msys2/usr/share/zoneinfo/Atlantic/Faroe differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Jan_Mayen b/msys2/usr/share/zoneinfo/Atlantic/Jan_Mayen
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Jan_Mayen and b/msys2/usr/share/zoneinfo/Atlantic/Jan_Mayen differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Madeira b/msys2/usr/share/zoneinfo/Atlantic/Madeira
index 5213761f8..7c3a49c0e 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Madeira and b/msys2/usr/share/zoneinfo/Atlantic/Madeira differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Reykjavik b/msys2/usr/share/zoneinfo/Atlantic/Reykjavik
index 10e0fc819..2451aca76 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Reykjavik and b/msys2/usr/share/zoneinfo/Atlantic/Reykjavik differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/South_Georgia b/msys2/usr/share/zoneinfo/Atlantic/South_Georgia
index 446660861..7fa5f4683 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/South_Georgia and b/msys2/usr/share/zoneinfo/Atlantic/South_Georgia differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/St_Helena b/msys2/usr/share/zoneinfo/Atlantic/St_Helena
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/St_Helena and b/msys2/usr/share/zoneinfo/Atlantic/St_Helena differ
diff --git a/msys2/usr/share/zoneinfo/Atlantic/Stanley b/msys2/usr/share/zoneinfo/Atlantic/Stanley
index 88077f110..1a4c8ea86 100644
Binary files a/msys2/usr/share/zoneinfo/Atlantic/Stanley and b/msys2/usr/share/zoneinfo/Atlantic/Stanley differ
diff --git a/msys2/usr/share/zoneinfo/Australia/ACT b/msys2/usr/share/zoneinfo/Australia/ACT
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/ACT and b/msys2/usr/share/zoneinfo/Australia/ACT differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Adelaide b/msys2/usr/share/zoneinfo/Australia/Adelaide
index 0b1252abb..3bfbbc563 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Adelaide and b/msys2/usr/share/zoneinfo/Australia/Adelaide differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Brisbane b/msys2/usr/share/zoneinfo/Australia/Brisbane
index 3021bdb61..dc9a980a6 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Brisbane and b/msys2/usr/share/zoneinfo/Australia/Brisbane differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Broken_Hill b/msys2/usr/share/zoneinfo/Australia/Broken_Hill
index 1ac3fc8f5..947b50995 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Broken_Hill and b/msys2/usr/share/zoneinfo/Australia/Broken_Hill differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Canberra b/msys2/usr/share/zoneinfo/Australia/Canberra
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Canberra and b/msys2/usr/share/zoneinfo/Australia/Canberra differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Currie b/msys2/usr/share/zoneinfo/Australia/Currie
index f65a990ef..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Currie and b/msys2/usr/share/zoneinfo/Australia/Currie differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Darwin b/msys2/usr/share/zoneinfo/Australia/Darwin
index 1cf502984..a6a67300d 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Darwin and b/msys2/usr/share/zoneinfo/Australia/Darwin differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Eucla b/msys2/usr/share/zoneinfo/Australia/Eucla
index 98ae55706..9080f5cdb 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Eucla and b/msys2/usr/share/zoneinfo/Australia/Eucla differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Hobart b/msys2/usr/share/zoneinfo/Australia/Hobart
index 02b07ca23..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Hobart and b/msys2/usr/share/zoneinfo/Australia/Hobart differ
diff --git a/msys2/usr/share/zoneinfo/Australia/LHI b/msys2/usr/share/zoneinfo/Australia/LHI
index 9e04a80ec..4d4ec8cee 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/LHI and b/msys2/usr/share/zoneinfo/Australia/LHI differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Lindeman b/msys2/usr/share/zoneinfo/Australia/Lindeman
index eab0fb998..131d77b54 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Lindeman and b/msys2/usr/share/zoneinfo/Australia/Lindeman differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Lord_Howe b/msys2/usr/share/zoneinfo/Australia/Lord_Howe
index 9e04a80ec..4d4ec8cee 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Lord_Howe and b/msys2/usr/share/zoneinfo/Australia/Lord_Howe differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Melbourne b/msys2/usr/share/zoneinfo/Australia/Melbourne
index ba457338b..d3f195ac2 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Melbourne and b/msys2/usr/share/zoneinfo/Australia/Melbourne differ
diff --git a/msys2/usr/share/zoneinfo/Australia/NSW b/msys2/usr/share/zoneinfo/Australia/NSW
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/NSW and b/msys2/usr/share/zoneinfo/Australia/NSW differ
diff --git a/msys2/usr/share/zoneinfo/Australia/North b/msys2/usr/share/zoneinfo/Australia/North
index 1cf502984..a6a67300d 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/North and b/msys2/usr/share/zoneinfo/Australia/North differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Perth b/msys2/usr/share/zoneinfo/Australia/Perth
index a876b9e78..4f771828c 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Perth and b/msys2/usr/share/zoneinfo/Australia/Perth differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Queensland b/msys2/usr/share/zoneinfo/Australia/Queensland
index 3021bdb61..dc9a980a6 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Queensland and b/msys2/usr/share/zoneinfo/Australia/Queensland differ
diff --git a/msys2/usr/share/zoneinfo/Australia/South b/msys2/usr/share/zoneinfo/Australia/South
index 0b1252abb..3bfbbc563 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/South and b/msys2/usr/share/zoneinfo/Australia/South differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Sydney b/msys2/usr/share/zoneinfo/Australia/Sydney
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Sydney and b/msys2/usr/share/zoneinfo/Australia/Sydney differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Tasmania b/msys2/usr/share/zoneinfo/Australia/Tasmania
index 02b07ca23..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Tasmania and b/msys2/usr/share/zoneinfo/Australia/Tasmania differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Victoria b/msys2/usr/share/zoneinfo/Australia/Victoria
index ba457338b..d3f195ac2 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Victoria and b/msys2/usr/share/zoneinfo/Australia/Victoria differ
diff --git a/msys2/usr/share/zoneinfo/Australia/West b/msys2/usr/share/zoneinfo/Australia/West
index a876b9e78..4f771828c 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/West and b/msys2/usr/share/zoneinfo/Australia/West differ
diff --git a/msys2/usr/share/zoneinfo/Australia/Yancowinna b/msys2/usr/share/zoneinfo/Australia/Yancowinna
index 1ac3fc8f5..947b50995 100644
Binary files a/msys2/usr/share/zoneinfo/Australia/Yancowinna and b/msys2/usr/share/zoneinfo/Australia/Yancowinna differ
diff --git a/msys2/usr/share/zoneinfo/Brazil/Acre b/msys2/usr/share/zoneinfo/Brazil/Acre
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/Brazil/Acre and b/msys2/usr/share/zoneinfo/Brazil/Acre differ
diff --git a/msys2/usr/share/zoneinfo/Brazil/DeNoronha b/msys2/usr/share/zoneinfo/Brazil/DeNoronha
index f140726f2..9e74745ca 100644
Binary files a/msys2/usr/share/zoneinfo/Brazil/DeNoronha and b/msys2/usr/share/zoneinfo/Brazil/DeNoronha differ
diff --git a/msys2/usr/share/zoneinfo/Brazil/East b/msys2/usr/share/zoneinfo/Brazil/East
index 13ff08386..a16da2c4d 100644
Binary files a/msys2/usr/share/zoneinfo/Brazil/East and b/msys2/usr/share/zoneinfo/Brazil/East differ
diff --git a/msys2/usr/share/zoneinfo/Brazil/West b/msys2/usr/share/zoneinfo/Brazil/West
index 63d58f80f..59c952ebc 100644
Binary files a/msys2/usr/share/zoneinfo/Brazil/West and b/msys2/usr/share/zoneinfo/Brazil/West differ
diff --git a/msys2/usr/share/zoneinfo/CET b/msys2/usr/share/zoneinfo/CET
index 122e93421..546748d6e 100644
Binary files a/msys2/usr/share/zoneinfo/CET and b/msys2/usr/share/zoneinfo/CET differ
diff --git a/msys2/usr/share/zoneinfo/CST6CDT b/msys2/usr/share/zoneinfo/CST6CDT
index ca67929fb..d93155805 100644
Binary files a/msys2/usr/share/zoneinfo/CST6CDT and b/msys2/usr/share/zoneinfo/CST6CDT differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Atlantic b/msys2/usr/share/zoneinfo/Canada/Atlantic
index 756099abe..9fa850a7d 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Atlantic and b/msys2/usr/share/zoneinfo/Canada/Atlantic differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Central b/msys2/usr/share/zoneinfo/Canada/Central
index ac40299f6..7e646d18e 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Central and b/msys2/usr/share/zoneinfo/Canada/Central differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Eastern b/msys2/usr/share/zoneinfo/Canada/Eastern
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Eastern and b/msys2/usr/share/zoneinfo/Canada/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Mountain b/msys2/usr/share/zoneinfo/Canada/Mountain
index cd78a6f8b..645ee9453 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Mountain and b/msys2/usr/share/zoneinfo/Canada/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Newfoundland b/msys2/usr/share/zoneinfo/Canada/Newfoundland
index 65a5b0c72..e5f2aec2b 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Newfoundland and b/msys2/usr/share/zoneinfo/Canada/Newfoundland differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Pacific b/msys2/usr/share/zoneinfo/Canada/Pacific
index bb60cbced..c99849111 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Pacific and b/msys2/usr/share/zoneinfo/Canada/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Saskatchewan b/msys2/usr/share/zoneinfo/Canada/Saskatchewan
index 20c9c84df..a3f8217a5 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Saskatchewan and b/msys2/usr/share/zoneinfo/Canada/Saskatchewan differ
diff --git a/msys2/usr/share/zoneinfo/Canada/Yukon b/msys2/usr/share/zoneinfo/Canada/Yukon
index 062b58ced..878b6a92f 100644
Binary files a/msys2/usr/share/zoneinfo/Canada/Yukon and b/msys2/usr/share/zoneinfo/Canada/Yukon differ
diff --git a/msys2/usr/share/zoneinfo/Chile/Continental b/msys2/usr/share/zoneinfo/Chile/Continental
index 816a04281..8d6032264 100644
Binary files a/msys2/usr/share/zoneinfo/Chile/Continental and b/msys2/usr/share/zoneinfo/Chile/Continental differ
diff --git a/msys2/usr/share/zoneinfo/Chile/EasterIsland b/msys2/usr/share/zoneinfo/Chile/EasterIsland
index cae374409..d29bcd68b 100644
Binary files a/msys2/usr/share/zoneinfo/Chile/EasterIsland and b/msys2/usr/share/zoneinfo/Chile/EasterIsland differ
diff --git a/msys2/usr/share/zoneinfo/Cuba b/msys2/usr/share/zoneinfo/Cuba
index b69ac4510..e06629d36 100644
Binary files a/msys2/usr/share/zoneinfo/Cuba and b/msys2/usr/share/zoneinfo/Cuba differ
diff --git a/msys2/usr/share/zoneinfo/EET b/msys2/usr/share/zoneinfo/EET
index cbdb71ddd..378919ea1 100644
Binary files a/msys2/usr/share/zoneinfo/EET and b/msys2/usr/share/zoneinfo/EET differ
diff --git a/msys2/usr/share/zoneinfo/EST b/msys2/usr/share/zoneinfo/EST
index 21ebc00b3..3ae969114 100644
Binary files a/msys2/usr/share/zoneinfo/EST and b/msys2/usr/share/zoneinfo/EST differ
diff --git a/msys2/usr/share/zoneinfo/EST5EDT b/msys2/usr/share/zoneinfo/EST5EDT
index 9bce5007d..50c95e0cb 100644
Binary files a/msys2/usr/share/zoneinfo/EST5EDT and b/msys2/usr/share/zoneinfo/EST5EDT differ
diff --git a/msys2/usr/share/zoneinfo/Egypt b/msys2/usr/share/zoneinfo/Egypt
index d3f819623..ea38c9700 100644
Binary files a/msys2/usr/share/zoneinfo/Egypt and b/msys2/usr/share/zoneinfo/Egypt differ
diff --git a/msys2/usr/share/zoneinfo/Eire b/msys2/usr/share/zoneinfo/Eire
index 1d994902d..4a45ea8f7 100644
Binary files a/msys2/usr/share/zoneinfo/Eire and b/msys2/usr/share/zoneinfo/Eire differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT b/msys2/usr/share/zoneinfo/Etc/GMT
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT and b/msys2/usr/share/zoneinfo/Etc/GMT differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+0 b/msys2/usr/share/zoneinfo/Etc/GMT+0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+0 and b/msys2/usr/share/zoneinfo/Etc/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+1 b/msys2/usr/share/zoneinfo/Etc/GMT+1
index 4dab6f900..98d5dcf91 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+1 and b/msys2/usr/share/zoneinfo/Etc/GMT+1 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+10 b/msys2/usr/share/zoneinfo/Etc/GMT+10
index c749290af..ecb287e66 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+10 and b/msys2/usr/share/zoneinfo/Etc/GMT+10 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+11 b/msys2/usr/share/zoneinfo/Etc/GMT+11
index d96998230..e94141297 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+11 and b/msys2/usr/share/zoneinfo/Etc/GMT+11 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+12 b/msys2/usr/share/zoneinfo/Etc/GMT+12
index cdeec9097..9c95bd073 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+12 and b/msys2/usr/share/zoneinfo/Etc/GMT+12 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+2 b/msys2/usr/share/zoneinfo/Etc/GMT+2
index fbd2a941f..6d5ce3db7 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+2 and b/msys2/usr/share/zoneinfo/Etc/GMT+2 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+3 b/msys2/usr/share/zoneinfo/Etc/GMT+3
index ee246ef56..5ef7be71f 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+3 and b/msys2/usr/share/zoneinfo/Etc/GMT+3 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+4 b/msys2/usr/share/zoneinfo/Etc/GMT+4
index 5a25ff2a6..75f16216f 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+4 and b/msys2/usr/share/zoneinfo/Etc/GMT+4 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+5 b/msys2/usr/share/zoneinfo/Etc/GMT+5
index c0b745f1c..589990ae8 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+5 and b/msys2/usr/share/zoneinfo/Etc/GMT+5 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+6 b/msys2/usr/share/zoneinfo/Etc/GMT+6
index 06e777d57..fcb60ca24 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+6 and b/msys2/usr/share/zoneinfo/Etc/GMT+6 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+7 b/msys2/usr/share/zoneinfo/Etc/GMT+7
index 4e0b53a08..c0427a40e 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+7 and b/msys2/usr/share/zoneinfo/Etc/GMT+7 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+8 b/msys2/usr/share/zoneinfo/Etc/GMT+8
index 714b0c562..9bdc2283c 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+8 and b/msys2/usr/share/zoneinfo/Etc/GMT+8 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT+9 b/msys2/usr/share/zoneinfo/Etc/GMT+9
index 78b9daa37..ca7a81f65 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT+9 and b/msys2/usr/share/zoneinfo/Etc/GMT+9 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-0 b/msys2/usr/share/zoneinfo/Etc/GMT-0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-0 and b/msys2/usr/share/zoneinfo/Etc/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-1 b/msys2/usr/share/zoneinfo/Etc/GMT-1
index a838bebf5..cb45601c9 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-1 and b/msys2/usr/share/zoneinfo/Etc/GMT-1 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-10 b/msys2/usr/share/zoneinfo/Etc/GMT-10
index 68ff77db0..11d988e10 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-10 and b/msys2/usr/share/zoneinfo/Etc/GMT-10 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-11 b/msys2/usr/share/zoneinfo/Etc/GMT-11
index 66af5a42b..f4c5d5cc2 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-11 and b/msys2/usr/share/zoneinfo/Etc/GMT-11 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-12 b/msys2/usr/share/zoneinfo/Etc/GMT-12
index 17ba50577..cd397b02c 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-12 and b/msys2/usr/share/zoneinfo/Etc/GMT-12 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-13 b/msys2/usr/share/zoneinfo/Etc/GMT-13
index 5f3706ce6..8fad7c6b0 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-13 and b/msys2/usr/share/zoneinfo/Etc/GMT-13 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-14 b/msys2/usr/share/zoneinfo/Etc/GMT-14
index 7e9f9c465..a595e60ee 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-14 and b/msys2/usr/share/zoneinfo/Etc/GMT-14 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-2 b/msys2/usr/share/zoneinfo/Etc/GMT-2
index fcef6d9ac..97b44a9ba 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-2 and b/msys2/usr/share/zoneinfo/Etc/GMT-2 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-3 b/msys2/usr/share/zoneinfo/Etc/GMT-3
index 27973bc85..4eb17ff00 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-3 and b/msys2/usr/share/zoneinfo/Etc/GMT-3 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-4 b/msys2/usr/share/zoneinfo/Etc/GMT-4
index 1efd84126..13aef80cb 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-4 and b/msys2/usr/share/zoneinfo/Etc/GMT-4 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-5 b/msys2/usr/share/zoneinfo/Etc/GMT-5
index 1f761844f..83a281695 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-5 and b/msys2/usr/share/zoneinfo/Etc/GMT-5 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-6 b/msys2/usr/share/zoneinfo/Etc/GMT-6
index 952681ed4..79a983e54 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-6 and b/msys2/usr/share/zoneinfo/Etc/GMT-6 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-7 b/msys2/usr/share/zoneinfo/Etc/GMT-7
index cefc9126c..e136690e1 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-7 and b/msys2/usr/share/zoneinfo/Etc/GMT-7 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-8 b/msys2/usr/share/zoneinfo/Etc/GMT-8
index afb093da0..bc70fe416 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-8 and b/msys2/usr/share/zoneinfo/Etc/GMT-8 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT-9 b/msys2/usr/share/zoneinfo/Etc/GMT-9
index 9265fb7c2..d18cedd52 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT-9 and b/msys2/usr/share/zoneinfo/Etc/GMT-9 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/GMT0 b/msys2/usr/share/zoneinfo/Etc/GMT0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/GMT0 and b/msys2/usr/share/zoneinfo/Etc/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/Etc/Greenwich b/msys2/usr/share/zoneinfo/Etc/Greenwich
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/Greenwich and b/msys2/usr/share/zoneinfo/Etc/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/Etc/UCT b/msys2/usr/share/zoneinfo/Etc/UCT
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/UCT and b/msys2/usr/share/zoneinfo/Etc/UCT differ
diff --git a/msys2/usr/share/zoneinfo/Etc/UTC b/msys2/usr/share/zoneinfo/Etc/UTC
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/UTC and b/msys2/usr/share/zoneinfo/Etc/UTC differ
diff --git a/msys2/usr/share/zoneinfo/Etc/Universal b/msys2/usr/share/zoneinfo/Etc/Universal
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/Universal and b/msys2/usr/share/zoneinfo/Etc/Universal differ
diff --git a/msys2/usr/share/zoneinfo/Etc/Zulu b/msys2/usr/share/zoneinfo/Etc/Zulu
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Etc/Zulu and b/msys2/usr/share/zoneinfo/Etc/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Amsterdam b/msys2/usr/share/zoneinfo/Europe/Amsterdam
index c3ff07b43..4a6fa1d49 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Amsterdam and b/msys2/usr/share/zoneinfo/Europe/Amsterdam differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Andorra b/msys2/usr/share/zoneinfo/Europe/Andorra
index 596255039..38685d421 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Andorra and b/msys2/usr/share/zoneinfo/Europe/Andorra differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Astrakhan b/msys2/usr/share/zoneinfo/Europe/Astrakhan
index 73a4d013f..aff8d82d2 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Astrakhan and b/msys2/usr/share/zoneinfo/Europe/Astrakhan differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Athens b/msys2/usr/share/zoneinfo/Europe/Athens
index 9f3a0678d..231bf9c3b 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Athens and b/msys2/usr/share/zoneinfo/Europe/Athens differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Belfast b/msys2/usr/share/zoneinfo/Europe/Belfast
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Belfast and b/msys2/usr/share/zoneinfo/Europe/Belfast differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Belgrade b/msys2/usr/share/zoneinfo/Europe/Belgrade
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Belgrade and b/msys2/usr/share/zoneinfo/Europe/Belgrade differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Berlin b/msys2/usr/share/zoneinfo/Europe/Berlin
index 7f6d958f8..465546bd3 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Berlin and b/msys2/usr/share/zoneinfo/Europe/Berlin differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Bratislava b/msys2/usr/share/zoneinfo/Europe/Bratislava
index ce8f433ec..fb7c145ac 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Bratislava and b/msys2/usr/share/zoneinfo/Europe/Bratislava differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Brussels b/msys2/usr/share/zoneinfo/Europe/Brussels
index 40d7124e5..31973271d 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Brussels and b/msys2/usr/share/zoneinfo/Europe/Brussels differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Bucharest b/msys2/usr/share/zoneinfo/Europe/Bucharest
index 4303b903e..efa689ba9 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Bucharest and b/msys2/usr/share/zoneinfo/Europe/Bucharest differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Budapest b/msys2/usr/share/zoneinfo/Europe/Budapest
index 6b94a4f31..940be4670 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Budapest and b/msys2/usr/share/zoneinfo/Europe/Budapest differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Busingen b/msys2/usr/share/zoneinfo/Europe/Busingen
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Busingen and b/msys2/usr/share/zoneinfo/Europe/Busingen differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Chisinau b/msys2/usr/share/zoneinfo/Europe/Chisinau
index 5ee23fe0e..6970b14c5 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Chisinau and b/msys2/usr/share/zoneinfo/Europe/Chisinau differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Copenhagen b/msys2/usr/share/zoneinfo/Europe/Copenhagen
index 776be6e4a..45984a759 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Copenhagen and b/msys2/usr/share/zoneinfo/Europe/Copenhagen differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Dublin b/msys2/usr/share/zoneinfo/Europe/Dublin
index 1d994902d..4a45ea8f7 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Dublin and b/msys2/usr/share/zoneinfo/Europe/Dublin differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Gibraltar b/msys2/usr/share/zoneinfo/Europe/Gibraltar
index 117aadb83..017bb2e34 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Gibraltar and b/msys2/usr/share/zoneinfo/Europe/Gibraltar differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Guernsey b/msys2/usr/share/zoneinfo/Europe/Guernsey
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Guernsey and b/msys2/usr/share/zoneinfo/Europe/Guernsey differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Helsinki b/msys2/usr/share/zoneinfo/Europe/Helsinki
index b4f8f9cbb..ff5e56530 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Helsinki and b/msys2/usr/share/zoneinfo/Europe/Helsinki differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Isle_of_Man b/msys2/usr/share/zoneinfo/Europe/Isle_of_Man
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Isle_of_Man and b/msys2/usr/share/zoneinfo/Europe/Isle_of_Man differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Istanbul b/msys2/usr/share/zoneinfo/Europe/Istanbul
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Istanbul and b/msys2/usr/share/zoneinfo/Europe/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Jersey b/msys2/usr/share/zoneinfo/Europe/Jersey
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Jersey and b/msys2/usr/share/zoneinfo/Europe/Jersey differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Kaliningrad b/msys2/usr/share/zoneinfo/Europe/Kaliningrad
index cc99beabe..0ec475647 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Kaliningrad and b/msys2/usr/share/zoneinfo/Europe/Kaliningrad differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Kiev b/msys2/usr/share/zoneinfo/Europe/Kiev
index 9337c9ea2..8f83cefbc 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Kiev and b/msys2/usr/share/zoneinfo/Europe/Kiev differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Kirov b/msys2/usr/share/zoneinfo/Europe/Kirov
index a3b5320a0..d1c93c540 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Kirov and b/msys2/usr/share/zoneinfo/Europe/Kirov differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Lisbon b/msys2/usr/share/zoneinfo/Europe/Lisbon
index 355817b52..64841661a 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Lisbon and b/msys2/usr/share/zoneinfo/Europe/Lisbon differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Ljubljana b/msys2/usr/share/zoneinfo/Europe/Ljubljana
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Ljubljana and b/msys2/usr/share/zoneinfo/Europe/Ljubljana differ
diff --git a/msys2/usr/share/zoneinfo/Europe/London b/msys2/usr/share/zoneinfo/Europe/London
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/London and b/msys2/usr/share/zoneinfo/Europe/London differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Luxembourg b/msys2/usr/share/zoneinfo/Europe/Luxembourg
index c4ca733f5..682bcbf61 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Luxembourg and b/msys2/usr/share/zoneinfo/Europe/Luxembourg differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Madrid b/msys2/usr/share/zoneinfo/Europe/Madrid
index 16f6420ab..60bdf4d07 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Madrid and b/msys2/usr/share/zoneinfo/Europe/Madrid differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Malta b/msys2/usr/share/zoneinfo/Europe/Malta
index bf2452da4..27539c224 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Malta and b/msys2/usr/share/zoneinfo/Europe/Malta differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Mariehamn b/msys2/usr/share/zoneinfo/Europe/Mariehamn
index b4f8f9cbb..ff5e56530 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Mariehamn and b/msys2/usr/share/zoneinfo/Europe/Mariehamn differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Minsk b/msys2/usr/share/zoneinfo/Europe/Minsk
index 453306c07..30d3a672b 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Minsk and b/msys2/usr/share/zoneinfo/Europe/Minsk differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Monaco b/msys2/usr/share/zoneinfo/Europe/Monaco
index 686ae8831..f30dfc701 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Monaco and b/msys2/usr/share/zoneinfo/Europe/Monaco differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Moscow b/msys2/usr/share/zoneinfo/Europe/Moscow
index ddb3f4e99..5e6b6de64 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Moscow and b/msys2/usr/share/zoneinfo/Europe/Moscow differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Nicosia b/msys2/usr/share/zoneinfo/Europe/Nicosia
index f7f10ab76..c210d0a59 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Nicosia and b/msys2/usr/share/zoneinfo/Europe/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Oslo b/msys2/usr/share/zoneinfo/Europe/Oslo
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Oslo and b/msys2/usr/share/zoneinfo/Europe/Oslo differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Paris b/msys2/usr/share/zoneinfo/Europe/Paris
index ca8543516..00a27264c 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Paris and b/msys2/usr/share/zoneinfo/Europe/Paris differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Podgorica b/msys2/usr/share/zoneinfo/Europe/Podgorica
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Podgorica and b/msys2/usr/share/zoneinfo/Europe/Podgorica differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Prague b/msys2/usr/share/zoneinfo/Europe/Prague
index ce8f433ec..fb7c145ac 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Prague and b/msys2/usr/share/zoneinfo/Europe/Prague differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Riga b/msys2/usr/share/zoneinfo/Europe/Riga
index 8db477d01..26af4c90b 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Riga and b/msys2/usr/share/zoneinfo/Europe/Riga differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Rome b/msys2/usr/share/zoneinfo/Europe/Rome
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Rome and b/msys2/usr/share/zoneinfo/Europe/Rome differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Samara b/msys2/usr/share/zoneinfo/Europe/Samara
index 97d5dd9e6..8d0c26e5c 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Samara and b/msys2/usr/share/zoneinfo/Europe/Samara differ
diff --git a/msys2/usr/share/zoneinfo/Europe/San_Marino b/msys2/usr/share/zoneinfo/Europe/San_Marino
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/San_Marino and b/msys2/usr/share/zoneinfo/Europe/San_Marino differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Sarajevo b/msys2/usr/share/zoneinfo/Europe/Sarajevo
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Sarajevo and b/msys2/usr/share/zoneinfo/Europe/Sarajevo differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Saratov b/msys2/usr/share/zoneinfo/Europe/Saratov
index 8fd5f6d4b..2684d8f8b 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Saratov and b/msys2/usr/share/zoneinfo/Europe/Saratov differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Simferopol b/msys2/usr/share/zoneinfo/Europe/Simferopol
index 432e8315b..88a6f3bdb 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Simferopol and b/msys2/usr/share/zoneinfo/Europe/Simferopol differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Skopje b/msys2/usr/share/zoneinfo/Europe/Skopje
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Skopje and b/msys2/usr/share/zoneinfo/Europe/Skopje differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Sofia b/msys2/usr/share/zoneinfo/Europe/Sofia
index 0e4d87933..eabc972a2 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Sofia and b/msys2/usr/share/zoneinfo/Europe/Sofia differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Stockholm b/msys2/usr/share/zoneinfo/Europe/Stockholm
index f3e0c7f0f..dd3eb3227 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Stockholm and b/msys2/usr/share/zoneinfo/Europe/Stockholm differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Tallinn b/msys2/usr/share/zoneinfo/Europe/Tallinn
index b5acca3cf..5321bbd46 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Tallinn and b/msys2/usr/share/zoneinfo/Europe/Tallinn differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Tirane b/msys2/usr/share/zoneinfo/Europe/Tirane
index 0b86017d2..743a7337f 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Tirane and b/msys2/usr/share/zoneinfo/Europe/Tirane differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Tiraspol b/msys2/usr/share/zoneinfo/Europe/Tiraspol
index 5ee23fe0e..6970b14c5 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Tiraspol and b/msys2/usr/share/zoneinfo/Europe/Tiraspol differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Ulyanovsk b/msys2/usr/share/zoneinfo/Europe/Ulyanovsk
index 7b61bdc52..bb842cb1f 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Ulyanovsk and b/msys2/usr/share/zoneinfo/Europe/Ulyanovsk differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Uzhgorod b/msys2/usr/share/zoneinfo/Europe/Uzhgorod
index 66ae8d69e..a5755685e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Uzhgorod and b/msys2/usr/share/zoneinfo/Europe/Uzhgorod differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Vaduz b/msys2/usr/share/zoneinfo/Europe/Vaduz
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Vaduz and b/msys2/usr/share/zoneinfo/Europe/Vaduz differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Vatican b/msys2/usr/share/zoneinfo/Europe/Vatican
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Vatican and b/msys2/usr/share/zoneinfo/Europe/Vatican differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Vienna b/msys2/usr/share/zoneinfo/Europe/Vienna
index 3582bb15c..75339e98d 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Vienna and b/msys2/usr/share/zoneinfo/Europe/Vienna differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Vilnius b/msys2/usr/share/zoneinfo/Europe/Vilnius
index 7abd63fa6..75b2eebb5 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Vilnius and b/msys2/usr/share/zoneinfo/Europe/Vilnius differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Volgograd b/msys2/usr/share/zoneinfo/Europe/Volgograd
index d1cfac0e3..c51700260 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Volgograd and b/msys2/usr/share/zoneinfo/Europe/Volgograd differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Warsaw b/msys2/usr/share/zoneinfo/Europe/Warsaw
index e33cf6717..efe1a40f2 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Warsaw and b/msys2/usr/share/zoneinfo/Europe/Warsaw differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Zagreb b/msys2/usr/share/zoneinfo/Europe/Zagreb
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Zagreb and b/msys2/usr/share/zoneinfo/Europe/Zagreb differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Zaporozhye b/msys2/usr/share/zoneinfo/Europe/Zaporozhye
index e42edfc85..4ea8dae45 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Zaporozhye and b/msys2/usr/share/zoneinfo/Europe/Zaporozhye differ
diff --git a/msys2/usr/share/zoneinfo/Europe/Zurich b/msys2/usr/share/zoneinfo/Europe/Zurich
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/Europe/Zurich and b/msys2/usr/share/zoneinfo/Europe/Zurich differ
diff --git a/msys2/usr/share/zoneinfo/Factory b/msys2/usr/share/zoneinfo/Factory
index 60aa2a0d6..b4dd7735e 100644
Binary files a/msys2/usr/share/zoneinfo/Factory and b/msys2/usr/share/zoneinfo/Factory differ
diff --git a/msys2/usr/share/zoneinfo/GB b/msys2/usr/share/zoneinfo/GB
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/GB and b/msys2/usr/share/zoneinfo/GB differ
diff --git a/msys2/usr/share/zoneinfo/GB-Eire b/msys2/usr/share/zoneinfo/GB-Eire
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/GB-Eire and b/msys2/usr/share/zoneinfo/GB-Eire differ
diff --git a/msys2/usr/share/zoneinfo/GMT b/msys2/usr/share/zoneinfo/GMT
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/GMT and b/msys2/usr/share/zoneinfo/GMT differ
diff --git a/msys2/usr/share/zoneinfo/GMT+0 b/msys2/usr/share/zoneinfo/GMT+0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/GMT+0 and b/msys2/usr/share/zoneinfo/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/GMT-0 b/msys2/usr/share/zoneinfo/GMT-0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/GMT-0 and b/msys2/usr/share/zoneinfo/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/GMT0 b/msys2/usr/share/zoneinfo/GMT0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/GMT0 and b/msys2/usr/share/zoneinfo/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/Greenwich b/msys2/usr/share/zoneinfo/Greenwich
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/Greenwich and b/msys2/usr/share/zoneinfo/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/HST b/msys2/usr/share/zoneinfo/HST
index cccd45eb8..160a53e04 100644
Binary files a/msys2/usr/share/zoneinfo/HST and b/msys2/usr/share/zoneinfo/HST differ
diff --git a/msys2/usr/share/zoneinfo/Hongkong b/msys2/usr/share/zoneinfo/Hongkong
index 23d0375fb..c80e36480 100644
Binary files a/msys2/usr/share/zoneinfo/Hongkong and b/msys2/usr/share/zoneinfo/Hongkong differ
diff --git a/msys2/usr/share/zoneinfo/Iceland b/msys2/usr/share/zoneinfo/Iceland
index 10e0fc819..2451aca76 100644
Binary files a/msys2/usr/share/zoneinfo/Iceland and b/msys2/usr/share/zoneinfo/Iceland differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Antananarivo b/msys2/usr/share/zoneinfo/Indian/Antananarivo
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Antananarivo and b/msys2/usr/share/zoneinfo/Indian/Antananarivo differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Chagos b/msys2/usr/share/zoneinfo/Indian/Chagos
index 93d6dda50..8b8ce226b 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Chagos and b/msys2/usr/share/zoneinfo/Indian/Chagos differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Christmas b/msys2/usr/share/zoneinfo/Indian/Christmas
index d18c3810d..766024b36 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Christmas and b/msys2/usr/share/zoneinfo/Indian/Christmas differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Cocos b/msys2/usr/share/zoneinfo/Indian/Cocos
index f8116e702..117503410 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Cocos and b/msys2/usr/share/zoneinfo/Indian/Cocos differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Comoro b/msys2/usr/share/zoneinfo/Indian/Comoro
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Comoro and b/msys2/usr/share/zoneinfo/Indian/Comoro differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Kerguelen b/msys2/usr/share/zoneinfo/Indian/Kerguelen
index cde4cf7ea..8ce93e012 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Kerguelen and b/msys2/usr/share/zoneinfo/Indian/Kerguelen differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Mahe b/msys2/usr/share/zoneinfo/Indian/Mahe
index cba7dfe73..e7fccf829 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Mahe and b/msys2/usr/share/zoneinfo/Indian/Mahe differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Maldives b/msys2/usr/share/zoneinfo/Indian/Maldives
index 7c839cfa9..58a82e4eb 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Maldives and b/msys2/usr/share/zoneinfo/Indian/Maldives differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Mauritius b/msys2/usr/share/zoneinfo/Indian/Mauritius
index 17f261699..7c1113488 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Mauritius and b/msys2/usr/share/zoneinfo/Indian/Mauritius differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Mayotte b/msys2/usr/share/zoneinfo/Indian/Mayotte
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Mayotte and b/msys2/usr/share/zoneinfo/Indian/Mayotte differ
diff --git a/msys2/usr/share/zoneinfo/Indian/Reunion b/msys2/usr/share/zoneinfo/Indian/Reunion
index dfe08313d..248a7c93a 100644
Binary files a/msys2/usr/share/zoneinfo/Indian/Reunion and b/msys2/usr/share/zoneinfo/Indian/Reunion differ
diff --git a/msys2/usr/share/zoneinfo/Iran b/msys2/usr/share/zoneinfo/Iran
index 8cec5ad7d..f1555f003 100644
Binary files a/msys2/usr/share/zoneinfo/Iran and b/msys2/usr/share/zoneinfo/Iran differ
diff --git a/msys2/usr/share/zoneinfo/Israel b/msys2/usr/share/zoneinfo/Israel
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/Israel and b/msys2/usr/share/zoneinfo/Israel differ
diff --git a/msys2/usr/share/zoneinfo/Jamaica b/msys2/usr/share/zoneinfo/Jamaica
index 2a9b7fd52..be6b1b6f1 100644
Binary files a/msys2/usr/share/zoneinfo/Jamaica and b/msys2/usr/share/zoneinfo/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/Japan b/msys2/usr/share/zoneinfo/Japan
index 26f4d34d6..1aa066ce3 100644
Binary files a/msys2/usr/share/zoneinfo/Japan and b/msys2/usr/share/zoneinfo/Japan differ
diff --git a/msys2/usr/share/zoneinfo/Kwajalein b/msys2/usr/share/zoneinfo/Kwajalein
index 1a7975fad..9416d522d 100644
Binary files a/msys2/usr/share/zoneinfo/Kwajalein and b/msys2/usr/share/zoneinfo/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/Libya b/msys2/usr/share/zoneinfo/Libya
index 07b393bb7..e0c89971a 100644
Binary files a/msys2/usr/share/zoneinfo/Libya and b/msys2/usr/share/zoneinfo/Libya differ
diff --git a/msys2/usr/share/zoneinfo/MET b/msys2/usr/share/zoneinfo/MET
index 4a826bb18..6f0558c3b 100644
Binary files a/msys2/usr/share/zoneinfo/MET and b/msys2/usr/share/zoneinfo/MET differ
diff --git a/msys2/usr/share/zoneinfo/MST b/msys2/usr/share/zoneinfo/MST
index c93a58eee..a0953d1e7 100644
Binary files a/msys2/usr/share/zoneinfo/MST and b/msys2/usr/share/zoneinfo/MST differ
diff --git a/msys2/usr/share/zoneinfo/MST7MDT b/msys2/usr/share/zoneinfo/MST7MDT
index 4506a6e15..137867c8b 100644
Binary files a/msys2/usr/share/zoneinfo/MST7MDT and b/msys2/usr/share/zoneinfo/MST7MDT differ
diff --git a/msys2/usr/share/zoneinfo/Mexico/BajaNorte b/msys2/usr/share/zoneinfo/Mexico/BajaNorte
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/Mexico/BajaNorte and b/msys2/usr/share/zoneinfo/Mexico/BajaNorte differ
diff --git a/msys2/usr/share/zoneinfo/Mexico/BajaSur b/msys2/usr/share/zoneinfo/Mexico/BajaSur
index e4a785743..4c819fab0 100644
Binary files a/msys2/usr/share/zoneinfo/Mexico/BajaSur and b/msys2/usr/share/zoneinfo/Mexico/BajaSur differ
diff --git a/msys2/usr/share/zoneinfo/Mexico/General b/msys2/usr/share/zoneinfo/Mexico/General
index e7fb6f295..ffcf8bee1 100644
Binary files a/msys2/usr/share/zoneinfo/Mexico/General and b/msys2/usr/share/zoneinfo/Mexico/General differ
diff --git a/msys2/usr/share/zoneinfo/NZ b/msys2/usr/share/zoneinfo/NZ
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/NZ and b/msys2/usr/share/zoneinfo/NZ differ
diff --git a/msys2/usr/share/zoneinfo/NZ-CHAT b/msys2/usr/share/zoneinfo/NZ-CHAT
index c00410988..f06065ebd 100644
Binary files a/msys2/usr/share/zoneinfo/NZ-CHAT and b/msys2/usr/share/zoneinfo/NZ-CHAT differ
diff --git a/msys2/usr/share/zoneinfo/Navajo b/msys2/usr/share/zoneinfo/Navajo
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/Navajo and b/msys2/usr/share/zoneinfo/Navajo differ
diff --git a/msys2/usr/share/zoneinfo/PRC b/msys2/usr/share/zoneinfo/PRC
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/PRC and b/msys2/usr/share/zoneinfo/PRC differ
diff --git a/msys2/usr/share/zoneinfo/PST8PDT b/msys2/usr/share/zoneinfo/PST8PDT
index 99d246baa..fde4833f6 100644
Binary files a/msys2/usr/share/zoneinfo/PST8PDT and b/msys2/usr/share/zoneinfo/PST8PDT differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Apia b/msys2/usr/share/zoneinfo/Pacific/Apia
index dab1f3f60..244af26f8 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Apia and b/msys2/usr/share/zoneinfo/Pacific/Apia differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Auckland b/msys2/usr/share/zoneinfo/Pacific/Auckland
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Auckland and b/msys2/usr/share/zoneinfo/Pacific/Auckland differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Bougainville b/msys2/usr/share/zoneinfo/Pacific/Bougainville
index 2892d2680..7c667093c 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Bougainville and b/msys2/usr/share/zoneinfo/Pacific/Bougainville differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Chatham b/msys2/usr/share/zoneinfo/Pacific/Chatham
index c00410988..f06065ebd 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Chatham and b/msys2/usr/share/zoneinfo/Pacific/Chatham differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Chuuk b/msys2/usr/share/zoneinfo/Pacific/Chuuk
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Chuuk and b/msys2/usr/share/zoneinfo/Pacific/Chuuk differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Easter b/msys2/usr/share/zoneinfo/Pacific/Easter
index cae374409..d29bcd68b 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Easter and b/msys2/usr/share/zoneinfo/Pacific/Easter differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Efate b/msys2/usr/share/zoneinfo/Pacific/Efate
index 60150175c..bf7471dd3 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Efate and b/msys2/usr/share/zoneinfo/Pacific/Efate differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Enderbury b/msys2/usr/share/zoneinfo/Pacific/Enderbury
index f0b825236..b22ab147c 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Enderbury and b/msys2/usr/share/zoneinfo/Pacific/Enderbury differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Fakaofo b/msys2/usr/share/zoneinfo/Pacific/Fakaofo
index e40307f6a..b7b30213e 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Fakaofo and b/msys2/usr/share/zoneinfo/Pacific/Fakaofo differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Fiji b/msys2/usr/share/zoneinfo/Pacific/Fiji
index d39bf5364..e3934e423 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Fiji and b/msys2/usr/share/zoneinfo/Pacific/Fiji differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Funafuti b/msys2/usr/share/zoneinfo/Pacific/Funafuti
index ea728637a..78ab35b6b 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Funafuti and b/msys2/usr/share/zoneinfo/Pacific/Funafuti differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Galapagos b/msys2/usr/share/zoneinfo/Pacific/Galapagos
index 31f0921ea..a9403eca4 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Galapagos and b/msys2/usr/share/zoneinfo/Pacific/Galapagos differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Gambier b/msys2/usr/share/zoneinfo/Pacific/Gambier
index e1fc3daa5..ddfc34ffc 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Gambier and b/msys2/usr/share/zoneinfo/Pacific/Gambier differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Guadalcanal b/msys2/usr/share/zoneinfo/Pacific/Guadalcanal
index 7e9d10a10..720c67901 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Guadalcanal and b/msys2/usr/share/zoneinfo/Pacific/Guadalcanal differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Guam b/msys2/usr/share/zoneinfo/Pacific/Guam
index 66490d25d..bf9a2d955 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Guam and b/msys2/usr/share/zoneinfo/Pacific/Guam differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Honolulu b/msys2/usr/share/zoneinfo/Pacific/Honolulu
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Honolulu and b/msys2/usr/share/zoneinfo/Pacific/Honolulu differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Johnston b/msys2/usr/share/zoneinfo/Pacific/Johnston
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Johnston and b/msys2/usr/share/zoneinfo/Pacific/Johnston differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Kiritimati b/msys2/usr/share/zoneinfo/Pacific/Kiritimati
index 7cae0cb75..2f676d3bf 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Kiritimati and b/msys2/usr/share/zoneinfo/Pacific/Kiritimati differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Kosrae b/msys2/usr/share/zoneinfo/Pacific/Kosrae
index a584aae5e..f5d58242c 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Kosrae and b/msys2/usr/share/zoneinfo/Pacific/Kosrae differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Kwajalein b/msys2/usr/share/zoneinfo/Pacific/Kwajalein
index 1a7975fad..9416d522d 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Kwajalein and b/msys2/usr/share/zoneinfo/Pacific/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Majuro b/msys2/usr/share/zoneinfo/Pacific/Majuro
index 9ef8374de..9228ee02e 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Majuro and b/msys2/usr/share/zoneinfo/Pacific/Majuro differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Marquesas b/msys2/usr/share/zoneinfo/Pacific/Marquesas
index 74d6792bf..6ea24b72c 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Marquesas and b/msys2/usr/share/zoneinfo/Pacific/Marquesas differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Midway b/msys2/usr/share/zoneinfo/Pacific/Midway
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Midway and b/msys2/usr/share/zoneinfo/Pacific/Midway differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Nauru b/msys2/usr/share/zoneinfo/Pacific/Nauru
index acec0429f..ae13aac77 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Nauru and b/msys2/usr/share/zoneinfo/Pacific/Nauru differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Niue b/msys2/usr/share/zoneinfo/Pacific/Niue
index 684b010e8..7b3579351 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Niue and b/msys2/usr/share/zoneinfo/Pacific/Niue differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Norfolk b/msys2/usr/share/zoneinfo/Pacific/Norfolk
index 53c1aad4e..79e2a9419 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Norfolk and b/msys2/usr/share/zoneinfo/Pacific/Norfolk differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Noumea b/msys2/usr/share/zoneinfo/Pacific/Noumea
index 931a1a306..824f81416 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Noumea and b/msys2/usr/share/zoneinfo/Pacific/Noumea differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Pago_Pago b/msys2/usr/share/zoneinfo/Pacific/Pago_Pago
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Pago_Pago and b/msys2/usr/share/zoneinfo/Pacific/Pago_Pago differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Palau b/msys2/usr/share/zoneinfo/Pacific/Palau
index 146b35152..bc8eb7a55 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Palau and b/msys2/usr/share/zoneinfo/Pacific/Palau differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Pitcairn b/msys2/usr/share/zoneinfo/Pacific/Pitcairn
index ef91b061b..8a4ba4d30 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Pitcairn and b/msys2/usr/share/zoneinfo/Pacific/Pitcairn differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Pohnpei b/msys2/usr/share/zoneinfo/Pacific/Pohnpei
index c298ddd4d..b92b254a9 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Pohnpei and b/msys2/usr/share/zoneinfo/Pacific/Pohnpei differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Ponape b/msys2/usr/share/zoneinfo/Pacific/Ponape
index c298ddd4d..b92b254a9 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Ponape and b/msys2/usr/share/zoneinfo/Pacific/Ponape differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Port_Moresby b/msys2/usr/share/zoneinfo/Pacific/Port_Moresby
index 920ad27e6..5d8fc3a1b 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Port_Moresby and b/msys2/usr/share/zoneinfo/Pacific/Port_Moresby differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Rarotonga b/msys2/usr/share/zoneinfo/Pacific/Rarotonga
index da6b0fade..143a1883b 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Rarotonga and b/msys2/usr/share/zoneinfo/Pacific/Rarotonga differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Saipan b/msys2/usr/share/zoneinfo/Pacific/Saipan
index 66490d25d..bf9a2d955 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Saipan and b/msys2/usr/share/zoneinfo/Pacific/Saipan differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Samoa b/msys2/usr/share/zoneinfo/Pacific/Samoa
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Samoa and b/msys2/usr/share/zoneinfo/Pacific/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Tahiti b/msys2/usr/share/zoneinfo/Pacific/Tahiti
index 442b8eb5a..50a064fa0 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Tahiti and b/msys2/usr/share/zoneinfo/Pacific/Tahiti differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Tarawa b/msys2/usr/share/zoneinfo/Pacific/Tarawa
index 3db6c7503..6bc216823 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Tarawa and b/msys2/usr/share/zoneinfo/Pacific/Tarawa differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Tongatapu b/msys2/usr/share/zoneinfo/Pacific/Tongatapu
index 5553c6009..54aeb0ffa 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Tongatapu and b/msys2/usr/share/zoneinfo/Pacific/Tongatapu differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Truk b/msys2/usr/share/zoneinfo/Pacific/Truk
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Truk and b/msys2/usr/share/zoneinfo/Pacific/Truk differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Wake b/msys2/usr/share/zoneinfo/Pacific/Wake
index c9e310670..71cca8877 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Wake and b/msys2/usr/share/zoneinfo/Pacific/Wake differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Wallis b/msys2/usr/share/zoneinfo/Pacific/Wallis
index b35344b31..4bce89300 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Wallis and b/msys2/usr/share/zoneinfo/Pacific/Wallis differ
diff --git a/msys2/usr/share/zoneinfo/Pacific/Yap b/msys2/usr/share/zoneinfo/Pacific/Yap
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/Pacific/Yap and b/msys2/usr/share/zoneinfo/Pacific/Yap differ
diff --git a/msys2/usr/share/zoneinfo/Poland b/msys2/usr/share/zoneinfo/Poland
index e33cf6717..efe1a40f2 100644
Binary files a/msys2/usr/share/zoneinfo/Poland and b/msys2/usr/share/zoneinfo/Poland differ
diff --git a/msys2/usr/share/zoneinfo/Portugal b/msys2/usr/share/zoneinfo/Portugal
index 355817b52..64841661a 100644
Binary files a/msys2/usr/share/zoneinfo/Portugal and b/msys2/usr/share/zoneinfo/Portugal differ
diff --git a/msys2/usr/share/zoneinfo/ROC b/msys2/usr/share/zoneinfo/ROC
index 24c43444b..35d89d036 100644
Binary files a/msys2/usr/share/zoneinfo/ROC and b/msys2/usr/share/zoneinfo/ROC differ
diff --git a/msys2/usr/share/zoneinfo/ROK b/msys2/usr/share/zoneinfo/ROK
index 96199e73e..1755147fa 100644
Binary files a/msys2/usr/share/zoneinfo/ROK and b/msys2/usr/share/zoneinfo/ROK differ
diff --git a/msys2/usr/share/zoneinfo/Singapore b/msys2/usr/share/zoneinfo/Singapore
index 2364b2178..350d77e28 100644
Binary files a/msys2/usr/share/zoneinfo/Singapore and b/msys2/usr/share/zoneinfo/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/Turkey b/msys2/usr/share/zoneinfo/Turkey
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/Turkey and b/msys2/usr/share/zoneinfo/Turkey differ
diff --git a/msys2/usr/share/zoneinfo/UCT b/msys2/usr/share/zoneinfo/UCT
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/UCT and b/msys2/usr/share/zoneinfo/UCT differ
diff --git a/msys2/usr/share/zoneinfo/US/Alaska b/msys2/usr/share/zoneinfo/US/Alaska
index 9bbb2fd3b..cdf0572be 100644
Binary files a/msys2/usr/share/zoneinfo/US/Alaska and b/msys2/usr/share/zoneinfo/US/Alaska differ
diff --git a/msys2/usr/share/zoneinfo/US/Aleutian b/msys2/usr/share/zoneinfo/US/Aleutian
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/US/Aleutian and b/msys2/usr/share/zoneinfo/US/Aleutian differ
diff --git a/msys2/usr/share/zoneinfo/US/Arizona b/msys2/usr/share/zoneinfo/US/Arizona
index ac6bb0c78..c2bd2f949 100644
Binary files a/msys2/usr/share/zoneinfo/US/Arizona and b/msys2/usr/share/zoneinfo/US/Arizona differ
diff --git a/msys2/usr/share/zoneinfo/US/Central b/msys2/usr/share/zoneinfo/US/Central
index a5b1617c7..b01688065 100644
Binary files a/msys2/usr/share/zoneinfo/US/Central and b/msys2/usr/share/zoneinfo/US/Central differ
diff --git a/msys2/usr/share/zoneinfo/US/East-Indiana b/msys2/usr/share/zoneinfo/US/East-Indiana
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/US/East-Indiana and b/msys2/usr/share/zoneinfo/US/East-Indiana differ
diff --git a/msys2/usr/share/zoneinfo/US/Eastern b/msys2/usr/share/zoneinfo/US/Eastern
index 2f75480e0..2b6c2eea1 100644
Binary files a/msys2/usr/share/zoneinfo/US/Eastern and b/msys2/usr/share/zoneinfo/US/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/US/Hawaii b/msys2/usr/share/zoneinfo/US/Hawaii
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/US/Hawaii and b/msys2/usr/share/zoneinfo/US/Hawaii differ
diff --git a/msys2/usr/share/zoneinfo/US/Indiana-Starke b/msys2/usr/share/zoneinfo/US/Indiana-Starke
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/US/Indiana-Starke and b/msys2/usr/share/zoneinfo/US/Indiana-Starke differ
diff --git a/msys2/usr/share/zoneinfo/US/Michigan b/msys2/usr/share/zoneinfo/US/Michigan
index e104faa46..6eb3ac46e 100644
Binary files a/msys2/usr/share/zoneinfo/US/Michigan and b/msys2/usr/share/zoneinfo/US/Michigan differ
diff --git a/msys2/usr/share/zoneinfo/US/Mountain b/msys2/usr/share/zoneinfo/US/Mountain
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/US/Mountain and b/msys2/usr/share/zoneinfo/US/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/US/Pacific b/msys2/usr/share/zoneinfo/US/Pacific
index 9dad4f4c7..aaf07787a 100644
Binary files a/msys2/usr/share/zoneinfo/US/Pacific and b/msys2/usr/share/zoneinfo/US/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/US/Pacific-New b/msys2/usr/share/zoneinfo/US/Pacific-New
deleted file mode 100644
index 9dad4f4c7..000000000
Binary files a/msys2/usr/share/zoneinfo/US/Pacific-New and /dev/null differ
diff --git a/msys2/usr/share/zoneinfo/US/Samoa b/msys2/usr/share/zoneinfo/US/Samoa
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/US/Samoa and b/msys2/usr/share/zoneinfo/US/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/UTC b/msys2/usr/share/zoneinfo/UTC
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/UTC and b/msys2/usr/share/zoneinfo/UTC differ
diff --git a/msys2/usr/share/zoneinfo/Universal b/msys2/usr/share/zoneinfo/Universal
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Universal and b/msys2/usr/share/zoneinfo/Universal differ
diff --git a/msys2/usr/share/zoneinfo/W-SU b/msys2/usr/share/zoneinfo/W-SU
index ddb3f4e99..5e6b6de64 100644
Binary files a/msys2/usr/share/zoneinfo/W-SU and b/msys2/usr/share/zoneinfo/W-SU differ
diff --git a/msys2/usr/share/zoneinfo/WET b/msys2/usr/share/zoneinfo/WET
index c27390b5b..423c6c203 100644
Binary files a/msys2/usr/share/zoneinfo/WET and b/msys2/usr/share/zoneinfo/WET differ
diff --git a/msys2/usr/share/zoneinfo/Zulu b/msys2/usr/share/zoneinfo/Zulu
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/Zulu and b/msys2/usr/share/zoneinfo/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/leapseconds b/msys2/usr/share/zoneinfo/leapseconds
index 3b9cc7b20..bf0d2d749 100644
--- a/msys2/usr/share/zoneinfo/leapseconds
+++ b/msys2/usr/share/zoneinfo/leapseconds
@@ -6,6 +6,10 @@
 # NIST format leap-seconds.list file, which can be copied from
 # <ftp://ftp.nist.gov/pub/time/leap-seconds.list>
 # or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
+# The NIST file is used instead of its IERS upstream counterpart
+# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
+# because under US law the NIST file is public domain
+# whereas the IERS file's copyright and license status is unclear.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
 # <https://www.eecis.udel.edu/~mills/leap.html>.
@@ -68,11 +72,11 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2020	Dec	28	00:00:00
+#Expires 2021	Jun	28	00:00:00
 
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1609113600 (2020-12-28 00:00:00 UTC)
+#expires 1624838400 (2021-06-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C59
-#	File expires on:  28 December 2020
+#	Updated through IERS Bulletin C60
+#	File expires on:  28 June 2021
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Abidjan b/msys2/usr/share/zoneinfo/posix/Africa/Abidjan
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Abidjan and b/msys2/usr/share/zoneinfo/posix/Africa/Abidjan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Accra b/msys2/usr/share/zoneinfo/posix/Africa/Accra
index 697b9933e..c39ae382b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Accra and b/msys2/usr/share/zoneinfo/posix/Africa/Accra differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Addis_Ababa b/msys2/usr/share/zoneinfo/posix/Africa/Addis_Ababa
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Addis_Ababa and b/msys2/usr/share/zoneinfo/posix/Africa/Addis_Ababa differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Algiers b/msys2/usr/share/zoneinfo/posix/Africa/Algiers
index ae0434231..56a4dd2a1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Algiers and b/msys2/usr/share/zoneinfo/posix/Africa/Algiers differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Asmara b/msys2/usr/share/zoneinfo/posix/Africa/Asmara
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Asmara and b/msys2/usr/share/zoneinfo/posix/Africa/Asmara differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Asmera b/msys2/usr/share/zoneinfo/posix/Africa/Asmera
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Asmera and b/msys2/usr/share/zoneinfo/posix/Africa/Asmera differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Bamako b/msys2/usr/share/zoneinfo/posix/Africa/Bamako
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Bamako and b/msys2/usr/share/zoneinfo/posix/Africa/Bamako differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Bangui b/msys2/usr/share/zoneinfo/posix/Africa/Bangui
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Bangui and b/msys2/usr/share/zoneinfo/posix/Africa/Bangui differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Banjul b/msys2/usr/share/zoneinfo/posix/Africa/Banjul
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Banjul and b/msys2/usr/share/zoneinfo/posix/Africa/Banjul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Bissau b/msys2/usr/share/zoneinfo/posix/Africa/Bissau
index 82ea5aaf0..0da1d1e21 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Bissau and b/msys2/usr/share/zoneinfo/posix/Africa/Bissau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Blantyre b/msys2/usr/share/zoneinfo/posix/Africa/Blantyre
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Blantyre and b/msys2/usr/share/zoneinfo/posix/Africa/Blantyre differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Brazzaville b/msys2/usr/share/zoneinfo/posix/Africa/Brazzaville
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Brazzaville and b/msys2/usr/share/zoneinfo/posix/Africa/Brazzaville differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Bujumbura b/msys2/usr/share/zoneinfo/posix/Africa/Bujumbura
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Bujumbura and b/msys2/usr/share/zoneinfo/posix/Africa/Bujumbura differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Cairo b/msys2/usr/share/zoneinfo/posix/Africa/Cairo
index d3f819623..ea38c9700 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Cairo and b/msys2/usr/share/zoneinfo/posix/Africa/Cairo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Casablanca b/msys2/usr/share/zoneinfo/posix/Africa/Casablanca
index d39016b89..0263c90bd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Casablanca and b/msys2/usr/share/zoneinfo/posix/Africa/Casablanca differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Ceuta b/msys2/usr/share/zoneinfo/posix/Africa/Ceuta
index 850c8f06f..a461dceaa 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Ceuta and b/msys2/usr/share/zoneinfo/posix/Africa/Ceuta differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Conakry b/msys2/usr/share/zoneinfo/posix/Africa/Conakry
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Conakry and b/msys2/usr/share/zoneinfo/posix/Africa/Conakry differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Dakar b/msys2/usr/share/zoneinfo/posix/Africa/Dakar
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Dakar and b/msys2/usr/share/zoneinfo/posix/Africa/Dakar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Dar_es_Salaam b/msys2/usr/share/zoneinfo/posix/Africa/Dar_es_Salaam
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Dar_es_Salaam and b/msys2/usr/share/zoneinfo/posix/Africa/Dar_es_Salaam differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Djibouti b/msys2/usr/share/zoneinfo/posix/Africa/Djibouti
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Djibouti and b/msys2/usr/share/zoneinfo/posix/Africa/Djibouti differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Douala b/msys2/usr/share/zoneinfo/posix/Africa/Douala
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Douala and b/msys2/usr/share/zoneinfo/posix/Africa/Douala differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/El_Aaiun b/msys2/usr/share/zoneinfo/posix/Africa/El_Aaiun
index 066fbed00..772e23c4c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/El_Aaiun and b/msys2/usr/share/zoneinfo/posix/Africa/El_Aaiun differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Freetown b/msys2/usr/share/zoneinfo/posix/Africa/Freetown
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Freetown and b/msys2/usr/share/zoneinfo/posix/Africa/Freetown differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Gaborone b/msys2/usr/share/zoneinfo/posix/Africa/Gaborone
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Gaborone and b/msys2/usr/share/zoneinfo/posix/Africa/Gaborone differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Harare b/msys2/usr/share/zoneinfo/posix/Africa/Harare
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Harare and b/msys2/usr/share/zoneinfo/posix/Africa/Harare differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Johannesburg b/msys2/usr/share/zoneinfo/posix/Africa/Johannesburg
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Johannesburg and b/msys2/usr/share/zoneinfo/posix/Africa/Johannesburg differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Juba b/msys2/usr/share/zoneinfo/posix/Africa/Juba
index 625b1accc..36b05220a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Juba and b/msys2/usr/share/zoneinfo/posix/Africa/Juba differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Kampala b/msys2/usr/share/zoneinfo/posix/Africa/Kampala
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Kampala and b/msys2/usr/share/zoneinfo/posix/Africa/Kampala differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Khartoum b/msys2/usr/share/zoneinfo/posix/Africa/Khartoum
index 8ee8cb92e..3f8e44b8a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Khartoum and b/msys2/usr/share/zoneinfo/posix/Africa/Khartoum differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Kigali b/msys2/usr/share/zoneinfo/posix/Africa/Kigali
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Kigali and b/msys2/usr/share/zoneinfo/posix/Africa/Kigali differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Kinshasa b/msys2/usr/share/zoneinfo/posix/Africa/Kinshasa
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Kinshasa and b/msys2/usr/share/zoneinfo/posix/Africa/Kinshasa differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Lagos b/msys2/usr/share/zoneinfo/posix/Africa/Lagos
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Lagos and b/msys2/usr/share/zoneinfo/posix/Africa/Lagos differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Libreville b/msys2/usr/share/zoneinfo/posix/Africa/Libreville
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Libreville and b/msys2/usr/share/zoneinfo/posix/Africa/Libreville differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Lome b/msys2/usr/share/zoneinfo/posix/Africa/Lome
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Lome and b/msys2/usr/share/zoneinfo/posix/Africa/Lome differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Luanda b/msys2/usr/share/zoneinfo/posix/Africa/Luanda
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Luanda and b/msys2/usr/share/zoneinfo/posix/Africa/Luanda differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Lubumbashi b/msys2/usr/share/zoneinfo/posix/Africa/Lubumbashi
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Lubumbashi and b/msys2/usr/share/zoneinfo/posix/Africa/Lubumbashi differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Lusaka b/msys2/usr/share/zoneinfo/posix/Africa/Lusaka
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Lusaka and b/msys2/usr/share/zoneinfo/posix/Africa/Lusaka differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Malabo b/msys2/usr/share/zoneinfo/posix/Africa/Malabo
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Malabo and b/msys2/usr/share/zoneinfo/posix/Africa/Malabo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Maputo b/msys2/usr/share/zoneinfo/posix/Africa/Maputo
index 52753c0f8..651e5cf67 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Maputo and b/msys2/usr/share/zoneinfo/posix/Africa/Maputo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Maseru b/msys2/usr/share/zoneinfo/posix/Africa/Maseru
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Maseru and b/msys2/usr/share/zoneinfo/posix/Africa/Maseru differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Mbabane b/msys2/usr/share/zoneinfo/posix/Africa/Mbabane
index b1c425dac..bada0638f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Mbabane and b/msys2/usr/share/zoneinfo/posix/Africa/Mbabane differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Mogadishu b/msys2/usr/share/zoneinfo/posix/Africa/Mogadishu
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Mogadishu and b/msys2/usr/share/zoneinfo/posix/Africa/Mogadishu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Monrovia b/msys2/usr/share/zoneinfo/posix/Africa/Monrovia
index 6d688502a..837780922 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Monrovia and b/msys2/usr/share/zoneinfo/posix/Africa/Monrovia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Nairobi b/msys2/usr/share/zoneinfo/posix/Africa/Nairobi
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Nairobi and b/msys2/usr/share/zoneinfo/posix/Africa/Nairobi differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Ndjamena b/msys2/usr/share/zoneinfo/posix/Africa/Ndjamena
index a968845e2..ecbc0966d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Ndjamena and b/msys2/usr/share/zoneinfo/posix/Africa/Ndjamena differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Niamey b/msys2/usr/share/zoneinfo/posix/Africa/Niamey
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Niamey and b/msys2/usr/share/zoneinfo/posix/Africa/Niamey differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Nouakchott b/msys2/usr/share/zoneinfo/posix/Africa/Nouakchott
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Nouakchott and b/msys2/usr/share/zoneinfo/posix/Africa/Nouakchott differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Ouagadougou b/msys2/usr/share/zoneinfo/posix/Africa/Ouagadougou
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Ouagadougou and b/msys2/usr/share/zoneinfo/posix/Africa/Ouagadougou differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Porto-Novo b/msys2/usr/share/zoneinfo/posix/Africa/Porto-Novo
index 0c80137c7..3d7a71ba0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Porto-Novo and b/msys2/usr/share/zoneinfo/posix/Africa/Porto-Novo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Sao_Tome b/msys2/usr/share/zoneinfo/posix/Africa/Sao_Tome
index 59f3759c4..425ad3fda 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Sao_Tome and b/msys2/usr/share/zoneinfo/posix/Africa/Sao_Tome differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Timbuktu b/msys2/usr/share/zoneinfo/posix/Africa/Timbuktu
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Timbuktu and b/msys2/usr/share/zoneinfo/posix/Africa/Timbuktu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Tripoli b/msys2/usr/share/zoneinfo/posix/Africa/Tripoli
index 07b393bb7..e0c89971a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Tripoli and b/msys2/usr/share/zoneinfo/posix/Africa/Tripoli differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Tunis b/msys2/usr/share/zoneinfo/posix/Africa/Tunis
index 427fa5630..ca324cb4c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Tunis and b/msys2/usr/share/zoneinfo/posix/Africa/Tunis differ
diff --git a/msys2/usr/share/zoneinfo/posix/Africa/Windhoek b/msys2/usr/share/zoneinfo/posix/Africa/Windhoek
index abecd137b..0edc52b9b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Africa/Windhoek and b/msys2/usr/share/zoneinfo/posix/Africa/Windhoek differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Adak b/msys2/usr/share/zoneinfo/posix/America/Adak
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Adak and b/msys2/usr/share/zoneinfo/posix/America/Adak differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Anchorage b/msys2/usr/share/zoneinfo/posix/America/Anchorage
index 9bbb2fd3b..cdf0572be 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Anchorage and b/msys2/usr/share/zoneinfo/posix/America/Anchorage differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Anguilla b/msys2/usr/share/zoneinfo/posix/America/Anguilla
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Anguilla and b/msys2/usr/share/zoneinfo/posix/America/Anguilla differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Antigua b/msys2/usr/share/zoneinfo/posix/America/Antigua
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Antigua and b/msys2/usr/share/zoneinfo/posix/America/Antigua differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Araguaina b/msys2/usr/share/zoneinfo/posix/America/Araguaina
index 49381b410..f66c9f79d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Araguaina and b/msys2/usr/share/zoneinfo/posix/America/Araguaina differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Buenos_Aires b/msys2/usr/share/zoneinfo/posix/America/Argentina/Buenos_Aires
index 260f86a91..d6f999b86 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Buenos_Aires and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Catamarca b/msys2/usr/share/zoneinfo/posix/America/Argentina/Catamarca
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Catamarca and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/ComodRivadavia b/msys2/usr/share/zoneinfo/posix/America/Argentina/ComodRivadavia
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/ComodRivadavia and b/msys2/usr/share/zoneinfo/posix/America/Argentina/ComodRivadavia differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Cordoba b/msys2/usr/share/zoneinfo/posix/America/Argentina/Cordoba
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Cordoba and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Jujuy b/msys2/usr/share/zoneinfo/posix/America/Argentina/Jujuy
index 604b85663..b275f27c0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Jujuy and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/La_Rioja b/msys2/usr/share/zoneinfo/posix/America/Argentina/La_Rioja
index 2218e36bf..23fca1220 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/La_Rioja and b/msys2/usr/share/zoneinfo/posix/America/Argentina/La_Rioja differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Mendoza b/msys2/usr/share/zoneinfo/posix/America/Argentina/Mendoza
index f9e677f17..691c56978 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Mendoza and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Rio_Gallegos b/msys2/usr/share/zoneinfo/posix/America/Argentina/Rio_Gallegos
index c36587e1c..991d1fae6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Rio_Gallegos and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Rio_Gallegos differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Salta b/msys2/usr/share/zoneinfo/posix/America/Argentina/Salta
index 0e797f221..58863e043 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Salta and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Salta differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Juan b/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Juan
index 2698495bb..7eba33c1c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Juan and b/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Juan differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Luis b/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Luis
index fe50f6211..0a81cbddf 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Luis and b/msys2/usr/share/zoneinfo/posix/America/Argentina/San_Luis differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Tucuman b/msys2/usr/share/zoneinfo/posix/America/Argentina/Tucuman
index c954000ba..10556d5d8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Tucuman and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Tucuman differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Argentina/Ushuaia b/msys2/usr/share/zoneinfo/posix/America/Argentina/Ushuaia
index 3643628a2..e03175027 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Argentina/Ushuaia and b/msys2/usr/share/zoneinfo/posix/America/Argentina/Ushuaia differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Aruba b/msys2/usr/share/zoneinfo/posix/America/Aruba
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Aruba and b/msys2/usr/share/zoneinfo/posix/America/Aruba differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Asuncion b/msys2/usr/share/zoneinfo/posix/America/Asuncion
index 2f3bbda6d..622503674 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Asuncion and b/msys2/usr/share/zoneinfo/posix/America/Asuncion differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Atikokan b/msys2/usr/share/zoneinfo/posix/America/Atikokan
index 629ed4231..c82871528 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Atikokan and b/msys2/usr/share/zoneinfo/posix/America/Atikokan differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Atka b/msys2/usr/share/zoneinfo/posix/America/Atka
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Atka and b/msys2/usr/share/zoneinfo/posix/America/Atka differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Bahia b/msys2/usr/share/zoneinfo/posix/America/Bahia
index 15808d30f..7969e3076 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Bahia and b/msys2/usr/share/zoneinfo/posix/America/Bahia differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Bahia_Banderas b/msys2/usr/share/zoneinfo/posix/America/Bahia_Banderas
index 896af3f56..cbe22a762 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Bahia_Banderas and b/msys2/usr/share/zoneinfo/posix/America/Bahia_Banderas differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Barbados b/msys2/usr/share/zoneinfo/posix/America/Barbados
index 9b90e306a..9d3afa6a5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Barbados and b/msys2/usr/share/zoneinfo/posix/America/Barbados differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Belem b/msys2/usr/share/zoneinfo/posix/America/Belem
index 60b5924dc..e0d7653c6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Belem and b/msys2/usr/share/zoneinfo/posix/America/Belem differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Belize b/msys2/usr/share/zoneinfo/posix/America/Belize
index 851051ae9..bfc19f4e5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Belize and b/msys2/usr/share/zoneinfo/posix/America/Belize differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Blanc-Sablon b/msys2/usr/share/zoneinfo/posix/America/Blanc-Sablon
index f9f13a167..7096b69a5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Blanc-Sablon and b/msys2/usr/share/zoneinfo/posix/America/Blanc-Sablon differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Boa_Vista b/msys2/usr/share/zoneinfo/posix/America/Boa_Vista
index 978c33100..fca97207b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Boa_Vista and b/msys2/usr/share/zoneinfo/posix/America/Boa_Vista differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Bogota b/msys2/usr/share/zoneinfo/posix/America/Bogota
index b2647d7a8..6cb53d4e6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Bogota and b/msys2/usr/share/zoneinfo/posix/America/Bogota differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Boise b/msys2/usr/share/zoneinfo/posix/America/Boise
index f8d54e274..72fec9e8c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Boise and b/msys2/usr/share/zoneinfo/posix/America/Boise differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Buenos_Aires b/msys2/usr/share/zoneinfo/posix/America/Buenos_Aires
index 260f86a91..d6f999b86 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Buenos_Aires and b/msys2/usr/share/zoneinfo/posix/America/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cambridge_Bay b/msys2/usr/share/zoneinfo/posix/America/Cambridge_Bay
index f8db4b6eb..0a2225244 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cambridge_Bay and b/msys2/usr/share/zoneinfo/posix/America/Cambridge_Bay differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Campo_Grande b/msys2/usr/share/zoneinfo/posix/America/Campo_Grande
index 81206247d..6855e4e9f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Campo_Grande and b/msys2/usr/share/zoneinfo/posix/America/Campo_Grande differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cancun b/msys2/usr/share/zoneinfo/posix/America/Cancun
index f907f0a5b..640b259fd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cancun and b/msys2/usr/share/zoneinfo/posix/America/Cancun differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Caracas b/msys2/usr/share/zoneinfo/posix/America/Caracas
index eedf725e8..8dbe6ff74 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Caracas and b/msys2/usr/share/zoneinfo/posix/America/Caracas differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Catamarca b/msys2/usr/share/zoneinfo/posix/America/Catamarca
index 0ae222a2f..1dcc8d854 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Catamarca and b/msys2/usr/share/zoneinfo/posix/America/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cayenne b/msys2/usr/share/zoneinfo/posix/America/Cayenne
index e5bc06fdb..cd49f0534 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cayenne and b/msys2/usr/share/zoneinfo/posix/America/Cayenne differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cayman b/msys2/usr/share/zoneinfo/posix/America/Cayman
index 9964b9a33..9154643f4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cayman and b/msys2/usr/share/zoneinfo/posix/America/Cayman differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Chicago b/msys2/usr/share/zoneinfo/posix/America/Chicago
index a5b1617c7..b01688065 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Chicago and b/msys2/usr/share/zoneinfo/posix/America/Chicago differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Chihuahua b/msys2/usr/share/zoneinfo/posix/America/Chihuahua
index 8ed5f93b0..e1780a575 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Chihuahua and b/msys2/usr/share/zoneinfo/posix/America/Chihuahua differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Coral_Harbour b/msys2/usr/share/zoneinfo/posix/America/Coral_Harbour
index 629ed4231..c82871528 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Coral_Harbour and b/msys2/usr/share/zoneinfo/posix/America/Coral_Harbour differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cordoba b/msys2/usr/share/zoneinfo/posix/America/Cordoba
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cordoba and b/msys2/usr/share/zoneinfo/posix/America/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Costa_Rica b/msys2/usr/share/zoneinfo/posix/America/Costa_Rica
index 37cb85e4d..08f0128ee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Costa_Rica and b/msys2/usr/share/zoneinfo/posix/America/Costa_Rica differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Creston b/msys2/usr/share/zoneinfo/posix/America/Creston
index ca648573e..9d69a0ab8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Creston and b/msys2/usr/share/zoneinfo/posix/America/Creston differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Cuiaba b/msys2/usr/share/zoneinfo/posix/America/Cuiaba
index 9bea3d407..c09a87558 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Cuiaba and b/msys2/usr/share/zoneinfo/posix/America/Cuiaba differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Curacao b/msys2/usr/share/zoneinfo/posix/America/Curacao
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Curacao and b/msys2/usr/share/zoneinfo/posix/America/Curacao differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Danmarkshavn b/msys2/usr/share/zoneinfo/posix/America/Danmarkshavn
index 9549adcb6..8718efcce 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Danmarkshavn and b/msys2/usr/share/zoneinfo/posix/America/Danmarkshavn differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Dawson b/msys2/usr/share/zoneinfo/posix/America/Dawson
index 2b6c3eeab..07e4c5f4a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Dawson and b/msys2/usr/share/zoneinfo/posix/America/Dawson differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Dawson_Creek b/msys2/usr/share/zoneinfo/posix/America/Dawson_Creek
index db9e33965..761d1d9af 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Dawson_Creek and b/msys2/usr/share/zoneinfo/posix/America/Dawson_Creek differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Denver b/msys2/usr/share/zoneinfo/posix/America/Denver
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Denver and b/msys2/usr/share/zoneinfo/posix/America/Denver differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Detroit b/msys2/usr/share/zoneinfo/posix/America/Detroit
index e104faa46..6eb3ac46e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Detroit and b/msys2/usr/share/zoneinfo/posix/America/Detroit differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Dominica b/msys2/usr/share/zoneinfo/posix/America/Dominica
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Dominica and b/msys2/usr/share/zoneinfo/posix/America/Dominica differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Edmonton b/msys2/usr/share/zoneinfo/posix/America/Edmonton
index cd78a6f8b..645ee9453 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Edmonton and b/msys2/usr/share/zoneinfo/posix/America/Edmonton differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Eirunepe b/msys2/usr/share/zoneinfo/posix/America/Eirunepe
index 39d6daeb9..7da4b98fe 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Eirunepe and b/msys2/usr/share/zoneinfo/posix/America/Eirunepe differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/El_Salvador b/msys2/usr/share/zoneinfo/posix/America/El_Salvador
index e2f22304a..43484117e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/El_Salvador and b/msys2/usr/share/zoneinfo/posix/America/El_Salvador differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Ensenada b/msys2/usr/share/zoneinfo/posix/America/Ensenada
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Ensenada and b/msys2/usr/share/zoneinfo/posix/America/Ensenada differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Fort_Nelson b/msys2/usr/share/zoneinfo/posix/America/Fort_Nelson
index 5a0b7f1ca..2a49c6c50 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Fort_Nelson and b/msys2/usr/share/zoneinfo/posix/America/Fort_Nelson differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Fort_Wayne b/msys2/usr/share/zoneinfo/posix/America/Fort_Wayne
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Fort_Wayne and b/msys2/usr/share/zoneinfo/posix/America/Fort_Wayne differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Fortaleza b/msys2/usr/share/zoneinfo/posix/America/Fortaleza
index be57dc20b..092e40d70 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Fortaleza and b/msys2/usr/share/zoneinfo/posix/America/Fortaleza differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Glace_Bay b/msys2/usr/share/zoneinfo/posix/America/Glace_Bay
index 48412a4cb..f85eb3415 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Glace_Bay and b/msys2/usr/share/zoneinfo/posix/America/Glace_Bay differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Godthab b/msys2/usr/share/zoneinfo/posix/America/Godthab
index 0160308bf..4ddc99d8b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Godthab and b/msys2/usr/share/zoneinfo/posix/America/Godthab differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Goose_Bay b/msys2/usr/share/zoneinfo/posix/America/Goose_Bay
index a3f299079..820e0dd2c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Goose_Bay and b/msys2/usr/share/zoneinfo/posix/America/Goose_Bay differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Grand_Turk b/msys2/usr/share/zoneinfo/posix/America/Grand_Turk
index b9bb063b6..9d90e745b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Grand_Turk and b/msys2/usr/share/zoneinfo/posix/America/Grand_Turk differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Grenada b/msys2/usr/share/zoneinfo/posix/America/Grenada
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Grenada and b/msys2/usr/share/zoneinfo/posix/America/Grenada differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Guadeloupe b/msys2/usr/share/zoneinfo/posix/America/Guadeloupe
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Guadeloupe and b/msys2/usr/share/zoneinfo/posix/America/Guadeloupe differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Guatemala b/msys2/usr/share/zoneinfo/posix/America/Guatemala
index 407138caf..8aa8e588e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Guatemala and b/msys2/usr/share/zoneinfo/posix/America/Guatemala differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Guayaquil b/msys2/usr/share/zoneinfo/posix/America/Guayaquil
index 0559a7a4a..381ae6c46 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Guayaquil and b/msys2/usr/share/zoneinfo/posix/America/Guayaquil differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Guyana b/msys2/usr/share/zoneinfo/posix/America/Guyana
index d5dab1496..ebd85d0f3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Guyana and b/msys2/usr/share/zoneinfo/posix/America/Guyana differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Halifax b/msys2/usr/share/zoneinfo/posix/America/Halifax
index 756099abe..9fa850a7d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Halifax and b/msys2/usr/share/zoneinfo/posix/America/Halifax differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Havana b/msys2/usr/share/zoneinfo/posix/America/Havana
index b69ac4510..e06629d36 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Havana and b/msys2/usr/share/zoneinfo/posix/America/Havana differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Hermosillo b/msys2/usr/share/zoneinfo/posix/America/Hermosillo
index 791a9fa2b..8283239ec 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Hermosillo and b/msys2/usr/share/zoneinfo/posix/America/Hermosillo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Indianapolis b/msys2/usr/share/zoneinfo/posix/America/Indiana/Indianapolis
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Indianapolis and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Knox b/msys2/usr/share/zoneinfo/posix/America/Indiana/Knox
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Knox and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Knox differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Marengo b/msys2/usr/share/zoneinfo/posix/America/Indiana/Marengo
index 1abf75e7e..a730fe666 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Marengo and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Marengo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Petersburg b/msys2/usr/share/zoneinfo/posix/America/Indiana/Petersburg
index 0133548ec..341a0235e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Petersburg and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Petersburg differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Tell_City b/msys2/usr/share/zoneinfo/posix/America/Indiana/Tell_City
index 7bbb653cd..76e1f6285 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Tell_City and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Tell_City differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Vevay b/msys2/usr/share/zoneinfo/posix/America/Indiana/Vevay
index d236b7c07..f2acf6cbb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Vevay and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Vevay differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Vincennes b/msys2/usr/share/zoneinfo/posix/America/Indiana/Vincennes
index c818929d1..c255f89b6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Vincennes and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Vincennes differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indiana/Winamac b/msys2/usr/share/zoneinfo/posix/America/Indiana/Winamac
index 630935c1e..8700ed9f0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indiana/Winamac and b/msys2/usr/share/zoneinfo/posix/America/Indiana/Winamac differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Indianapolis b/msys2/usr/share/zoneinfo/posix/America/Indianapolis
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Indianapolis and b/msys2/usr/share/zoneinfo/posix/America/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Inuvik b/msys2/usr/share/zoneinfo/posix/America/Inuvik
index 87bb35529..af3107db5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Inuvik and b/msys2/usr/share/zoneinfo/posix/America/Inuvik differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Iqaluit b/msys2/usr/share/zoneinfo/posix/America/Iqaluit
index c8138bdbb..eb2c99cca 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Iqaluit and b/msys2/usr/share/zoneinfo/posix/America/Iqaluit differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Jamaica b/msys2/usr/share/zoneinfo/posix/America/Jamaica
index 2a9b7fd52..be6b1b6f1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Jamaica and b/msys2/usr/share/zoneinfo/posix/America/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Jujuy b/msys2/usr/share/zoneinfo/posix/America/Jujuy
index 604b85663..b275f27c0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Jujuy and b/msys2/usr/share/zoneinfo/posix/America/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Juneau b/msys2/usr/share/zoneinfo/posix/America/Juneau
index 451f34900..e347b369f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Juneau and b/msys2/usr/share/zoneinfo/posix/America/Juneau differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Kentucky/Louisville b/msys2/usr/share/zoneinfo/posix/America/Kentucky/Louisville
index 177836e4f..f2136d6ed 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Kentucky/Louisville and b/msys2/usr/share/zoneinfo/posix/America/Kentucky/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Kentucky/Monticello b/msys2/usr/share/zoneinfo/posix/America/Kentucky/Monticello
index 438e3eab4..d9f54a18b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Kentucky/Monticello and b/msys2/usr/share/zoneinfo/posix/America/Kentucky/Monticello differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Knox_IN b/msys2/usr/share/zoneinfo/posix/America/Knox_IN
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Knox_IN and b/msys2/usr/share/zoneinfo/posix/America/Knox_IN differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Kralendijk b/msys2/usr/share/zoneinfo/posix/America/Kralendijk
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Kralendijk and b/msys2/usr/share/zoneinfo/posix/America/Kralendijk differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/La_Paz b/msys2/usr/share/zoneinfo/posix/America/La_Paz
index a10137243..68ddaae76 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/La_Paz and b/msys2/usr/share/zoneinfo/posix/America/La_Paz differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Lima b/msys2/usr/share/zoneinfo/posix/America/Lima
index 3c6529b75..b643c5517 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Lima and b/msys2/usr/share/zoneinfo/posix/America/Lima differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Los_Angeles b/msys2/usr/share/zoneinfo/posix/America/Los_Angeles
index 9dad4f4c7..aaf07787a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Los_Angeles and b/msys2/usr/share/zoneinfo/posix/America/Los_Angeles differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Louisville b/msys2/usr/share/zoneinfo/posix/America/Louisville
index 177836e4f..f2136d6ed 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Louisville and b/msys2/usr/share/zoneinfo/posix/America/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Lower_Princes b/msys2/usr/share/zoneinfo/posix/America/Lower_Princes
index f7ab6efcc..d6ddf7d8f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Lower_Princes and b/msys2/usr/share/zoneinfo/posix/America/Lower_Princes differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Maceio b/msys2/usr/share/zoneinfo/posix/America/Maceio
index bc8b951d2..dbb8d57d9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Maceio and b/msys2/usr/share/zoneinfo/posix/America/Maceio differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Managua b/msys2/usr/share/zoneinfo/posix/America/Managua
index e0242bff6..86ef76bf2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Managua and b/msys2/usr/share/zoneinfo/posix/America/Managua differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Manaus b/msys2/usr/share/zoneinfo/posix/America/Manaus
index 63d58f80f..59c952ebc 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Manaus and b/msys2/usr/share/zoneinfo/posix/America/Manaus differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Marigot b/msys2/usr/share/zoneinfo/posix/America/Marigot
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Marigot and b/msys2/usr/share/zoneinfo/posix/America/Marigot differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Martinique b/msys2/usr/share/zoneinfo/posix/America/Martinique
index 8df43dcf1..25c0232d9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Martinique and b/msys2/usr/share/zoneinfo/posix/America/Martinique differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Matamoros b/msys2/usr/share/zoneinfo/posix/America/Matamoros
index 047968dff..722751b20 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Matamoros and b/msys2/usr/share/zoneinfo/posix/America/Matamoros differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Mazatlan b/msys2/usr/share/zoneinfo/posix/America/Mazatlan
index e4a785743..4c819fab0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Mazatlan and b/msys2/usr/share/zoneinfo/posix/America/Mazatlan differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Mendoza b/msys2/usr/share/zoneinfo/posix/America/Mendoza
index f9e677f17..691c56978 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Mendoza and b/msys2/usr/share/zoneinfo/posix/America/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Menominee b/msys2/usr/share/zoneinfo/posix/America/Menominee
index 314613866..28d2c56e1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Menominee and b/msys2/usr/share/zoneinfo/posix/America/Menominee differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Merida b/msys2/usr/share/zoneinfo/posix/America/Merida
index ea852da33..d3b0ca12c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Merida and b/msys2/usr/share/zoneinfo/posix/America/Merida differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Metlakatla b/msys2/usr/share/zoneinfo/posix/America/Metlakatla
index 1e94be3d5..9fefee388 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Metlakatla and b/msys2/usr/share/zoneinfo/posix/America/Metlakatla differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Mexico_City b/msys2/usr/share/zoneinfo/posix/America/Mexico_City
index e7fb6f295..ffcf8bee1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Mexico_City and b/msys2/usr/share/zoneinfo/posix/America/Mexico_City differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Miquelon b/msys2/usr/share/zoneinfo/posix/America/Miquelon
index b924b7100..3b62585d0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Miquelon and b/msys2/usr/share/zoneinfo/posix/America/Miquelon differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Moncton b/msys2/usr/share/zoneinfo/posix/America/Moncton
index 9df8d0f2e..ecb69ef2c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Moncton and b/msys2/usr/share/zoneinfo/posix/America/Moncton differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Monterrey b/msys2/usr/share/zoneinfo/posix/America/Monterrey
index a8928c8dc..dea9e3f58 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Monterrey and b/msys2/usr/share/zoneinfo/posix/America/Monterrey differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Montevideo b/msys2/usr/share/zoneinfo/posix/America/Montevideo
index 2f357bcf5..4b2fb3e56 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Montevideo and b/msys2/usr/share/zoneinfo/posix/America/Montevideo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Montreal b/msys2/usr/share/zoneinfo/posix/America/Montreal
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Montreal and b/msys2/usr/share/zoneinfo/posix/America/Montreal differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Montserrat b/msys2/usr/share/zoneinfo/posix/America/Montserrat
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Montserrat and b/msys2/usr/share/zoneinfo/posix/America/Montserrat differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Nassau b/msys2/usr/share/zoneinfo/posix/America/Nassau
index 33cc6c626..2ef2aa897 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Nassau and b/msys2/usr/share/zoneinfo/posix/America/Nassau differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/New_York b/msys2/usr/share/zoneinfo/posix/America/New_York
index 2f75480e0..2b6c2eea1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/New_York and b/msys2/usr/share/zoneinfo/posix/America/New_York differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Nipigon b/msys2/usr/share/zoneinfo/posix/America/Nipigon
index f6a856e69..b9f67a9f9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Nipigon and b/msys2/usr/share/zoneinfo/posix/America/Nipigon differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Nome b/msys2/usr/share/zoneinfo/posix/America/Nome
index 10998df3b..23ead1c00 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Nome and b/msys2/usr/share/zoneinfo/posix/America/Nome differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Noronha b/msys2/usr/share/zoneinfo/posix/America/Noronha
index f140726f2..9e74745ca 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Noronha and b/msys2/usr/share/zoneinfo/posix/America/Noronha differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Beulah b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Beulah
index 246345dde..becf43833 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Beulah and b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Beulah differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Center b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Center
index 1fa070377..d03bda045 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Center and b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/Center differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/New_Salem b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/New_Salem
index 123f2aeec..ecefc15d8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/North_Dakota/New_Salem and b/msys2/usr/share/zoneinfo/posix/America/North_Dakota/New_Salem differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Nuuk b/msys2/usr/share/zoneinfo/posix/America/Nuuk
index 0160308bf..4ddc99d8b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Nuuk and b/msys2/usr/share/zoneinfo/posix/America/Nuuk differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Ojinaga b/msys2/usr/share/zoneinfo/posix/America/Ojinaga
index fc4a03e36..da0909cb2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Ojinaga and b/msys2/usr/share/zoneinfo/posix/America/Ojinaga differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Panama b/msys2/usr/share/zoneinfo/posix/America/Panama
index 9964b9a33..9154643f4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Panama and b/msys2/usr/share/zoneinfo/posix/America/Panama differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Pangnirtung b/msys2/usr/share/zoneinfo/posix/America/Pangnirtung
index 3e4e0db6a..5be6f9b01 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Pangnirtung and b/msys2/usr/share/zoneinfo/posix/America/Pangnirtung differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Paramaribo b/msys2/usr/share/zoneinfo/posix/America/Paramaribo
index bc8a6edf1..24f925a2d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Paramaribo and b/msys2/usr/share/zoneinfo/posix/America/Paramaribo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Phoenix b/msys2/usr/share/zoneinfo/posix/America/Phoenix
index ac6bb0c78..c2bd2f949 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Phoenix and b/msys2/usr/share/zoneinfo/posix/America/Phoenix differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Port-au-Prince b/msys2/usr/share/zoneinfo/posix/America/Port-au-Prince
index 287f14392..3e75731ba 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Port-au-Prince and b/msys2/usr/share/zoneinfo/posix/America/Port-au-Prince differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Port_of_Spain b/msys2/usr/share/zoneinfo/posix/America/Port_of_Spain
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Port_of_Spain and b/msys2/usr/share/zoneinfo/posix/America/Port_of_Spain differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Porto_Acre b/msys2/usr/share/zoneinfo/posix/America/Porto_Acre
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Porto_Acre and b/msys2/usr/share/zoneinfo/posix/America/Porto_Acre differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Porto_Velho b/msys2/usr/share/zoneinfo/posix/America/Porto_Velho
index 2e873a5aa..7f8047d93 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Porto_Velho and b/msys2/usr/share/zoneinfo/posix/America/Porto_Velho differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Puerto_Rico b/msys2/usr/share/zoneinfo/posix/America/Puerto_Rico
index a662a5713..47b4dc341 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Puerto_Rico and b/msys2/usr/share/zoneinfo/posix/America/Puerto_Rico differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Punta_Arenas b/msys2/usr/share/zoneinfo/posix/America/Punta_Arenas
index a5a8af52c..5c9a20b94 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Punta_Arenas and b/msys2/usr/share/zoneinfo/posix/America/Punta_Arenas differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Rainy_River b/msys2/usr/share/zoneinfo/posix/America/Rainy_River
index ea6609915..d6ddda482 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Rainy_River and b/msys2/usr/share/zoneinfo/posix/America/Rainy_River differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Rankin_Inlet b/msys2/usr/share/zoneinfo/posix/America/Rankin_Inlet
index 3a7058747..92e2ed2db 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Rankin_Inlet and b/msys2/usr/share/zoneinfo/posix/America/Rankin_Inlet differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Recife b/msys2/usr/share/zoneinfo/posix/America/Recife
index d7abb168a..305abcb8a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Recife and b/msys2/usr/share/zoneinfo/posix/America/Recife differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Regina b/msys2/usr/share/zoneinfo/posix/America/Regina
index 20c9c84df..a3f8217a5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Regina and b/msys2/usr/share/zoneinfo/posix/America/Regina differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Resolute b/msys2/usr/share/zoneinfo/posix/America/Resolute
index 0a73b753b..a84d1dfdb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Resolute and b/msys2/usr/share/zoneinfo/posix/America/Resolute differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Rio_Branco b/msys2/usr/share/zoneinfo/posix/America/Rio_Branco
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Rio_Branco and b/msys2/usr/share/zoneinfo/posix/America/Rio_Branco differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Rosario b/msys2/usr/share/zoneinfo/posix/America/Rosario
index da4c23a54..35a52e53d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Rosario and b/msys2/usr/share/zoneinfo/posix/America/Rosario differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Santa_Isabel b/msys2/usr/share/zoneinfo/posix/America/Santa_Isabel
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Santa_Isabel and b/msys2/usr/share/zoneinfo/posix/America/Santa_Isabel differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Santarem b/msys2/usr/share/zoneinfo/posix/America/Santarem
index c28f36063..f81d14420 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Santarem and b/msys2/usr/share/zoneinfo/posix/America/Santarem differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Santiago b/msys2/usr/share/zoneinfo/posix/America/Santiago
index 816a04281..8d6032264 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Santiago and b/msys2/usr/share/zoneinfo/posix/America/Santiago differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Santo_Domingo b/msys2/usr/share/zoneinfo/posix/America/Santo_Domingo
index 4fe36fd4c..3e0785086 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Santo_Domingo and b/msys2/usr/share/zoneinfo/posix/America/Santo_Domingo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Sao_Paulo b/msys2/usr/share/zoneinfo/posix/America/Sao_Paulo
index 13ff08386..a16da2c4d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Sao_Paulo and b/msys2/usr/share/zoneinfo/posix/America/Sao_Paulo differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Scoresbysund b/msys2/usr/share/zoneinfo/posix/America/Scoresbysund
index e20e9e1c4..6db49124e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Scoresbysund and b/msys2/usr/share/zoneinfo/posix/America/Scoresbysund differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Shiprock b/msys2/usr/share/zoneinfo/posix/America/Shiprock
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Shiprock and b/msys2/usr/share/zoneinfo/posix/America/Shiprock differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Sitka b/msys2/usr/share/zoneinfo/posix/America/Sitka
index 31f706137..36681ed78 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Sitka and b/msys2/usr/share/zoneinfo/posix/America/Sitka differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Barthelemy b/msys2/usr/share/zoneinfo/posix/America/St_Barthelemy
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Barthelemy and b/msys2/usr/share/zoneinfo/posix/America/St_Barthelemy differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Johns b/msys2/usr/share/zoneinfo/posix/America/St_Johns
index 65a5b0c72..e5f2aec2b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Johns and b/msys2/usr/share/zoneinfo/posix/America/St_Johns differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Kitts b/msys2/usr/share/zoneinfo/posix/America/St_Kitts
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Kitts and b/msys2/usr/share/zoneinfo/posix/America/St_Kitts differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Lucia b/msys2/usr/share/zoneinfo/posix/America/St_Lucia
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Lucia and b/msys2/usr/share/zoneinfo/posix/America/St_Lucia differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Thomas b/msys2/usr/share/zoneinfo/posix/America/St_Thomas
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Thomas and b/msys2/usr/share/zoneinfo/posix/America/St_Thomas differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/St_Vincent b/msys2/usr/share/zoneinfo/posix/America/St_Vincent
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/St_Vincent and b/msys2/usr/share/zoneinfo/posix/America/St_Vincent differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Swift_Current b/msys2/usr/share/zoneinfo/posix/America/Swift_Current
index 8e9ef255e..bdbb49448 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Swift_Current and b/msys2/usr/share/zoneinfo/posix/America/Swift_Current differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Tegucigalpa b/msys2/usr/share/zoneinfo/posix/America/Tegucigalpa
index 2adacb2e5..38036a328 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Tegucigalpa and b/msys2/usr/share/zoneinfo/posix/America/Tegucigalpa differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Thule b/msys2/usr/share/zoneinfo/posix/America/Thule
index 6f802f1c2..f38dc56bf 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Thule and b/msys2/usr/share/zoneinfo/posix/America/Thule differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Thunder_Bay b/msys2/usr/share/zoneinfo/posix/America/Thunder_Bay
index e504c9acf..fcb032804 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Thunder_Bay and b/msys2/usr/share/zoneinfo/posix/America/Thunder_Bay differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Tijuana b/msys2/usr/share/zoneinfo/posix/America/Tijuana
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Tijuana and b/msys2/usr/share/zoneinfo/posix/America/Tijuana differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Toronto b/msys2/usr/share/zoneinfo/posix/America/Toronto
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Toronto and b/msys2/usr/share/zoneinfo/posix/America/Toronto differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Tortola b/msys2/usr/share/zoneinfo/posix/America/Tortola
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Tortola and b/msys2/usr/share/zoneinfo/posix/America/Tortola differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Vancouver b/msys2/usr/share/zoneinfo/posix/America/Vancouver
index bb60cbced..c99849111 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Vancouver and b/msys2/usr/share/zoneinfo/posix/America/Vancouver differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Virgin b/msys2/usr/share/zoneinfo/posix/America/Virgin
index 697cf5bcf..f4fe59034 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Virgin and b/msys2/usr/share/zoneinfo/posix/America/Virgin differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Whitehorse b/msys2/usr/share/zoneinfo/posix/America/Whitehorse
index 062b58ced..878b6a92f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Whitehorse and b/msys2/usr/share/zoneinfo/posix/America/Whitehorse differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Winnipeg b/msys2/usr/share/zoneinfo/posix/America/Winnipeg
index ac40299f6..7e646d18e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Winnipeg and b/msys2/usr/share/zoneinfo/posix/America/Winnipeg differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Yakutat b/msys2/usr/share/zoneinfo/posix/America/Yakutat
index da209f9f0..773feba89 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Yakutat and b/msys2/usr/share/zoneinfo/posix/America/Yakutat differ
diff --git a/msys2/usr/share/zoneinfo/posix/America/Yellowknife b/msys2/usr/share/zoneinfo/posix/America/Yellowknife
index e6afa390e..c779cef92 100644
Binary files a/msys2/usr/share/zoneinfo/posix/America/Yellowknife and b/msys2/usr/share/zoneinfo/posix/America/Yellowknife differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Casey b/msys2/usr/share/zoneinfo/posix/Antarctica/Casey
index f100f4746..30315cc07 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Casey and b/msys2/usr/share/zoneinfo/posix/Antarctica/Casey differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Davis b/msys2/usr/share/zoneinfo/posix/Antarctica/Davis
index 916f2c259..3ec32224f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Davis and b/msys2/usr/share/zoneinfo/posix/Antarctica/Davis differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/DumontDUrville b/msys2/usr/share/zoneinfo/posix/Antarctica/DumontDUrville
index a71b39c00..c0cfc85a2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/DumontDUrville and b/msys2/usr/share/zoneinfo/posix/Antarctica/DumontDUrville differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Macquarie b/msys2/usr/share/zoneinfo/posix/Antarctica/Macquarie
index 616afd9c8..3fc1f231c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Macquarie and b/msys2/usr/share/zoneinfo/posix/Antarctica/Macquarie differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Mawson b/msys2/usr/share/zoneinfo/posix/Antarctica/Mawson
index b32e7fd6c..05e4c6c58 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Mawson and b/msys2/usr/share/zoneinfo/posix/Antarctica/Mawson differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/McMurdo b/msys2/usr/share/zoneinfo/posix/Antarctica/McMurdo
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/McMurdo and b/msys2/usr/share/zoneinfo/posix/Antarctica/McMurdo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Palmer b/msys2/usr/share/zoneinfo/posix/Antarctica/Palmer
index 3dd85f84f..32c194163 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Palmer and b/msys2/usr/share/zoneinfo/posix/Antarctica/Palmer differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Rothera b/msys2/usr/share/zoneinfo/posix/Antarctica/Rothera
index 8b2430a20..ea49c00b2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Rothera and b/msys2/usr/share/zoneinfo/posix/Antarctica/Rothera differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/South_Pole b/msys2/usr/share/zoneinfo/posix/Antarctica/South_Pole
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/South_Pole and b/msys2/usr/share/zoneinfo/posix/Antarctica/South_Pole differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Syowa b/msys2/usr/share/zoneinfo/posix/Antarctica/Syowa
index 254af7d12..97d80d752 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Syowa and b/msys2/usr/share/zoneinfo/posix/Antarctica/Syowa differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Troll b/msys2/usr/share/zoneinfo/posix/Antarctica/Troll
index 5e565da2f..4e31affb5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Troll and b/msys2/usr/share/zoneinfo/posix/Antarctica/Troll differ
diff --git a/msys2/usr/share/zoneinfo/posix/Antarctica/Vostok b/msys2/usr/share/zoneinfo/posix/Antarctica/Vostok
index 728305305..6e3290717 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Antarctica/Vostok and b/msys2/usr/share/zoneinfo/posix/Antarctica/Vostok differ
diff --git a/msys2/usr/share/zoneinfo/posix/Arctic/Longyearbyen b/msys2/usr/share/zoneinfo/posix/Arctic/Longyearbyen
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Arctic/Longyearbyen and b/msys2/usr/share/zoneinfo/posix/Arctic/Longyearbyen differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Aden b/msys2/usr/share/zoneinfo/posix/Asia/Aden
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Aden and b/msys2/usr/share/zoneinfo/posix/Asia/Aden differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Almaty b/msys2/usr/share/zoneinfo/posix/Asia/Almaty
index a4b007790..3ec4fc89f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Almaty and b/msys2/usr/share/zoneinfo/posix/Asia/Almaty differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Amman b/msys2/usr/share/zoneinfo/posix/Asia/Amman
index c9e870791..1bd09fef2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Amman and b/msys2/usr/share/zoneinfo/posix/Asia/Amman differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Anadyr b/msys2/usr/share/zoneinfo/posix/Asia/Anadyr
index 6ed8b7cb0..551884d32 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Anadyr and b/msys2/usr/share/zoneinfo/posix/Asia/Anadyr differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Aqtau b/msys2/usr/share/zoneinfo/posix/Asia/Aqtau
index e2d0f9195..3a40d1175 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Aqtau and b/msys2/usr/share/zoneinfo/posix/Asia/Aqtau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Aqtobe b/msys2/usr/share/zoneinfo/posix/Asia/Aqtobe
index 06f0a13a6..62c5840a8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Aqtobe and b/msys2/usr/share/zoneinfo/posix/Asia/Aqtobe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ashgabat b/msys2/usr/share/zoneinfo/posix/Asia/Ashgabat
index 73891af1e..848216726 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ashgabat and b/msys2/usr/share/zoneinfo/posix/Asia/Ashgabat differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ashkhabad b/msys2/usr/share/zoneinfo/posix/Asia/Ashkhabad
index 73891af1e..848216726 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ashkhabad and b/msys2/usr/share/zoneinfo/posix/Asia/Ashkhabad differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Atyrau b/msys2/usr/share/zoneinfo/posix/Asia/Atyrau
index 8b5153e05..cb2c82f65 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Atyrau and b/msys2/usr/share/zoneinfo/posix/Asia/Atyrau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Baghdad b/msys2/usr/share/zoneinfo/posix/Asia/Baghdad
index f7162edf9..a3ce97599 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Baghdad and b/msys2/usr/share/zoneinfo/posix/Asia/Baghdad differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Bahrain b/msys2/usr/share/zoneinfo/posix/Asia/Bahrain
index 63188b269..7409d7498 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Bahrain and b/msys2/usr/share/zoneinfo/posix/Asia/Bahrain differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Baku b/msys2/usr/share/zoneinfo/posix/Asia/Baku
index a0de74b95..96203d7a4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Baku and b/msys2/usr/share/zoneinfo/posix/Asia/Baku differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Bangkok b/msys2/usr/share/zoneinfo/posix/Asia/Bangkok
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Bangkok and b/msys2/usr/share/zoneinfo/posix/Asia/Bangkok differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Barnaul b/msys2/usr/share/zoneinfo/posix/Asia/Barnaul
index 759592a25..ff976dd3b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Barnaul and b/msys2/usr/share/zoneinfo/posix/Asia/Barnaul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Beirut b/msys2/usr/share/zoneinfo/posix/Asia/Beirut
index fb266ede2..55dce5722 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Beirut and b/msys2/usr/share/zoneinfo/posix/Asia/Beirut differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Bishkek b/msys2/usr/share/zoneinfo/posix/Asia/Bishkek
index f6e20dd3a..fe7832cdf 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Bishkek and b/msys2/usr/share/zoneinfo/posix/Asia/Bishkek differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Brunei b/msys2/usr/share/zoneinfo/posix/Asia/Brunei
index 3dab0abf4..e67b411b9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Brunei and b/msys2/usr/share/zoneinfo/posix/Asia/Brunei differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Calcutta b/msys2/usr/share/zoneinfo/posix/Asia/Calcutta
index 0014046d2..00bc80a65 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Calcutta and b/msys2/usr/share/zoneinfo/posix/Asia/Calcutta differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Chita b/msys2/usr/share/zoneinfo/posix/Asia/Chita
index c4149c05c..9d49cd35c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Chita and b/msys2/usr/share/zoneinfo/posix/Asia/Chita differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Choibalsan b/msys2/usr/share/zoneinfo/posix/Asia/Choibalsan
index e48daa824..0a948c2ea 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Choibalsan and b/msys2/usr/share/zoneinfo/posix/Asia/Choibalsan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Chongqing b/msys2/usr/share/zoneinfo/posix/Asia/Chongqing
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Chongqing and b/msys2/usr/share/zoneinfo/posix/Asia/Chongqing differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Chungking b/msys2/usr/share/zoneinfo/posix/Asia/Chungking
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Chungking and b/msys2/usr/share/zoneinfo/posix/Asia/Chungking differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Colombo b/msys2/usr/share/zoneinfo/posix/Asia/Colombo
index 62c64d85d..3eeb1b72b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Colombo and b/msys2/usr/share/zoneinfo/posix/Asia/Colombo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Dacca b/msys2/usr/share/zoneinfo/posix/Asia/Dacca
index b11c92841..28136808b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Dacca and b/msys2/usr/share/zoneinfo/posix/Asia/Dacca differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Damascus b/msys2/usr/share/zoneinfo/posix/Asia/Damascus
index d9104a7ab..168ef9baa 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Damascus and b/msys2/usr/share/zoneinfo/posix/Asia/Damascus differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Dhaka b/msys2/usr/share/zoneinfo/posix/Asia/Dhaka
index b11c92841..28136808b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Dhaka and b/msys2/usr/share/zoneinfo/posix/Asia/Dhaka differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Dili b/msys2/usr/share/zoneinfo/posix/Asia/Dili
index 30943bbd0..bb7be9f3a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Dili and b/msys2/usr/share/zoneinfo/posix/Asia/Dili differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Dubai b/msys2/usr/share/zoneinfo/posix/Asia/Dubai
index fc0a589e2..58d75bc26 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Dubai and b/msys2/usr/share/zoneinfo/posix/Asia/Dubai differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Dushanbe b/msys2/usr/share/zoneinfo/posix/Asia/Dushanbe
index 82d85b8c1..d83fb076a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Dushanbe and b/msys2/usr/share/zoneinfo/posix/Asia/Dushanbe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Famagusta b/msys2/usr/share/zoneinfo/posix/Asia/Famagusta
index 653b146a6..cc4417956 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Famagusta and b/msys2/usr/share/zoneinfo/posix/Asia/Famagusta differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Gaza b/msys2/usr/share/zoneinfo/posix/Asia/Gaza
index 592b63260..58e9fdf42 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Gaza and b/msys2/usr/share/zoneinfo/posix/Asia/Gaza differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Harbin b/msys2/usr/share/zoneinfo/posix/Asia/Harbin
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Harbin and b/msys2/usr/share/zoneinfo/posix/Asia/Harbin differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Hebron b/msys2/usr/share/zoneinfo/posix/Asia/Hebron
index ae82f9b54..aeda06b52 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Hebron and b/msys2/usr/share/zoneinfo/posix/Asia/Hebron differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ho_Chi_Minh b/msys2/usr/share/zoneinfo/posix/Asia/Ho_Chi_Minh
index e2934e371..7ca997250 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ho_Chi_Minh and b/msys2/usr/share/zoneinfo/posix/Asia/Ho_Chi_Minh differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Hong_Kong b/msys2/usr/share/zoneinfo/posix/Asia/Hong_Kong
index 23d0375fb..c80e36480 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Hong_Kong and b/msys2/usr/share/zoneinfo/posix/Asia/Hong_Kong differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Hovd b/msys2/usr/share/zoneinfo/posix/Asia/Hovd
index 4cb800a91..6e08a2612 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Hovd and b/msys2/usr/share/zoneinfo/posix/Asia/Hovd differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Irkutsk b/msys2/usr/share/zoneinfo/posix/Asia/Irkutsk
index 4dcbbb7ea..550e2a087 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Irkutsk and b/msys2/usr/share/zoneinfo/posix/Asia/Irkutsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Istanbul b/msys2/usr/share/zoneinfo/posix/Asia/Istanbul
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Istanbul and b/msys2/usr/share/zoneinfo/posix/Asia/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Jakarta b/msys2/usr/share/zoneinfo/posix/Asia/Jakarta
index 5baa3a8f2..c9752d2f2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Jakarta and b/msys2/usr/share/zoneinfo/posix/Asia/Jakarta differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Jayapura b/msys2/usr/share/zoneinfo/posix/Asia/Jayapura
index 3002c8202..7c22f539d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Jayapura and b/msys2/usr/share/zoneinfo/posix/Asia/Jayapura differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Jerusalem b/msys2/usr/share/zoneinfo/posix/Asia/Jerusalem
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Jerusalem and b/msys2/usr/share/zoneinfo/posix/Asia/Jerusalem differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kabul b/msys2/usr/share/zoneinfo/posix/Asia/Kabul
index d19b9bd51..660ce4cf6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kabul and b/msys2/usr/share/zoneinfo/posix/Asia/Kabul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kamchatka b/msys2/usr/share/zoneinfo/posix/Asia/Kamchatka
index 3e80b4e09..c65155402 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kamchatka and b/msys2/usr/share/zoneinfo/posix/Asia/Kamchatka differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Karachi b/msys2/usr/share/zoneinfo/posix/Asia/Karachi
index ba65c0e8d..e56d5afda 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Karachi and b/msys2/usr/share/zoneinfo/posix/Asia/Karachi differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kashgar b/msys2/usr/share/zoneinfo/posix/Asia/Kashgar
index faa14d92d..69ff7f6fb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kashgar and b/msys2/usr/share/zoneinfo/posix/Asia/Kashgar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kathmandu b/msys2/usr/share/zoneinfo/posix/Asia/Kathmandu
index a5d510753..3a0d330ff 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kathmandu and b/msys2/usr/share/zoneinfo/posix/Asia/Kathmandu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Katmandu b/msys2/usr/share/zoneinfo/posix/Asia/Katmandu
index a5d510753..3a0d330ff 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Katmandu and b/msys2/usr/share/zoneinfo/posix/Asia/Katmandu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Khandyga b/msys2/usr/share/zoneinfo/posix/Asia/Khandyga
index 72bea64ba..aeb733202 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Khandyga and b/msys2/usr/share/zoneinfo/posix/Asia/Khandyga differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kolkata b/msys2/usr/share/zoneinfo/posix/Asia/Kolkata
index 0014046d2..00bc80a65 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kolkata and b/msys2/usr/share/zoneinfo/posix/Asia/Kolkata differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Krasnoyarsk b/msys2/usr/share/zoneinfo/posix/Asia/Krasnoyarsk
index 30c6f1650..e0d4fcb5c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Krasnoyarsk and b/msys2/usr/share/zoneinfo/posix/Asia/Krasnoyarsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kuala_Lumpur b/msys2/usr/share/zoneinfo/posix/Asia/Kuala_Lumpur
index 612b01e71..e93dd5141 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kuala_Lumpur and b/msys2/usr/share/zoneinfo/posix/Asia/Kuala_Lumpur differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kuching b/msys2/usr/share/zoneinfo/posix/Asia/Kuching
index c86750cb7..59bc6e40b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kuching and b/msys2/usr/share/zoneinfo/posix/Asia/Kuching differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Kuwait b/msys2/usr/share/zoneinfo/posix/Asia/Kuwait
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Kuwait and b/msys2/usr/share/zoneinfo/posix/Asia/Kuwait differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Macao b/msys2/usr/share/zoneinfo/posix/Asia/Macao
index cac65063d..c22f75e42 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Macao and b/msys2/usr/share/zoneinfo/posix/Asia/Macao differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Macau b/msys2/usr/share/zoneinfo/posix/Asia/Macau
index cac65063d..c22f75e42 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Macau and b/msys2/usr/share/zoneinfo/posix/Asia/Macau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Magadan b/msys2/usr/share/zoneinfo/posix/Asia/Magadan
index b4fcac18e..16bac8444 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Magadan and b/msys2/usr/share/zoneinfo/posix/Asia/Magadan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Makassar b/msys2/usr/share/zoneinfo/posix/Asia/Makassar
index 556ba8669..5990010b6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Makassar and b/msys2/usr/share/zoneinfo/posix/Asia/Makassar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Manila b/msys2/usr/share/zoneinfo/posix/Asia/Manila
index f4f4b04ef..3c3584e09 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Manila and b/msys2/usr/share/zoneinfo/posix/Asia/Manila differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Muscat b/msys2/usr/share/zoneinfo/posix/Asia/Muscat
index fc0a589e2..58d75bc26 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Muscat and b/msys2/usr/share/zoneinfo/posix/Asia/Muscat differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Nicosia b/msys2/usr/share/zoneinfo/posix/Asia/Nicosia
index f7f10ab76..c210d0a59 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Nicosia and b/msys2/usr/share/zoneinfo/posix/Asia/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Novokuznetsk b/msys2/usr/share/zoneinfo/posix/Asia/Novokuznetsk
index d98327611..9378d5053 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Novokuznetsk and b/msys2/usr/share/zoneinfo/posix/Asia/Novokuznetsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Novosibirsk b/msys2/usr/share/zoneinfo/posix/Asia/Novosibirsk
index e0ee5fcea..65a9fa2cd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Novosibirsk and b/msys2/usr/share/zoneinfo/posix/Asia/Novosibirsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Omsk b/msys2/usr/share/zoneinfo/posix/Asia/Omsk
index b29b76931..dc0ed422f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Omsk and b/msys2/usr/share/zoneinfo/posix/Asia/Omsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Oral b/msys2/usr/share/zoneinfo/posix/Asia/Oral
index ad1f9ca1c..25a63ec8b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Oral and b/msys2/usr/share/zoneinfo/posix/Asia/Oral differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Phnom_Penh b/msys2/usr/share/zoneinfo/posix/Asia/Phnom_Penh
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Phnom_Penh and b/msys2/usr/share/zoneinfo/posix/Asia/Phnom_Penh differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Pontianak b/msys2/usr/share/zoneinfo/posix/Asia/Pontianak
index 12ce24cbe..285bed2c6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Pontianak and b/msys2/usr/share/zoneinfo/posix/Asia/Pontianak differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Pyongyang b/msys2/usr/share/zoneinfo/posix/Asia/Pyongyang
index 7ad7e0b2c..57240cf89 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Pyongyang and b/msys2/usr/share/zoneinfo/posix/Asia/Pyongyang differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Qatar b/msys2/usr/share/zoneinfo/posix/Asia/Qatar
index 63188b269..7409d7498 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Qatar and b/msys2/usr/share/zoneinfo/posix/Asia/Qatar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Qostanay b/msys2/usr/share/zoneinfo/posix/Asia/Qostanay
index 73b9d963e..ff6fe61d5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Qostanay and b/msys2/usr/share/zoneinfo/posix/Asia/Qostanay differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Qyzylorda b/msys2/usr/share/zoneinfo/posix/Asia/Qyzylorda
index c2fe4c144..fe4d6c6d6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Qyzylorda and b/msys2/usr/share/zoneinfo/posix/Asia/Qyzylorda differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Rangoon b/msys2/usr/share/zoneinfo/posix/Asia/Rangoon
index dd77395b0..14b2ad09e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Rangoon and b/msys2/usr/share/zoneinfo/posix/Asia/Rangoon differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Riyadh b/msys2/usr/share/zoneinfo/posix/Asia/Riyadh
index 2aea25f8c..01c47ccb8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Riyadh and b/msys2/usr/share/zoneinfo/posix/Asia/Riyadh differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Saigon b/msys2/usr/share/zoneinfo/posix/Asia/Saigon
index e2934e371..7ca997250 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Saigon and b/msys2/usr/share/zoneinfo/posix/Asia/Saigon differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Sakhalin b/msys2/usr/share/zoneinfo/posix/Asia/Sakhalin
index 485459ce0..69f0faad1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Sakhalin and b/msys2/usr/share/zoneinfo/posix/Asia/Sakhalin differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Samarkand b/msys2/usr/share/zoneinfo/posix/Asia/Samarkand
index 030d47ce0..c43e27c5d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Samarkand and b/msys2/usr/share/zoneinfo/posix/Asia/Samarkand differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Seoul b/msys2/usr/share/zoneinfo/posix/Asia/Seoul
index 96199e73e..1755147fa 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Seoul and b/msys2/usr/share/zoneinfo/posix/Asia/Seoul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Shanghai b/msys2/usr/share/zoneinfo/posix/Asia/Shanghai
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Shanghai and b/msys2/usr/share/zoneinfo/posix/Asia/Shanghai differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Singapore b/msys2/usr/share/zoneinfo/posix/Asia/Singapore
index 2364b2178..350d77e28 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Singapore and b/msys2/usr/share/zoneinfo/posix/Asia/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Srednekolymsk b/msys2/usr/share/zoneinfo/posix/Asia/Srednekolymsk
index 261a9832b..7fdee5cbe 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Srednekolymsk and b/msys2/usr/share/zoneinfo/posix/Asia/Srednekolymsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Taipei b/msys2/usr/share/zoneinfo/posix/Asia/Taipei
index 24c43444b..35d89d036 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Taipei and b/msys2/usr/share/zoneinfo/posix/Asia/Taipei differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tashkent b/msys2/usr/share/zoneinfo/posix/Asia/Tashkent
index 32a9d7d0c..65ee428ce 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tashkent and b/msys2/usr/share/zoneinfo/posix/Asia/Tashkent differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tbilisi b/msys2/usr/share/zoneinfo/posix/Asia/Tbilisi
index b608d7974..166e4341d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tbilisi and b/msys2/usr/share/zoneinfo/posix/Asia/Tbilisi differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tehran b/msys2/usr/share/zoneinfo/posix/Asia/Tehran
index 8cec5ad7d..f1555f003 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tehran and b/msys2/usr/share/zoneinfo/posix/Asia/Tehran differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tel_Aviv b/msys2/usr/share/zoneinfo/posix/Asia/Tel_Aviv
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tel_Aviv and b/msys2/usr/share/zoneinfo/posix/Asia/Tel_Aviv differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Thimbu b/msys2/usr/share/zoneinfo/posix/Asia/Thimbu
index fe409c7a2..0edc72cfe 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Thimbu and b/msys2/usr/share/zoneinfo/posix/Asia/Thimbu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Thimphu b/msys2/usr/share/zoneinfo/posix/Asia/Thimphu
index fe409c7a2..0edc72cfe 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Thimphu and b/msys2/usr/share/zoneinfo/posix/Asia/Thimphu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tokyo b/msys2/usr/share/zoneinfo/posix/Asia/Tokyo
index 26f4d34d6..1aa066ce3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tokyo and b/msys2/usr/share/zoneinfo/posix/Asia/Tokyo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Tomsk b/msys2/usr/share/zoneinfo/posix/Asia/Tomsk
index 670e2ad2c..c3c307d7b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Tomsk and b/msys2/usr/share/zoneinfo/posix/Asia/Tomsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ujung_Pandang b/msys2/usr/share/zoneinfo/posix/Asia/Ujung_Pandang
index 556ba8669..5990010b6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ujung_Pandang and b/msys2/usr/share/zoneinfo/posix/Asia/Ujung_Pandang differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ulaanbaatar b/msys2/usr/share/zoneinfo/posix/Asia/Ulaanbaatar
index 2e20cc3a4..6f5d3a15a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ulaanbaatar and b/msys2/usr/share/zoneinfo/posix/Asia/Ulaanbaatar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ulan_Bator b/msys2/usr/share/zoneinfo/posix/Asia/Ulan_Bator
index 2e20cc3a4..6f5d3a15a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ulan_Bator and b/msys2/usr/share/zoneinfo/posix/Asia/Ulan_Bator differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Urumqi b/msys2/usr/share/zoneinfo/posix/Asia/Urumqi
index faa14d92d..69ff7f6fb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Urumqi and b/msys2/usr/share/zoneinfo/posix/Asia/Urumqi differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Ust-Nera b/msys2/usr/share/zoneinfo/posix/Asia/Ust-Nera
index 9e4a78f6a..c39331e3a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Ust-Nera and b/msys2/usr/share/zoneinfo/posix/Asia/Ust-Nera differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Vientiane b/msys2/usr/share/zoneinfo/posix/Asia/Vientiane
index c292ac5b5..ed687d298 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Vientiane and b/msys2/usr/share/zoneinfo/posix/Asia/Vientiane differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Vladivostok b/msys2/usr/share/zoneinfo/posix/Asia/Vladivostok
index 8ab253ce7..72a3d4e87 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Vladivostok and b/msys2/usr/share/zoneinfo/posix/Asia/Vladivostok differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Yakutsk b/msys2/usr/share/zoneinfo/posix/Asia/Yakutsk
index c815e99b1..336f932e8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Yakutsk and b/msys2/usr/share/zoneinfo/posix/Asia/Yakutsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Yangon b/msys2/usr/share/zoneinfo/posix/Asia/Yangon
index dd77395b0..14b2ad09e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Yangon and b/msys2/usr/share/zoneinfo/posix/Asia/Yangon differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Yekaterinburg b/msys2/usr/share/zoneinfo/posix/Asia/Yekaterinburg
index 6958d7edd..a3bf7f29b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Yekaterinburg and b/msys2/usr/share/zoneinfo/posix/Asia/Yekaterinburg differ
diff --git a/msys2/usr/share/zoneinfo/posix/Asia/Yerevan b/msys2/usr/share/zoneinfo/posix/Asia/Yerevan
index 250bfe020..6dd927cb9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Asia/Yerevan and b/msys2/usr/share/zoneinfo/posix/Asia/Yerevan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Azores b/msys2/usr/share/zoneinfo/posix/Atlantic/Azores
index 56593dbff..b7f75a9cf 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Azores and b/msys2/usr/share/zoneinfo/posix/Atlantic/Azores differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Bermuda b/msys2/usr/share/zoneinfo/posix/Atlantic/Bermuda
index 419c660ba..abc75ea7e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Bermuda and b/msys2/usr/share/zoneinfo/posix/Atlantic/Bermuda differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Canary b/msys2/usr/share/zoneinfo/posix/Atlantic/Canary
index f3192156f..5ab3243a5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Canary and b/msys2/usr/share/zoneinfo/posix/Atlantic/Canary differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Cape_Verde b/msys2/usr/share/zoneinfo/posix/Atlantic/Cape_Verde
index e2a49d248..8f7de1c0a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Cape_Verde and b/msys2/usr/share/zoneinfo/posix/Atlantic/Cape_Verde differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Faeroe b/msys2/usr/share/zoneinfo/posix/Atlantic/Faeroe
index 4dab7ef08..9558bf718 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Faeroe and b/msys2/usr/share/zoneinfo/posix/Atlantic/Faeroe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Faroe b/msys2/usr/share/zoneinfo/posix/Atlantic/Faroe
index 4dab7ef08..9558bf718 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Faroe and b/msys2/usr/share/zoneinfo/posix/Atlantic/Faroe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Jan_Mayen b/msys2/usr/share/zoneinfo/posix/Atlantic/Jan_Mayen
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Jan_Mayen and b/msys2/usr/share/zoneinfo/posix/Atlantic/Jan_Mayen differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Madeira b/msys2/usr/share/zoneinfo/posix/Atlantic/Madeira
index 5213761f8..7c3a49c0e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Madeira and b/msys2/usr/share/zoneinfo/posix/Atlantic/Madeira differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Reykjavik b/msys2/usr/share/zoneinfo/posix/Atlantic/Reykjavik
index 10e0fc819..2451aca76 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Reykjavik and b/msys2/usr/share/zoneinfo/posix/Atlantic/Reykjavik differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/South_Georgia b/msys2/usr/share/zoneinfo/posix/Atlantic/South_Georgia
index 446660861..7fa5f4683 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/South_Georgia and b/msys2/usr/share/zoneinfo/posix/Atlantic/South_Georgia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/St_Helena b/msys2/usr/share/zoneinfo/posix/Atlantic/St_Helena
index 28b32ab2e..8906e88c8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/St_Helena and b/msys2/usr/share/zoneinfo/posix/Atlantic/St_Helena differ
diff --git a/msys2/usr/share/zoneinfo/posix/Atlantic/Stanley b/msys2/usr/share/zoneinfo/posix/Atlantic/Stanley
index 88077f110..1a4c8ea86 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Atlantic/Stanley and b/msys2/usr/share/zoneinfo/posix/Atlantic/Stanley differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/ACT b/msys2/usr/share/zoneinfo/posix/Australia/ACT
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/ACT and b/msys2/usr/share/zoneinfo/posix/Australia/ACT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Adelaide b/msys2/usr/share/zoneinfo/posix/Australia/Adelaide
index 0b1252abb..3bfbbc563 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Adelaide and b/msys2/usr/share/zoneinfo/posix/Australia/Adelaide differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Brisbane b/msys2/usr/share/zoneinfo/posix/Australia/Brisbane
index 3021bdb61..dc9a980a6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Brisbane and b/msys2/usr/share/zoneinfo/posix/Australia/Brisbane differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Broken_Hill b/msys2/usr/share/zoneinfo/posix/Australia/Broken_Hill
index 1ac3fc8f5..947b50995 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Broken_Hill and b/msys2/usr/share/zoneinfo/posix/Australia/Broken_Hill differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Canberra b/msys2/usr/share/zoneinfo/posix/Australia/Canberra
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Canberra and b/msys2/usr/share/zoneinfo/posix/Australia/Canberra differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Currie b/msys2/usr/share/zoneinfo/posix/Australia/Currie
index f65a990ef..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Currie and b/msys2/usr/share/zoneinfo/posix/Australia/Currie differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Darwin b/msys2/usr/share/zoneinfo/posix/Australia/Darwin
index 1cf502984..a6a67300d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Darwin and b/msys2/usr/share/zoneinfo/posix/Australia/Darwin differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Eucla b/msys2/usr/share/zoneinfo/posix/Australia/Eucla
index 98ae55706..9080f5cdb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Eucla and b/msys2/usr/share/zoneinfo/posix/Australia/Eucla differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Hobart b/msys2/usr/share/zoneinfo/posix/Australia/Hobart
index 02b07ca23..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Hobart and b/msys2/usr/share/zoneinfo/posix/Australia/Hobart differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/LHI b/msys2/usr/share/zoneinfo/posix/Australia/LHI
index 9e04a80ec..4d4ec8cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/LHI and b/msys2/usr/share/zoneinfo/posix/Australia/LHI differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Lindeman b/msys2/usr/share/zoneinfo/posix/Australia/Lindeman
index eab0fb998..131d77b54 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Lindeman and b/msys2/usr/share/zoneinfo/posix/Australia/Lindeman differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Lord_Howe b/msys2/usr/share/zoneinfo/posix/Australia/Lord_Howe
index 9e04a80ec..4d4ec8cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Lord_Howe and b/msys2/usr/share/zoneinfo/posix/Australia/Lord_Howe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Melbourne b/msys2/usr/share/zoneinfo/posix/Australia/Melbourne
index ba457338b..d3f195ac2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Melbourne and b/msys2/usr/share/zoneinfo/posix/Australia/Melbourne differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/NSW b/msys2/usr/share/zoneinfo/posix/Australia/NSW
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/NSW and b/msys2/usr/share/zoneinfo/posix/Australia/NSW differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/North b/msys2/usr/share/zoneinfo/posix/Australia/North
index 1cf502984..a6a67300d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/North and b/msys2/usr/share/zoneinfo/posix/Australia/North differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Perth b/msys2/usr/share/zoneinfo/posix/Australia/Perth
index a876b9e78..4f771828c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Perth and b/msys2/usr/share/zoneinfo/posix/Australia/Perth differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Queensland b/msys2/usr/share/zoneinfo/posix/Australia/Queensland
index 3021bdb61..dc9a980a6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Queensland and b/msys2/usr/share/zoneinfo/posix/Australia/Queensland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/South b/msys2/usr/share/zoneinfo/posix/Australia/South
index 0b1252abb..3bfbbc563 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/South and b/msys2/usr/share/zoneinfo/posix/Australia/South differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Sydney b/msys2/usr/share/zoneinfo/posix/Australia/Sydney
index 7636592aa..1975a3a4b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Sydney and b/msys2/usr/share/zoneinfo/posix/Australia/Sydney differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Tasmania b/msys2/usr/share/zoneinfo/posix/Australia/Tasmania
index 02b07ca23..dc2ef554d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Tasmania and b/msys2/usr/share/zoneinfo/posix/Australia/Tasmania differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Victoria b/msys2/usr/share/zoneinfo/posix/Australia/Victoria
index ba457338b..d3f195ac2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Victoria and b/msys2/usr/share/zoneinfo/posix/Australia/Victoria differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/West b/msys2/usr/share/zoneinfo/posix/Australia/West
index a876b9e78..4f771828c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/West and b/msys2/usr/share/zoneinfo/posix/Australia/West differ
diff --git a/msys2/usr/share/zoneinfo/posix/Australia/Yancowinna b/msys2/usr/share/zoneinfo/posix/Australia/Yancowinna
index 1ac3fc8f5..947b50995 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Australia/Yancowinna and b/msys2/usr/share/zoneinfo/posix/Australia/Yancowinna differ
diff --git a/msys2/usr/share/zoneinfo/posix/Brazil/Acre b/msys2/usr/share/zoneinfo/posix/Brazil/Acre
index a374cb43d..fb5185ca6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Brazil/Acre and b/msys2/usr/share/zoneinfo/posix/Brazil/Acre differ
diff --git a/msys2/usr/share/zoneinfo/posix/Brazil/DeNoronha b/msys2/usr/share/zoneinfo/posix/Brazil/DeNoronha
index f140726f2..9e74745ca 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Brazil/DeNoronha and b/msys2/usr/share/zoneinfo/posix/Brazil/DeNoronha differ
diff --git a/msys2/usr/share/zoneinfo/posix/Brazil/East b/msys2/usr/share/zoneinfo/posix/Brazil/East
index 13ff08386..a16da2c4d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Brazil/East and b/msys2/usr/share/zoneinfo/posix/Brazil/East differ
diff --git a/msys2/usr/share/zoneinfo/posix/Brazil/West b/msys2/usr/share/zoneinfo/posix/Brazil/West
index 63d58f80f..59c952ebc 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Brazil/West and b/msys2/usr/share/zoneinfo/posix/Brazil/West differ
diff --git a/msys2/usr/share/zoneinfo/posix/CET b/msys2/usr/share/zoneinfo/posix/CET
index 122e93421..546748d6e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/CET and b/msys2/usr/share/zoneinfo/posix/CET differ
diff --git a/msys2/usr/share/zoneinfo/posix/CST6CDT b/msys2/usr/share/zoneinfo/posix/CST6CDT
index ca67929fb..d93155805 100644
Binary files a/msys2/usr/share/zoneinfo/posix/CST6CDT and b/msys2/usr/share/zoneinfo/posix/CST6CDT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Atlantic b/msys2/usr/share/zoneinfo/posix/Canada/Atlantic
index 756099abe..9fa850a7d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Atlantic and b/msys2/usr/share/zoneinfo/posix/Canada/Atlantic differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Central b/msys2/usr/share/zoneinfo/posix/Canada/Central
index ac40299f6..7e646d18e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Central and b/msys2/usr/share/zoneinfo/posix/Canada/Central differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Eastern b/msys2/usr/share/zoneinfo/posix/Canada/Eastern
index 6752c5b05..fe6be8ea8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Eastern and b/msys2/usr/share/zoneinfo/posix/Canada/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Mountain b/msys2/usr/share/zoneinfo/posix/Canada/Mountain
index cd78a6f8b..645ee9453 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Mountain and b/msys2/usr/share/zoneinfo/posix/Canada/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Newfoundland b/msys2/usr/share/zoneinfo/posix/Canada/Newfoundland
index 65a5b0c72..e5f2aec2b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Newfoundland and b/msys2/usr/share/zoneinfo/posix/Canada/Newfoundland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Pacific b/msys2/usr/share/zoneinfo/posix/Canada/Pacific
index bb60cbced..c99849111 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Pacific and b/msys2/usr/share/zoneinfo/posix/Canada/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Saskatchewan b/msys2/usr/share/zoneinfo/posix/Canada/Saskatchewan
index 20c9c84df..a3f8217a5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Saskatchewan and b/msys2/usr/share/zoneinfo/posix/Canada/Saskatchewan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Canada/Yukon b/msys2/usr/share/zoneinfo/posix/Canada/Yukon
index 062b58ced..878b6a92f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Canada/Yukon and b/msys2/usr/share/zoneinfo/posix/Canada/Yukon differ
diff --git a/msys2/usr/share/zoneinfo/posix/Chile/Continental b/msys2/usr/share/zoneinfo/posix/Chile/Continental
index 816a04281..8d6032264 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Chile/Continental and b/msys2/usr/share/zoneinfo/posix/Chile/Continental differ
diff --git a/msys2/usr/share/zoneinfo/posix/Chile/EasterIsland b/msys2/usr/share/zoneinfo/posix/Chile/EasterIsland
index cae374409..d29bcd68b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Chile/EasterIsland and b/msys2/usr/share/zoneinfo/posix/Chile/EasterIsland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Cuba b/msys2/usr/share/zoneinfo/posix/Cuba
index b69ac4510..e06629d36 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Cuba and b/msys2/usr/share/zoneinfo/posix/Cuba differ
diff --git a/msys2/usr/share/zoneinfo/posix/EET b/msys2/usr/share/zoneinfo/posix/EET
index cbdb71ddd..378919ea1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/EET and b/msys2/usr/share/zoneinfo/posix/EET differ
diff --git a/msys2/usr/share/zoneinfo/posix/EST b/msys2/usr/share/zoneinfo/posix/EST
index 21ebc00b3..3ae969114 100644
Binary files a/msys2/usr/share/zoneinfo/posix/EST and b/msys2/usr/share/zoneinfo/posix/EST differ
diff --git a/msys2/usr/share/zoneinfo/posix/EST5EDT b/msys2/usr/share/zoneinfo/posix/EST5EDT
index 9bce5007d..50c95e0cb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/EST5EDT and b/msys2/usr/share/zoneinfo/posix/EST5EDT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Egypt b/msys2/usr/share/zoneinfo/posix/Egypt
index d3f819623..ea38c9700 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Egypt and b/msys2/usr/share/zoneinfo/posix/Egypt differ
diff --git a/msys2/usr/share/zoneinfo/posix/Eire b/msys2/usr/share/zoneinfo/posix/Eire
index 1d994902d..4a45ea8f7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Eire and b/msys2/usr/share/zoneinfo/posix/Eire differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT b/msys2/usr/share/zoneinfo/posix/Etc/GMT
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT and b/msys2/usr/share/zoneinfo/posix/Etc/GMT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+0 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+0 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+1 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+1
index 4dab6f900..98d5dcf91 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+1 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+1 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+10 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+10
index c749290af..ecb287e66 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+10 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+10 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+11 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+11
index d96998230..e94141297 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+11 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+11 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+12 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+12
index cdeec9097..9c95bd073 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+12 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+12 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+2 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+2
index fbd2a941f..6d5ce3db7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+2 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+2 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+3 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+3
index ee246ef56..5ef7be71f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+3 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+3 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+4 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+4
index 5a25ff2a6..75f16216f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+4 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+4 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+5 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+5
index c0b745f1c..589990ae8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+5 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+5 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+6 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+6
index 06e777d57..fcb60ca24 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+6 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+6 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+7 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+7
index 4e0b53a08..c0427a40e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+7 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+7 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+8 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+8
index 714b0c562..9bdc2283c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+8 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+8 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT+9 b/msys2/usr/share/zoneinfo/posix/Etc/GMT+9
index 78b9daa37..ca7a81f65 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT+9 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT+9 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-0 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-0 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-1 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-1
index a838bebf5..cb45601c9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-1 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-1 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-10 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-10
index 68ff77db0..11d988e10 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-10 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-10 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-11 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-11
index 66af5a42b..f4c5d5cc2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-11 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-11 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-12 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-12
index 17ba50577..cd397b02c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-12 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-12 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-13 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-13
index 5f3706ce6..8fad7c6b0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-13 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-13 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-14 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-14
index 7e9f9c465..a595e60ee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-14 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-14 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-2 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-2
index fcef6d9ac..97b44a9ba 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-2 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-2 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-3 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-3
index 27973bc85..4eb17ff00 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-3 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-3 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-4 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-4
index 1efd84126..13aef80cb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-4 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-4 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-5 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-5
index 1f761844f..83a281695 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-5 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-5 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-6 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-6
index 952681ed4..79a983e54 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-6 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-6 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-7 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-7
index cefc9126c..e136690e1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-7 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-7 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-8 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-8
index afb093da0..bc70fe416 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-8 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-8 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT-9 b/msys2/usr/share/zoneinfo/posix/Etc/GMT-9
index 9265fb7c2..d18cedd52 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT-9 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT-9 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/GMT0 b/msys2/usr/share/zoneinfo/posix/Etc/GMT0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/GMT0 and b/msys2/usr/share/zoneinfo/posix/Etc/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/Greenwich b/msys2/usr/share/zoneinfo/posix/Etc/Greenwich
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/Greenwich and b/msys2/usr/share/zoneinfo/posix/Etc/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/UCT b/msys2/usr/share/zoneinfo/posix/Etc/UCT
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/UCT and b/msys2/usr/share/zoneinfo/posix/Etc/UCT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/UTC b/msys2/usr/share/zoneinfo/posix/Etc/UTC
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/UTC and b/msys2/usr/share/zoneinfo/posix/Etc/UTC differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/Universal b/msys2/usr/share/zoneinfo/posix/Etc/Universal
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/Universal and b/msys2/usr/share/zoneinfo/posix/Etc/Universal differ
diff --git a/msys2/usr/share/zoneinfo/posix/Etc/Zulu b/msys2/usr/share/zoneinfo/posix/Etc/Zulu
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Etc/Zulu and b/msys2/usr/share/zoneinfo/posix/Etc/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Amsterdam b/msys2/usr/share/zoneinfo/posix/Europe/Amsterdam
index c3ff07b43..4a6fa1d49 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Amsterdam and b/msys2/usr/share/zoneinfo/posix/Europe/Amsterdam differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Andorra b/msys2/usr/share/zoneinfo/posix/Europe/Andorra
index 596255039..38685d421 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Andorra and b/msys2/usr/share/zoneinfo/posix/Europe/Andorra differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Astrakhan b/msys2/usr/share/zoneinfo/posix/Europe/Astrakhan
index 73a4d013f..aff8d82d2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Astrakhan and b/msys2/usr/share/zoneinfo/posix/Europe/Astrakhan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Athens b/msys2/usr/share/zoneinfo/posix/Europe/Athens
index 9f3a0678d..231bf9c3b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Athens and b/msys2/usr/share/zoneinfo/posix/Europe/Athens differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Belfast b/msys2/usr/share/zoneinfo/posix/Europe/Belfast
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Belfast and b/msys2/usr/share/zoneinfo/posix/Europe/Belfast differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Belgrade b/msys2/usr/share/zoneinfo/posix/Europe/Belgrade
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Belgrade and b/msys2/usr/share/zoneinfo/posix/Europe/Belgrade differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Berlin b/msys2/usr/share/zoneinfo/posix/Europe/Berlin
index 7f6d958f8..465546bd3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Berlin and b/msys2/usr/share/zoneinfo/posix/Europe/Berlin differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Bratislava b/msys2/usr/share/zoneinfo/posix/Europe/Bratislava
index ce8f433ec..fb7c145ac 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Bratislava and b/msys2/usr/share/zoneinfo/posix/Europe/Bratislava differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Brussels b/msys2/usr/share/zoneinfo/posix/Europe/Brussels
index 40d7124e5..31973271d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Brussels and b/msys2/usr/share/zoneinfo/posix/Europe/Brussels differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Bucharest b/msys2/usr/share/zoneinfo/posix/Europe/Bucharest
index 4303b903e..efa689ba9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Bucharest and b/msys2/usr/share/zoneinfo/posix/Europe/Bucharest differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Budapest b/msys2/usr/share/zoneinfo/posix/Europe/Budapest
index 6b94a4f31..940be4670 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Budapest and b/msys2/usr/share/zoneinfo/posix/Europe/Budapest differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Busingen b/msys2/usr/share/zoneinfo/posix/Europe/Busingen
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Busingen and b/msys2/usr/share/zoneinfo/posix/Europe/Busingen differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Chisinau b/msys2/usr/share/zoneinfo/posix/Europe/Chisinau
index 5ee23fe0e..6970b14c5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Chisinau and b/msys2/usr/share/zoneinfo/posix/Europe/Chisinau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Copenhagen b/msys2/usr/share/zoneinfo/posix/Europe/Copenhagen
index 776be6e4a..45984a759 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Copenhagen and b/msys2/usr/share/zoneinfo/posix/Europe/Copenhagen differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Dublin b/msys2/usr/share/zoneinfo/posix/Europe/Dublin
index 1d994902d..4a45ea8f7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Dublin and b/msys2/usr/share/zoneinfo/posix/Europe/Dublin differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Gibraltar b/msys2/usr/share/zoneinfo/posix/Europe/Gibraltar
index 117aadb83..017bb2e34 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Gibraltar and b/msys2/usr/share/zoneinfo/posix/Europe/Gibraltar differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Guernsey b/msys2/usr/share/zoneinfo/posix/Europe/Guernsey
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Guernsey and b/msys2/usr/share/zoneinfo/posix/Europe/Guernsey differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Helsinki b/msys2/usr/share/zoneinfo/posix/Europe/Helsinki
index b4f8f9cbb..ff5e56530 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Helsinki and b/msys2/usr/share/zoneinfo/posix/Europe/Helsinki differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Isle_of_Man b/msys2/usr/share/zoneinfo/posix/Europe/Isle_of_Man
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Isle_of_Man and b/msys2/usr/share/zoneinfo/posix/Europe/Isle_of_Man differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Istanbul b/msys2/usr/share/zoneinfo/posix/Europe/Istanbul
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Istanbul and b/msys2/usr/share/zoneinfo/posix/Europe/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Jersey b/msys2/usr/share/zoneinfo/posix/Europe/Jersey
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Jersey and b/msys2/usr/share/zoneinfo/posix/Europe/Jersey differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Kaliningrad b/msys2/usr/share/zoneinfo/posix/Europe/Kaliningrad
index cc99beabe..0ec475647 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Kaliningrad and b/msys2/usr/share/zoneinfo/posix/Europe/Kaliningrad differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Kiev b/msys2/usr/share/zoneinfo/posix/Europe/Kiev
index 9337c9ea2..8f83cefbc 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Kiev and b/msys2/usr/share/zoneinfo/posix/Europe/Kiev differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Kirov b/msys2/usr/share/zoneinfo/posix/Europe/Kirov
index a3b5320a0..d1c93c540 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Kirov and b/msys2/usr/share/zoneinfo/posix/Europe/Kirov differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Lisbon b/msys2/usr/share/zoneinfo/posix/Europe/Lisbon
index 355817b52..64841661a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Lisbon and b/msys2/usr/share/zoneinfo/posix/Europe/Lisbon differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Ljubljana b/msys2/usr/share/zoneinfo/posix/Europe/Ljubljana
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Ljubljana and b/msys2/usr/share/zoneinfo/posix/Europe/Ljubljana differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/London b/msys2/usr/share/zoneinfo/posix/Europe/London
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/London and b/msys2/usr/share/zoneinfo/posix/Europe/London differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Luxembourg b/msys2/usr/share/zoneinfo/posix/Europe/Luxembourg
index c4ca733f5..682bcbf61 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Luxembourg and b/msys2/usr/share/zoneinfo/posix/Europe/Luxembourg differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Madrid b/msys2/usr/share/zoneinfo/posix/Europe/Madrid
index 16f6420ab..60bdf4d07 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Madrid and b/msys2/usr/share/zoneinfo/posix/Europe/Madrid differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Malta b/msys2/usr/share/zoneinfo/posix/Europe/Malta
index bf2452da4..27539c224 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Malta and b/msys2/usr/share/zoneinfo/posix/Europe/Malta differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Mariehamn b/msys2/usr/share/zoneinfo/posix/Europe/Mariehamn
index b4f8f9cbb..ff5e56530 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Mariehamn and b/msys2/usr/share/zoneinfo/posix/Europe/Mariehamn differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Minsk b/msys2/usr/share/zoneinfo/posix/Europe/Minsk
index 453306c07..30d3a672b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Minsk and b/msys2/usr/share/zoneinfo/posix/Europe/Minsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Monaco b/msys2/usr/share/zoneinfo/posix/Europe/Monaco
index 686ae8831..f30dfc701 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Monaco and b/msys2/usr/share/zoneinfo/posix/Europe/Monaco differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Moscow b/msys2/usr/share/zoneinfo/posix/Europe/Moscow
index ddb3f4e99..5e6b6de64 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Moscow and b/msys2/usr/share/zoneinfo/posix/Europe/Moscow differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Nicosia b/msys2/usr/share/zoneinfo/posix/Europe/Nicosia
index f7f10ab76..c210d0a59 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Nicosia and b/msys2/usr/share/zoneinfo/posix/Europe/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Oslo b/msys2/usr/share/zoneinfo/posix/Europe/Oslo
index 15a34c3ce..dfc509570 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Oslo and b/msys2/usr/share/zoneinfo/posix/Europe/Oslo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Paris b/msys2/usr/share/zoneinfo/posix/Europe/Paris
index ca8543516..00a27264c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Paris and b/msys2/usr/share/zoneinfo/posix/Europe/Paris differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Podgorica b/msys2/usr/share/zoneinfo/posix/Europe/Podgorica
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Podgorica and b/msys2/usr/share/zoneinfo/posix/Europe/Podgorica differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Prague b/msys2/usr/share/zoneinfo/posix/Europe/Prague
index ce8f433ec..fb7c145ac 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Prague and b/msys2/usr/share/zoneinfo/posix/Europe/Prague differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Riga b/msys2/usr/share/zoneinfo/posix/Europe/Riga
index 8db477d01..26af4c90b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Riga and b/msys2/usr/share/zoneinfo/posix/Europe/Riga differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Rome b/msys2/usr/share/zoneinfo/posix/Europe/Rome
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Rome and b/msys2/usr/share/zoneinfo/posix/Europe/Rome differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Samara b/msys2/usr/share/zoneinfo/posix/Europe/Samara
index 97d5dd9e6..8d0c26e5c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Samara and b/msys2/usr/share/zoneinfo/posix/Europe/Samara differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/San_Marino b/msys2/usr/share/zoneinfo/posix/Europe/San_Marino
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/San_Marino and b/msys2/usr/share/zoneinfo/posix/Europe/San_Marino differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Sarajevo b/msys2/usr/share/zoneinfo/posix/Europe/Sarajevo
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Sarajevo and b/msys2/usr/share/zoneinfo/posix/Europe/Sarajevo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Saratov b/msys2/usr/share/zoneinfo/posix/Europe/Saratov
index 8fd5f6d4b..2684d8f8b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Saratov and b/msys2/usr/share/zoneinfo/posix/Europe/Saratov differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Simferopol b/msys2/usr/share/zoneinfo/posix/Europe/Simferopol
index 432e8315b..88a6f3bdb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Simferopol and b/msys2/usr/share/zoneinfo/posix/Europe/Simferopol differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Skopje b/msys2/usr/share/zoneinfo/posix/Europe/Skopje
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Skopje and b/msys2/usr/share/zoneinfo/posix/Europe/Skopje differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Sofia b/msys2/usr/share/zoneinfo/posix/Europe/Sofia
index 0e4d87933..eabc972a2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Sofia and b/msys2/usr/share/zoneinfo/posix/Europe/Sofia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Stockholm b/msys2/usr/share/zoneinfo/posix/Europe/Stockholm
index f3e0c7f0f..dd3eb3227 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Stockholm and b/msys2/usr/share/zoneinfo/posix/Europe/Stockholm differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Tallinn b/msys2/usr/share/zoneinfo/posix/Europe/Tallinn
index b5acca3cf..5321bbd46 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Tallinn and b/msys2/usr/share/zoneinfo/posix/Europe/Tallinn differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Tirane b/msys2/usr/share/zoneinfo/posix/Europe/Tirane
index 0b86017d2..743a7337f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Tirane and b/msys2/usr/share/zoneinfo/posix/Europe/Tirane differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Tiraspol b/msys2/usr/share/zoneinfo/posix/Europe/Tiraspol
index 5ee23fe0e..6970b14c5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Tiraspol and b/msys2/usr/share/zoneinfo/posix/Europe/Tiraspol differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Ulyanovsk b/msys2/usr/share/zoneinfo/posix/Europe/Ulyanovsk
index 7b61bdc52..bb842cb1f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Ulyanovsk and b/msys2/usr/share/zoneinfo/posix/Europe/Ulyanovsk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Uzhgorod b/msys2/usr/share/zoneinfo/posix/Europe/Uzhgorod
index 66ae8d69e..a5755685e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Uzhgorod and b/msys2/usr/share/zoneinfo/posix/Europe/Uzhgorod differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Vaduz b/msys2/usr/share/zoneinfo/posix/Europe/Vaduz
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Vaduz and b/msys2/usr/share/zoneinfo/posix/Europe/Vaduz differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Vatican b/msys2/usr/share/zoneinfo/posix/Europe/Vatican
index ac4c16342..639ca3be4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Vatican and b/msys2/usr/share/zoneinfo/posix/Europe/Vatican differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Vienna b/msys2/usr/share/zoneinfo/posix/Europe/Vienna
index 3582bb15c..75339e98d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Vienna and b/msys2/usr/share/zoneinfo/posix/Europe/Vienna differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Vilnius b/msys2/usr/share/zoneinfo/posix/Europe/Vilnius
index 7abd63fa6..75b2eebb5 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Vilnius and b/msys2/usr/share/zoneinfo/posix/Europe/Vilnius differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Volgograd b/msys2/usr/share/zoneinfo/posix/Europe/Volgograd
index d1cfac0e3..c51700260 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Volgograd and b/msys2/usr/share/zoneinfo/posix/Europe/Volgograd differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Warsaw b/msys2/usr/share/zoneinfo/posix/Europe/Warsaw
index e33cf6717..efe1a40f2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Warsaw and b/msys2/usr/share/zoneinfo/posix/Europe/Warsaw differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Zagreb b/msys2/usr/share/zoneinfo/posix/Europe/Zagreb
index 27de456f1..a1bf9281e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Zagreb and b/msys2/usr/share/zoneinfo/posix/Europe/Zagreb differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Zaporozhye b/msys2/usr/share/zoneinfo/posix/Europe/Zaporozhye
index e42edfc85..4ea8dae45 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Zaporozhye and b/msys2/usr/share/zoneinfo/posix/Europe/Zaporozhye differ
diff --git a/msys2/usr/share/zoneinfo/posix/Europe/Zurich b/msys2/usr/share/zoneinfo/posix/Europe/Zurich
index ad6cf5928..388df2969 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Europe/Zurich and b/msys2/usr/share/zoneinfo/posix/Europe/Zurich differ
diff --git a/msys2/usr/share/zoneinfo/posix/Factory b/msys2/usr/share/zoneinfo/posix/Factory
index 60aa2a0d6..b4dd7735e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Factory and b/msys2/usr/share/zoneinfo/posix/Factory differ
diff --git a/msys2/usr/share/zoneinfo/posix/GB b/msys2/usr/share/zoneinfo/posix/GB
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GB and b/msys2/usr/share/zoneinfo/posix/GB differ
diff --git a/msys2/usr/share/zoneinfo/posix/GB-Eire b/msys2/usr/share/zoneinfo/posix/GB-Eire
index ac02a8144..323cd3818 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GB-Eire and b/msys2/usr/share/zoneinfo/posix/GB-Eire differ
diff --git a/msys2/usr/share/zoneinfo/posix/GMT b/msys2/usr/share/zoneinfo/posix/GMT
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GMT and b/msys2/usr/share/zoneinfo/posix/GMT differ
diff --git a/msys2/usr/share/zoneinfo/posix/GMT+0 b/msys2/usr/share/zoneinfo/posix/GMT+0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GMT+0 and b/msys2/usr/share/zoneinfo/posix/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/GMT-0 b/msys2/usr/share/zoneinfo/posix/GMT-0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GMT-0 and b/msys2/usr/share/zoneinfo/posix/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/GMT0 b/msys2/usr/share/zoneinfo/posix/GMT0
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/GMT0 and b/msys2/usr/share/zoneinfo/posix/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/posix/Greenwich b/msys2/usr/share/zoneinfo/posix/Greenwich
index c63474664..157573b1d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Greenwich and b/msys2/usr/share/zoneinfo/posix/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/posix/HST b/msys2/usr/share/zoneinfo/posix/HST
index cccd45eb8..160a53e04 100644
Binary files a/msys2/usr/share/zoneinfo/posix/HST and b/msys2/usr/share/zoneinfo/posix/HST differ
diff --git a/msys2/usr/share/zoneinfo/posix/Hongkong b/msys2/usr/share/zoneinfo/posix/Hongkong
index 23d0375fb..c80e36480 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Hongkong and b/msys2/usr/share/zoneinfo/posix/Hongkong differ
diff --git a/msys2/usr/share/zoneinfo/posix/Iceland b/msys2/usr/share/zoneinfo/posix/Iceland
index 10e0fc819..2451aca76 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Iceland and b/msys2/usr/share/zoneinfo/posix/Iceland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Antananarivo b/msys2/usr/share/zoneinfo/posix/Indian/Antananarivo
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Antananarivo and b/msys2/usr/share/zoneinfo/posix/Indian/Antananarivo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Chagos b/msys2/usr/share/zoneinfo/posix/Indian/Chagos
index 93d6dda50..8b8ce226b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Chagos and b/msys2/usr/share/zoneinfo/posix/Indian/Chagos differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Christmas b/msys2/usr/share/zoneinfo/posix/Indian/Christmas
index d18c3810d..766024b36 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Christmas and b/msys2/usr/share/zoneinfo/posix/Indian/Christmas differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Cocos b/msys2/usr/share/zoneinfo/posix/Indian/Cocos
index f8116e702..117503410 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Cocos and b/msys2/usr/share/zoneinfo/posix/Indian/Cocos differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Comoro b/msys2/usr/share/zoneinfo/posix/Indian/Comoro
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Comoro and b/msys2/usr/share/zoneinfo/posix/Indian/Comoro differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Kerguelen b/msys2/usr/share/zoneinfo/posix/Indian/Kerguelen
index cde4cf7ea..8ce93e012 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Kerguelen and b/msys2/usr/share/zoneinfo/posix/Indian/Kerguelen differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Mahe b/msys2/usr/share/zoneinfo/posix/Indian/Mahe
index cba7dfe73..e7fccf829 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Mahe and b/msys2/usr/share/zoneinfo/posix/Indian/Mahe differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Maldives b/msys2/usr/share/zoneinfo/posix/Indian/Maldives
index 7c839cfa9..58a82e4eb 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Maldives and b/msys2/usr/share/zoneinfo/posix/Indian/Maldives differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Mauritius b/msys2/usr/share/zoneinfo/posix/Indian/Mauritius
index 17f261699..7c1113488 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Mauritius and b/msys2/usr/share/zoneinfo/posix/Indian/Mauritius differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Mayotte b/msys2/usr/share/zoneinfo/posix/Indian/Mayotte
index 9a2918f40..5f4ebcb7f 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Mayotte and b/msys2/usr/share/zoneinfo/posix/Indian/Mayotte differ
diff --git a/msys2/usr/share/zoneinfo/posix/Indian/Reunion b/msys2/usr/share/zoneinfo/posix/Indian/Reunion
index dfe08313d..248a7c93a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Indian/Reunion and b/msys2/usr/share/zoneinfo/posix/Indian/Reunion differ
diff --git a/msys2/usr/share/zoneinfo/posix/Iran b/msys2/usr/share/zoneinfo/posix/Iran
index 8cec5ad7d..f1555f003 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Iran and b/msys2/usr/share/zoneinfo/posix/Iran differ
diff --git a/msys2/usr/share/zoneinfo/posix/Israel b/msys2/usr/share/zoneinfo/posix/Israel
index 440ef06b5..4c49bbf52 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Israel and b/msys2/usr/share/zoneinfo/posix/Israel differ
diff --git a/msys2/usr/share/zoneinfo/posix/Jamaica b/msys2/usr/share/zoneinfo/posix/Jamaica
index 2a9b7fd52..be6b1b6f1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Jamaica and b/msys2/usr/share/zoneinfo/posix/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/posix/Japan b/msys2/usr/share/zoneinfo/posix/Japan
index 26f4d34d6..1aa066ce3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Japan and b/msys2/usr/share/zoneinfo/posix/Japan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Kwajalein b/msys2/usr/share/zoneinfo/posix/Kwajalein
index 1a7975fad..9416d522d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Kwajalein and b/msys2/usr/share/zoneinfo/posix/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/posix/Libya b/msys2/usr/share/zoneinfo/posix/Libya
index 07b393bb7..e0c89971a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Libya and b/msys2/usr/share/zoneinfo/posix/Libya differ
diff --git a/msys2/usr/share/zoneinfo/posix/MET b/msys2/usr/share/zoneinfo/posix/MET
index 4a826bb18..6f0558c3b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/MET and b/msys2/usr/share/zoneinfo/posix/MET differ
diff --git a/msys2/usr/share/zoneinfo/posix/MST b/msys2/usr/share/zoneinfo/posix/MST
index c93a58eee..a0953d1e7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/MST and b/msys2/usr/share/zoneinfo/posix/MST differ
diff --git a/msys2/usr/share/zoneinfo/posix/MST7MDT b/msys2/usr/share/zoneinfo/posix/MST7MDT
index 4506a6e15..137867c8b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/MST7MDT and b/msys2/usr/share/zoneinfo/posix/MST7MDT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Mexico/BajaNorte b/msys2/usr/share/zoneinfo/posix/Mexico/BajaNorte
index ada6bf78b..19ccd3576 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Mexico/BajaNorte and b/msys2/usr/share/zoneinfo/posix/Mexico/BajaNorte differ
diff --git a/msys2/usr/share/zoneinfo/posix/Mexico/BajaSur b/msys2/usr/share/zoneinfo/posix/Mexico/BajaSur
index e4a785743..4c819fab0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Mexico/BajaSur and b/msys2/usr/share/zoneinfo/posix/Mexico/BajaSur differ
diff --git a/msys2/usr/share/zoneinfo/posix/Mexico/General b/msys2/usr/share/zoneinfo/posix/Mexico/General
index e7fb6f295..ffcf8bee1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Mexico/General and b/msys2/usr/share/zoneinfo/posix/Mexico/General differ
diff --git a/msys2/usr/share/zoneinfo/posix/NZ b/msys2/usr/share/zoneinfo/posix/NZ
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/posix/NZ and b/msys2/usr/share/zoneinfo/posix/NZ differ
diff --git a/msys2/usr/share/zoneinfo/posix/NZ-CHAT b/msys2/usr/share/zoneinfo/posix/NZ-CHAT
index c00410988..f06065ebd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/NZ-CHAT and b/msys2/usr/share/zoneinfo/posix/NZ-CHAT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Navajo b/msys2/usr/share/zoneinfo/posix/Navajo
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Navajo and b/msys2/usr/share/zoneinfo/posix/Navajo differ
diff --git a/msys2/usr/share/zoneinfo/posix/PRC b/msys2/usr/share/zoneinfo/posix/PRC
index 91f6f8bc2..d6b66984a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/PRC and b/msys2/usr/share/zoneinfo/posix/PRC differ
diff --git a/msys2/usr/share/zoneinfo/posix/PST8PDT b/msys2/usr/share/zoneinfo/posix/PST8PDT
index 99d246baa..fde4833f6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/PST8PDT and b/msys2/usr/share/zoneinfo/posix/PST8PDT differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Apia b/msys2/usr/share/zoneinfo/posix/Pacific/Apia
index dab1f3f60..244af26f8 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Apia and b/msys2/usr/share/zoneinfo/posix/Pacific/Apia differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Auckland b/msys2/usr/share/zoneinfo/posix/Pacific/Auckland
index 6575fdce3..afb392931 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Auckland and b/msys2/usr/share/zoneinfo/posix/Pacific/Auckland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Bougainville b/msys2/usr/share/zoneinfo/posix/Pacific/Bougainville
index 2892d2680..7c667093c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Bougainville and b/msys2/usr/share/zoneinfo/posix/Pacific/Bougainville differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Chatham b/msys2/usr/share/zoneinfo/posix/Pacific/Chatham
index c00410988..f06065ebd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Chatham and b/msys2/usr/share/zoneinfo/posix/Pacific/Chatham differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Chuuk b/msys2/usr/share/zoneinfo/posix/Pacific/Chuuk
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Chuuk and b/msys2/usr/share/zoneinfo/posix/Pacific/Chuuk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Easter b/msys2/usr/share/zoneinfo/posix/Pacific/Easter
index cae374409..d29bcd68b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Easter and b/msys2/usr/share/zoneinfo/posix/Pacific/Easter differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Efate b/msys2/usr/share/zoneinfo/posix/Pacific/Efate
index 60150175c..bf7471dd3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Efate and b/msys2/usr/share/zoneinfo/posix/Pacific/Efate differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Enderbury b/msys2/usr/share/zoneinfo/posix/Pacific/Enderbury
index f0b825236..b22ab147c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Enderbury and b/msys2/usr/share/zoneinfo/posix/Pacific/Enderbury differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Fakaofo b/msys2/usr/share/zoneinfo/posix/Pacific/Fakaofo
index e40307f6a..b7b30213e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Fakaofo and b/msys2/usr/share/zoneinfo/posix/Pacific/Fakaofo differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Fiji b/msys2/usr/share/zoneinfo/posix/Pacific/Fiji
index d39bf5364..e3934e423 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Fiji and b/msys2/usr/share/zoneinfo/posix/Pacific/Fiji differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Funafuti b/msys2/usr/share/zoneinfo/posix/Pacific/Funafuti
index ea728637a..78ab35b6b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Funafuti and b/msys2/usr/share/zoneinfo/posix/Pacific/Funafuti differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Galapagos b/msys2/usr/share/zoneinfo/posix/Pacific/Galapagos
index 31f0921ea..a9403eca4 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Galapagos and b/msys2/usr/share/zoneinfo/posix/Pacific/Galapagos differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Gambier b/msys2/usr/share/zoneinfo/posix/Pacific/Gambier
index e1fc3daa5..ddfc34ffc 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Gambier and b/msys2/usr/share/zoneinfo/posix/Pacific/Gambier differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Guadalcanal b/msys2/usr/share/zoneinfo/posix/Pacific/Guadalcanal
index 7e9d10a10..720c67901 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Guadalcanal and b/msys2/usr/share/zoneinfo/posix/Pacific/Guadalcanal differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Guam b/msys2/usr/share/zoneinfo/posix/Pacific/Guam
index 66490d25d..bf9a2d955 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Guam and b/msys2/usr/share/zoneinfo/posix/Pacific/Guam differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Honolulu b/msys2/usr/share/zoneinfo/posix/Pacific/Honolulu
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Honolulu and b/msys2/usr/share/zoneinfo/posix/Pacific/Honolulu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Johnston b/msys2/usr/share/zoneinfo/posix/Pacific/Johnston
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Johnston and b/msys2/usr/share/zoneinfo/posix/Pacific/Johnston differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Kiritimati b/msys2/usr/share/zoneinfo/posix/Pacific/Kiritimati
index 7cae0cb75..2f676d3bf 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Kiritimati and b/msys2/usr/share/zoneinfo/posix/Pacific/Kiritimati differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Kosrae b/msys2/usr/share/zoneinfo/posix/Pacific/Kosrae
index a584aae5e..f5d58242c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Kosrae and b/msys2/usr/share/zoneinfo/posix/Pacific/Kosrae differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Kwajalein b/msys2/usr/share/zoneinfo/posix/Pacific/Kwajalein
index 1a7975fad..9416d522d 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Kwajalein and b/msys2/usr/share/zoneinfo/posix/Pacific/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Majuro b/msys2/usr/share/zoneinfo/posix/Pacific/Majuro
index 9ef8374de..9228ee02e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Majuro and b/msys2/usr/share/zoneinfo/posix/Pacific/Majuro differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Marquesas b/msys2/usr/share/zoneinfo/posix/Pacific/Marquesas
index 74d6792bf..6ea24b72c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Marquesas and b/msys2/usr/share/zoneinfo/posix/Pacific/Marquesas differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Midway b/msys2/usr/share/zoneinfo/posix/Pacific/Midway
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Midway and b/msys2/usr/share/zoneinfo/posix/Pacific/Midway differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Nauru b/msys2/usr/share/zoneinfo/posix/Pacific/Nauru
index acec0429f..ae13aac77 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Nauru and b/msys2/usr/share/zoneinfo/posix/Pacific/Nauru differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Niue b/msys2/usr/share/zoneinfo/posix/Pacific/Niue
index 684b010e8..7b3579351 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Niue and b/msys2/usr/share/zoneinfo/posix/Pacific/Niue differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Norfolk b/msys2/usr/share/zoneinfo/posix/Pacific/Norfolk
index 53c1aad4e..79e2a9419 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Norfolk and b/msys2/usr/share/zoneinfo/posix/Pacific/Norfolk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Noumea b/msys2/usr/share/zoneinfo/posix/Pacific/Noumea
index 931a1a306..824f81416 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Noumea and b/msys2/usr/share/zoneinfo/posix/Pacific/Noumea differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Pago_Pago b/msys2/usr/share/zoneinfo/posix/Pacific/Pago_Pago
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Pago_Pago and b/msys2/usr/share/zoneinfo/posix/Pacific/Pago_Pago differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Palau b/msys2/usr/share/zoneinfo/posix/Pacific/Palau
index 146b35152..bc8eb7a55 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Palau and b/msys2/usr/share/zoneinfo/posix/Pacific/Palau differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Pitcairn b/msys2/usr/share/zoneinfo/posix/Pacific/Pitcairn
index ef91b061b..8a4ba4d30 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Pitcairn and b/msys2/usr/share/zoneinfo/posix/Pacific/Pitcairn differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Pohnpei b/msys2/usr/share/zoneinfo/posix/Pacific/Pohnpei
index c298ddd4d..b92b254a9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Pohnpei and b/msys2/usr/share/zoneinfo/posix/Pacific/Pohnpei differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Ponape b/msys2/usr/share/zoneinfo/posix/Pacific/Ponape
index c298ddd4d..b92b254a9 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Ponape and b/msys2/usr/share/zoneinfo/posix/Pacific/Ponape differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Port_Moresby b/msys2/usr/share/zoneinfo/posix/Pacific/Port_Moresby
index 920ad27e6..5d8fc3a1b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Port_Moresby and b/msys2/usr/share/zoneinfo/posix/Pacific/Port_Moresby differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Rarotonga b/msys2/usr/share/zoneinfo/posix/Pacific/Rarotonga
index da6b0fade..143a1883b 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Rarotonga and b/msys2/usr/share/zoneinfo/posix/Pacific/Rarotonga differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Saipan b/msys2/usr/share/zoneinfo/posix/Pacific/Saipan
index 66490d25d..bf9a2d955 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Saipan and b/msys2/usr/share/zoneinfo/posix/Pacific/Saipan differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Samoa b/msys2/usr/share/zoneinfo/posix/Pacific/Samoa
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Samoa and b/msys2/usr/share/zoneinfo/posix/Pacific/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Tahiti b/msys2/usr/share/zoneinfo/posix/Pacific/Tahiti
index 442b8eb5a..50a064fa0 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Tahiti and b/msys2/usr/share/zoneinfo/posix/Pacific/Tahiti differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Tarawa b/msys2/usr/share/zoneinfo/posix/Pacific/Tarawa
index 3db6c7503..6bc216823 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Tarawa and b/msys2/usr/share/zoneinfo/posix/Pacific/Tarawa differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Tongatapu b/msys2/usr/share/zoneinfo/posix/Pacific/Tongatapu
index 5553c6009..54aeb0ffa 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Tongatapu and b/msys2/usr/share/zoneinfo/posix/Pacific/Tongatapu differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Truk b/msys2/usr/share/zoneinfo/posix/Pacific/Truk
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Truk and b/msys2/usr/share/zoneinfo/posix/Pacific/Truk differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Wake b/msys2/usr/share/zoneinfo/posix/Pacific/Wake
index c9e310670..71cca8877 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Wake and b/msys2/usr/share/zoneinfo/posix/Pacific/Wake differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Wallis b/msys2/usr/share/zoneinfo/posix/Pacific/Wallis
index b35344b31..4bce89300 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Wallis and b/msys2/usr/share/zoneinfo/posix/Pacific/Wallis differ
diff --git a/msys2/usr/share/zoneinfo/posix/Pacific/Yap b/msys2/usr/share/zoneinfo/posix/Pacific/Yap
index 07c84b711..ea3fb5cd3 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Pacific/Yap and b/msys2/usr/share/zoneinfo/posix/Pacific/Yap differ
diff --git a/msys2/usr/share/zoneinfo/posix/Poland b/msys2/usr/share/zoneinfo/posix/Poland
index e33cf6717..efe1a40f2 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Poland and b/msys2/usr/share/zoneinfo/posix/Poland differ
diff --git a/msys2/usr/share/zoneinfo/posix/Portugal b/msys2/usr/share/zoneinfo/posix/Portugal
index 355817b52..64841661a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Portugal and b/msys2/usr/share/zoneinfo/posix/Portugal differ
diff --git a/msys2/usr/share/zoneinfo/posix/ROC b/msys2/usr/share/zoneinfo/posix/ROC
index 24c43444b..35d89d036 100644
Binary files a/msys2/usr/share/zoneinfo/posix/ROC and b/msys2/usr/share/zoneinfo/posix/ROC differ
diff --git a/msys2/usr/share/zoneinfo/posix/ROK b/msys2/usr/share/zoneinfo/posix/ROK
index 96199e73e..1755147fa 100644
Binary files a/msys2/usr/share/zoneinfo/posix/ROK and b/msys2/usr/share/zoneinfo/posix/ROK differ
diff --git a/msys2/usr/share/zoneinfo/posix/Singapore b/msys2/usr/share/zoneinfo/posix/Singapore
index 2364b2178..350d77e28 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Singapore and b/msys2/usr/share/zoneinfo/posix/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/posix/Turkey b/msys2/usr/share/zoneinfo/posix/Turkey
index 508446bb6..c89186687 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Turkey and b/msys2/usr/share/zoneinfo/posix/Turkey differ
diff --git a/msys2/usr/share/zoneinfo/posix/UCT b/msys2/usr/share/zoneinfo/posix/UCT
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/UCT and b/msys2/usr/share/zoneinfo/posix/UCT differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Alaska b/msys2/usr/share/zoneinfo/posix/US/Alaska
index 9bbb2fd3b..cdf0572be 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Alaska and b/msys2/usr/share/zoneinfo/posix/US/Alaska differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Aleutian b/msys2/usr/share/zoneinfo/posix/US/Aleutian
index 43236498f..b1497bda6 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Aleutian and b/msys2/usr/share/zoneinfo/posix/US/Aleutian differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Arizona b/msys2/usr/share/zoneinfo/posix/US/Arizona
index ac6bb0c78..c2bd2f949 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Arizona and b/msys2/usr/share/zoneinfo/posix/US/Arizona differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Central b/msys2/usr/share/zoneinfo/posix/US/Central
index a5b1617c7..b01688065 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Central and b/msys2/usr/share/zoneinfo/posix/US/Central differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/East-Indiana b/msys2/usr/share/zoneinfo/posix/US/East-Indiana
index 09511ccdc..6b08d15bd 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/East-Indiana and b/msys2/usr/share/zoneinfo/posix/US/East-Indiana differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Eastern b/msys2/usr/share/zoneinfo/posix/US/Eastern
index 2f75480e0..2b6c2eea1 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Eastern and b/msys2/usr/share/zoneinfo/posix/US/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Hawaii b/msys2/usr/share/zoneinfo/posix/US/Hawaii
index c7cd06015..40e3d492e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Hawaii and b/msys2/usr/share/zoneinfo/posix/US/Hawaii differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Indiana-Starke b/msys2/usr/share/zoneinfo/posix/US/Indiana-Starke
index fcd408d74..b187d5f8c 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Indiana-Starke and b/msys2/usr/share/zoneinfo/posix/US/Indiana-Starke differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Michigan b/msys2/usr/share/zoneinfo/posix/US/Michigan
index e104faa46..6eb3ac46e 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Michigan and b/msys2/usr/share/zoneinfo/posix/US/Michigan differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Mountain b/msys2/usr/share/zoneinfo/posix/US/Mountain
index 5fbe26b1d..09e54e5c7 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Mountain and b/msys2/usr/share/zoneinfo/posix/US/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Pacific b/msys2/usr/share/zoneinfo/posix/US/Pacific
index 9dad4f4c7..aaf07787a 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Pacific and b/msys2/usr/share/zoneinfo/posix/US/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Pacific-New b/msys2/usr/share/zoneinfo/posix/US/Pacific-New
deleted file mode 100644
index 9dad4f4c7..000000000
Binary files a/msys2/usr/share/zoneinfo/posix/US/Pacific-New and /dev/null differ
diff --git a/msys2/usr/share/zoneinfo/posix/US/Samoa b/msys2/usr/share/zoneinfo/posix/US/Samoa
index cb56709a7..001289cee 100644
Binary files a/msys2/usr/share/zoneinfo/posix/US/Samoa and b/msys2/usr/share/zoneinfo/posix/US/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/posix/UTC b/msys2/usr/share/zoneinfo/posix/UTC
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/UTC and b/msys2/usr/share/zoneinfo/posix/UTC differ
diff --git a/msys2/usr/share/zoneinfo/posix/Universal b/msys2/usr/share/zoneinfo/posix/Universal
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Universal and b/msys2/usr/share/zoneinfo/posix/Universal differ
diff --git a/msys2/usr/share/zoneinfo/posix/W-SU b/msys2/usr/share/zoneinfo/posix/W-SU
index ddb3f4e99..5e6b6de64 100644
Binary files a/msys2/usr/share/zoneinfo/posix/W-SU and b/msys2/usr/share/zoneinfo/posix/W-SU differ
diff --git a/msys2/usr/share/zoneinfo/posix/WET b/msys2/usr/share/zoneinfo/posix/WET
index c27390b5b..423c6c203 100644
Binary files a/msys2/usr/share/zoneinfo/posix/WET and b/msys2/usr/share/zoneinfo/posix/WET differ
diff --git a/msys2/usr/share/zoneinfo/posix/Zulu b/msys2/usr/share/zoneinfo/posix/Zulu
index 91558be0c..00841a622 100644
Binary files a/msys2/usr/share/zoneinfo/posix/Zulu and b/msys2/usr/share/zoneinfo/posix/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/posixrules b/msys2/usr/share/zoneinfo/posixrules
index 2f75480e0..2b6c2eea1 100644
Binary files a/msys2/usr/share/zoneinfo/posixrules and b/msys2/usr/share/zoneinfo/posixrules differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Abidjan b/msys2/usr/share/zoneinfo/right/Africa/Abidjan
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Abidjan and b/msys2/usr/share/zoneinfo/right/Africa/Abidjan differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Accra b/msys2/usr/share/zoneinfo/right/Africa/Accra
index 25a8a068d..a5813357c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Accra and b/msys2/usr/share/zoneinfo/right/Africa/Accra differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Addis_Ababa b/msys2/usr/share/zoneinfo/right/Africa/Addis_Ababa
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Addis_Ababa and b/msys2/usr/share/zoneinfo/right/Africa/Addis_Ababa differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Algiers b/msys2/usr/share/zoneinfo/right/Africa/Algiers
index 65efc4ea2..ce83013ee 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Algiers and b/msys2/usr/share/zoneinfo/right/Africa/Algiers differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Asmara b/msys2/usr/share/zoneinfo/right/Africa/Asmara
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Asmara and b/msys2/usr/share/zoneinfo/right/Africa/Asmara differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Asmera b/msys2/usr/share/zoneinfo/right/Africa/Asmera
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Asmera and b/msys2/usr/share/zoneinfo/right/Africa/Asmera differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Bamako b/msys2/usr/share/zoneinfo/right/Africa/Bamako
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Bamako and b/msys2/usr/share/zoneinfo/right/Africa/Bamako differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Bangui b/msys2/usr/share/zoneinfo/right/Africa/Bangui
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Bangui and b/msys2/usr/share/zoneinfo/right/Africa/Bangui differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Banjul b/msys2/usr/share/zoneinfo/right/Africa/Banjul
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Banjul and b/msys2/usr/share/zoneinfo/right/Africa/Banjul differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Bissau b/msys2/usr/share/zoneinfo/right/Africa/Bissau
index e2353bd92..95f9052ce 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Bissau and b/msys2/usr/share/zoneinfo/right/Africa/Bissau differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Blantyre b/msys2/usr/share/zoneinfo/right/Africa/Blantyre
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Blantyre and b/msys2/usr/share/zoneinfo/right/Africa/Blantyre differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Brazzaville b/msys2/usr/share/zoneinfo/right/Africa/Brazzaville
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Brazzaville and b/msys2/usr/share/zoneinfo/right/Africa/Brazzaville differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Bujumbura b/msys2/usr/share/zoneinfo/right/Africa/Bujumbura
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Bujumbura and b/msys2/usr/share/zoneinfo/right/Africa/Bujumbura differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Cairo b/msys2/usr/share/zoneinfo/right/Africa/Cairo
index 8fa9ec17d..1779e49c4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Cairo and b/msys2/usr/share/zoneinfo/right/Africa/Cairo differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Casablanca b/msys2/usr/share/zoneinfo/right/Africa/Casablanca
index ab7e2c909..87041d0e0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Casablanca and b/msys2/usr/share/zoneinfo/right/Africa/Casablanca differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Ceuta b/msys2/usr/share/zoneinfo/right/Africa/Ceuta
index 09603efe1..b140691c9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Ceuta and b/msys2/usr/share/zoneinfo/right/Africa/Ceuta differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Conakry b/msys2/usr/share/zoneinfo/right/Africa/Conakry
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Conakry and b/msys2/usr/share/zoneinfo/right/Africa/Conakry differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Dakar b/msys2/usr/share/zoneinfo/right/Africa/Dakar
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Dakar and b/msys2/usr/share/zoneinfo/right/Africa/Dakar differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Dar_es_Salaam b/msys2/usr/share/zoneinfo/right/Africa/Dar_es_Salaam
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Dar_es_Salaam and b/msys2/usr/share/zoneinfo/right/Africa/Dar_es_Salaam differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Djibouti b/msys2/usr/share/zoneinfo/right/Africa/Djibouti
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Djibouti and b/msys2/usr/share/zoneinfo/right/Africa/Djibouti differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Douala b/msys2/usr/share/zoneinfo/right/Africa/Douala
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Douala and b/msys2/usr/share/zoneinfo/right/Africa/Douala differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/El_Aaiun b/msys2/usr/share/zoneinfo/right/Africa/El_Aaiun
index 8d4b9c59f..aec13c5bc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/El_Aaiun and b/msys2/usr/share/zoneinfo/right/Africa/El_Aaiun differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Freetown b/msys2/usr/share/zoneinfo/right/Africa/Freetown
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Freetown and b/msys2/usr/share/zoneinfo/right/Africa/Freetown differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Gaborone b/msys2/usr/share/zoneinfo/right/Africa/Gaborone
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Gaborone and b/msys2/usr/share/zoneinfo/right/Africa/Gaborone differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Harare b/msys2/usr/share/zoneinfo/right/Africa/Harare
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Harare and b/msys2/usr/share/zoneinfo/right/Africa/Harare differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Johannesburg b/msys2/usr/share/zoneinfo/right/Africa/Johannesburg
index f530b4d8b..22444b3f0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Johannesburg and b/msys2/usr/share/zoneinfo/right/Africa/Johannesburg differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Juba b/msys2/usr/share/zoneinfo/right/Africa/Juba
index 275fd0c77..47d90b614 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Juba and b/msys2/usr/share/zoneinfo/right/Africa/Juba differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Kampala b/msys2/usr/share/zoneinfo/right/Africa/Kampala
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Kampala and b/msys2/usr/share/zoneinfo/right/Africa/Kampala differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Khartoum b/msys2/usr/share/zoneinfo/right/Africa/Khartoum
index 5721b8ca0..df34e0604 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Khartoum and b/msys2/usr/share/zoneinfo/right/Africa/Khartoum differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Kigali b/msys2/usr/share/zoneinfo/right/Africa/Kigali
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Kigali and b/msys2/usr/share/zoneinfo/right/Africa/Kigali differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Kinshasa b/msys2/usr/share/zoneinfo/right/Africa/Kinshasa
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Kinshasa and b/msys2/usr/share/zoneinfo/right/Africa/Kinshasa differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Lagos b/msys2/usr/share/zoneinfo/right/Africa/Lagos
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Lagos and b/msys2/usr/share/zoneinfo/right/Africa/Lagos differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Libreville b/msys2/usr/share/zoneinfo/right/Africa/Libreville
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Libreville and b/msys2/usr/share/zoneinfo/right/Africa/Libreville differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Lome b/msys2/usr/share/zoneinfo/right/Africa/Lome
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Lome and b/msys2/usr/share/zoneinfo/right/Africa/Lome differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Luanda b/msys2/usr/share/zoneinfo/right/Africa/Luanda
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Luanda and b/msys2/usr/share/zoneinfo/right/Africa/Luanda differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Lubumbashi b/msys2/usr/share/zoneinfo/right/Africa/Lubumbashi
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Lubumbashi and b/msys2/usr/share/zoneinfo/right/Africa/Lubumbashi differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Lusaka b/msys2/usr/share/zoneinfo/right/Africa/Lusaka
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Lusaka and b/msys2/usr/share/zoneinfo/right/Africa/Lusaka differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Malabo b/msys2/usr/share/zoneinfo/right/Africa/Malabo
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Malabo and b/msys2/usr/share/zoneinfo/right/Africa/Malabo differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Maputo b/msys2/usr/share/zoneinfo/right/Africa/Maputo
index f216ee63f..c741a57bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Maputo and b/msys2/usr/share/zoneinfo/right/Africa/Maputo differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Maseru b/msys2/usr/share/zoneinfo/right/Africa/Maseru
index f530b4d8b..22444b3f0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Maseru and b/msys2/usr/share/zoneinfo/right/Africa/Maseru differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Mbabane b/msys2/usr/share/zoneinfo/right/Africa/Mbabane
index f530b4d8b..22444b3f0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Mbabane and b/msys2/usr/share/zoneinfo/right/Africa/Mbabane differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Mogadishu b/msys2/usr/share/zoneinfo/right/Africa/Mogadishu
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Mogadishu and b/msys2/usr/share/zoneinfo/right/Africa/Mogadishu differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Monrovia b/msys2/usr/share/zoneinfo/right/Africa/Monrovia
index d52073735..5d53872cf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Monrovia and b/msys2/usr/share/zoneinfo/right/Africa/Monrovia differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Nairobi b/msys2/usr/share/zoneinfo/right/Africa/Nairobi
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Nairobi and b/msys2/usr/share/zoneinfo/right/Africa/Nairobi differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Ndjamena b/msys2/usr/share/zoneinfo/right/Africa/Ndjamena
index 13d2a8d18..5e4ada97e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Ndjamena and b/msys2/usr/share/zoneinfo/right/Africa/Ndjamena differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Niamey b/msys2/usr/share/zoneinfo/right/Africa/Niamey
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Niamey and b/msys2/usr/share/zoneinfo/right/Africa/Niamey differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Nouakchott b/msys2/usr/share/zoneinfo/right/Africa/Nouakchott
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Nouakchott and b/msys2/usr/share/zoneinfo/right/Africa/Nouakchott differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Ouagadougou b/msys2/usr/share/zoneinfo/right/Africa/Ouagadougou
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Ouagadougou and b/msys2/usr/share/zoneinfo/right/Africa/Ouagadougou differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Porto-Novo b/msys2/usr/share/zoneinfo/right/Africa/Porto-Novo
index 5a9821a69..85cdea8fa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Porto-Novo and b/msys2/usr/share/zoneinfo/right/Africa/Porto-Novo differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Sao_Tome b/msys2/usr/share/zoneinfo/right/Africa/Sao_Tome
index 912be5634..9ad7d5b97 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Sao_Tome and b/msys2/usr/share/zoneinfo/right/Africa/Sao_Tome differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Timbuktu b/msys2/usr/share/zoneinfo/right/Africa/Timbuktu
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Timbuktu and b/msys2/usr/share/zoneinfo/right/Africa/Timbuktu differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Tripoli b/msys2/usr/share/zoneinfo/right/Africa/Tripoli
index 58fea0c8f..93f2268cf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Tripoli and b/msys2/usr/share/zoneinfo/right/Africa/Tripoli differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Tunis b/msys2/usr/share/zoneinfo/right/Africa/Tunis
index 2a23817ed..54a3af2bd 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Tunis and b/msys2/usr/share/zoneinfo/right/Africa/Tunis differ
diff --git a/msys2/usr/share/zoneinfo/right/Africa/Windhoek b/msys2/usr/share/zoneinfo/right/Africa/Windhoek
index d76aafc52..1140d169c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Africa/Windhoek and b/msys2/usr/share/zoneinfo/right/Africa/Windhoek differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Adak b/msys2/usr/share/zoneinfo/right/America/Adak
index a06fafbe8..c06bb758e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Adak and b/msys2/usr/share/zoneinfo/right/America/Adak differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Anchorage b/msys2/usr/share/zoneinfo/right/America/Anchorage
index 30fb3a855..b52b6bd89 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Anchorage and b/msys2/usr/share/zoneinfo/right/America/Anchorage differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Anguilla b/msys2/usr/share/zoneinfo/right/America/Anguilla
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Anguilla and b/msys2/usr/share/zoneinfo/right/America/Anguilla differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Antigua b/msys2/usr/share/zoneinfo/right/America/Antigua
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Antigua and b/msys2/usr/share/zoneinfo/right/America/Antigua differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Araguaina b/msys2/usr/share/zoneinfo/right/America/Araguaina
index 8817fd14e..12cfd5cc3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Araguaina and b/msys2/usr/share/zoneinfo/right/America/Araguaina differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Buenos_Aires b/msys2/usr/share/zoneinfo/right/America/Argentina/Buenos_Aires
index 7b77233cc..60c6128b6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Buenos_Aires and b/msys2/usr/share/zoneinfo/right/America/Argentina/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Catamarca b/msys2/usr/share/zoneinfo/right/America/Argentina/Catamarca
index 203cbb28c..4023f3a38 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Catamarca and b/msys2/usr/share/zoneinfo/right/America/Argentina/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/ComodRivadavia b/msys2/usr/share/zoneinfo/right/America/Argentina/ComodRivadavia
index 203cbb28c..4023f3a38 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/ComodRivadavia and b/msys2/usr/share/zoneinfo/right/America/Argentina/ComodRivadavia differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Cordoba b/msys2/usr/share/zoneinfo/right/America/Argentina/Cordoba
index adfb3a07d..7b100b1ad 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Cordoba and b/msys2/usr/share/zoneinfo/right/America/Argentina/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Jujuy b/msys2/usr/share/zoneinfo/right/America/Argentina/Jujuy
index 5f293197b..2f9a3144f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Jujuy and b/msys2/usr/share/zoneinfo/right/America/Argentina/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/La_Rioja b/msys2/usr/share/zoneinfo/right/America/Argentina/La_Rioja
index 7ed279d61..18cf0588e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/La_Rioja and b/msys2/usr/share/zoneinfo/right/America/Argentina/La_Rioja differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Mendoza b/msys2/usr/share/zoneinfo/right/America/Argentina/Mendoza
index 58da928bb..3202f7a68 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Mendoza and b/msys2/usr/share/zoneinfo/right/America/Argentina/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Rio_Gallegos b/msys2/usr/share/zoneinfo/right/America/Argentina/Rio_Gallegos
index b98f46956..ef245184b 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Rio_Gallegos and b/msys2/usr/share/zoneinfo/right/America/Argentina/Rio_Gallegos differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Salta b/msys2/usr/share/zoneinfo/right/America/Argentina/Salta
index 8c8973855..702521300 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Salta and b/msys2/usr/share/zoneinfo/right/America/Argentina/Salta differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/San_Juan b/msys2/usr/share/zoneinfo/right/America/Argentina/San_Juan
index 65df6dbf7..12db36567 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/San_Juan and b/msys2/usr/share/zoneinfo/right/America/Argentina/San_Juan differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/San_Luis b/msys2/usr/share/zoneinfo/right/America/Argentina/San_Luis
index 1035eca2d..db24ba781 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/San_Luis and b/msys2/usr/share/zoneinfo/right/America/Argentina/San_Luis differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Tucuman b/msys2/usr/share/zoneinfo/right/America/Argentina/Tucuman
index 59295a0b5..00e51d854 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Tucuman and b/msys2/usr/share/zoneinfo/right/America/Argentina/Tucuman differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Argentina/Ushuaia b/msys2/usr/share/zoneinfo/right/America/Argentina/Ushuaia
index 037414b48..1b1facf14 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Argentina/Ushuaia and b/msys2/usr/share/zoneinfo/right/America/Argentina/Ushuaia differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Aruba b/msys2/usr/share/zoneinfo/right/America/Aruba
index c0da2ad85..d1b018136 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Aruba and b/msys2/usr/share/zoneinfo/right/America/Aruba differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Asuncion b/msys2/usr/share/zoneinfo/right/America/Asuncion
index 1b4479763..a072670dc 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Asuncion and b/msys2/usr/share/zoneinfo/right/America/Asuncion differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Atikokan b/msys2/usr/share/zoneinfo/right/America/Atikokan
index 7401968fa..e9c292a24 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Atikokan and b/msys2/usr/share/zoneinfo/right/America/Atikokan differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Atka b/msys2/usr/share/zoneinfo/right/America/Atka
index a06fafbe8..c06bb758e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Atka and b/msys2/usr/share/zoneinfo/right/America/Atka differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Bahia b/msys2/usr/share/zoneinfo/right/America/Bahia
index 4202c1fa8..07ccb5cdc 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Bahia and b/msys2/usr/share/zoneinfo/right/America/Bahia differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Bahia_Banderas b/msys2/usr/share/zoneinfo/right/America/Bahia_Banderas
index 79569666d..b23dd9fc6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Bahia_Banderas and b/msys2/usr/share/zoneinfo/right/America/Bahia_Banderas differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Barbados b/msys2/usr/share/zoneinfo/right/America/Barbados
index db20333ba..795ab7726 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Barbados and b/msys2/usr/share/zoneinfo/right/America/Barbados differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Belem b/msys2/usr/share/zoneinfo/right/America/Belem
index 63cf419d5..358bf2d50 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Belem and b/msys2/usr/share/zoneinfo/right/America/Belem differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Belize b/msys2/usr/share/zoneinfo/right/America/Belize
index 9f3d426b3..92367d8ce 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Belize and b/msys2/usr/share/zoneinfo/right/America/Belize differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Blanc-Sablon b/msys2/usr/share/zoneinfo/right/America/Blanc-Sablon
index 584f12ed5..59bc01a65 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Blanc-Sablon and b/msys2/usr/share/zoneinfo/right/America/Blanc-Sablon differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Boa_Vista b/msys2/usr/share/zoneinfo/right/America/Boa_Vista
index 7a38507a2..11489c704 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Boa_Vista and b/msys2/usr/share/zoneinfo/right/America/Boa_Vista differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Bogota b/msys2/usr/share/zoneinfo/right/America/Bogota
index 39688069d..0edbecb7e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Bogota and b/msys2/usr/share/zoneinfo/right/America/Bogota differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Boise b/msys2/usr/share/zoneinfo/right/America/Boise
index ec546bdb1..c83c46f2a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Boise and b/msys2/usr/share/zoneinfo/right/America/Boise differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Buenos_Aires b/msys2/usr/share/zoneinfo/right/America/Buenos_Aires
index 7b77233cc..60c6128b6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Buenos_Aires and b/msys2/usr/share/zoneinfo/right/America/Buenos_Aires differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cambridge_Bay b/msys2/usr/share/zoneinfo/right/America/Cambridge_Bay
index 1cc3a6bbb..64fb1f7d5 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cambridge_Bay and b/msys2/usr/share/zoneinfo/right/America/Cambridge_Bay differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Campo_Grande b/msys2/usr/share/zoneinfo/right/America/Campo_Grande
index 78acd6db8..4472064c7 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Campo_Grande and b/msys2/usr/share/zoneinfo/right/America/Campo_Grande differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cancun b/msys2/usr/share/zoneinfo/right/America/Cancun
index b0cfc554a..4451519a3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cancun and b/msys2/usr/share/zoneinfo/right/America/Cancun differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Caracas b/msys2/usr/share/zoneinfo/right/America/Caracas
index 560f48a6e..f71318ba5 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Caracas and b/msys2/usr/share/zoneinfo/right/America/Caracas differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Catamarca b/msys2/usr/share/zoneinfo/right/America/Catamarca
index 203cbb28c..4023f3a38 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Catamarca and b/msys2/usr/share/zoneinfo/right/America/Catamarca differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cayenne b/msys2/usr/share/zoneinfo/right/America/Cayenne
index f7e1abee8..7246933af 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cayenne and b/msys2/usr/share/zoneinfo/right/America/Cayenne differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cayman b/msys2/usr/share/zoneinfo/right/America/Cayman
index 0cc6fd40c..7919f0e08 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cayman and b/msys2/usr/share/zoneinfo/right/America/Cayman differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Chicago b/msys2/usr/share/zoneinfo/right/America/Chicago
index d88325d64..7311d8735 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Chicago and b/msys2/usr/share/zoneinfo/right/America/Chicago differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Chihuahua b/msys2/usr/share/zoneinfo/right/America/Chihuahua
index 81f85e837..138dee450 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Chihuahua and b/msys2/usr/share/zoneinfo/right/America/Chihuahua differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Coral_Harbour b/msys2/usr/share/zoneinfo/right/America/Coral_Harbour
index 7401968fa..e9c292a24 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Coral_Harbour and b/msys2/usr/share/zoneinfo/right/America/Coral_Harbour differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cordoba b/msys2/usr/share/zoneinfo/right/America/Cordoba
index adfb3a07d..7b100b1ad 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cordoba and b/msys2/usr/share/zoneinfo/right/America/Cordoba differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Costa_Rica b/msys2/usr/share/zoneinfo/right/America/Costa_Rica
index cfad5e7ad..fb34d9a09 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Costa_Rica and b/msys2/usr/share/zoneinfo/right/America/Costa_Rica differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Creston b/msys2/usr/share/zoneinfo/right/America/Creston
index c9bf8b9e7..3574d74e1 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Creston and b/msys2/usr/share/zoneinfo/right/America/Creston differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Cuiaba b/msys2/usr/share/zoneinfo/right/America/Cuiaba
index 158ca5de9..d8ce7649d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Cuiaba and b/msys2/usr/share/zoneinfo/right/America/Cuiaba differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Curacao b/msys2/usr/share/zoneinfo/right/America/Curacao
index c0da2ad85..d1b018136 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Curacao and b/msys2/usr/share/zoneinfo/right/America/Curacao differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Danmarkshavn b/msys2/usr/share/zoneinfo/right/America/Danmarkshavn
index 06b682acb..ecd696029 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Danmarkshavn and b/msys2/usr/share/zoneinfo/right/America/Danmarkshavn differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Dawson b/msys2/usr/share/zoneinfo/right/America/Dawson
index 35cdfb361..fcbbc277c 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Dawson and b/msys2/usr/share/zoneinfo/right/America/Dawson differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Dawson_Creek b/msys2/usr/share/zoneinfo/right/America/Dawson_Creek
index f7bda8b1c..f512c8174 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Dawson_Creek and b/msys2/usr/share/zoneinfo/right/America/Dawson_Creek differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Denver b/msys2/usr/share/zoneinfo/right/America/Denver
index 7cc28edc8..b800db811 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Denver and b/msys2/usr/share/zoneinfo/right/America/Denver differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Detroit b/msys2/usr/share/zoneinfo/right/America/Detroit
index d9612d63d..14f0720fe 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Detroit and b/msys2/usr/share/zoneinfo/right/America/Detroit differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Dominica b/msys2/usr/share/zoneinfo/right/America/Dominica
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Dominica and b/msys2/usr/share/zoneinfo/right/America/Dominica differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Edmonton b/msys2/usr/share/zoneinfo/right/America/Edmonton
index 0e41c0df2..4239e2d1f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Edmonton and b/msys2/usr/share/zoneinfo/right/America/Edmonton differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Eirunepe b/msys2/usr/share/zoneinfo/right/America/Eirunepe
index 4c3719102..4ef3b6408 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Eirunepe and b/msys2/usr/share/zoneinfo/right/America/Eirunepe differ
diff --git a/msys2/usr/share/zoneinfo/right/America/El_Salvador b/msys2/usr/share/zoneinfo/right/America/El_Salvador
index 2cb3f3acd..1392a95fe 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/El_Salvador and b/msys2/usr/share/zoneinfo/right/America/El_Salvador differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Ensenada b/msys2/usr/share/zoneinfo/right/America/Ensenada
index 839d31a8b..29f2851d4 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Ensenada and b/msys2/usr/share/zoneinfo/right/America/Ensenada differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Fort_Nelson b/msys2/usr/share/zoneinfo/right/America/Fort_Nelson
index a792dccda..5a4b88b83 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Fort_Nelson and b/msys2/usr/share/zoneinfo/right/America/Fort_Nelson differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Fort_Wayne b/msys2/usr/share/zoneinfo/right/America/Fort_Wayne
index 2dc7d1a39..7a13a7197 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Fort_Wayne and b/msys2/usr/share/zoneinfo/right/America/Fort_Wayne differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Fortaleza b/msys2/usr/share/zoneinfo/right/America/Fortaleza
index 49b52948c..36d066628 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Fortaleza and b/msys2/usr/share/zoneinfo/right/America/Fortaleza differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Glace_Bay b/msys2/usr/share/zoneinfo/right/America/Glace_Bay
index 4ba70e10f..92abda5ac 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Glace_Bay and b/msys2/usr/share/zoneinfo/right/America/Glace_Bay differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Godthab b/msys2/usr/share/zoneinfo/right/America/Godthab
index a76d4ec18..736ee14a5 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Godthab and b/msys2/usr/share/zoneinfo/right/America/Godthab differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Goose_Bay b/msys2/usr/share/zoneinfo/right/America/Goose_Bay
index f48da6141..9bff56dc9 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Goose_Bay and b/msys2/usr/share/zoneinfo/right/America/Goose_Bay differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Grand_Turk b/msys2/usr/share/zoneinfo/right/America/Grand_Turk
index b3afa07ae..bf04ea287 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Grand_Turk and b/msys2/usr/share/zoneinfo/right/America/Grand_Turk differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Grenada b/msys2/usr/share/zoneinfo/right/America/Grenada
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Grenada and b/msys2/usr/share/zoneinfo/right/America/Grenada differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Guadeloupe b/msys2/usr/share/zoneinfo/right/America/Guadeloupe
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Guadeloupe and b/msys2/usr/share/zoneinfo/right/America/Guadeloupe differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Guatemala b/msys2/usr/share/zoneinfo/right/America/Guatemala
index f00c717c1..a7eba9055 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Guatemala and b/msys2/usr/share/zoneinfo/right/America/Guatemala differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Guayaquil b/msys2/usr/share/zoneinfo/right/America/Guayaquil
index bcffc53c8..bd48cef59 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Guayaquil and b/msys2/usr/share/zoneinfo/right/America/Guayaquil differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Guyana b/msys2/usr/share/zoneinfo/right/America/Guyana
index a3e8d6a74..81a046a71 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Guyana and b/msys2/usr/share/zoneinfo/right/America/Guyana differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Halifax b/msys2/usr/share/zoneinfo/right/America/Halifax
index ac75f42bd..e4abcd2b4 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Halifax and b/msys2/usr/share/zoneinfo/right/America/Halifax differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Havana b/msys2/usr/share/zoneinfo/right/America/Havana
index f8ac0787a..71d3caf48 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Havana and b/msys2/usr/share/zoneinfo/right/America/Havana differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Hermosillo b/msys2/usr/share/zoneinfo/right/America/Hermosillo
index 29d247688..0e32e074e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Hermosillo and b/msys2/usr/share/zoneinfo/right/America/Hermosillo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Indianapolis b/msys2/usr/share/zoneinfo/right/America/Indiana/Indianapolis
index 2dc7d1a39..7a13a7197 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Indianapolis and b/msys2/usr/share/zoneinfo/right/America/Indiana/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Knox b/msys2/usr/share/zoneinfo/right/America/Indiana/Knox
index feb31a0a9..950d4c0ff 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Knox and b/msys2/usr/share/zoneinfo/right/America/Indiana/Knox differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Marengo b/msys2/usr/share/zoneinfo/right/America/Indiana/Marengo
index 1c2058b33..23c1b5b4f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Marengo and b/msys2/usr/share/zoneinfo/right/America/Indiana/Marengo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Petersburg b/msys2/usr/share/zoneinfo/right/America/Indiana/Petersburg
index 6f969f246..1e6b12306 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Petersburg and b/msys2/usr/share/zoneinfo/right/America/Indiana/Petersburg differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Tell_City b/msys2/usr/share/zoneinfo/right/America/Indiana/Tell_City
index dfcb0ac75..9f63d87a1 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Tell_City and b/msys2/usr/share/zoneinfo/right/America/Indiana/Tell_City differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Vevay b/msys2/usr/share/zoneinfo/right/America/Indiana/Vevay
index d72a0a54a..dbae646bb 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Vevay and b/msys2/usr/share/zoneinfo/right/America/Indiana/Vevay differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Vincennes b/msys2/usr/share/zoneinfo/right/America/Indiana/Vincennes
index ecd774443..9dc0d5fa1 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Vincennes and b/msys2/usr/share/zoneinfo/right/America/Indiana/Vincennes differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indiana/Winamac b/msys2/usr/share/zoneinfo/right/America/Indiana/Winamac
index 7d08a266e..97f543001 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indiana/Winamac and b/msys2/usr/share/zoneinfo/right/America/Indiana/Winamac differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Indianapolis b/msys2/usr/share/zoneinfo/right/America/Indianapolis
index 2dc7d1a39..7a13a7197 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Indianapolis and b/msys2/usr/share/zoneinfo/right/America/Indianapolis differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Inuvik b/msys2/usr/share/zoneinfo/right/America/Inuvik
index e6ed48c25..d125a26c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Inuvik and b/msys2/usr/share/zoneinfo/right/America/Inuvik differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Iqaluit b/msys2/usr/share/zoneinfo/right/America/Iqaluit
index 6f6f2653d..e93c124ea 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Iqaluit and b/msys2/usr/share/zoneinfo/right/America/Iqaluit differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Jamaica b/msys2/usr/share/zoneinfo/right/America/Jamaica
index 9543ff895..8798d1b60 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Jamaica and b/msys2/usr/share/zoneinfo/right/America/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Jujuy b/msys2/usr/share/zoneinfo/right/America/Jujuy
index 5f293197b..2f9a3144f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Jujuy and b/msys2/usr/share/zoneinfo/right/America/Jujuy differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Juneau b/msys2/usr/share/zoneinfo/right/America/Juneau
index 653bf12f9..9ca2c6282 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Juneau and b/msys2/usr/share/zoneinfo/right/America/Juneau differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Kentucky/Louisville b/msys2/usr/share/zoneinfo/right/America/Kentucky/Louisville
index 9e954b538..e042cb098 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Kentucky/Louisville and b/msys2/usr/share/zoneinfo/right/America/Kentucky/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Kentucky/Monticello b/msys2/usr/share/zoneinfo/right/America/Kentucky/Monticello
index 1c974adad..8f2940239 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Kentucky/Monticello and b/msys2/usr/share/zoneinfo/right/America/Kentucky/Monticello differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Knox_IN b/msys2/usr/share/zoneinfo/right/America/Knox_IN
index feb31a0a9..950d4c0ff 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Knox_IN and b/msys2/usr/share/zoneinfo/right/America/Knox_IN differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Kralendijk b/msys2/usr/share/zoneinfo/right/America/Kralendijk
index c0da2ad85..d1b018136 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Kralendijk and b/msys2/usr/share/zoneinfo/right/America/Kralendijk differ
diff --git a/msys2/usr/share/zoneinfo/right/America/La_Paz b/msys2/usr/share/zoneinfo/right/America/La_Paz
index 51c483c72..3a0d1d6d8 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/La_Paz and b/msys2/usr/share/zoneinfo/right/America/La_Paz differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Lima b/msys2/usr/share/zoneinfo/right/America/Lima
index be15c482d..97ea35c9d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Lima and b/msys2/usr/share/zoneinfo/right/America/Lima differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Los_Angeles b/msys2/usr/share/zoneinfo/right/America/Los_Angeles
index 520d500b4..31bf81f12 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Los_Angeles and b/msys2/usr/share/zoneinfo/right/America/Los_Angeles differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Louisville b/msys2/usr/share/zoneinfo/right/America/Louisville
index 9e954b538..e042cb098 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Louisville and b/msys2/usr/share/zoneinfo/right/America/Louisville differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Lower_Princes b/msys2/usr/share/zoneinfo/right/America/Lower_Princes
index c0da2ad85..d1b018136 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Lower_Princes and b/msys2/usr/share/zoneinfo/right/America/Lower_Princes differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Maceio b/msys2/usr/share/zoneinfo/right/America/Maceio
index 6e672c70b..ca6eab732 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Maceio and b/msys2/usr/share/zoneinfo/right/America/Maceio differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Managua b/msys2/usr/share/zoneinfo/right/America/Managua
index a499dc740..f9a040637 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Managua and b/msys2/usr/share/zoneinfo/right/America/Managua differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Manaus b/msys2/usr/share/zoneinfo/right/America/Manaus
index aaff9de5d..1fc068e7d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Manaus and b/msys2/usr/share/zoneinfo/right/America/Manaus differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Marigot b/msys2/usr/share/zoneinfo/right/America/Marigot
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Marigot and b/msys2/usr/share/zoneinfo/right/America/Marigot differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Martinique b/msys2/usr/share/zoneinfo/right/America/Martinique
index 6b4a9501e..96bedb040 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Martinique and b/msys2/usr/share/zoneinfo/right/America/Martinique differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Matamoros b/msys2/usr/share/zoneinfo/right/America/Matamoros
index c4a20a18d..4976da2eb 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Matamoros and b/msys2/usr/share/zoneinfo/right/America/Matamoros differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Mazatlan b/msys2/usr/share/zoneinfo/right/America/Mazatlan
index 2bb9dccf6..bba9730df 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Mazatlan and b/msys2/usr/share/zoneinfo/right/America/Mazatlan differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Mendoza b/msys2/usr/share/zoneinfo/right/America/Mendoza
index 58da928bb..3202f7a68 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Mendoza and b/msys2/usr/share/zoneinfo/right/America/Mendoza differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Menominee b/msys2/usr/share/zoneinfo/right/America/Menominee
index 92ccc0012..4861fdff9 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Menominee and b/msys2/usr/share/zoneinfo/right/America/Menominee differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Merida b/msys2/usr/share/zoneinfo/right/America/Merida
index 532778f9f..7e1ec1d0a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Merida and b/msys2/usr/share/zoneinfo/right/America/Merida differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Metlakatla b/msys2/usr/share/zoneinfo/right/America/Metlakatla
index c258b07b1..d1eb4714e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Metlakatla and b/msys2/usr/share/zoneinfo/right/America/Metlakatla differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Mexico_City b/msys2/usr/share/zoneinfo/right/America/Mexico_City
index 8cd8273fe..56234844e 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Mexico_City and b/msys2/usr/share/zoneinfo/right/America/Mexico_City differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Miquelon b/msys2/usr/share/zoneinfo/right/America/Miquelon
index 570df4b54..2b6785e29 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Miquelon and b/msys2/usr/share/zoneinfo/right/America/Miquelon differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Moncton b/msys2/usr/share/zoneinfo/right/America/Moncton
index afd29e3e2..ab0eaae1a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Moncton and b/msys2/usr/share/zoneinfo/right/America/Moncton differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Monterrey b/msys2/usr/share/zoneinfo/right/America/Monterrey
index 1681adb31..43be5f610 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Monterrey and b/msys2/usr/share/zoneinfo/right/America/Monterrey differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Montevideo b/msys2/usr/share/zoneinfo/right/America/Montevideo
index d6b827045..634fbaedd 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Montevideo and b/msys2/usr/share/zoneinfo/right/America/Montevideo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Montreal b/msys2/usr/share/zoneinfo/right/America/Montreal
index 72fe02862..7fccc469a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Montreal and b/msys2/usr/share/zoneinfo/right/America/Montreal differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Montserrat b/msys2/usr/share/zoneinfo/right/America/Montserrat
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Montserrat and b/msys2/usr/share/zoneinfo/right/America/Montserrat differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Nassau b/msys2/usr/share/zoneinfo/right/America/Nassau
index 8756a35af..9118476f7 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Nassau and b/msys2/usr/share/zoneinfo/right/America/Nassau differ
diff --git a/msys2/usr/share/zoneinfo/right/America/New_York b/msys2/usr/share/zoneinfo/right/America/New_York
index 83926bd65..b1b4cc0c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/New_York and b/msys2/usr/share/zoneinfo/right/America/New_York differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Nipigon b/msys2/usr/share/zoneinfo/right/America/Nipigon
index 32abce21f..ae75464e9 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Nipigon and b/msys2/usr/share/zoneinfo/right/America/Nipigon differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Nome b/msys2/usr/share/zoneinfo/right/America/Nome
index 3087531a7..ebbde4687 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Nome and b/msys2/usr/share/zoneinfo/right/America/Nome differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Noronha b/msys2/usr/share/zoneinfo/right/America/Noronha
index c392b8dc9..a58d2f0ee 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Noronha and b/msys2/usr/share/zoneinfo/right/America/Noronha differ
diff --git a/msys2/usr/share/zoneinfo/right/America/North_Dakota/Beulah b/msys2/usr/share/zoneinfo/right/America/North_Dakota/Beulah
index d6daf1385..560e6c47d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/North_Dakota/Beulah and b/msys2/usr/share/zoneinfo/right/America/North_Dakota/Beulah differ
diff --git a/msys2/usr/share/zoneinfo/right/America/North_Dakota/Center b/msys2/usr/share/zoneinfo/right/America/North_Dakota/Center
index 0e69090b1..ff4127796 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/North_Dakota/Center and b/msys2/usr/share/zoneinfo/right/America/North_Dakota/Center differ
diff --git a/msys2/usr/share/zoneinfo/right/America/North_Dakota/New_Salem b/msys2/usr/share/zoneinfo/right/America/North_Dakota/New_Salem
index 9ee02c214..9cb416355 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/North_Dakota/New_Salem and b/msys2/usr/share/zoneinfo/right/America/North_Dakota/New_Salem differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Nuuk b/msys2/usr/share/zoneinfo/right/America/Nuuk
index a76d4ec18..736ee14a5 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Nuuk and b/msys2/usr/share/zoneinfo/right/America/Nuuk differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Ojinaga b/msys2/usr/share/zoneinfo/right/America/Ojinaga
index 062f6d2e1..67674720d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Ojinaga and b/msys2/usr/share/zoneinfo/right/America/Ojinaga differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Panama b/msys2/usr/share/zoneinfo/right/America/Panama
index 0cc6fd40c..7919f0e08 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Panama and b/msys2/usr/share/zoneinfo/right/America/Panama differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Pangnirtung b/msys2/usr/share/zoneinfo/right/America/Pangnirtung
index 591e68eee..357f53aa6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Pangnirtung and b/msys2/usr/share/zoneinfo/right/America/Pangnirtung differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Paramaribo b/msys2/usr/share/zoneinfo/right/America/Paramaribo
index ea6df7e82..9e7756a61 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Paramaribo and b/msys2/usr/share/zoneinfo/right/America/Paramaribo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Phoenix b/msys2/usr/share/zoneinfo/right/America/Phoenix
index dbd20f054..3cb292d5f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Phoenix and b/msys2/usr/share/zoneinfo/right/America/Phoenix differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Port-au-Prince b/msys2/usr/share/zoneinfo/right/America/Port-au-Prince
index 6dc6cb70a..050107786 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Port-au-Prince and b/msys2/usr/share/zoneinfo/right/America/Port-au-Prince differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Port_of_Spain b/msys2/usr/share/zoneinfo/right/America/Port_of_Spain
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Port_of_Spain and b/msys2/usr/share/zoneinfo/right/America/Port_of_Spain differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Porto_Acre b/msys2/usr/share/zoneinfo/right/America/Porto_Acre
index f1211e412..431e8fb27 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Porto_Acre and b/msys2/usr/share/zoneinfo/right/America/Porto_Acre differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Porto_Velho b/msys2/usr/share/zoneinfo/right/America/Porto_Velho
index 1bd94d94d..fe0de2a64 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Porto_Velho and b/msys2/usr/share/zoneinfo/right/America/Porto_Velho differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Puerto_Rico b/msys2/usr/share/zoneinfo/right/America/Puerto_Rico
index 1820a33a5..e54ba965a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Puerto_Rico and b/msys2/usr/share/zoneinfo/right/America/Puerto_Rico differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Punta_Arenas b/msys2/usr/share/zoneinfo/right/America/Punta_Arenas
index b48fe6f22..5a45f736f 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Punta_Arenas and b/msys2/usr/share/zoneinfo/right/America/Punta_Arenas differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Rainy_River b/msys2/usr/share/zoneinfo/right/America/Rainy_River
index 50e0d831a..32a242781 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Rainy_River and b/msys2/usr/share/zoneinfo/right/America/Rainy_River differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Rankin_Inlet b/msys2/usr/share/zoneinfo/right/America/Rankin_Inlet
index 3cb7fa831..a851b17c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Rankin_Inlet and b/msys2/usr/share/zoneinfo/right/America/Rankin_Inlet differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Recife b/msys2/usr/share/zoneinfo/right/America/Recife
index 0048be672..2084d3727 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Recife and b/msys2/usr/share/zoneinfo/right/America/Recife differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Regina b/msys2/usr/share/zoneinfo/right/America/Regina
index 9c304c51f..76c2ecbf1 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Regina and b/msys2/usr/share/zoneinfo/right/America/Regina differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Resolute b/msys2/usr/share/zoneinfo/right/America/Resolute
index dbec84083..5870af610 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Resolute and b/msys2/usr/share/zoneinfo/right/America/Resolute differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Rio_Branco b/msys2/usr/share/zoneinfo/right/America/Rio_Branco
index f1211e412..431e8fb27 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Rio_Branco and b/msys2/usr/share/zoneinfo/right/America/Rio_Branco differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Rosario b/msys2/usr/share/zoneinfo/right/America/Rosario
index adfb3a07d..7b100b1ad 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Rosario and b/msys2/usr/share/zoneinfo/right/America/Rosario differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Santa_Isabel b/msys2/usr/share/zoneinfo/right/America/Santa_Isabel
index 839d31a8b..29f2851d4 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Santa_Isabel and b/msys2/usr/share/zoneinfo/right/America/Santa_Isabel differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Santarem b/msys2/usr/share/zoneinfo/right/America/Santarem
index c3386aaa8..b39f2602d 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Santarem and b/msys2/usr/share/zoneinfo/right/America/Santarem differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Santiago b/msys2/usr/share/zoneinfo/right/America/Santiago
index 47f15e96e..f95917655 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Santiago and b/msys2/usr/share/zoneinfo/right/America/Santiago differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Santo_Domingo b/msys2/usr/share/zoneinfo/right/America/Santo_Domingo
index 957853a62..d8cf389a4 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Santo_Domingo and b/msys2/usr/share/zoneinfo/right/America/Santo_Domingo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Sao_Paulo b/msys2/usr/share/zoneinfo/right/America/Sao_Paulo
index 0c2258eb4..4cce4197b 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Sao_Paulo and b/msys2/usr/share/zoneinfo/right/America/Sao_Paulo differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Scoresbysund b/msys2/usr/share/zoneinfo/right/America/Scoresbysund
index 06684fff7..1717ba896 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Scoresbysund and b/msys2/usr/share/zoneinfo/right/America/Scoresbysund differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Shiprock b/msys2/usr/share/zoneinfo/right/America/Shiprock
index 7cc28edc8..b800db811 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Shiprock and b/msys2/usr/share/zoneinfo/right/America/Shiprock differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Sitka b/msys2/usr/share/zoneinfo/right/America/Sitka
index 5bb363cfd..583c10af9 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Sitka and b/msys2/usr/share/zoneinfo/right/America/Sitka differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Barthelemy b/msys2/usr/share/zoneinfo/right/America/St_Barthelemy
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Barthelemy and b/msys2/usr/share/zoneinfo/right/America/St_Barthelemy differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Johns b/msys2/usr/share/zoneinfo/right/America/St_Johns
index a5bbcc2b5..a261d59ec 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Johns and b/msys2/usr/share/zoneinfo/right/America/St_Johns differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Kitts b/msys2/usr/share/zoneinfo/right/America/St_Kitts
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Kitts and b/msys2/usr/share/zoneinfo/right/America/St_Kitts differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Lucia b/msys2/usr/share/zoneinfo/right/America/St_Lucia
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Lucia and b/msys2/usr/share/zoneinfo/right/America/St_Lucia differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Thomas b/msys2/usr/share/zoneinfo/right/America/St_Thomas
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Thomas and b/msys2/usr/share/zoneinfo/right/America/St_Thomas differ
diff --git a/msys2/usr/share/zoneinfo/right/America/St_Vincent b/msys2/usr/share/zoneinfo/right/America/St_Vincent
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/St_Vincent and b/msys2/usr/share/zoneinfo/right/America/St_Vincent differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Swift_Current b/msys2/usr/share/zoneinfo/right/America/Swift_Current
index e56e5d668..8902aae7a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Swift_Current and b/msys2/usr/share/zoneinfo/right/America/Swift_Current differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Tegucigalpa b/msys2/usr/share/zoneinfo/right/America/Tegucigalpa
index 2f6cea2f7..03ff0dd47 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Tegucigalpa and b/msys2/usr/share/zoneinfo/right/America/Tegucigalpa differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Thule b/msys2/usr/share/zoneinfo/right/America/Thule
index 24e4bda27..343e03b91 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Thule and b/msys2/usr/share/zoneinfo/right/America/Thule differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Thunder_Bay b/msys2/usr/share/zoneinfo/right/America/Thunder_Bay
index b786715d5..d936c5bd6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Thunder_Bay and b/msys2/usr/share/zoneinfo/right/America/Thunder_Bay differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Tijuana b/msys2/usr/share/zoneinfo/right/America/Tijuana
index 839d31a8b..29f2851d4 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Tijuana and b/msys2/usr/share/zoneinfo/right/America/Tijuana differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Toronto b/msys2/usr/share/zoneinfo/right/America/Toronto
index 72fe02862..7fccc469a 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Toronto and b/msys2/usr/share/zoneinfo/right/America/Toronto differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Tortola b/msys2/usr/share/zoneinfo/right/America/Tortola
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Tortola and b/msys2/usr/share/zoneinfo/right/America/Tortola differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Vancouver b/msys2/usr/share/zoneinfo/right/America/Vancouver
index dfccf25d4..6eb10a6aa 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Vancouver and b/msys2/usr/share/zoneinfo/right/America/Vancouver differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Virgin b/msys2/usr/share/zoneinfo/right/America/Virgin
index 5887c1357..3b9df77c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Virgin and b/msys2/usr/share/zoneinfo/right/America/Virgin differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Whitehorse b/msys2/usr/share/zoneinfo/right/America/Whitehorse
index b91dc95e5..e00b2ea09 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Whitehorse and b/msys2/usr/share/zoneinfo/right/America/Whitehorse differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Winnipeg b/msys2/usr/share/zoneinfo/right/America/Winnipeg
index f77039c35..a8d2a6c7c 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Winnipeg and b/msys2/usr/share/zoneinfo/right/America/Winnipeg differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Yakutat b/msys2/usr/share/zoneinfo/right/America/Yakutat
index cfebfa99c..84e5b3900 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Yakutat and b/msys2/usr/share/zoneinfo/right/America/Yakutat differ
diff --git a/msys2/usr/share/zoneinfo/right/America/Yellowknife b/msys2/usr/share/zoneinfo/right/America/Yellowknife
index 323dbc7d6..05fb7e4e6 100644
Binary files a/msys2/usr/share/zoneinfo/right/America/Yellowknife and b/msys2/usr/share/zoneinfo/right/America/Yellowknife differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Casey b/msys2/usr/share/zoneinfo/right/Antarctica/Casey
index d5eafd07d..bceeb842a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Casey and b/msys2/usr/share/zoneinfo/right/Antarctica/Casey differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Davis b/msys2/usr/share/zoneinfo/right/Antarctica/Davis
index 9a2031dc6..437efd89a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Davis and b/msys2/usr/share/zoneinfo/right/Antarctica/Davis differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/DumontDUrville b/msys2/usr/share/zoneinfo/right/Antarctica/DumontDUrville
index 0bfaa3eb0..6671d2ae1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/DumontDUrville and b/msys2/usr/share/zoneinfo/right/Antarctica/DumontDUrville differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Macquarie b/msys2/usr/share/zoneinfo/right/Antarctica/Macquarie
index 026289a82..da8af8990 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Macquarie and b/msys2/usr/share/zoneinfo/right/Antarctica/Macquarie differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Mawson b/msys2/usr/share/zoneinfo/right/Antarctica/Mawson
index 83d72c1b1..a26b3a74a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Mawson and b/msys2/usr/share/zoneinfo/right/Antarctica/Mawson differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/McMurdo b/msys2/usr/share/zoneinfo/right/Antarctica/McMurdo
index 3a6cc208f..210dcf938 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/McMurdo and b/msys2/usr/share/zoneinfo/right/Antarctica/McMurdo differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Palmer b/msys2/usr/share/zoneinfo/right/Antarctica/Palmer
index e46672f63..0aefa9901 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Palmer and b/msys2/usr/share/zoneinfo/right/Antarctica/Palmer differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Rothera b/msys2/usr/share/zoneinfo/right/Antarctica/Rothera
index cf65557b8..71704daef 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Rothera and b/msys2/usr/share/zoneinfo/right/Antarctica/Rothera differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/South_Pole b/msys2/usr/share/zoneinfo/right/Antarctica/South_Pole
index 3a6cc208f..210dcf938 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/South_Pole and b/msys2/usr/share/zoneinfo/right/Antarctica/South_Pole differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Syowa b/msys2/usr/share/zoneinfo/right/Antarctica/Syowa
index 3a29f3a2b..7ddaa46b8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Syowa and b/msys2/usr/share/zoneinfo/right/Antarctica/Syowa differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Troll b/msys2/usr/share/zoneinfo/right/Antarctica/Troll
index 3c8519935..c7442473c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Troll and b/msys2/usr/share/zoneinfo/right/Antarctica/Troll differ
diff --git a/msys2/usr/share/zoneinfo/right/Antarctica/Vostok b/msys2/usr/share/zoneinfo/right/Antarctica/Vostok
index bea7f3060..aa7f47615 100644
Binary files a/msys2/usr/share/zoneinfo/right/Antarctica/Vostok and b/msys2/usr/share/zoneinfo/right/Antarctica/Vostok differ
diff --git a/msys2/usr/share/zoneinfo/right/Arctic/Longyearbyen b/msys2/usr/share/zoneinfo/right/Arctic/Longyearbyen
index 6ea3cae9f..53c7ddbbc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Arctic/Longyearbyen and b/msys2/usr/share/zoneinfo/right/Arctic/Longyearbyen differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Aden b/msys2/usr/share/zoneinfo/right/Asia/Aden
index 85923ab5e..985c25f50 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Aden and b/msys2/usr/share/zoneinfo/right/Asia/Aden differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Almaty b/msys2/usr/share/zoneinfo/right/Asia/Almaty
index f1b220158..df8c4d369 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Almaty and b/msys2/usr/share/zoneinfo/right/Asia/Almaty differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Amman b/msys2/usr/share/zoneinfo/right/Asia/Amman
index ab164f479..167737ba5 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Amman and b/msys2/usr/share/zoneinfo/right/Asia/Amman differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Anadyr b/msys2/usr/share/zoneinfo/right/Asia/Anadyr
index 8b52b25f6..5f502697e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Anadyr and b/msys2/usr/share/zoneinfo/right/Asia/Anadyr differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Aqtau b/msys2/usr/share/zoneinfo/right/Asia/Aqtau
index 4e331a0c3..5804b1bc4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Aqtau and b/msys2/usr/share/zoneinfo/right/Asia/Aqtau differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Aqtobe b/msys2/usr/share/zoneinfo/right/Asia/Aqtobe
index 06b7b73dd..d91d41adb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Aqtobe and b/msys2/usr/share/zoneinfo/right/Asia/Aqtobe differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ashgabat b/msys2/usr/share/zoneinfo/right/Asia/Ashgabat
index 671d7cdf3..a0a6dc1cd 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ashgabat and b/msys2/usr/share/zoneinfo/right/Asia/Ashgabat differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ashkhabad b/msys2/usr/share/zoneinfo/right/Asia/Ashkhabad
index 671d7cdf3..a0a6dc1cd 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ashkhabad and b/msys2/usr/share/zoneinfo/right/Asia/Ashkhabad differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Atyrau b/msys2/usr/share/zoneinfo/right/Asia/Atyrau
index 112ad26cf..b0dde56da 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Atyrau and b/msys2/usr/share/zoneinfo/right/Asia/Atyrau differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Baghdad b/msys2/usr/share/zoneinfo/right/Asia/Baghdad
index 171394d54..dbf014a2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Baghdad and b/msys2/usr/share/zoneinfo/right/Asia/Baghdad differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Bahrain b/msys2/usr/share/zoneinfo/right/Asia/Bahrain
index fc1b0f049..85264ed6b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Bahrain and b/msys2/usr/share/zoneinfo/right/Asia/Bahrain differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Baku b/msys2/usr/share/zoneinfo/right/Asia/Baku
index 27ffd0f1a..65887add9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Baku and b/msys2/usr/share/zoneinfo/right/Asia/Baku differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Bangkok b/msys2/usr/share/zoneinfo/right/Asia/Bangkok
index 95e1f9cc7..464d4a4d2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Bangkok and b/msys2/usr/share/zoneinfo/right/Asia/Bangkok differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Barnaul b/msys2/usr/share/zoneinfo/right/Asia/Barnaul
index b375395ac..29cbe15a8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Barnaul and b/msys2/usr/share/zoneinfo/right/Asia/Barnaul differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Beirut b/msys2/usr/share/zoneinfo/right/Asia/Beirut
index 66525cb2d..af3ce4b8a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Beirut and b/msys2/usr/share/zoneinfo/right/Asia/Beirut differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Bishkek b/msys2/usr/share/zoneinfo/right/Asia/Bishkek
index b830acbc6..81e95efa5 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Bishkek and b/msys2/usr/share/zoneinfo/right/Asia/Bishkek differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Brunei b/msys2/usr/share/zoneinfo/right/Asia/Brunei
index 574cfa6a2..492aed378 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Brunei and b/msys2/usr/share/zoneinfo/right/Asia/Brunei differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Calcutta b/msys2/usr/share/zoneinfo/right/Asia/Calcutta
index 3dd9b7935..0af6c508b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Calcutta and b/msys2/usr/share/zoneinfo/right/Asia/Calcutta differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Chita b/msys2/usr/share/zoneinfo/right/Asia/Chita
index 71789c9fd..1161b8072 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Chita and b/msys2/usr/share/zoneinfo/right/Asia/Chita differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Choibalsan b/msys2/usr/share/zoneinfo/right/Asia/Choibalsan
index 42e9148eb..84bfcc7bb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Choibalsan and b/msys2/usr/share/zoneinfo/right/Asia/Choibalsan differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Chongqing b/msys2/usr/share/zoneinfo/right/Asia/Chongqing
index f07831972..10d15fcbb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Chongqing and b/msys2/usr/share/zoneinfo/right/Asia/Chongqing differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Chungking b/msys2/usr/share/zoneinfo/right/Asia/Chungking
index f07831972..10d15fcbb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Chungking and b/msys2/usr/share/zoneinfo/right/Asia/Chungking differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Colombo b/msys2/usr/share/zoneinfo/right/Asia/Colombo
index 1117cccd2..571ed00a6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Colombo and b/msys2/usr/share/zoneinfo/right/Asia/Colombo differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Dacca b/msys2/usr/share/zoneinfo/right/Asia/Dacca
index 1fbbd23d7..7af09a465 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Dacca and b/msys2/usr/share/zoneinfo/right/Asia/Dacca differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Damascus b/msys2/usr/share/zoneinfo/right/Asia/Damascus
index 02d386688..7685780d9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Damascus and b/msys2/usr/share/zoneinfo/right/Asia/Damascus differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Dhaka b/msys2/usr/share/zoneinfo/right/Asia/Dhaka
index 1fbbd23d7..7af09a465 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Dhaka and b/msys2/usr/share/zoneinfo/right/Asia/Dhaka differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Dili b/msys2/usr/share/zoneinfo/right/Asia/Dili
index 0ce422551..e5134e68e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Dili and b/msys2/usr/share/zoneinfo/right/Asia/Dili differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Dubai b/msys2/usr/share/zoneinfo/right/Asia/Dubai
index 9ac9a64b3..f6e745cfe 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Dubai and b/msys2/usr/share/zoneinfo/right/Asia/Dubai differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Dushanbe b/msys2/usr/share/zoneinfo/right/Asia/Dushanbe
index c6ec39830..50c3a12b3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Dushanbe and b/msys2/usr/share/zoneinfo/right/Asia/Dushanbe differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Famagusta b/msys2/usr/share/zoneinfo/right/Asia/Famagusta
index ab782b770..05d9b1d6a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Famagusta and b/msys2/usr/share/zoneinfo/right/Asia/Famagusta differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Gaza b/msys2/usr/share/zoneinfo/right/Asia/Gaza
index da9adcc42..95efedb75 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Gaza and b/msys2/usr/share/zoneinfo/right/Asia/Gaza differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Harbin b/msys2/usr/share/zoneinfo/right/Asia/Harbin
index f07831972..10d15fcbb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Harbin and b/msys2/usr/share/zoneinfo/right/Asia/Harbin differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Hebron b/msys2/usr/share/zoneinfo/right/Asia/Hebron
index 5b2d9a6de..c882529d0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Hebron and b/msys2/usr/share/zoneinfo/right/Asia/Hebron differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ho_Chi_Minh b/msys2/usr/share/zoneinfo/right/Asia/Ho_Chi_Minh
index 9953637ed..529e2dc26 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ho_Chi_Minh and b/msys2/usr/share/zoneinfo/right/Asia/Ho_Chi_Minh differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Hong_Kong b/msys2/usr/share/zoneinfo/right/Asia/Hong_Kong
index c42348088..16b5369c8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Hong_Kong and b/msys2/usr/share/zoneinfo/right/Asia/Hong_Kong differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Hovd b/msys2/usr/share/zoneinfo/right/Asia/Hovd
index 827c5861b..af58ab661 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Hovd and b/msys2/usr/share/zoneinfo/right/Asia/Hovd differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Irkutsk b/msys2/usr/share/zoneinfo/right/Asia/Irkutsk
index d1c4b633d..f16eccfc3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Irkutsk and b/msys2/usr/share/zoneinfo/right/Asia/Irkutsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Istanbul b/msys2/usr/share/zoneinfo/right/Asia/Istanbul
index ffd127329..93c8e5b7a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Istanbul and b/msys2/usr/share/zoneinfo/right/Asia/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Jakarta b/msys2/usr/share/zoneinfo/right/Asia/Jakarta
index f4fe40a99..09c80778c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Jakarta and b/msys2/usr/share/zoneinfo/right/Asia/Jakarta differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Jayapura b/msys2/usr/share/zoneinfo/right/Asia/Jayapura
index 106351e75..7ab871342 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Jayapura and b/msys2/usr/share/zoneinfo/right/Asia/Jayapura differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Jerusalem b/msys2/usr/share/zoneinfo/right/Asia/Jerusalem
index 35a24d26c..c940d3e37 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Jerusalem and b/msys2/usr/share/zoneinfo/right/Asia/Jerusalem differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kabul b/msys2/usr/share/zoneinfo/right/Asia/Kabul
index c9d5fd0db..7d588cbd8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kabul and b/msys2/usr/share/zoneinfo/right/Asia/Kabul differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kamchatka b/msys2/usr/share/zoneinfo/right/Asia/Kamchatka
index 5fe7bf4b6..4d7944c5e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kamchatka and b/msys2/usr/share/zoneinfo/right/Asia/Kamchatka differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Karachi b/msys2/usr/share/zoneinfo/right/Asia/Karachi
index e39804b0c..200c0388d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Karachi and b/msys2/usr/share/zoneinfo/right/Asia/Karachi differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kashgar b/msys2/usr/share/zoneinfo/right/Asia/Kashgar
index 6957be063..2447499c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kashgar and b/msys2/usr/share/zoneinfo/right/Asia/Kashgar differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kathmandu b/msys2/usr/share/zoneinfo/right/Asia/Kathmandu
index 9a3a5318e..88d2b8d49 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kathmandu and b/msys2/usr/share/zoneinfo/right/Asia/Kathmandu differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Katmandu b/msys2/usr/share/zoneinfo/right/Asia/Katmandu
index 9a3a5318e..88d2b8d49 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Katmandu and b/msys2/usr/share/zoneinfo/right/Asia/Katmandu differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Khandyga b/msys2/usr/share/zoneinfo/right/Asia/Khandyga
index b42458f70..4858bac3d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Khandyga and b/msys2/usr/share/zoneinfo/right/Asia/Khandyga differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kolkata b/msys2/usr/share/zoneinfo/right/Asia/Kolkata
index 3dd9b7935..0af6c508b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kolkata and b/msys2/usr/share/zoneinfo/right/Asia/Kolkata differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Krasnoyarsk b/msys2/usr/share/zoneinfo/right/Asia/Krasnoyarsk
index dded055ab..be2287488 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Krasnoyarsk and b/msys2/usr/share/zoneinfo/right/Asia/Krasnoyarsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kuala_Lumpur b/msys2/usr/share/zoneinfo/right/Asia/Kuala_Lumpur
index 68a655f24..9cf9305d3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kuala_Lumpur and b/msys2/usr/share/zoneinfo/right/Asia/Kuala_Lumpur differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kuching b/msys2/usr/share/zoneinfo/right/Asia/Kuching
index 939dfd5e2..967241969 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kuching and b/msys2/usr/share/zoneinfo/right/Asia/Kuching differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Kuwait b/msys2/usr/share/zoneinfo/right/Asia/Kuwait
index 85923ab5e..985c25f50 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Kuwait and b/msys2/usr/share/zoneinfo/right/Asia/Kuwait differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Macao b/msys2/usr/share/zoneinfo/right/Asia/Macao
index ac56ec8dc..28db27d4c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Macao and b/msys2/usr/share/zoneinfo/right/Asia/Macao differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Macau b/msys2/usr/share/zoneinfo/right/Asia/Macau
index ac56ec8dc..28db27d4c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Macau and b/msys2/usr/share/zoneinfo/right/Asia/Macau differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Magadan b/msys2/usr/share/zoneinfo/right/Asia/Magadan
index 9d98be2ea..12f0126b8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Magadan and b/msys2/usr/share/zoneinfo/right/Asia/Magadan differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Makassar b/msys2/usr/share/zoneinfo/right/Asia/Makassar
index aa9cfc050..bc6c3b624 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Makassar and b/msys2/usr/share/zoneinfo/right/Asia/Makassar differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Manila b/msys2/usr/share/zoneinfo/right/Asia/Manila
index b208e1d2f..24f61651e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Manila and b/msys2/usr/share/zoneinfo/right/Asia/Manila differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Muscat b/msys2/usr/share/zoneinfo/right/Asia/Muscat
index 9ac9a64b3..f6e745cfe 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Muscat and b/msys2/usr/share/zoneinfo/right/Asia/Muscat differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Nicosia b/msys2/usr/share/zoneinfo/right/Asia/Nicosia
index c85280267..f7160c07b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Nicosia and b/msys2/usr/share/zoneinfo/right/Asia/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Novokuznetsk b/msys2/usr/share/zoneinfo/right/Asia/Novokuznetsk
index 35a4d7399..417857234 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Novokuznetsk and b/msys2/usr/share/zoneinfo/right/Asia/Novokuznetsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Novosibirsk b/msys2/usr/share/zoneinfo/right/Asia/Novosibirsk
index 38bee6832..425ab9ad4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Novosibirsk and b/msys2/usr/share/zoneinfo/right/Asia/Novosibirsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Omsk b/msys2/usr/share/zoneinfo/right/Asia/Omsk
index 49da6c254..48964e054 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Omsk and b/msys2/usr/share/zoneinfo/right/Asia/Omsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Oral b/msys2/usr/share/zoneinfo/right/Asia/Oral
index a5ae46459..ff2945c86 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Oral and b/msys2/usr/share/zoneinfo/right/Asia/Oral differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Phnom_Penh b/msys2/usr/share/zoneinfo/right/Asia/Phnom_Penh
index 95e1f9cc7..464d4a4d2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Phnom_Penh and b/msys2/usr/share/zoneinfo/right/Asia/Phnom_Penh differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Pontianak b/msys2/usr/share/zoneinfo/right/Asia/Pontianak
index d757ab04f..141aa0445 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Pontianak and b/msys2/usr/share/zoneinfo/right/Asia/Pontianak differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Pyongyang b/msys2/usr/share/zoneinfo/right/Asia/Pyongyang
index 2f5aa95c6..4cfa74112 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Pyongyang and b/msys2/usr/share/zoneinfo/right/Asia/Pyongyang differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Qatar b/msys2/usr/share/zoneinfo/right/Asia/Qatar
index fc1b0f049..85264ed6b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Qatar and b/msys2/usr/share/zoneinfo/right/Asia/Qatar differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Qostanay b/msys2/usr/share/zoneinfo/right/Asia/Qostanay
index e0bddd632..34c782267 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Qostanay and b/msys2/usr/share/zoneinfo/right/Asia/Qostanay differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Qyzylorda b/msys2/usr/share/zoneinfo/right/Asia/Qyzylorda
index 27a575793..ab10a2a1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Qyzylorda and b/msys2/usr/share/zoneinfo/right/Asia/Qyzylorda differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Rangoon b/msys2/usr/share/zoneinfo/right/Asia/Rangoon
index fd5ffec69..5caf07fae 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Rangoon and b/msys2/usr/share/zoneinfo/right/Asia/Rangoon differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Riyadh b/msys2/usr/share/zoneinfo/right/Asia/Riyadh
index 85923ab5e..985c25f50 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Riyadh and b/msys2/usr/share/zoneinfo/right/Asia/Riyadh differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Saigon b/msys2/usr/share/zoneinfo/right/Asia/Saigon
index 9953637ed..529e2dc26 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Saigon and b/msys2/usr/share/zoneinfo/right/Asia/Saigon differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Sakhalin b/msys2/usr/share/zoneinfo/right/Asia/Sakhalin
index 1e0193fb2..62f1031be 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Sakhalin and b/msys2/usr/share/zoneinfo/right/Asia/Sakhalin differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Samarkand b/msys2/usr/share/zoneinfo/right/Asia/Samarkand
index 49e488a7b..a35a80056 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Samarkand and b/msys2/usr/share/zoneinfo/right/Asia/Samarkand differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Seoul b/msys2/usr/share/zoneinfo/right/Asia/Seoul
index f9120e3d4..dd70ccd2b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Seoul and b/msys2/usr/share/zoneinfo/right/Asia/Seoul differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Shanghai b/msys2/usr/share/zoneinfo/right/Asia/Shanghai
index f07831972..10d15fcbb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Shanghai and b/msys2/usr/share/zoneinfo/right/Asia/Shanghai differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Singapore b/msys2/usr/share/zoneinfo/right/Asia/Singapore
index 3dc6d5263..00d44974f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Singapore and b/msys2/usr/share/zoneinfo/right/Asia/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Srednekolymsk b/msys2/usr/share/zoneinfo/right/Asia/Srednekolymsk
index f4b6b9a2d..c6210222a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Srednekolymsk and b/msys2/usr/share/zoneinfo/right/Asia/Srednekolymsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Taipei b/msys2/usr/share/zoneinfo/right/Asia/Taipei
index fe077c96e..6e38b26be 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Taipei and b/msys2/usr/share/zoneinfo/right/Asia/Taipei differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tashkent b/msys2/usr/share/zoneinfo/right/Asia/Tashkent
index 25a47130e..398eff445 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tashkent and b/msys2/usr/share/zoneinfo/right/Asia/Tashkent differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tbilisi b/msys2/usr/share/zoneinfo/right/Asia/Tbilisi
index 49250cb23..1676e160b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tbilisi and b/msys2/usr/share/zoneinfo/right/Asia/Tbilisi differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tehran b/msys2/usr/share/zoneinfo/right/Asia/Tehran
index 0bc7b8ced..719dd4c39 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tehran and b/msys2/usr/share/zoneinfo/right/Asia/Tehran differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tel_Aviv b/msys2/usr/share/zoneinfo/right/Asia/Tel_Aviv
index 35a24d26c..c940d3e37 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tel_Aviv and b/msys2/usr/share/zoneinfo/right/Asia/Tel_Aviv differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Thimbu b/msys2/usr/share/zoneinfo/right/Asia/Thimbu
index a0644db8e..993560f8d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Thimbu and b/msys2/usr/share/zoneinfo/right/Asia/Thimbu differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Thimphu b/msys2/usr/share/zoneinfo/right/Asia/Thimphu
index a0644db8e..993560f8d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Thimphu and b/msys2/usr/share/zoneinfo/right/Asia/Thimphu differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tokyo b/msys2/usr/share/zoneinfo/right/Asia/Tokyo
index cf9eaf063..1a1917b2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tokyo and b/msys2/usr/share/zoneinfo/right/Asia/Tokyo differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Tomsk b/msys2/usr/share/zoneinfo/right/Asia/Tomsk
index bfcd44de4..84f3daf43 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Tomsk and b/msys2/usr/share/zoneinfo/right/Asia/Tomsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ujung_Pandang b/msys2/usr/share/zoneinfo/right/Asia/Ujung_Pandang
index aa9cfc050..bc6c3b624 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ujung_Pandang and b/msys2/usr/share/zoneinfo/right/Asia/Ujung_Pandang differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ulaanbaatar b/msys2/usr/share/zoneinfo/right/Asia/Ulaanbaatar
index 524037aef..5b2fe151d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ulaanbaatar and b/msys2/usr/share/zoneinfo/right/Asia/Ulaanbaatar differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ulan_Bator b/msys2/usr/share/zoneinfo/right/Asia/Ulan_Bator
index 524037aef..5b2fe151d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ulan_Bator and b/msys2/usr/share/zoneinfo/right/Asia/Ulan_Bator differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Urumqi b/msys2/usr/share/zoneinfo/right/Asia/Urumqi
index 6957be063..2447499c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Urumqi and b/msys2/usr/share/zoneinfo/right/Asia/Urumqi differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Ust-Nera b/msys2/usr/share/zoneinfo/right/Asia/Ust-Nera
index f348853e3..282c9d524 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Ust-Nera and b/msys2/usr/share/zoneinfo/right/Asia/Ust-Nera differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Vientiane b/msys2/usr/share/zoneinfo/right/Asia/Vientiane
index 95e1f9cc7..464d4a4d2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Vientiane and b/msys2/usr/share/zoneinfo/right/Asia/Vientiane differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Vladivostok b/msys2/usr/share/zoneinfo/right/Asia/Vladivostok
index c65d0170b..11c067562 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Vladivostok and b/msys2/usr/share/zoneinfo/right/Asia/Vladivostok differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Yakutsk b/msys2/usr/share/zoneinfo/right/Asia/Yakutsk
index c19b9b668..d0d06a635 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Yakutsk and b/msys2/usr/share/zoneinfo/right/Asia/Yakutsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Yangon b/msys2/usr/share/zoneinfo/right/Asia/Yangon
index fd5ffec69..5caf07fae 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Yangon and b/msys2/usr/share/zoneinfo/right/Asia/Yangon differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Yekaterinburg b/msys2/usr/share/zoneinfo/right/Asia/Yekaterinburg
index 4acc0b4c8..b70d57d23 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Yekaterinburg and b/msys2/usr/share/zoneinfo/right/Asia/Yekaterinburg differ
diff --git a/msys2/usr/share/zoneinfo/right/Asia/Yerevan b/msys2/usr/share/zoneinfo/right/Asia/Yerevan
index 243dea721..a62de2f19 100644
Binary files a/msys2/usr/share/zoneinfo/right/Asia/Yerevan and b/msys2/usr/share/zoneinfo/right/Asia/Yerevan differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Azores b/msys2/usr/share/zoneinfo/right/Atlantic/Azores
index b0f6bb456..53256540b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Azores and b/msys2/usr/share/zoneinfo/right/Atlantic/Azores differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Bermuda b/msys2/usr/share/zoneinfo/right/Atlantic/Bermuda
index 3b93e9733..988d8eebb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Bermuda and b/msys2/usr/share/zoneinfo/right/Atlantic/Bermuda differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Canary b/msys2/usr/share/zoneinfo/right/Atlantic/Canary
index 1f5d7f9ac..aa1b4fa05 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Canary and b/msys2/usr/share/zoneinfo/right/Atlantic/Canary differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Cape_Verde b/msys2/usr/share/zoneinfo/right/Atlantic/Cape_Verde
index f02517263..6dae3728b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Cape_Verde and b/msys2/usr/share/zoneinfo/right/Atlantic/Cape_Verde differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Faeroe b/msys2/usr/share/zoneinfo/right/Atlantic/Faeroe
index fcc0d51f0..981173c21 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Faeroe and b/msys2/usr/share/zoneinfo/right/Atlantic/Faeroe differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Faroe b/msys2/usr/share/zoneinfo/right/Atlantic/Faroe
index fcc0d51f0..981173c21 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Faroe and b/msys2/usr/share/zoneinfo/right/Atlantic/Faroe differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Jan_Mayen b/msys2/usr/share/zoneinfo/right/Atlantic/Jan_Mayen
index 6ea3cae9f..53c7ddbbc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Jan_Mayen and b/msys2/usr/share/zoneinfo/right/Atlantic/Jan_Mayen differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Madeira b/msys2/usr/share/zoneinfo/right/Atlantic/Madeira
index c0fe52880..207484a5f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Madeira and b/msys2/usr/share/zoneinfo/right/Atlantic/Madeira differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Reykjavik b/msys2/usr/share/zoneinfo/right/Atlantic/Reykjavik
index 79871535a..56c377cc3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Reykjavik and b/msys2/usr/share/zoneinfo/right/Atlantic/Reykjavik differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/South_Georgia b/msys2/usr/share/zoneinfo/right/Atlantic/South_Georgia
index 4403b1a23..c8ce3ca53 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/South_Georgia and b/msys2/usr/share/zoneinfo/right/Atlantic/South_Georgia differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/St_Helena b/msys2/usr/share/zoneinfo/right/Atlantic/St_Helena
index 5c7730ca0..50fbe72bf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/St_Helena and b/msys2/usr/share/zoneinfo/right/Atlantic/St_Helena differ
diff --git a/msys2/usr/share/zoneinfo/right/Atlantic/Stanley b/msys2/usr/share/zoneinfo/right/Atlantic/Stanley
index 6def9ec7b..aed22d616 100644
Binary files a/msys2/usr/share/zoneinfo/right/Atlantic/Stanley and b/msys2/usr/share/zoneinfo/right/Atlantic/Stanley differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/ACT b/msys2/usr/share/zoneinfo/right/Australia/ACT
index cea3dc35f..0caa25fd7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/ACT and b/msys2/usr/share/zoneinfo/right/Australia/ACT differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Adelaide b/msys2/usr/share/zoneinfo/right/Australia/Adelaide
index 99425f7d4..164951b97 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Adelaide and b/msys2/usr/share/zoneinfo/right/Australia/Adelaide differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Brisbane b/msys2/usr/share/zoneinfo/right/Australia/Brisbane
index aa950270c..8dfe29d2c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Brisbane and b/msys2/usr/share/zoneinfo/right/Australia/Brisbane differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Broken_Hill b/msys2/usr/share/zoneinfo/right/Australia/Broken_Hill
index 0a3502f73..c25595d2f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Broken_Hill and b/msys2/usr/share/zoneinfo/right/Australia/Broken_Hill differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Canberra b/msys2/usr/share/zoneinfo/right/Australia/Canberra
index cea3dc35f..0caa25fd7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Canberra and b/msys2/usr/share/zoneinfo/right/Australia/Canberra differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Currie b/msys2/usr/share/zoneinfo/right/Australia/Currie
index 5c3a61d86..d213b3aa6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Currie and b/msys2/usr/share/zoneinfo/right/Australia/Currie differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Darwin b/msys2/usr/share/zoneinfo/right/Australia/Darwin
index e9a709039..39f64e485 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Darwin and b/msys2/usr/share/zoneinfo/right/Australia/Darwin differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Eucla b/msys2/usr/share/zoneinfo/right/Australia/Eucla
index 44f679e3f..ca8ba76e2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Eucla and b/msys2/usr/share/zoneinfo/right/Australia/Eucla differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Hobart b/msys2/usr/share/zoneinfo/right/Australia/Hobart
index a94d721be..d213b3aa6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Hobart and b/msys2/usr/share/zoneinfo/right/Australia/Hobart differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/LHI b/msys2/usr/share/zoneinfo/right/Australia/LHI
index 15b98780f..7f77ef433 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/LHI and b/msys2/usr/share/zoneinfo/right/Australia/LHI differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Lindeman b/msys2/usr/share/zoneinfo/right/Australia/Lindeman
index 6087b3933..fbf82fa59 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Lindeman and b/msys2/usr/share/zoneinfo/right/Australia/Lindeman differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Lord_Howe b/msys2/usr/share/zoneinfo/right/Australia/Lord_Howe
index 15b98780f..7f77ef433 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Lord_Howe and b/msys2/usr/share/zoneinfo/right/Australia/Lord_Howe differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Melbourne b/msys2/usr/share/zoneinfo/right/Australia/Melbourne
index 5f79613ef..4557198b2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Melbourne and b/msys2/usr/share/zoneinfo/right/Australia/Melbourne differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/NSW b/msys2/usr/share/zoneinfo/right/Australia/NSW
index cea3dc35f..0caa25fd7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/NSW and b/msys2/usr/share/zoneinfo/right/Australia/NSW differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/North b/msys2/usr/share/zoneinfo/right/Australia/North
index e9a709039..39f64e485 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/North and b/msys2/usr/share/zoneinfo/right/Australia/North differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Perth b/msys2/usr/share/zoneinfo/right/Australia/Perth
index be7fc0985..081ddde78 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Perth and b/msys2/usr/share/zoneinfo/right/Australia/Perth differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Queensland b/msys2/usr/share/zoneinfo/right/Australia/Queensland
index aa950270c..8dfe29d2c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Queensland and b/msys2/usr/share/zoneinfo/right/Australia/Queensland differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/South b/msys2/usr/share/zoneinfo/right/Australia/South
index 99425f7d4..164951b97 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/South and b/msys2/usr/share/zoneinfo/right/Australia/South differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Sydney b/msys2/usr/share/zoneinfo/right/Australia/Sydney
index cea3dc35f..0caa25fd7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Sydney and b/msys2/usr/share/zoneinfo/right/Australia/Sydney differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Tasmania b/msys2/usr/share/zoneinfo/right/Australia/Tasmania
index a94d721be..d213b3aa6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Tasmania and b/msys2/usr/share/zoneinfo/right/Australia/Tasmania differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Victoria b/msys2/usr/share/zoneinfo/right/Australia/Victoria
index 5f79613ef..4557198b2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Victoria and b/msys2/usr/share/zoneinfo/right/Australia/Victoria differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/West b/msys2/usr/share/zoneinfo/right/Australia/West
index be7fc0985..081ddde78 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/West and b/msys2/usr/share/zoneinfo/right/Australia/West differ
diff --git a/msys2/usr/share/zoneinfo/right/Australia/Yancowinna b/msys2/usr/share/zoneinfo/right/Australia/Yancowinna
index 0a3502f73..c25595d2f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Australia/Yancowinna and b/msys2/usr/share/zoneinfo/right/Australia/Yancowinna differ
diff --git a/msys2/usr/share/zoneinfo/right/Brazil/Acre b/msys2/usr/share/zoneinfo/right/Brazil/Acre
index f1211e412..431e8fb27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Brazil/Acre and b/msys2/usr/share/zoneinfo/right/Brazil/Acre differ
diff --git a/msys2/usr/share/zoneinfo/right/Brazil/DeNoronha b/msys2/usr/share/zoneinfo/right/Brazil/DeNoronha
index c392b8dc9..a58d2f0ee 100644
Binary files a/msys2/usr/share/zoneinfo/right/Brazil/DeNoronha and b/msys2/usr/share/zoneinfo/right/Brazil/DeNoronha differ
diff --git a/msys2/usr/share/zoneinfo/right/Brazil/East b/msys2/usr/share/zoneinfo/right/Brazil/East
index 0c2258eb4..4cce4197b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Brazil/East and b/msys2/usr/share/zoneinfo/right/Brazil/East differ
diff --git a/msys2/usr/share/zoneinfo/right/Brazil/West b/msys2/usr/share/zoneinfo/right/Brazil/West
index aaff9de5d..1fc068e7d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Brazil/West and b/msys2/usr/share/zoneinfo/right/Brazil/West differ
diff --git a/msys2/usr/share/zoneinfo/right/CET b/msys2/usr/share/zoneinfo/right/CET
index fb81d7a14..032150f51 100644
Binary files a/msys2/usr/share/zoneinfo/right/CET and b/msys2/usr/share/zoneinfo/right/CET differ
diff --git a/msys2/usr/share/zoneinfo/right/CST6CDT b/msys2/usr/share/zoneinfo/right/CST6CDT
index b2ba8362d..84de6c544 100644
Binary files a/msys2/usr/share/zoneinfo/right/CST6CDT and b/msys2/usr/share/zoneinfo/right/CST6CDT differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Atlantic b/msys2/usr/share/zoneinfo/right/Canada/Atlantic
index ac75f42bd..e4abcd2b4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Atlantic and b/msys2/usr/share/zoneinfo/right/Canada/Atlantic differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Central b/msys2/usr/share/zoneinfo/right/Canada/Central
index f77039c35..a8d2a6c7c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Central and b/msys2/usr/share/zoneinfo/right/Canada/Central differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Eastern b/msys2/usr/share/zoneinfo/right/Canada/Eastern
index 72fe02862..7fccc469a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Eastern and b/msys2/usr/share/zoneinfo/right/Canada/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Mountain b/msys2/usr/share/zoneinfo/right/Canada/Mountain
index 0e41c0df2..4239e2d1f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Mountain and b/msys2/usr/share/zoneinfo/right/Canada/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Newfoundland b/msys2/usr/share/zoneinfo/right/Canada/Newfoundland
index a5bbcc2b5..a261d59ec 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Newfoundland and b/msys2/usr/share/zoneinfo/right/Canada/Newfoundland differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Pacific b/msys2/usr/share/zoneinfo/right/Canada/Pacific
index dfccf25d4..6eb10a6aa 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Pacific and b/msys2/usr/share/zoneinfo/right/Canada/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Saskatchewan b/msys2/usr/share/zoneinfo/right/Canada/Saskatchewan
index 9c304c51f..76c2ecbf1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Saskatchewan and b/msys2/usr/share/zoneinfo/right/Canada/Saskatchewan differ
diff --git a/msys2/usr/share/zoneinfo/right/Canada/Yukon b/msys2/usr/share/zoneinfo/right/Canada/Yukon
index b91dc95e5..e00b2ea09 100644
Binary files a/msys2/usr/share/zoneinfo/right/Canada/Yukon and b/msys2/usr/share/zoneinfo/right/Canada/Yukon differ
diff --git a/msys2/usr/share/zoneinfo/right/Chile/Continental b/msys2/usr/share/zoneinfo/right/Chile/Continental
index 47f15e96e..f95917655 100644
Binary files a/msys2/usr/share/zoneinfo/right/Chile/Continental and b/msys2/usr/share/zoneinfo/right/Chile/Continental differ
diff --git a/msys2/usr/share/zoneinfo/right/Chile/EasterIsland b/msys2/usr/share/zoneinfo/right/Chile/EasterIsland
index 15307cdc1..6fb2c6a94 100644
Binary files a/msys2/usr/share/zoneinfo/right/Chile/EasterIsland and b/msys2/usr/share/zoneinfo/right/Chile/EasterIsland differ
diff --git a/msys2/usr/share/zoneinfo/right/Cuba b/msys2/usr/share/zoneinfo/right/Cuba
index f8ac0787a..71d3caf48 100644
Binary files a/msys2/usr/share/zoneinfo/right/Cuba and b/msys2/usr/share/zoneinfo/right/Cuba differ
diff --git a/msys2/usr/share/zoneinfo/right/EET b/msys2/usr/share/zoneinfo/right/EET
index 2f71c81b5..f207020ff 100644
Binary files a/msys2/usr/share/zoneinfo/right/EET and b/msys2/usr/share/zoneinfo/right/EET differ
diff --git a/msys2/usr/share/zoneinfo/right/EST b/msys2/usr/share/zoneinfo/right/EST
index 62a6f3d09..ea299fed3 100644
Binary files a/msys2/usr/share/zoneinfo/right/EST and b/msys2/usr/share/zoneinfo/right/EST differ
diff --git a/msys2/usr/share/zoneinfo/right/EST5EDT b/msys2/usr/share/zoneinfo/right/EST5EDT
index e52c7eab7..d7dcee83b 100644
Binary files a/msys2/usr/share/zoneinfo/right/EST5EDT and b/msys2/usr/share/zoneinfo/right/EST5EDT differ
diff --git a/msys2/usr/share/zoneinfo/right/Egypt b/msys2/usr/share/zoneinfo/right/Egypt
index 8fa9ec17d..1779e49c4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Egypt and b/msys2/usr/share/zoneinfo/right/Egypt differ
diff --git a/msys2/usr/share/zoneinfo/right/Eire b/msys2/usr/share/zoneinfo/right/Eire
index 3cc111a8c..5da400204 100644
Binary files a/msys2/usr/share/zoneinfo/right/Eire and b/msys2/usr/share/zoneinfo/right/Eire differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT b/msys2/usr/share/zoneinfo/right/Etc/GMT
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT and b/msys2/usr/share/zoneinfo/right/Etc/GMT differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+0 b/msys2/usr/share/zoneinfo/right/Etc/GMT+0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+0 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+1 b/msys2/usr/share/zoneinfo/right/Etc/GMT+1
index a1f4ab65d..23399b0e0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+1 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+1 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+10 b/msys2/usr/share/zoneinfo/right/Etc/GMT+10
index f680bf916..a77a70312 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+10 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+10 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+11 b/msys2/usr/share/zoneinfo/right/Etc/GMT+11
index 610b53ee7..323e7cb29 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+11 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+11 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+12 b/msys2/usr/share/zoneinfo/right/Etc/GMT+12
index 8e1e901f7..6c73f6191 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+12 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+12 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+2 b/msys2/usr/share/zoneinfo/right/Etc/GMT+2
index 0fd79e568..7adc5e849 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+2 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+2 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+3 b/msys2/usr/share/zoneinfo/right/Etc/GMT+3
index 1bc4cff9c..c5ce56349 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+3 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+3 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+4 b/msys2/usr/share/zoneinfo/right/Etc/GMT+4
index 43050532d..0785c7b05 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+4 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+4 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+5 b/msys2/usr/share/zoneinfo/right/Etc/GMT+5
index d750d58fd..9012aff3c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+5 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+5 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+6 b/msys2/usr/share/zoneinfo/right/Etc/GMT+6
index 6001f0abd..888b8fa83 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+6 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+6 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+7 b/msys2/usr/share/zoneinfo/right/Etc/GMT+7
index dbd5ac197..8ee56b5e2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+7 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+7 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+8 b/msys2/usr/share/zoneinfo/right/Etc/GMT+8
index 91ee58a27..bd77170e4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+8 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+8 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT+9 b/msys2/usr/share/zoneinfo/right/Etc/GMT+9
index 2c47e9828..120637962 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT+9 and b/msys2/usr/share/zoneinfo/right/Etc/GMT+9 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-0 b/msys2/usr/share/zoneinfo/right/Etc/GMT-0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-0 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-1 b/msys2/usr/share/zoneinfo/right/Etc/GMT-1
index 3ea4c1198..40eb07846 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-1 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-1 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-10 b/msys2/usr/share/zoneinfo/right/Etc/GMT-10
index cdce98b8d..e62e3b7de 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-10 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-10 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-11 b/msys2/usr/share/zoneinfo/right/Etc/GMT-11
index c8e18dc0f..bce4729a2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-11 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-11 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-12 b/msys2/usr/share/zoneinfo/right/Etc/GMT-12
index f72d7cec6..f56e59b58 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-12 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-12 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-13 b/msys2/usr/share/zoneinfo/right/Etc/GMT-13
index 38cd04d58..2ad9adb03 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-13 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-13 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-14 b/msys2/usr/share/zoneinfo/right/Etc/GMT-14
index 96d5e5d63..9c15bda6d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-14 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-14 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-2 b/msys2/usr/share/zoneinfo/right/Etc/GMT-2
index 71caa24d6..a82db2fd3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-2 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-2 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-3 b/msys2/usr/share/zoneinfo/right/Etc/GMT-3
index cdc452b6f..1e3bc75e0 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-3 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-3 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-4 b/msys2/usr/share/zoneinfo/right/Etc/GMT-4
index c07511f01..6ce2821fd 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-4 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-4 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-5 b/msys2/usr/share/zoneinfo/right/Etc/GMT-5
index 321457dea..c1462a5c3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-5 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-5 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-6 b/msys2/usr/share/zoneinfo/right/Etc/GMT-6
index f961f5219..280c89919 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-6 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-6 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-7 b/msys2/usr/share/zoneinfo/right/Etc/GMT-7
index 965b0982b..132f5829c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-7 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-7 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-8 b/msys2/usr/share/zoneinfo/right/Etc/GMT-8
index 8d27b5465..2d3d8481b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-8 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-8 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT-9 b/msys2/usr/share/zoneinfo/right/Etc/GMT-9
index e26e3fe69..901ab0984 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT-9 and b/msys2/usr/share/zoneinfo/right/Etc/GMT-9 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/GMT0 b/msys2/usr/share/zoneinfo/right/Etc/GMT0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/GMT0 and b/msys2/usr/share/zoneinfo/right/Etc/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/Greenwich b/msys2/usr/share/zoneinfo/right/Etc/Greenwich
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/Greenwich and b/msys2/usr/share/zoneinfo/right/Etc/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/UCT b/msys2/usr/share/zoneinfo/right/Etc/UCT
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/UCT and b/msys2/usr/share/zoneinfo/right/Etc/UCT differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/UTC b/msys2/usr/share/zoneinfo/right/Etc/UTC
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/UTC and b/msys2/usr/share/zoneinfo/right/Etc/UTC differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/Universal b/msys2/usr/share/zoneinfo/right/Etc/Universal
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/Universal and b/msys2/usr/share/zoneinfo/right/Etc/Universal differ
diff --git a/msys2/usr/share/zoneinfo/right/Etc/Zulu b/msys2/usr/share/zoneinfo/right/Etc/Zulu
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Etc/Zulu and b/msys2/usr/share/zoneinfo/right/Etc/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Amsterdam b/msys2/usr/share/zoneinfo/right/Europe/Amsterdam
index c58afd9e6..d952ba14d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Amsterdam and b/msys2/usr/share/zoneinfo/right/Europe/Amsterdam differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Andorra b/msys2/usr/share/zoneinfo/right/Europe/Andorra
index 8f30b8cb2..2e889337e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Andorra and b/msys2/usr/share/zoneinfo/right/Europe/Andorra differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Astrakhan b/msys2/usr/share/zoneinfo/right/Europe/Astrakhan
index 4e6c8b1d1..2ec027b6d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Astrakhan and b/msys2/usr/share/zoneinfo/right/Europe/Astrakhan differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Athens b/msys2/usr/share/zoneinfo/right/Europe/Athens
index dd45a70b5..7da529ead 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Athens and b/msys2/usr/share/zoneinfo/right/Europe/Athens differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Belfast b/msys2/usr/share/zoneinfo/right/Europe/Belfast
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Belfast and b/msys2/usr/share/zoneinfo/right/Europe/Belfast differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Belgrade b/msys2/usr/share/zoneinfo/right/Europe/Belgrade
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Belgrade and b/msys2/usr/share/zoneinfo/right/Europe/Belgrade differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Berlin b/msys2/usr/share/zoneinfo/right/Europe/Berlin
index d3d425d85..bc025c42d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Berlin and b/msys2/usr/share/zoneinfo/right/Europe/Berlin differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Bratislava b/msys2/usr/share/zoneinfo/right/Europe/Bratislava
index 73b87aa0f..88ba88353 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Bratislava and b/msys2/usr/share/zoneinfo/right/Europe/Bratislava differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Brussels b/msys2/usr/share/zoneinfo/right/Europe/Brussels
index 9d1e93b0c..87f0b0735 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Brussels and b/msys2/usr/share/zoneinfo/right/Europe/Brussels differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Bucharest b/msys2/usr/share/zoneinfo/right/Europe/Bucharest
index 1d052fba5..7f2805e7d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Bucharest and b/msys2/usr/share/zoneinfo/right/Europe/Bucharest differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Budapest b/msys2/usr/share/zoneinfo/right/Europe/Budapest
index 94bbdada2..67352c616 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Budapest and b/msys2/usr/share/zoneinfo/right/Europe/Budapest differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Busingen b/msys2/usr/share/zoneinfo/right/Europe/Busingen
index 506f68f25..4640e2fa7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Busingen and b/msys2/usr/share/zoneinfo/right/Europe/Busingen differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Chisinau b/msys2/usr/share/zoneinfo/right/Europe/Chisinau
index 691e90b44..df0ffbb49 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Chisinau and b/msys2/usr/share/zoneinfo/right/Europe/Chisinau differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Copenhagen b/msys2/usr/share/zoneinfo/right/Europe/Copenhagen
index 35adccad8..d8a0a4ca1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Copenhagen and b/msys2/usr/share/zoneinfo/right/Europe/Copenhagen differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Dublin b/msys2/usr/share/zoneinfo/right/Europe/Dublin
index 3cc111a8c..5da400204 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Dublin and b/msys2/usr/share/zoneinfo/right/Europe/Dublin differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Gibraltar b/msys2/usr/share/zoneinfo/right/Europe/Gibraltar
index 0d9181f7b..69e37b55a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Gibraltar and b/msys2/usr/share/zoneinfo/right/Europe/Gibraltar differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Guernsey b/msys2/usr/share/zoneinfo/right/Europe/Guernsey
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Guernsey and b/msys2/usr/share/zoneinfo/right/Europe/Guernsey differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Helsinki b/msys2/usr/share/zoneinfo/right/Europe/Helsinki
index 44b6d62d5..dcaec7f5d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Helsinki and b/msys2/usr/share/zoneinfo/right/Europe/Helsinki differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Isle_of_Man b/msys2/usr/share/zoneinfo/right/Europe/Isle_of_Man
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Isle_of_Man and b/msys2/usr/share/zoneinfo/right/Europe/Isle_of_Man differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Istanbul b/msys2/usr/share/zoneinfo/right/Europe/Istanbul
index ffd127329..93c8e5b7a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Istanbul and b/msys2/usr/share/zoneinfo/right/Europe/Istanbul differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Jersey b/msys2/usr/share/zoneinfo/right/Europe/Jersey
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Jersey and b/msys2/usr/share/zoneinfo/right/Europe/Jersey differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Kaliningrad b/msys2/usr/share/zoneinfo/right/Europe/Kaliningrad
index 60f10523f..424bd05e4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Kaliningrad and b/msys2/usr/share/zoneinfo/right/Europe/Kaliningrad differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Kiev b/msys2/usr/share/zoneinfo/right/Europe/Kiev
index 6a0e5a410..22459b2e6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Kiev and b/msys2/usr/share/zoneinfo/right/Europe/Kiev differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Kirov b/msys2/usr/share/zoneinfo/right/Europe/Kirov
index 1ec6a076d..3287cc63a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Kirov and b/msys2/usr/share/zoneinfo/right/Europe/Kirov differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Lisbon b/msys2/usr/share/zoneinfo/right/Europe/Lisbon
index a21f0f9ba..da6b5ffb4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Lisbon and b/msys2/usr/share/zoneinfo/right/Europe/Lisbon differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Ljubljana b/msys2/usr/share/zoneinfo/right/Europe/Ljubljana
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Ljubljana and b/msys2/usr/share/zoneinfo/right/Europe/Ljubljana differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/London b/msys2/usr/share/zoneinfo/right/Europe/London
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/London and b/msys2/usr/share/zoneinfo/right/Europe/London differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Luxembourg b/msys2/usr/share/zoneinfo/right/Europe/Luxembourg
index 148eb041c..047e645cd 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Luxembourg and b/msys2/usr/share/zoneinfo/right/Europe/Luxembourg differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Madrid b/msys2/usr/share/zoneinfo/right/Europe/Madrid
index 157700112..c0019959f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Madrid and b/msys2/usr/share/zoneinfo/right/Europe/Madrid differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Malta b/msys2/usr/share/zoneinfo/right/Europe/Malta
index e0a255d73..74408736c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Malta and b/msys2/usr/share/zoneinfo/right/Europe/Malta differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Mariehamn b/msys2/usr/share/zoneinfo/right/Europe/Mariehamn
index 44b6d62d5..dcaec7f5d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Mariehamn and b/msys2/usr/share/zoneinfo/right/Europe/Mariehamn differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Minsk b/msys2/usr/share/zoneinfo/right/Europe/Minsk
index cd6a6df34..06d7e1f06 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Minsk and b/msys2/usr/share/zoneinfo/right/Europe/Minsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Monaco b/msys2/usr/share/zoneinfo/right/Europe/Monaco
index a21bec3df..b35aa27f1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Monaco and b/msys2/usr/share/zoneinfo/right/Europe/Monaco differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Moscow b/msys2/usr/share/zoneinfo/right/Europe/Moscow
index e3235fdda..a93d2a04c 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Moscow and b/msys2/usr/share/zoneinfo/right/Europe/Moscow differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Nicosia b/msys2/usr/share/zoneinfo/right/Europe/Nicosia
index c85280267..f7160c07b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Nicosia and b/msys2/usr/share/zoneinfo/right/Europe/Nicosia differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Oslo b/msys2/usr/share/zoneinfo/right/Europe/Oslo
index 6ea3cae9f..53c7ddbbc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Oslo and b/msys2/usr/share/zoneinfo/right/Europe/Oslo differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Paris b/msys2/usr/share/zoneinfo/right/Europe/Paris
index 0cffbe954..6720bd2d8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Paris and b/msys2/usr/share/zoneinfo/right/Europe/Paris differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Podgorica b/msys2/usr/share/zoneinfo/right/Europe/Podgorica
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Podgorica and b/msys2/usr/share/zoneinfo/right/Europe/Podgorica differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Prague b/msys2/usr/share/zoneinfo/right/Europe/Prague
index 73b87aa0f..88ba88353 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Prague and b/msys2/usr/share/zoneinfo/right/Europe/Prague differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Riga b/msys2/usr/share/zoneinfo/right/Europe/Riga
index f678ff018..9565b752e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Riga and b/msys2/usr/share/zoneinfo/right/Europe/Riga differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Rome b/msys2/usr/share/zoneinfo/right/Europe/Rome
index 711ae8c00..f67aab90e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Rome and b/msys2/usr/share/zoneinfo/right/Europe/Rome differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Samara b/msys2/usr/share/zoneinfo/right/Europe/Samara
index 30df0a8bd..e18a23633 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Samara and b/msys2/usr/share/zoneinfo/right/Europe/Samara differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/San_Marino b/msys2/usr/share/zoneinfo/right/Europe/San_Marino
index 711ae8c00..f67aab90e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/San_Marino and b/msys2/usr/share/zoneinfo/right/Europe/San_Marino differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Sarajevo b/msys2/usr/share/zoneinfo/right/Europe/Sarajevo
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Sarajevo and b/msys2/usr/share/zoneinfo/right/Europe/Sarajevo differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Saratov b/msys2/usr/share/zoneinfo/right/Europe/Saratov
index 82153437d..ad144b904 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Saratov and b/msys2/usr/share/zoneinfo/right/Europe/Saratov differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Simferopol b/msys2/usr/share/zoneinfo/right/Europe/Simferopol
index 1f9e5a4b6..7e5d665e3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Simferopol and b/msys2/usr/share/zoneinfo/right/Europe/Simferopol differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Skopje b/msys2/usr/share/zoneinfo/right/Europe/Skopje
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Skopje and b/msys2/usr/share/zoneinfo/right/Europe/Skopje differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Sofia b/msys2/usr/share/zoneinfo/right/Europe/Sofia
index bfba09535..1ed7043d7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Sofia and b/msys2/usr/share/zoneinfo/right/Europe/Sofia differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Stockholm b/msys2/usr/share/zoneinfo/right/Europe/Stockholm
index d90b7ff05..47436c86e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Stockholm and b/msys2/usr/share/zoneinfo/right/Europe/Stockholm differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Tallinn b/msys2/usr/share/zoneinfo/right/Europe/Tallinn
index 2bcb8f517..e4223b0af 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Tallinn and b/msys2/usr/share/zoneinfo/right/Europe/Tallinn differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Tirane b/msys2/usr/share/zoneinfo/right/Europe/Tirane
index 82d703e0d..23308a65f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Tirane and b/msys2/usr/share/zoneinfo/right/Europe/Tirane differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Tiraspol b/msys2/usr/share/zoneinfo/right/Europe/Tiraspol
index 691e90b44..df0ffbb49 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Tiraspol and b/msys2/usr/share/zoneinfo/right/Europe/Tiraspol differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Ulyanovsk b/msys2/usr/share/zoneinfo/right/Europe/Ulyanovsk
index f757e09b6..6ea5bc523 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Ulyanovsk and b/msys2/usr/share/zoneinfo/right/Europe/Ulyanovsk differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Uzhgorod b/msys2/usr/share/zoneinfo/right/Europe/Uzhgorod
index 530b7591b..a388724c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Uzhgorod and b/msys2/usr/share/zoneinfo/right/Europe/Uzhgorod differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Vaduz b/msys2/usr/share/zoneinfo/right/Europe/Vaduz
index 506f68f25..4640e2fa7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Vaduz and b/msys2/usr/share/zoneinfo/right/Europe/Vaduz differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Vatican b/msys2/usr/share/zoneinfo/right/Europe/Vatican
index 711ae8c00..f67aab90e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Vatican and b/msys2/usr/share/zoneinfo/right/Europe/Vatican differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Vienna b/msys2/usr/share/zoneinfo/right/Europe/Vienna
index a01e4e37e..1561d614d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Vienna and b/msys2/usr/share/zoneinfo/right/Europe/Vienna differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Vilnius b/msys2/usr/share/zoneinfo/right/Europe/Vilnius
index 21f4d1592..0660ab097 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Vilnius and b/msys2/usr/share/zoneinfo/right/Europe/Vilnius differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Volgograd b/msys2/usr/share/zoneinfo/right/Europe/Volgograd
index f8ba4cf80..585fe10f9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Volgograd and b/msys2/usr/share/zoneinfo/right/Europe/Volgograd differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Warsaw b/msys2/usr/share/zoneinfo/right/Europe/Warsaw
index a3acbb6e4..fd51e34f7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Warsaw and b/msys2/usr/share/zoneinfo/right/Europe/Warsaw differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Zagreb b/msys2/usr/share/zoneinfo/right/Europe/Zagreb
index c64068969..948ba58fc 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Zagreb and b/msys2/usr/share/zoneinfo/right/Europe/Zagreb differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Zaporozhye b/msys2/usr/share/zoneinfo/right/Europe/Zaporozhye
index 6fbcdb97a..872e5221a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Zaporozhye and b/msys2/usr/share/zoneinfo/right/Europe/Zaporozhye differ
diff --git a/msys2/usr/share/zoneinfo/right/Europe/Zurich b/msys2/usr/share/zoneinfo/right/Europe/Zurich
index 506f68f25..4640e2fa7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Europe/Zurich and b/msys2/usr/share/zoneinfo/right/Europe/Zurich differ
diff --git a/msys2/usr/share/zoneinfo/right/Factory b/msys2/usr/share/zoneinfo/right/Factory
index 1e6b70b38..ad5f8c842 100644
Binary files a/msys2/usr/share/zoneinfo/right/Factory and b/msys2/usr/share/zoneinfo/right/Factory differ
diff --git a/msys2/usr/share/zoneinfo/right/GB b/msys2/usr/share/zoneinfo/right/GB
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/GB and b/msys2/usr/share/zoneinfo/right/GB differ
diff --git a/msys2/usr/share/zoneinfo/right/GB-Eire b/msys2/usr/share/zoneinfo/right/GB-Eire
index 436651841..9b8560d27 100644
Binary files a/msys2/usr/share/zoneinfo/right/GB-Eire and b/msys2/usr/share/zoneinfo/right/GB-Eire differ
diff --git a/msys2/usr/share/zoneinfo/right/GMT b/msys2/usr/share/zoneinfo/right/GMT
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/GMT and b/msys2/usr/share/zoneinfo/right/GMT differ
diff --git a/msys2/usr/share/zoneinfo/right/GMT+0 b/msys2/usr/share/zoneinfo/right/GMT+0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/GMT+0 and b/msys2/usr/share/zoneinfo/right/GMT+0 differ
diff --git a/msys2/usr/share/zoneinfo/right/GMT-0 b/msys2/usr/share/zoneinfo/right/GMT-0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/GMT-0 and b/msys2/usr/share/zoneinfo/right/GMT-0 differ
diff --git a/msys2/usr/share/zoneinfo/right/GMT0 b/msys2/usr/share/zoneinfo/right/GMT0
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/GMT0 and b/msys2/usr/share/zoneinfo/right/GMT0 differ
diff --git a/msys2/usr/share/zoneinfo/right/Greenwich b/msys2/usr/share/zoneinfo/right/Greenwich
index 07d55289c..685991e1d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Greenwich and b/msys2/usr/share/zoneinfo/right/Greenwich differ
diff --git a/msys2/usr/share/zoneinfo/right/HST b/msys2/usr/share/zoneinfo/right/HST
index e4edfeef0..f6ce48e63 100644
Binary files a/msys2/usr/share/zoneinfo/right/HST and b/msys2/usr/share/zoneinfo/right/HST differ
diff --git a/msys2/usr/share/zoneinfo/right/Hongkong b/msys2/usr/share/zoneinfo/right/Hongkong
index c42348088..16b5369c8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Hongkong and b/msys2/usr/share/zoneinfo/right/Hongkong differ
diff --git a/msys2/usr/share/zoneinfo/right/Iceland b/msys2/usr/share/zoneinfo/right/Iceland
index 79871535a..56c377cc3 100644
Binary files a/msys2/usr/share/zoneinfo/right/Iceland and b/msys2/usr/share/zoneinfo/right/Iceland differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Antananarivo b/msys2/usr/share/zoneinfo/right/Indian/Antananarivo
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Antananarivo and b/msys2/usr/share/zoneinfo/right/Indian/Antananarivo differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Chagos b/msys2/usr/share/zoneinfo/right/Indian/Chagos
index 29bca375a..34c1aef50 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Chagos and b/msys2/usr/share/zoneinfo/right/Indian/Chagos differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Christmas b/msys2/usr/share/zoneinfo/right/Indian/Christmas
index 621cc7a31..81603fce9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Christmas and b/msys2/usr/share/zoneinfo/right/Indian/Christmas differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Cocos b/msys2/usr/share/zoneinfo/right/Indian/Cocos
index 213a20eb0..112a34ef9 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Cocos and b/msys2/usr/share/zoneinfo/right/Indian/Cocos differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Comoro b/msys2/usr/share/zoneinfo/right/Indian/Comoro
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Comoro and b/msys2/usr/share/zoneinfo/right/Indian/Comoro differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Kerguelen b/msys2/usr/share/zoneinfo/right/Indian/Kerguelen
index 3d964093c..d6cd240ae 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Kerguelen and b/msys2/usr/share/zoneinfo/right/Indian/Kerguelen differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Mahe b/msys2/usr/share/zoneinfo/right/Indian/Mahe
index b3aa4444d..697bbbcd1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Mahe and b/msys2/usr/share/zoneinfo/right/Indian/Mahe differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Maldives b/msys2/usr/share/zoneinfo/right/Indian/Maldives
index a8a6fcf1d..706365415 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Maldives and b/msys2/usr/share/zoneinfo/right/Indian/Maldives differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Mauritius b/msys2/usr/share/zoneinfo/right/Indian/Mauritius
index 24091b254..cfe072300 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Mauritius and b/msys2/usr/share/zoneinfo/right/Indian/Mauritius differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Mayotte b/msys2/usr/share/zoneinfo/right/Indian/Mayotte
index 5a524688f..2626d5423 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Mayotte and b/msys2/usr/share/zoneinfo/right/Indian/Mayotte differ
diff --git a/msys2/usr/share/zoneinfo/right/Indian/Reunion b/msys2/usr/share/zoneinfo/right/Indian/Reunion
index 65b1b5254..85e3003b4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Indian/Reunion and b/msys2/usr/share/zoneinfo/right/Indian/Reunion differ
diff --git a/msys2/usr/share/zoneinfo/right/Iran b/msys2/usr/share/zoneinfo/right/Iran
index 0bc7b8ced..719dd4c39 100644
Binary files a/msys2/usr/share/zoneinfo/right/Iran and b/msys2/usr/share/zoneinfo/right/Iran differ
diff --git a/msys2/usr/share/zoneinfo/right/Israel b/msys2/usr/share/zoneinfo/right/Israel
index 35a24d26c..c940d3e37 100644
Binary files a/msys2/usr/share/zoneinfo/right/Israel and b/msys2/usr/share/zoneinfo/right/Israel differ
diff --git a/msys2/usr/share/zoneinfo/right/Jamaica b/msys2/usr/share/zoneinfo/right/Jamaica
index 9543ff895..8798d1b60 100644
Binary files a/msys2/usr/share/zoneinfo/right/Jamaica and b/msys2/usr/share/zoneinfo/right/Jamaica differ
diff --git a/msys2/usr/share/zoneinfo/right/Japan b/msys2/usr/share/zoneinfo/right/Japan
index cf9eaf063..1a1917b2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Japan and b/msys2/usr/share/zoneinfo/right/Japan differ
diff --git a/msys2/usr/share/zoneinfo/right/Kwajalein b/msys2/usr/share/zoneinfo/right/Kwajalein
index de044dd68..66bf6860e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Kwajalein and b/msys2/usr/share/zoneinfo/right/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/right/Libya b/msys2/usr/share/zoneinfo/right/Libya
index 58fea0c8f..93f2268cf 100644
Binary files a/msys2/usr/share/zoneinfo/right/Libya and b/msys2/usr/share/zoneinfo/right/Libya differ
diff --git a/msys2/usr/share/zoneinfo/right/MET b/msys2/usr/share/zoneinfo/right/MET
index 4b65595d0..853750a52 100644
Binary files a/msys2/usr/share/zoneinfo/right/MET and b/msys2/usr/share/zoneinfo/right/MET differ
diff --git a/msys2/usr/share/zoneinfo/right/MST b/msys2/usr/share/zoneinfo/right/MST
index d459abe57..008cf2e27 100644
Binary files a/msys2/usr/share/zoneinfo/right/MST and b/msys2/usr/share/zoneinfo/right/MST differ
diff --git a/msys2/usr/share/zoneinfo/right/MST7MDT b/msys2/usr/share/zoneinfo/right/MST7MDT
index 06ba268b1..cc9e7aeb1 100644
Binary files a/msys2/usr/share/zoneinfo/right/MST7MDT and b/msys2/usr/share/zoneinfo/right/MST7MDT differ
diff --git a/msys2/usr/share/zoneinfo/right/Mexico/BajaNorte b/msys2/usr/share/zoneinfo/right/Mexico/BajaNorte
index 839d31a8b..29f2851d4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Mexico/BajaNorte and b/msys2/usr/share/zoneinfo/right/Mexico/BajaNorte differ
diff --git a/msys2/usr/share/zoneinfo/right/Mexico/BajaSur b/msys2/usr/share/zoneinfo/right/Mexico/BajaSur
index 2bb9dccf6..bba9730df 100644
Binary files a/msys2/usr/share/zoneinfo/right/Mexico/BajaSur and b/msys2/usr/share/zoneinfo/right/Mexico/BajaSur differ
diff --git a/msys2/usr/share/zoneinfo/right/Mexico/General b/msys2/usr/share/zoneinfo/right/Mexico/General
index 8cd8273fe..56234844e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Mexico/General and b/msys2/usr/share/zoneinfo/right/Mexico/General differ
diff --git a/msys2/usr/share/zoneinfo/right/NZ b/msys2/usr/share/zoneinfo/right/NZ
index 3a6cc208f..210dcf938 100644
Binary files a/msys2/usr/share/zoneinfo/right/NZ and b/msys2/usr/share/zoneinfo/right/NZ differ
diff --git a/msys2/usr/share/zoneinfo/right/NZ-CHAT b/msys2/usr/share/zoneinfo/right/NZ-CHAT
index 9e1abfba7..f363b1cf6 100644
Binary files a/msys2/usr/share/zoneinfo/right/NZ-CHAT and b/msys2/usr/share/zoneinfo/right/NZ-CHAT differ
diff --git a/msys2/usr/share/zoneinfo/right/Navajo b/msys2/usr/share/zoneinfo/right/Navajo
index 7cc28edc8..b800db811 100644
Binary files a/msys2/usr/share/zoneinfo/right/Navajo and b/msys2/usr/share/zoneinfo/right/Navajo differ
diff --git a/msys2/usr/share/zoneinfo/right/PRC b/msys2/usr/share/zoneinfo/right/PRC
index f07831972..10d15fcbb 100644
Binary files a/msys2/usr/share/zoneinfo/right/PRC and b/msys2/usr/share/zoneinfo/right/PRC differ
diff --git a/msys2/usr/share/zoneinfo/right/PST8PDT b/msys2/usr/share/zoneinfo/right/PST8PDT
index 42d443f30..40907f4be 100644
Binary files a/msys2/usr/share/zoneinfo/right/PST8PDT and b/msys2/usr/share/zoneinfo/right/PST8PDT differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Apia b/msys2/usr/share/zoneinfo/right/Pacific/Apia
index e712b0ae9..81a09712b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Apia and b/msys2/usr/share/zoneinfo/right/Pacific/Apia differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Auckland b/msys2/usr/share/zoneinfo/right/Pacific/Auckland
index 3a6cc208f..210dcf938 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Auckland and b/msys2/usr/share/zoneinfo/right/Pacific/Auckland differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Bougainville b/msys2/usr/share/zoneinfo/right/Pacific/Bougainville
index 0d5b84a94..226c9c43d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Bougainville and b/msys2/usr/share/zoneinfo/right/Pacific/Bougainville differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Chatham b/msys2/usr/share/zoneinfo/right/Pacific/Chatham
index 9e1abfba7..f363b1cf6 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Chatham and b/msys2/usr/share/zoneinfo/right/Pacific/Chatham differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Chuuk b/msys2/usr/share/zoneinfo/right/Pacific/Chuuk
index 5778522ca..b969d1170 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Chuuk and b/msys2/usr/share/zoneinfo/right/Pacific/Chuuk differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Easter b/msys2/usr/share/zoneinfo/right/Pacific/Easter
index 15307cdc1..6fb2c6a94 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Easter and b/msys2/usr/share/zoneinfo/right/Pacific/Easter differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Efate b/msys2/usr/share/zoneinfo/right/Pacific/Efate
index fa5cb3ab4..e6762c918 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Efate and b/msys2/usr/share/zoneinfo/right/Pacific/Efate differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Enderbury b/msys2/usr/share/zoneinfo/right/Pacific/Enderbury
index 58396340a..fe77de78d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Enderbury and b/msys2/usr/share/zoneinfo/right/Pacific/Enderbury differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Fakaofo b/msys2/usr/share/zoneinfo/right/Pacific/Fakaofo
index ba67d1379..a5e48fe6e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Fakaofo and b/msys2/usr/share/zoneinfo/right/Pacific/Fakaofo differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Fiji b/msys2/usr/share/zoneinfo/right/Pacific/Fiji
index 681b960eb..30bc724cb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Fiji and b/msys2/usr/share/zoneinfo/right/Pacific/Fiji differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Funafuti b/msys2/usr/share/zoneinfo/right/Pacific/Funafuti
index 5d06a4e53..0c716f0f2 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Funafuti and b/msys2/usr/share/zoneinfo/right/Pacific/Funafuti differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Galapagos b/msys2/usr/share/zoneinfo/right/Pacific/Galapagos
index 08b1143cd..986c14497 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Galapagos and b/msys2/usr/share/zoneinfo/right/Pacific/Galapagos differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Gambier b/msys2/usr/share/zoneinfo/right/Pacific/Gambier
index 1d0981953..e2f5d2987 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Gambier and b/msys2/usr/share/zoneinfo/right/Pacific/Gambier differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Guadalcanal b/msys2/usr/share/zoneinfo/right/Pacific/Guadalcanal
index 7c0e917dd..2206c3488 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Guadalcanal and b/msys2/usr/share/zoneinfo/right/Pacific/Guadalcanal differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Guam b/msys2/usr/share/zoneinfo/right/Pacific/Guam
index f1c105db2..69fb26323 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Guam and b/msys2/usr/share/zoneinfo/right/Pacific/Guam differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Honolulu b/msys2/usr/share/zoneinfo/right/Pacific/Honolulu
index 0528794f7..60da1c316 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Honolulu and b/msys2/usr/share/zoneinfo/right/Pacific/Honolulu differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Johnston b/msys2/usr/share/zoneinfo/right/Pacific/Johnston
index 0528794f7..60da1c316 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Johnston and b/msys2/usr/share/zoneinfo/right/Pacific/Johnston differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Kiritimati b/msys2/usr/share/zoneinfo/right/Pacific/Kiritimati
index 471cf75e5..4040b56e8 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Kiritimati and b/msys2/usr/share/zoneinfo/right/Pacific/Kiritimati differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Kosrae b/msys2/usr/share/zoneinfo/right/Pacific/Kosrae
index 52a43a2e2..d97af73f5 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Kosrae and b/msys2/usr/share/zoneinfo/right/Pacific/Kosrae differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Kwajalein b/msys2/usr/share/zoneinfo/right/Pacific/Kwajalein
index de044dd68..66bf6860e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Kwajalein and b/msys2/usr/share/zoneinfo/right/Pacific/Kwajalein differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Majuro b/msys2/usr/share/zoneinfo/right/Pacific/Majuro
index 6567bede6..ed47005b1 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Majuro and b/msys2/usr/share/zoneinfo/right/Pacific/Majuro differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Marquesas b/msys2/usr/share/zoneinfo/right/Pacific/Marquesas
index 660b60665..25e3c1be4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Marquesas and b/msys2/usr/share/zoneinfo/right/Pacific/Marquesas differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Midway b/msys2/usr/share/zoneinfo/right/Pacific/Midway
index 7dd062892..530020c2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Midway and b/msys2/usr/share/zoneinfo/right/Pacific/Midway differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Nauru b/msys2/usr/share/zoneinfo/right/Pacific/Nauru
index a1d4e6df0..14d4afd25 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Nauru and b/msys2/usr/share/zoneinfo/right/Pacific/Nauru differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Niue b/msys2/usr/share/zoneinfo/right/Pacific/Niue
index ff3dbd9da..9d39e64ce 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Niue and b/msys2/usr/share/zoneinfo/right/Pacific/Niue differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Norfolk b/msys2/usr/share/zoneinfo/right/Pacific/Norfolk
index 1f2ac2f13..67ae486ae 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Norfolk and b/msys2/usr/share/zoneinfo/right/Pacific/Norfolk differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Noumea b/msys2/usr/share/zoneinfo/right/Pacific/Noumea
index 207bb5ded..0637f2e77 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Noumea and b/msys2/usr/share/zoneinfo/right/Pacific/Noumea differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Pago_Pago b/msys2/usr/share/zoneinfo/right/Pacific/Pago_Pago
index 7dd062892..530020c2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Pago_Pago and b/msys2/usr/share/zoneinfo/right/Pacific/Pago_Pago differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Palau b/msys2/usr/share/zoneinfo/right/Pacific/Palau
index cdcfb71fd..1deb78303 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Palau and b/msys2/usr/share/zoneinfo/right/Pacific/Palau differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Pitcairn b/msys2/usr/share/zoneinfo/right/Pacific/Pitcairn
index 789f667fd..a59372330 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Pitcairn and b/msys2/usr/share/zoneinfo/right/Pacific/Pitcairn differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Pohnpei b/msys2/usr/share/zoneinfo/right/Pacific/Pohnpei
index e81809303..94ca53cdb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Pohnpei and b/msys2/usr/share/zoneinfo/right/Pacific/Pohnpei differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Ponape b/msys2/usr/share/zoneinfo/right/Pacific/Ponape
index e81809303..94ca53cdb 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Ponape and b/msys2/usr/share/zoneinfo/right/Pacific/Ponape differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Port_Moresby b/msys2/usr/share/zoneinfo/right/Pacific/Port_Moresby
index 77bb59b47..f23d3df2e 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Port_Moresby and b/msys2/usr/share/zoneinfo/right/Pacific/Port_Moresby differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Rarotonga b/msys2/usr/share/zoneinfo/right/Pacific/Rarotonga
index 70f8b6356..755d21f70 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Rarotonga and b/msys2/usr/share/zoneinfo/right/Pacific/Rarotonga differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Saipan b/msys2/usr/share/zoneinfo/right/Pacific/Saipan
index f1c105db2..69fb26323 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Saipan and b/msys2/usr/share/zoneinfo/right/Pacific/Saipan differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Samoa b/msys2/usr/share/zoneinfo/right/Pacific/Samoa
index 7dd062892..530020c2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Samoa and b/msys2/usr/share/zoneinfo/right/Pacific/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Tahiti b/msys2/usr/share/zoneinfo/right/Pacific/Tahiti
index 06200fc5d..96af485b4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Tahiti and b/msys2/usr/share/zoneinfo/right/Pacific/Tahiti differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Tarawa b/msys2/usr/share/zoneinfo/right/Pacific/Tarawa
index e05ae6200..6a4274d33 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Tarawa and b/msys2/usr/share/zoneinfo/right/Pacific/Tarawa differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Tongatapu b/msys2/usr/share/zoneinfo/right/Pacific/Tongatapu
index c81c4ff1b..b8f875f05 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Tongatapu and b/msys2/usr/share/zoneinfo/right/Pacific/Tongatapu differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Truk b/msys2/usr/share/zoneinfo/right/Pacific/Truk
index 5778522ca..b969d1170 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Truk and b/msys2/usr/share/zoneinfo/right/Pacific/Truk differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Wake b/msys2/usr/share/zoneinfo/right/Pacific/Wake
index 4081f4163..bf8b7ac42 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Wake and b/msys2/usr/share/zoneinfo/right/Pacific/Wake differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Wallis b/msys2/usr/share/zoneinfo/right/Pacific/Wallis
index 9ee4ceb6d..bfc38a98b 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Wallis and b/msys2/usr/share/zoneinfo/right/Pacific/Wallis differ
diff --git a/msys2/usr/share/zoneinfo/right/Pacific/Yap b/msys2/usr/share/zoneinfo/right/Pacific/Yap
index 5778522ca..b969d1170 100644
Binary files a/msys2/usr/share/zoneinfo/right/Pacific/Yap and b/msys2/usr/share/zoneinfo/right/Pacific/Yap differ
diff --git a/msys2/usr/share/zoneinfo/right/Poland b/msys2/usr/share/zoneinfo/right/Poland
index a3acbb6e4..fd51e34f7 100644
Binary files a/msys2/usr/share/zoneinfo/right/Poland and b/msys2/usr/share/zoneinfo/right/Poland differ
diff --git a/msys2/usr/share/zoneinfo/right/Portugal b/msys2/usr/share/zoneinfo/right/Portugal
index a21f0f9ba..da6b5ffb4 100644
Binary files a/msys2/usr/share/zoneinfo/right/Portugal and b/msys2/usr/share/zoneinfo/right/Portugal differ
diff --git a/msys2/usr/share/zoneinfo/right/ROC b/msys2/usr/share/zoneinfo/right/ROC
index fe077c96e..6e38b26be 100644
Binary files a/msys2/usr/share/zoneinfo/right/ROC and b/msys2/usr/share/zoneinfo/right/ROC differ
diff --git a/msys2/usr/share/zoneinfo/right/ROK b/msys2/usr/share/zoneinfo/right/ROK
index f9120e3d4..dd70ccd2b 100644
Binary files a/msys2/usr/share/zoneinfo/right/ROK and b/msys2/usr/share/zoneinfo/right/ROK differ
diff --git a/msys2/usr/share/zoneinfo/right/Singapore b/msys2/usr/share/zoneinfo/right/Singapore
index 3dc6d5263..00d44974f 100644
Binary files a/msys2/usr/share/zoneinfo/right/Singapore and b/msys2/usr/share/zoneinfo/right/Singapore differ
diff --git a/msys2/usr/share/zoneinfo/right/Turkey b/msys2/usr/share/zoneinfo/right/Turkey
index ffd127329..93c8e5b7a 100644
Binary files a/msys2/usr/share/zoneinfo/right/Turkey and b/msys2/usr/share/zoneinfo/right/Turkey differ
diff --git a/msys2/usr/share/zoneinfo/right/UCT b/msys2/usr/share/zoneinfo/right/UCT
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/UCT and b/msys2/usr/share/zoneinfo/right/UCT differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Alaska b/msys2/usr/share/zoneinfo/right/US/Alaska
index 30fb3a855..b52b6bd89 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Alaska and b/msys2/usr/share/zoneinfo/right/US/Alaska differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Aleutian b/msys2/usr/share/zoneinfo/right/US/Aleutian
index a06fafbe8..c06bb758e 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Aleutian and b/msys2/usr/share/zoneinfo/right/US/Aleutian differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Arizona b/msys2/usr/share/zoneinfo/right/US/Arizona
index dbd20f054..3cb292d5f 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Arizona and b/msys2/usr/share/zoneinfo/right/US/Arizona differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Central b/msys2/usr/share/zoneinfo/right/US/Central
index d88325d64..7311d8735 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Central and b/msys2/usr/share/zoneinfo/right/US/Central differ
diff --git a/msys2/usr/share/zoneinfo/right/US/East-Indiana b/msys2/usr/share/zoneinfo/right/US/East-Indiana
index 2dc7d1a39..7a13a7197 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/East-Indiana and b/msys2/usr/share/zoneinfo/right/US/East-Indiana differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Eastern b/msys2/usr/share/zoneinfo/right/US/Eastern
index 83926bd65..b1b4cc0c6 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Eastern and b/msys2/usr/share/zoneinfo/right/US/Eastern differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Hawaii b/msys2/usr/share/zoneinfo/right/US/Hawaii
index 0528794f7..60da1c316 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Hawaii and b/msys2/usr/share/zoneinfo/right/US/Hawaii differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Indiana-Starke b/msys2/usr/share/zoneinfo/right/US/Indiana-Starke
index feb31a0a9..950d4c0ff 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Indiana-Starke and b/msys2/usr/share/zoneinfo/right/US/Indiana-Starke differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Michigan b/msys2/usr/share/zoneinfo/right/US/Michigan
index d9612d63d..14f0720fe 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Michigan and b/msys2/usr/share/zoneinfo/right/US/Michigan differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Mountain b/msys2/usr/share/zoneinfo/right/US/Mountain
index 7cc28edc8..b800db811 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Mountain and b/msys2/usr/share/zoneinfo/right/US/Mountain differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Pacific b/msys2/usr/share/zoneinfo/right/US/Pacific
index 520d500b4..31bf81f12 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Pacific and b/msys2/usr/share/zoneinfo/right/US/Pacific differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Pacific-New b/msys2/usr/share/zoneinfo/right/US/Pacific-New
deleted file mode 100644
index 520d500b4..000000000
Binary files a/msys2/usr/share/zoneinfo/right/US/Pacific-New and /dev/null differ
diff --git a/msys2/usr/share/zoneinfo/right/US/Samoa b/msys2/usr/share/zoneinfo/right/US/Samoa
index 7dd062892..530020c2d 100644
Binary files a/msys2/usr/share/zoneinfo/right/US/Samoa and b/msys2/usr/share/zoneinfo/right/US/Samoa differ
diff --git a/msys2/usr/share/zoneinfo/right/UTC b/msys2/usr/share/zoneinfo/right/UTC
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/UTC and b/msys2/usr/share/zoneinfo/right/UTC differ
diff --git a/msys2/usr/share/zoneinfo/right/Universal b/msys2/usr/share/zoneinfo/right/Universal
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Universal and b/msys2/usr/share/zoneinfo/right/Universal differ
diff --git a/msys2/usr/share/zoneinfo/right/W-SU b/msys2/usr/share/zoneinfo/right/W-SU
index e3235fdda..a93d2a04c 100644
Binary files a/msys2/usr/share/zoneinfo/right/W-SU and b/msys2/usr/share/zoneinfo/right/W-SU differ
diff --git a/msys2/usr/share/zoneinfo/right/WET b/msys2/usr/share/zoneinfo/right/WET
index 651fdec43..178e26b96 100644
Binary files a/msys2/usr/share/zoneinfo/right/WET and b/msys2/usr/share/zoneinfo/right/WET differ
diff --git a/msys2/usr/share/zoneinfo/right/Zulu b/msys2/usr/share/zoneinfo/right/Zulu
index 358417451..1dade3027 100644
Binary files a/msys2/usr/share/zoneinfo/right/Zulu and b/msys2/usr/share/zoneinfo/right/Zulu differ
diff --git a/msys2/usr/share/zoneinfo/tzdata.zi b/msys2/usr/share/zoneinfo/tzdata.zi
index 4b3f5104f..f91921b59 100644
--- a/msys2/usr/share/zoneinfo/tzdata.zi
+++ b/msys2/usr/share/zoneinfo/tzdata.zi
@@ -1,4 +1,4 @@
-# version unknown
+# version 2020f-dirty
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
 R d 1916 1919 - O Su>=1 23s 0 -
@@ -22,7 +22,7 @@ R d 1978 o - Mar 24 1 1 S
 R d 1978 o - S 22 3 0 -
 R d 1980 o - Ap 25 0 1 S
 R d 1980 o - O 31 2 0 -
-Z Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:1
+Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
 0:9:21 - PMT 1911 Mar 11
 0 d WE%sT 1940 F 25 2
 1 d CE%sT 1946 O 7
@@ -86,17 +86,24 @@ R K 2014 o - Jul 31 24 1 S
 R K 2014 o - S lastTh 24 0 -
 Z Africa/Cairo 2:5:9 - LMT 1900 O
 2 K EE%sT
-R GH 1920 1942 - S 1 0 0:20 -
-R GH 1920 1942 - D 31 0 0 -
-Z Africa/Accra -0:0:52 - LMT 1918
-0 GH GMT/+0020
+R GH 1919 o - N 24 0 0:20 +0020
+R GH 1920 1942 - Ja 1 2 0 GMT
+R GH 1920 1939 - S 1 2 0:20 +0020
+R GH 1940 1941 - May 1 2 0:20 +0020
+R GH 1950 1955 - S 1 2 0:30 +0030
+R GH 1951 1956 - Ja 1 2 0 GMT
+Z Africa/Accra -0:0:52 - LMT 1915 N 2
+0 GH %s 1942 F 8
+0:30 - +0030 1946 Ja 6
+0 GH %s
 Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
 -1 - -01 1975
 0 - GMT
-Z Africa/Nairobi 2:27:16 - LMT 1928 Jul
-3 - EAT 1930
-2:30 - +0230 1940
-2:45 - +0245 1960
+Z Africa/Nairobi 2:27:16 - LMT 1908 May
+2:30 - +0230 1928 Jun 30 24
+3 - EAT 1930 Ja 4 24
+2:30 - +0230 1936 D 31 24
+2:45 - +0245 1942 Jul 31 24
 3 - EAT
 L Africa/Nairobi Africa/Addis_Ababa
 L Africa/Nairobi Africa/Asmara
@@ -193,7 +200,7 @@ R M 2021 o - May 16 2 0 -
 R M 2022 o - Mar 27 3 -1 -
 R M 2022 o - May 8 2 0 -
 R M 2023 o - Mar 19 3 -1 -
-R M 2023 o - Ap 23 2 0 -
+R M 2023 o - Ap 30 2 0 -
 R M 2024 o - Mar 10 3 -1 -
 R M 2024 o - Ap 14 2 0 -
 R M 2025 o - F 23 3 -1 -
@@ -209,7 +216,7 @@ R M 2029 o - F 18 2 0 -
 R M 2029 o - D 30 3 -1 -
 R M 2030 o - F 10 2 0 -
 R M 2030 o - D 22 3 -1 -
-R M 2031 o - Ja 26 2 0 -
+R M 2031 o - F 2 2 0 -
 R M 2031 o - D 14 3 -1 -
 R M 2032 o - Ja 18 2 0 -
 R M 2032 o - N 28 3 -1 -
@@ -225,7 +232,7 @@ R M 2036 o - N 23 2 0 -
 R M 2037 o - O 4 3 -1 -
 R M 2037 o - N 15 2 0 -
 R M 2038 o - S 26 3 -1 -
-R M 2038 o - O 31 2 0 -
+R M 2038 o - N 7 2 0 -
 R M 2039 o - S 18 3 -1 -
 R M 2039 o - O 23 2 0 -
 R M 2040 o - S 2 3 -1 -
@@ -241,7 +248,7 @@ R M 2044 o - Au 28 2 0 -
 R M 2045 o - Jul 9 3 -1 -
 R M 2045 o - Au 20 2 0 -
 R M 2046 o - Jul 1 3 -1 -
-R M 2046 o - Au 5 2 0 -
+R M 2046 o - Au 12 2 0 -
 R M 2047 o - Jun 23 3 -1 -
 R M 2047 o - Jul 28 2 0 -
 R M 2048 o - Jun 7 3 -1 -
@@ -257,7 +264,7 @@ R M 2052 o - Jun 2 2 0 -
 R M 2053 o - Ap 13 3 -1 -
 R M 2053 o - May 25 2 0 -
 R M 2054 o - Ap 5 3 -1 -
-R M 2054 o - May 10 2 0 -
+R M 2054 o - May 17 2 0 -
 R M 2055 o - Mar 28 3 -1 -
 R M 2055 o - May 2 2 0 -
 R M 2056 o - Mar 12 3 -1 -
@@ -273,7 +280,7 @@ R M 2060 o - Mar 7 2 0 -
 R M 2061 o - Ja 16 3 -1 -
 R M 2061 o - F 27 2 0 -
 R M 2062 o - Ja 8 3 -1 -
-R M 2062 o - F 12 2 0 -
+R M 2062 o - F 19 2 0 -
 R M 2062 o - D 31 3 -1 -
 R M 2063 o - F 4 2 0 -
 R M 2063 o - D 16 3 -1 -
@@ -289,7 +296,7 @@ R M 2067 o - D 11 2 0 -
 R M 2068 o - O 21 3 -1 -
 R M 2068 o - D 2 2 0 -
 R M 2069 o - O 13 3 -1 -
-R M 2069 o - N 17 2 0 -
+R M 2069 o - N 24 2 0 -
 R M 2070 o - O 5 3 -1 -
 R M 2070 o - N 9 2 0 -
 R M 2071 o - S 20 3 -1 -
@@ -305,7 +312,7 @@ R M 2075 o - S 15 2 0 -
 R M 2076 o - Jul 26 3 -1 -
 R M 2076 o - S 6 2 0 -
 R M 2077 o - Jul 18 3 -1 -
-R M 2077 o - Au 22 2 0 -
+R M 2077 o - Au 29 2 0 -
 R M 2078 o - Jul 10 3 -1 -
 R M 2078 o - Au 14 2 0 -
 R M 2079 o - Jun 25 3 -1 -
@@ -315,13 +322,13 @@ R M 2080 o - Jul 21 2 0 -
 R M 2081 o - Jun 1 3 -1 -
 R M 2081 o - Jul 13 2 0 -
 R M 2082 o - May 24 3 -1 -
-R M 2082 o - Jun 28 2 0 -
+R M 2082 o - Jul 5 2 0 -
 R M 2083 o - May 16 3 -1 -
 R M 2083 o - Jun 20 2 0 -
 R M 2084 o - Ap 30 3 -1 -
 R M 2084 o - Jun 11 2 0 -
 R M 2085 o - Ap 22 3 -1 -
-R M 2085 o - May 27 2 0 -
+R M 2085 o - Jun 3 2 0 -
 R M 2086 o - Ap 14 3 -1 -
 R M 2086 o - May 19 2 0 -
 R M 2087 o - Mar 30 3 -1 -
@@ -353,7 +360,10 @@ Z Africa/Windhoek 1:8:24 - LMT 1892 F 8
 2 1 SAST 1943 Mar 21 2
 2 - SAST 1990 Mar 21
 2 NA %s
-Z Africa/Lagos 0:13:36 - LMT 1919 S
+Z Africa/Lagos 0:13:35 - LMT 1905 Jul
+0 - GMT 1908 Jul
+0:13:35 - LMT 1914
+0:30 - +0030 1919 S
 1 - WAT
 L Africa/Lagos Africa/Bangui
 L Africa/Lagos Africa/Brazzaville
@@ -371,7 +381,7 @@ Z Africa/Sao_Tome 0:26:56 - LMT 1884
 0 - GMT 2018 Ja 1 1
 1 - WAT 2019 Ja 1 2
 0 - GMT
-Z Indian/Mahe 3:41:48 - LMT 1906 Jun
+Z Indian/Mahe 3:41:48 - LMT 1907
 4 - +04
 R SA 1942 1943 - S Su>=15 2 1 -
 R SA 1943 1944 - Mar Su>=15 2 0 -
@@ -426,7 +436,12 @@ Z Antarctica/Casey 0 - -00 1969
 11 - +11 2012 F 21 17u
 8 - +08 2016 O 22
 11 - +11 2018 Mar 11 4
-8 - +08
+8 - +08 2018 O 7 4
+11 - +11 2019 Mar 17 3
+8 - +08 2019 O 4 3
+11 - +11 2020 Mar 8 3
+8 - +08 2020 O 4 0:1
+11 - +11
 Z Antarctica/Davis 0 - -00 1957 Ja 13
 7 - +07 1964 N
 0 - -00 1969 F
@@ -777,68 +792,66 @@ Z Asia/Baghdad 2:57:40 - LMT 1890
 2:57:36 - BMT 1918
 3 - +03 1982 May
 3 IQ +03/+04
-R Z 1940 o - Jun 1 0 1 D
-R Z 1942 1944 - N 1 0 0 S
-R Z 1943 o - Ap 1 2 1 D
-R Z 1944 o - Ap 1 0 1 D
-R Z 1945 o - Ap 16 0 1 D
-R Z 1945 o - N 1 2 0 S
-R Z 1946 o - Ap 16 2 1 D
-R Z 1946 o - N 1 0 0 S
-R Z 1948 o - May 23 0 2 DD
-R Z 1948 o - S 1 0 1 D
-R Z 1948 1949 - N 1 2 0 S
-R Z 1949 o - May 1 0 1 D
-R Z 1950 o - Ap 16 0 1 D
-R Z 1950 o - S 15 3 0 S
-R Z 1951 o - Ap 1 0 1 D
-R Z 1951 o - N 11 3 0 S
-R Z 1952 o - Ap 20 2 1 D
-R Z 1952 o - O 19 3 0 S
-R Z 1953 o - Ap 12 2 1 D
-R Z 1953 o - S 13 3 0 S
-R Z 1954 o - Jun 13 0 1 D
-R Z 1954 o - S 12 0 0 S
-R Z 1955 o - Jun 11 2 1 D
-R Z 1955 o - S 11 0 0 S
-R Z 1956 o - Jun 3 0 1 D
-R Z 1956 o - S 30 3 0 S
-R Z 1957 o - Ap 29 2 1 D
-R Z 1957 o - S 22 0 0 S
-R Z 1974 o - Jul 7 0 1 D
-R Z 1974 o - O 13 0 0 S
-R Z 1975 o - Ap 20 0 1 D
-R Z 1975 o - Au 31 0 0 S
-R Z 1980 o - Au 2 0 1 D
-R Z 1980 o - S 13 1 0 S
-R Z 1984 o - May 5 0 1 D
-R Z 1984 o - Au 25 1 0 S
-R Z 1985 o - Ap 14 0 1 D
-R Z 1985 o - S 15 0 0 S
-R Z 1986 o - May 18 0 1 D
-R Z 1986 o - S 7 0 0 S
-R Z 1987 o - Ap 15 0 1 D
-R Z 1987 o - S 13 0 0 S
-R Z 1988 o - Ap 10 0 1 D
-R Z 1988 o - S 4 0 0 S
-R Z 1989 o - Ap 30 0 1 D
-R Z 1989 o - S 3 0 0 S
-R Z 1990 o - Mar 25 0 1 D
-R Z 1990 o - Au 26 0 0 S
-R Z 1991 o - Mar 24 0 1 D
-R Z 1991 o - S 1 0 0 S
-R Z 1992 o - Mar 29 0 1 D
-R Z 1992 o - S 6 0 0 S
+R Z 1940 o - May 31 24u 1 D
+R Z 1940 o - S 30 24u 0 S
+R Z 1940 o - N 16 24u 1 D
+R Z 1942 1946 - O 31 24u 0 S
+R Z 1943 1944 - Mar 31 24u 1 D
+R Z 1945 1946 - Ap 15 24u 1 D
+R Z 1948 o - May 22 24u 2 DD
+R Z 1948 o - Au 31 24u 1 D
+R Z 1948 1949 - O 31 24u 0 S
+R Z 1949 o - Ap 30 24u 1 D
+R Z 1950 o - Ap 15 24u 1 D
+R Z 1950 o - S 14 24u 0 S
+R Z 1951 o - Mar 31 24u 1 D
+R Z 1951 o - N 10 24u 0 S
+R Z 1952 o - Ap 19 24u 1 D
+R Z 1952 o - O 18 24u 0 S
+R Z 1953 o - Ap 11 24u 1 D
+R Z 1953 o - S 12 24u 0 S
+R Z 1954 o - Jun 12 24u 1 D
+R Z 1954 o - S 11 24u 0 S
+R Z 1955 o - Jun 11 24u 1 D
+R Z 1955 o - S 10 24u 0 S
+R Z 1956 o - Jun 2 24u 1 D
+R Z 1956 o - S 29 24u 0 S
+R Z 1957 o - Ap 27 24u 1 D
+R Z 1957 o - S 21 24u 0 S
+R Z 1974 o - Jul 6 24 1 D
+R Z 1974 o - O 12 24 0 S
+R Z 1975 o - Ap 19 24 1 D
+R Z 1975 o - Au 30 24 0 S
+R Z 1980 o - Au 2 24s 1 D
+R Z 1980 o - S 13 24s 0 S
+R Z 1984 o - May 5 24s 1 D
+R Z 1984 o - Au 25 24s 0 S
+R Z 1985 o - Ap 13 24 1 D
+R Z 1985 o - Au 31 24 0 S
+R Z 1986 o - May 17 24 1 D
+R Z 1986 o - S 6 24 0 S
+R Z 1987 o - Ap 14 24 1 D
+R Z 1987 o - S 12 24 0 S
+R Z 1988 o - Ap 9 24 1 D
+R Z 1988 o - S 3 24 0 S
+R Z 1989 o - Ap 29 24 1 D
+R Z 1989 o - S 2 24 0 S
+R Z 1990 o - Mar 24 24 1 D
+R Z 1990 o - Au 25 24 0 S
+R Z 1991 o - Mar 23 24 1 D
+R Z 1991 o - Au 31 24 0 S
+R Z 1992 o - Mar 28 24 1 D
+R Z 1992 o - S 5 24 0 S
 R Z 1993 o - Ap 2 0 1 D
 R Z 1993 o - S 5 0 0 S
 R Z 1994 o - Ap 1 0 1 D
 R Z 1994 o - Au 28 0 0 S
 R Z 1995 o - Mar 31 0 1 D
 R Z 1995 o - S 3 0 0 S
-R Z 1996 o - Mar 15 0 1 D
-R Z 1996 o - S 16 0 0 S
-R Z 1997 o - Mar 21 0 1 D
-R Z 1997 o - S 14 0 0 S
+R Z 1996 o - Mar 14 24 1 D
+R Z 1996 o - S 15 24 0 S
+R Z 1997 o - Mar 20 24 1 D
+R Z 1997 o - S 13 24 0 S
 R Z 1998 o - Mar 20 0 1 D
 R Z 1998 o - S 6 0 0 S
 R Z 1999 o - Ap 2 2 1 D
@@ -1091,10 +1104,10 @@ R P 2004 o - O 1 1 0 -
 R P 2005 o - O 4 2 0 -
 R P 2006 2007 - Ap 1 0 1 S
 R P 2006 o - S 22 0 0 -
-R P 2007 o - S Th>=8 2 0 -
+R P 2007 o - S 13 2 0 -
 R P 2008 2009 - Mar lastF 0 1 S
 R P 2008 o - S 1 0 0 -
-R P 2009 o - S F>=1 1 0 -
+R P 2009 o - S 4 1 0 -
 R P 2010 o - Mar 26 0 1 S
 R P 2010 o - Au 11 0 0 -
 R P 2011 o - Ap 1 0:1 1 S
@@ -1103,12 +1116,16 @@ R P 2011 o - Au 30 0 1 S
 R P 2011 o - S 30 0 0 -
 R P 2012 2014 - Mar lastTh 24 1 S
 R P 2012 o - S 21 1 0 -
-R P 2013 o - S F>=21 0 0 -
-R P 2014 2015 - O F>=21 0 0 -
-R P 2015 o - Mar lastF 24 1 S
+R P 2013 o - S 27 0 0 -
+R P 2014 o - O 24 0 0 -
+R P 2015 o - Mar 28 0 1 S
+R P 2015 o - O 23 1 0 -
 R P 2016 2018 - Mar Sa>=24 1 1 S
-R P 2016 ma - O lastSa 1 0 -
-R P 2019 ma - Mar lastF 0 1 S
+R P 2016 2018 - O Sa>=24 1 0 -
+R P 2019 o - Mar 29 0 1 S
+R P 2019 o - O Sa>=24 0 0 -
+R P 2020 ma - Mar Sa>=24 0 1 S
+R P 2020 ma - O Sa>=24 1 0 -
 Z Asia/Gaza 2:17:52 - LMT 1900 O
 2 Z EET/EEST 1948 May 15
 2 K EE%sT 1967 Jun 5
@@ -1247,13 +1264,13 @@ Z Asia/Ho_Chi_Minh 7:6:40 - LMT 1906 Jul
 7 - +07 1959 D 31 23
 8 - +08 1975 Jun 13
 7 - +07
-R AU 1917 o - Ja 1 0:1 1 D
-R AU 1917 o - Mar 25 2 0 S
-R AU 1942 o - Ja 1 2 1 D
-R AU 1942 o - Mar 29 2 0 S
-R AU 1942 o - S 27 2 1 D
-R AU 1943 1944 - Mar lastSu 2 0 S
-R AU 1943 o - O 3 2 1 D
+R AU 1917 o - Ja 1 2s 1 D
+R AU 1917 o - Mar lastSu 2s 0 S
+R AU 1942 o - Ja 1 2s 1 D
+R AU 1942 o - Mar lastSu 2s 0 S
+R AU 1942 o - S 27 2s 1 D
+R AU 1943 1944 - Mar lastSu 2s 0 S
+R AU 1943 o - O 3 2s 1 D
 Z Australia/Darwin 8:43:20 - LMT 1895 F
 9 - ACST 1899 May
 9:30 AU AC%sT
@@ -1304,8 +1321,12 @@ Z Australia/Adelaide 9:14:20 - LMT 1895 F
 9 - ACST 1899 May
 9:30 AU AC%sT 1971
 9:30 AS AC%sT
+R AT 1916 o - O Su>=1 2s 1 D
+R AT 1917 o - Mar lastSu 2s 0 S
+R AT 1917 1918 - O Su>=22 2s 1 D
+R AT 1918 1919 - Mar Su>=1 2s 0 S
 R AT 1967 o - O Su>=1 2s 1 D
-R AT 1968 o - Mar lastSu 2s 0 S
+R AT 1968 o - Mar Su>=29 2s 0 S
 R AT 1968 1985 - O lastSu 2s 1 D
 R AT 1969 1971 - Mar Su>=8 2s 0 S
 R AT 1972 o - F lastSu 2s 0 S
@@ -1324,15 +1345,9 @@ R AT 2006 o - Ap Su>=1 2s 0 S
 R AT 2007 o - Mar lastSu 2s 0 S
 R AT 2008 ma - Ap Su>=1 2s 0 S
 Z Australia/Hobart 9:49:16 - LMT 1895 S
-10 - AEST 1916 O 1 2
-10 1 AEDT 1917 F
+10 AT AE%sT 1919 O 24
 10 AU AE%sT 1967
 10 AT AE%sT
-Z Australia/Currie 9:35:28 - LMT 1895 S
-10 - AEST 1916 O 1 2
-10 1 AEDT 1917 F
-10 AU AE%sT 1971 Jul
-10 AT AE%sT
 R AV 1971 1985 - O lastSu 2s 1 D
 R AV 1972 o - F lastSu 2s 0 S
 R AV 1973 1985 - Mar Su>=1 2s 0 S
@@ -1399,8 +1414,9 @@ Z Antarctica/Macquarie 0 - -00 1899 N
 10 AU AE%sT 1919 Ap 1 0s
 0 - -00 1948 Mar 25
 10 AU AE%sT 1967
-10 AT AE%sT 2010 Ap 4 3
-11 - +11
+10 AT AE%sT 2010
+10 1 AEDT 2011
+10 AT AE%sT
 Z Indian/Christmas 7:2:52 - LMT 1895 F
 7 - +07
 Z Indian/Cocos 6:27:40 - LMT 1900
@@ -1415,7 +1431,9 @@ R FJ 2012 2013 - Ja Su>=18 3 0 -
 R FJ 2014 o - Ja Su>=18 2 0 -
 R FJ 2014 2018 - N Su>=1 2 1 -
 R FJ 2015 ma - Ja Su>=12 3 0 -
-R FJ 2019 ma - N Su>=8 2 1 -
+R FJ 2019 o - N Su>=8 2 1 -
+R FJ 2020 o - D 20 2 1 -
+R FJ 2021 ma - N Su>=8 2 1 -
 Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
 12 FJ +12/+13
 Z Pacific/Gambier -8:59:48 - LMT 1912 O
@@ -1603,12 +1621,12 @@ Z Pacific/Funafuti 11:56:52 - LMT 1901
 12 - +12
 Z Pacific/Wake 11:6:28 - LMT 1901
 12 - +12
-R VU 1983 o - S 25 0 1 -
-R VU 1984 1991 - Mar Su>=23 0 0 -
-R VU 1984 o - O 23 0 1 -
-R VU 1985 1991 - S Su>=23 0 1 -
-R VU 1992 1993 - Ja Su>=23 0 0 -
-R VU 1992 o - O Su>=23 0 1 -
+R VU 1973 o - D 22 12u 1 -
+R VU 1974 o - Mar 30 12u 0 -
+R VU 1983 1991 - S Sa>=22 24 1 -
+R VU 1984 1991 - Mar Sa>=22 24 0 -
+R VU 1992 1993 - Ja Sa>=22 24 0 -
+R VU 1992 o - O Sa>=22 24 1 -
 Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
 11 VU +11/+12
 Z Pacific/Wallis 12:15:20 - LMT 1901
@@ -1992,8 +2010,8 @@ R F 1945 o - Ap 2 2 2 M
 R F 1945 o - S 16 3 0 -
 R F 1976 o - Mar 28 1 1 S
 R F 1976 o - S 26 1 0 -
-Z Europe/Paris 0:9:21 - LMT 1891 Mar 15 0:1
-0:9:21 - PMT 1911 Mar 11 0:1
+Z Europe/Paris 0:9:21 - LMT 1891 Mar 16
+0:9:21 - PMT 1911 Mar 11
 0 F WE%sT 1940 Jun 14 23
 1 c CE%sT 1944 Au 25
 0 F WE%sT 1945 S 16 3
@@ -2045,29 +2063,30 @@ Z Europe/Athens 1:34:52 - LMT 1895 S 14
 1 g CE%sT 1944 Ap 4
 2 g EE%sT 1981
 2 E EE%sT
-R h 1918 o - Ap 1 3 1 S
-R h 1918 o - S 16 3 0 -
-R h 1919 o - Ap 15 3 1 S
-R h 1919 o - N 24 3 0 -
+R h 1918 1919 - Ap 15 2 1 S
+R h 1918 1920 - S M>=15 3 0 -
+R h 1920 o - Ap 5 2 1 S
 R h 1945 o - May 1 23 1 S
-R h 1945 o - N 1 0 0 -
+R h 1945 o - N 1 1 0 -
 R h 1946 o - Mar 31 2s 1 S
-R h 1946 1949 - O Su>=1 2s 0 -
+R h 1946 o - O 7 2 0 -
 R h 1947 1949 - Ap Su>=4 2s 1 S
-R h 1950 o - Ap 17 2s 1 S
-R h 1950 o - O 23 2s 0 -
-R h 1954 1955 - May 23 0 1 S
-R h 1954 1955 - O 3 0 0 -
-R h 1956 o - Jun Su>=1 0 1 S
-R h 1956 o - S lastSu 0 0 -
-R h 1957 o - Jun Su>=1 1 1 S
-R h 1957 o - S lastSu 3 0 -
-R h 1980 o - Ap 6 1 1 S
-Z Europe/Budapest 1:16:20 - LMT 1890 O
+R h 1947 1949 - O Su>=1 2s 0 -
+R h 1954 o - May 23 0 1 S
+R h 1954 o - O 3 0 0 -
+R h 1955 o - May 22 2 1 S
+R h 1955 o - O 2 3 0 -
+R h 1956 1957 - Jun Su>=1 2 1 S
+R h 1956 1957 - S lastSu 3 0 -
+R h 1980 o - Ap 6 0 1 S
+R h 1980 o - S 28 1 0 -
+R h 1981 1983 - Mar lastSu 0 1 S
+R h 1981 1983 - S lastSu 1 0 -
+Z Europe/Budapest 1:16:20 - LMT 1890 N
 1 c CE%sT 1918
-1 h CE%sT 1941 Ap 8
+1 h CE%sT 1941 Ap 7 23
 1 c CE%sT 1945
-1 h CE%sT 1980 S 28 2s
+1 h CE%sT 1984
 1 E CE%sT
 R w 1917 1919 - F 19 23 1 -
 R w 1917 o - O 21 1 0 -
@@ -2223,8 +2242,8 @@ Z Europe/Chisinau 1:55:20 - LMT 1880
 2 R EE%sT 1992
 2 e EE%sT 1997
 2 MD EE%sT
-Z Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-0:9:21 - PMT 1911 Mar 11
+Z Europe/Monaco 0:29:32 - LMT 1892 Jun
+0:9:21 - PMT 1911 Mar 29
 0 F WE%sT 1945 S 16 3
 1 F CE%sT 1977
 1 E CE%sT
@@ -2450,7 +2469,8 @@ Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
 3 R +03/+04 2011 Mar 27 2s
 4 - +04 2014 O 26 2s
 3 - +03 2018 O 28 2s
-4 - +04
+4 - +04 2020 D 27 2s
+3 - +03
 Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
 3 - +03 1930 Jun 21
 4 R +04/+05 1988 Mar 27 2s
@@ -3413,12 +3433,12 @@ Z America/Inuvik 0 - -00 1953
 Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
 -9 Y Y%sT 1967 May 28
 -8 Y P%sT 1980
--8 C P%sT 2020 Mar 8 2
+-8 C P%sT 2020 N
 -7 - MST
 Z America/Dawson -9:17:40 - LMT 1900 Au 20
 -9 Y Y%sT 1973 O 28
 -8 Y P%sT 1980
--8 C P%sT 2020 Mar 8 2
+-8 C P%sT 2020 N
 -7 - MST
 R m 1939 o - F 5 0 1 D
 R m 1939 o - Jun 25 0 0 S
@@ -3533,6 +3553,11 @@ Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 0:11:56
 -8 u P%sT 2002 F 20
 -8 m P%sT 2010
 -8 u P%sT
+R BS 1942 o - May 1 24 1 W
+R BS 1944 o - D 31 24 0 S
+R BS 1945 o - F 1 0 1 W
+R BS 1945 o - Au 14 23u 1 P
+R BS 1945 o - O 17 24 0 S
 R BS 1964 1975 - O lastSu 2 0 S
 R BS 1964 1975 - Ap lastSu 2 1 D
 Z America/Nassau -5:9:30 - LMT 1912 Mar 2
@@ -3546,16 +3571,38 @@ R BB 1980 o - S 25 2 0 S
 Z America/Barbados -3:58:29 - LMT 1924
 -3:58:29 - BMT 1932
 -4 BB A%sT
-R BZ 1918 1942 - O Su>=2 0 0:30 -0530
-R BZ 1919 1943 - F Su>=9 0 0 CST
+R BZ 1918 1941 - O Sa>=1 24 0:30 -0530
+R BZ 1919 1942 - F Sa>=8 24 0 CST
+R BZ 1942 o - Jun 27 24 1 CWT
+R BZ 1945 o - Au 14 23u 1 CPT
+R BZ 1945 o - D 15 24 0 CST
+R BZ 1947 1967 - O Sa>=1 24 0:30 -0530
+R BZ 1948 1968 - F Sa>=8 24 0 CST
 R BZ 1973 o - D 5 0 1 CDT
 R BZ 1974 o - F 9 0 0 CST
 R BZ 1982 o - D 18 0 1 CDT
 R BZ 1983 o - F 12 0 0 CST
 Z America/Belize -5:52:48 - LMT 1912 Ap
 -6 BZ %s
-Z Atlantic/Bermuda -4:19:18 - LMT 1930 Ja 1 2
--4 - AST 1974 Ap 28 2
+R Be 1917 o - Ap 5 24 1 -
+R Be 1917 o - S 30 24 0 -
+R Be 1918 o - Ap 13 24 1 -
+R Be 1918 o - S 15 24 0 S
+R Be 1942 o - Ja 11 2 1 D
+R Be 1942 o - O 18 2 0 S
+R Be 1943 o - Mar 21 2 1 D
+R Be 1943 o - O 31 2 0 S
+R Be 1944 1945 - Mar Su>=8 2 1 D
+R Be 1944 1945 - N Su>=1 2 0 S
+R Be 1947 o - May Su>=15 2 1 D
+R Be 1947 o - S Su>=8 2 0 S
+R Be 1948 1952 - May Su>=22 2 1 D
+R Be 1948 1952 - S Su>=1 2 0 S
+R Be 1956 o - May Su>=22 2 1 D
+R Be 1956 o - O lastSu 2 0 S
+Z Atlantic/Bermuda -4:19:18 - LMT 1890
+-4:19:18 Be BMT/BST 1930 Ja 1 2
+-4 Be A%sT 1974 Ap 28 2
 -4 C A%sT 1976
 -4 u A%sT
 R CR 1979 1980 - F lastSu 0 1 D
@@ -3694,7 +3741,7 @@ Z America/Miquelon -3:44:40 - LMT 1911 May 15
 Z America/Grand_Turk -4:44:32 - LMT 1890
 -5:7:10 - KMT 1912 F
 -5 - EST 1979
--5 u E%sT 2015 N Su>=1 2
+-5 u E%sT 2015 Mar 8 2
 -4 - AST 2018 Mar 11 3
 -5 u E%sT
 R A 1930 o - D 1 0 1 -
@@ -4330,6 +4377,7 @@ L Atlantic/Faroe Atlantic/Faeroe
 L Europe/Oslo Atlantic/Jan_Mayen
 L Australia/Sydney Australia/ACT
 L Australia/Sydney Australia/Canberra
+L Australia/Hobart Australia/Currie
 L Australia/Lord_Howe Australia/LHI
 L Australia/Sydney Australia/NSW
 L Australia/Darwin Australia/North
diff --git a/msys2/usr/share/zoneinfo/zone.tab b/msys2/usr/share/zoneinfo/zone.tab
index 8d056e374..1f0128f3b 100644
--- a/msys2/usr/share/zoneinfo/zone.tab
+++ b/msys2/usr/share/zoneinfo/zone.tab
@@ -56,8 +56,7 @@ AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
-AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+AU	-4253+14719	Australia/Hobart	Tasmania
 AU	-3749+14458	Australia/Melbourne	Victoria
 AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
 AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
@@ -130,9 +129,9 @@ CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
 CA	+4906-11631	America/Creston	MST - BC (Creston)
 CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
 CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
+CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
+CA	+6404-13925	America/Dawson	MST - Yukon (west)
 CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (east)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (west)
 CC	-1210+09655	Indian/Cocos
 CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
 CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
@@ -337,8 +336,8 @@ RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
 # Programs should use zone1970.tab instead; see above.
 UA	+4457+03406	Europe/Simferopol	Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
+RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
 RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+4844+04425	Europe/Volgograd	MSK+01 - Volgograd
 RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
 RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
 RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
diff --git a/msys2/usr/share/zoneinfo/zone1970.tab b/msys2/usr/share/zoneinfo/zone1970.tab
index 53ee77e88..396e4d381 100644
--- a/msys2/usr/share/zoneinfo/zone1970.tab
+++ b/msys2/usr/share/zoneinfo/zone1970.tab
@@ -63,8 +63,7 @@ AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
-AU	-3956+14352	Australia/Currie	Tasmania (King Island)
+AU	-4253+14719	Australia/Hobart	Tasmania
 AU	-3749+14458	Australia/Melbourne	Victoria
 AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
 AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
@@ -127,9 +126,9 @@ CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
 CA	+4906-11631	America/Creston	MST - BC (Creston)
 CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
 CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
+CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
+CA	+6404-13925	America/Dawson	MST - Yukon (west)
 CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (east)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (west)
 CC	-1210+09655	Indian/Cocos
 CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
 CI,BF,GM,GN,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
@@ -292,8 +291,8 @@ RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
 # Mention RU and UA alphabetically.  See "territorial claims" above.
 RU,UA	+4457+03406	Europe/Simferopol	Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
+RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
 RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+4844+04425	Europe/Volgograd	MSK+01 - Volgograd
 RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
 RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
 RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
diff --git a/msys2/usr/ssl/misc/tsget b/msys2/usr/ssl/misc/tsget
index 9ae48d193..bb4795339 100644
--- a/msys2/usr/ssl/misc/tsget
+++ b/msys2/usr/ssl/misc/tsget
@@ -47,7 +47,7 @@ sub create_curl {
     $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
     $curl->setopt(CURLOPT_FAILONERROR, 1);
     $curl->setopt(CURLOPT_USERAGENT,
-        "OpenTSA tsget.pl/openssl-1.1.1g");
+        "OpenTSA tsget.pl/openssl-1.1.1i");
 
     # Options for POST method.
     $curl->setopt(CURLOPT_UPLOAD, 1);
diff --git a/msys2/usr/ssl/misc/tsget.pl b/msys2/usr/ssl/misc/tsget.pl
index 9ae48d193..bb4795339 100644
--- a/msys2/usr/ssl/misc/tsget.pl
+++ b/msys2/usr/ssl/misc/tsget.pl
@@ -47,7 +47,7 @@ sub create_curl {
     $curl->setopt(CURLOPT_VERBOSE, 1) if $options{d};
     $curl->setopt(CURLOPT_FAILONERROR, 1);
     $curl->setopt(CURLOPT_USERAGENT,
-        "OpenTSA tsget.pl/openssl-1.1.1g");
+        "OpenTSA tsget.pl/openssl-1.1.1i");
 
     # Options for POST method.
     $curl->setopt(CURLOPT_UPLOAD, 1);
diff --git a/msys2/var/lib/pacman/local/base-2020.05-2/mtree b/msys2/var/lib/pacman/local/base-2020.05-2/mtree
deleted file mode 100644
index f63f8b58d..000000000
Binary files a/msys2/var/lib/pacman/local/base-2020.05-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/base-2020.05-2/desc b/msys2/var/lib/pacman/local/base-2020.12-1/desc
similarity index 86%
rename from msys2/var/lib/pacman/local/base-2020.05-2/desc
rename to msys2/var/lib/pacman/local/base-2020.12-1/desc
index 428b60f08..805e8d455 100644
--- a/msys2/var/lib/pacman/local/base-2020.05-2/desc
+++ b/msys2/var/lib/pacman/local/base-2020.12-1/desc
@@ -2,7 +2,7 @@
 base
 
 %VERSION%
-2020.05-2
+2020.12-1
 
 %BASE%
 base
@@ -17,13 +17,13 @@ https://www.msys2.org
 any
 
 %BUILDDATE%
-1590994606
+1608382090
 
 %INSTALLDATE%
-1599157263
+1613407330
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/432379984)
 
 %LICENSE%
 GPL
@@ -53,6 +53,7 @@ mintty
 msys2-keyring
 msys2-launcher
 msys2-runtime
+nano
 pacman
 pacman-contrib
 pacman-mirrors
diff --git a/msys2/var/lib/pacman/local/base-2020.05-2/files b/msys2/var/lib/pacman/local/base-2020.12-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/base-2020.05-2/files
rename to msys2/var/lib/pacman/local/base-2020.12-1/files
diff --git a/msys2/var/lib/pacman/local/base-2020.12-1/mtree b/msys2/var/lib/pacman/local/base-2020.12-1/mtree
new file mode 100644
index 000000000..572eb918f
Binary files /dev/null and b/msys2/var/lib/pacman/local/base-2020.12-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/bash-4.4.023-2/mtree b/msys2/var/lib/pacman/local/bash-4.4.023-2/mtree
deleted file mode 100644
index 922fc52d5..000000000
Binary files a/msys2/var/lib/pacman/local/bash-4.4.023-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/bash-4.4.023-2/desc b/msys2/var/lib/pacman/local/bash-5.1.004-1/desc
similarity index 68%
rename from msys2/var/lib/pacman/local/bash-4.4.023-2/desc
rename to msys2/var/lib/pacman/local/bash-5.1.004-1/desc
index e5c159b62..a987df349 100644
--- a/msys2/var/lib/pacman/local/bash-4.4.023-2/desc
+++ b/msys2/var/lib/pacman/local/bash-5.1.004-1/desc
@@ -2,7 +2,7 @@
 bash
 
 %VERSION%
-4.4.023-2
+5.1.004-1
 
 %BASE%
 bash
@@ -17,32 +17,26 @@ https://www.gnu.org/software/bash/bash.html
 x86_64
 
 %BUILDDATE%
-1581923461
+1608588391
 
 %INSTALLDATE%
-1599157238
+1613407305
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/436616027)
 
 %SIZE%
-10094265
+11275288
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 GPL
 
 %VALIDATION%
 pgp
 
-%DEPENDS%
-msys2-runtime
-
 %PROVIDES%
 sh
 
diff --git a/msys2/var/lib/pacman/local/bash-4.4.023-2/files b/msys2/var/lib/pacman/local/bash-5.1.004-1/files
similarity index 97%
rename from msys2/var/lib/pacman/local/bash-4.4.023-2/files
rename to msys2/var/lib/pacman/local/bash-5.1.004-1/files
index 805d9c860..3591dd88e 100644
--- a/msys2/var/lib/pacman/local/bash-4.4.023-2/files
+++ b/msys2/var/lib/pacman/local/bash-5.1.004-1/files
@@ -83,6 +83,9 @@ usr/share/locale/it/LC_MESSAGES/bash.mo
 usr/share/locale/ja/
 usr/share/locale/ja/LC_MESSAGES/
 usr/share/locale/ja/LC_MESSAGES/bash.mo
+usr/share/locale/ko/
+usr/share/locale/ko/LC_MESSAGES/
+usr/share/locale/ko/LC_MESSAGES/bash.mo
 usr/share/locale/lt/
 usr/share/locale/lt/LC_MESSAGES/
 usr/share/locale/lt/LC_MESSAGES/bash.mo
@@ -95,6 +98,9 @@ usr/share/locale/nl/LC_MESSAGES/bash.mo
 usr/share/locale/pl/
 usr/share/locale/pl/LC_MESSAGES/
 usr/share/locale/pl/LC_MESSAGES/bash.mo
+usr/share/locale/pt/
+usr/share/locale/pt/LC_MESSAGES/
+usr/share/locale/pt/LC_MESSAGES/bash.mo
 usr/share/locale/pt_BR/
 usr/share/locale/pt_BR/LC_MESSAGES/
 usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
diff --git a/msys2/var/lib/pacman/local/bash-5.1.004-1/mtree b/msys2/var/lib/pacman/local/bash-5.1.004-1/mtree
new file mode 100644
index 000000000..60a8155da
Binary files /dev/null and b/msys2/var/lib/pacman/local/bash-5.1.004-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/bash-completion-2.10-1/mtree b/msys2/var/lib/pacman/local/bash-completion-2.10-1/mtree
deleted file mode 100644
index 7851e2feb..000000000
Binary files a/msys2/var/lib/pacman/local/bash-completion-2.10-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/bash-completion-2.10-1/desc b/msys2/var/lib/pacman/local/bash-completion-2.11-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/bash-completion-2.10-1/desc
rename to msys2/var/lib/pacman/local/bash-completion-2.11-1/desc
index 45158c8f3..ccb195cb0 100644
--- a/msys2/var/lib/pacman/local/bash-completion-2.10-1/desc
+++ b/msys2/var/lib/pacman/local/bash-completion-2.11-1/desc
@@ -2,7 +2,7 @@
 bash-completion
 
 %VERSION%
-2.10-1
+2.11-1
 
 %BASE%
 bash-completion
@@ -17,23 +17,20 @@ https://bash-completion.alioth.debian.org/
 any
 
 %BUILDDATE%
-1576135630
+1603700081
 
 %INSTALLDATE%
-1599157238
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/6e7d6a99/328625740)
 
 %SIZE%
-2428783
+2486890
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 GPL
 
diff --git a/msys2/var/lib/pacman/local/bash-completion-2.10-1/files b/msys2/var/lib/pacman/local/bash-completion-2.11-1/files
similarity index 98%
rename from msys2/var/lib/pacman/local/bash-completion-2.10-1/files
rename to msys2/var/lib/pacman/local/bash-completion-2.11-1/files
index 6379fe8ca..ed091b9db 100644
--- a/msys2/var/lib/pacman/local/bash-completion-2.10-1/files
+++ b/msys2/var/lib/pacman/local/bash-completion-2.11-1/files
@@ -94,6 +94,7 @@ usr/share/bash-completion/completions/avctrl
 usr/share/bash-completion/completions/badblocks
 usr/share/bash-completion/completions/bind
 usr/share/bash-completion/completions/bk
+usr/share/bash-completion/completions/bmake
 usr/share/bash-completion/completions/brctl
 usr/share/bash-completion/completions/bsdtar
 usr/share/bash-completion/completions/btdownloadcurses.py
@@ -316,6 +317,7 @@ usr/share/bash-completion/completions/installpkg
 usr/share/bash-completion/completions/interdiff
 usr/share/bash-completion/completions/invoke-rc.d
 usr/share/bash-completion/completions/ip
+usr/share/bash-completion/completions/ipcalc
 usr/share/bash-completion/completions/iperf
 usr/share/bash-completion/completions/iperf3
 usr/share/bash-completion/completions/ipmitool
@@ -514,6 +516,7 @@ usr/share/bash-completion/completions/postsuper
 usr/share/bash-completion/completions/povray
 usr/share/bash-completion/completions/ppc-koji
 usr/share/bash-completion/completions/prelink
+usr/share/bash-completion/completions/printenv
 usr/share/bash-completion/completions/protoc
 usr/share/bash-completion/completions/psql
 usr/share/bash-completion/completions/puppet
@@ -554,7 +557,14 @@ usr/share/bash-completion/completions/pytest-2
 usr/share/bash-completion/completions/pytest-3
 usr/share/bash-completion/completions/python
 usr/share/bash-completion/completions/python2
+usr/share/bash-completion/completions/python2.7
 usr/share/bash-completion/completions/python3
+usr/share/bash-completion/completions/python3.3
+usr/share/bash-completion/completions/python3.4
+usr/share/bash-completion/completions/python3.5
+usr/share/bash-completion/completions/python3.6
+usr/share/bash-completion/completions/python3.7
+usr/share/bash-completion/completions/python3.8
 usr/share/bash-completion/completions/pyvenv
 usr/share/bash-completion/completions/pyvenv-3.4
 usr/share/bash-completion/completions/pyvenv-3.5
@@ -607,6 +617,7 @@ usr/share/bash-completion/completions/scp
 usr/share/bash-completion/completions/screen
 usr/share/bash-completion/completions/scrub
 usr/share/bash-completion/completions/sdptool
+usr/share/bash-completion/completions/secret-tool
 usr/share/bash-completion/completions/setquota
 usr/share/bash-completion/completions/sftp
 usr/share/bash-completion/completions/sh
@@ -660,6 +671,7 @@ usr/share/bash-completion/completions/tox
 usr/share/bash-completion/completions/tracepath
 usr/share/bash-completion/completions/tracepath6
 usr/share/bash-completion/completions/tshark
+usr/share/bash-completion/completions/tsig-keygen
 usr/share/bash-completion/completions/tune2fs
 usr/share/bash-completion/completions/typeset
 usr/share/bash-completion/completions/ulimit
diff --git a/msys2/var/lib/pacman/local/bash-completion-2.11-1/mtree b/msys2/var/lib/pacman/local/bash-completion-2.11-1/mtree
new file mode 100644
index 000000000..856bacb16
Binary files /dev/null and b/msys2/var/lib/pacman/local/bash-completion-2.11-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/brotli-1.0.7-3/mtree b/msys2/var/lib/pacman/local/brotli-1.0.7-3/mtree
deleted file mode 100644
index 52bdefc79..000000000
Binary files a/msys2/var/lib/pacman/local/brotli-1.0.7-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/brotli-1.0.7-3/desc b/msys2/var/lib/pacman/local/brotli-1.0.9-1/desc
similarity index 73%
rename from msys2/var/lib/pacman/local/brotli-1.0.7-3/desc
rename to msys2/var/lib/pacman/local/brotli-1.0.9-1/desc
index b4979f647..1443cf460 100644
--- a/msys2/var/lib/pacman/local/brotli-1.0.7-3/desc
+++ b/msys2/var/lib/pacman/local/brotli-1.0.9-1/desc
@@ -2,7 +2,7 @@
 brotli
 
 %VERSION%
-1.0.7-3
+1.0.9-1
 
 %BASE%
 brotli
@@ -17,16 +17,16 @@ https://github.com/google/brotli
 x86_64
 
 %BUILDDATE%
-1587067802
+1603627078
 
 %INSTALLDATE%
-1599157249
+1613407317
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/b3385361/327177988)
 
 %SIZE%
-1495612
+1609764
 
 %REASON%
 1
@@ -38,6 +38,5 @@ MIT
 pgp
 
 %DEPENDS%
-msys2-runtime
 gcc-libs
 
diff --git a/msys2/var/lib/pacman/local/brotli-1.0.7-3/files b/msys2/var/lib/pacman/local/brotli-1.0.9-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/brotli-1.0.7-3/files
rename to msys2/var/lib/pacman/local/brotli-1.0.9-1/files
diff --git a/msys2/var/lib/pacman/local/brotli-1.0.9-1/mtree b/msys2/var/lib/pacman/local/brotli-1.0.9-1/mtree
new file mode 100644
index 000000000..ae7aa2175
Binary files /dev/null and b/msys2/var/lib/pacman/local/brotli-1.0.9-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/mtree b/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/mtree
deleted file mode 100644
index 350f3eff7..000000000
Binary files a/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/desc b/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/desc
similarity index 80%
rename from msys2/var/lib/pacman/local/bsdtar-3.4.3-1/desc
rename to msys2/var/lib/pacman/local/bsdtar-3.5.1-1/desc
index e56211917..e9de1eb7e 100644
--- a/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/desc
+++ b/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/desc
@@ -2,7 +2,7 @@
 bsdtar
 
 %VERSION%
-3.4.3-1
+3.5.1-1
 
 %BASE%
 libarchive
@@ -17,22 +17,22 @@ https://libarchive.org/
 x86_64
 
 %BUILDDATE%
-1590144412
+1610722113
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-4532869
+3991268
 
 %REASON%
 1
 
 %GROUPS%
-base
+libraries
 
 %LICENSE%
 BSD
diff --git a/msys2/var/lib/pacman/local/bsdtar-3.4.3-1/files b/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/bsdtar-3.4.3-1/files
rename to msys2/var/lib/pacman/local/bsdtar-3.5.1-1/files
diff --git a/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/mtree b/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/mtree
new file mode 100644
index 000000000..a60af4a2c
Binary files /dev/null and b/msys2/var/lib/pacman/local/bsdtar-3.5.1-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/bzip2-1.0.8-2/desc b/msys2/var/lib/pacman/local/bzip2-1.0.8-2/desc
index 9ffddf556..cfeb87eeb 100644
--- a/msys2/var/lib/pacman/local/bzip2-1.0.8-2/desc
+++ b/msys2/var/lib/pacman/local/bzip2-1.0.8-2/desc
@@ -20,7 +20,7 @@ x86_64
 1587055041
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/ca-certificates-20190110-1/desc b/msys2/var/lib/pacman/local/ca-certificates-20190110-1/desc
index ec5309315..b2d3f57fe 100644
--- a/msys2/var/lib/pacman/local/ca-certificates-20190110-1/desc
+++ b/msys2/var/lib/pacman/local/ca-certificates-20190110-1/desc
@@ -20,7 +20,7 @@ any
 1573155200
 
 %INSTALLDATE%
-1599157249
+1613407316
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/coreutils-8.32-1/desc b/msys2/var/lib/pacman/local/coreutils-8.32-1/desc
index 5a262d0b3..8801db7cb 100644
--- a/msys2/var/lib/pacman/local/coreutils-8.32-1/desc
+++ b/msys2/var/lib/pacman/local/coreutils-8.32-1/desc
@@ -20,7 +20,7 @@ x86_64
 1583748603
 
 %INSTALLDATE%
-1599157240
+1613407307
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/curl-7.71.1-1/mtree b/msys2/var/lib/pacman/local/curl-7.71.1-1/mtree
deleted file mode 100644
index 95f8c6257..000000000
Binary files a/msys2/var/lib/pacman/local/curl-7.71.1-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/curl-7.71.1-1/desc b/msys2/var/lib/pacman/local/curl-7.74.0-4/desc
similarity index 80%
rename from msys2/var/lib/pacman/local/curl-7.71.1-1/desc
rename to msys2/var/lib/pacman/local/curl-7.74.0-4/desc
index f05e93cec..a09078c72 100644
--- a/msys2/var/lib/pacman/local/curl-7.71.1-1/desc
+++ b/msys2/var/lib/pacman/local/curl-7.74.0-4/desc
@@ -2,7 +2,7 @@
 curl
 
 %VERSION%
-7.71.1-1
+7.74.0-4
 
 %BASE%
 curl
@@ -17,16 +17,16 @@ https://curl.haxx.se
 x86_64
 
 %BUILDDATE%
-1594717164
+1608526923
 
 %INSTALLDATE%
-1599157252
+1613407320
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434829238)
 
 %SIZE%
-911825
+929805
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/curl-7.71.1-1/files b/msys2/var/lib/pacman/local/curl-7.74.0-4/files
similarity index 97%
rename from msys2/var/lib/pacman/local/curl-7.71.1-1/files
rename to msys2/var/lib/pacman/local/curl-7.74.0-4/files
index 6008841ff..aeb24488e 100644
--- a/msys2/var/lib/pacman/local/curl-7.71.1-1/files
+++ b/msys2/var/lib/pacman/local/curl-7.74.0-4/files
@@ -18,6 +18,9 @@ usr/share/man/man3/curl_easy_duphandle.3.gz
 usr/share/man/man3/curl_easy_escape.3.gz
 usr/share/man/man3/curl_easy_getinfo.3.gz
 usr/share/man/man3/curl_easy_init.3.gz
+usr/share/man/man3/curl_easy_option_by_id.3.gz
+usr/share/man/man3/curl_easy_option_by_name.3.gz
+usr/share/man/man3/curl_easy_option_next.3.gz
 usr/share/man/man3/curl_easy_pause.3.gz
 usr/share/man/man3/curl_easy_perform.3.gz
 usr/share/man/man3/curl_easy_recv.3.gz
@@ -97,6 +100,7 @@ usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz
 usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3.gz
 usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz
 usr/share/man/man3/CURLINFO_COOKIELIST.3.gz
+usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3.gz
 usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz
 usr/share/man/man3/CURLINFO_FILETIME.3.gz
 usr/share/man/man3/CURLINFO_FILETIME_T.3.gz
@@ -118,6 +122,7 @@ usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz
 usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz
 usr/share/man/man3/CURLINFO_PRIVATE.3.gz
 usr/share/man/man3/CURLINFO_PROTOCOL.3.gz
+usr/share/man/man3/CURLINFO_PROXY_ERROR.3.gz
 usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz
 usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
 usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz
@@ -240,6 +245,12 @@ usr/share/man/man3/CURLOPT_HEADER.3.gz
 usr/share/man/man3/CURLOPT_HEADERDATA.3.gz
 usr/share/man/man3/CURLOPT_HEADERFUNCTION.3.gz
 usr/share/man/man3/CURLOPT_HEADEROPT.3.gz
+usr/share/man/man3/CURLOPT_HSTS.3.gz
+usr/share/man/man3/CURLOPT_HSTS_CTRL.3.gz
+usr/share/man/man3/CURLOPT_HSTSREADDATA.3.gz
+usr/share/man/man3/CURLOPT_HSTSREADFUNCTION.3.gz
+usr/share/man/man3/CURLOPT_HSTSWRITEDATA.3.gz
+usr/share/man/man3/CURLOPT_HSTSWRITEFUNCTION.3.gz
 usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3.gz
 usr/share/man/man3/CURLOPT_HTTP200ALIASES.3.gz
 usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz
@@ -382,6 +393,7 @@ usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz
 usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz
 usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3.gz
 usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz
+usr/share/man/man3/CURLOPT_SSL_EC_CURVES.3.gz
 usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz
 usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz
 usr/share/man/man3/CURLOPT_SSL_FALSESTART.3.gz
diff --git a/msys2/var/lib/pacman/local/curl-7.74.0-4/mtree b/msys2/var/lib/pacman/local/curl-7.74.0-4/mtree
new file mode 100644
index 000000000..974e03f81
Binary files /dev/null and b/msys2/var/lib/pacman/local/curl-7.74.0-4/mtree differ
diff --git a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/mtree b/msys2/var/lib/pacman/local/dash-0.5.11.1-2/mtree
deleted file mode 100644
index bb27b4fac..000000000
Binary files a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/desc b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/dash-0.5.11.1-2/desc
rename to msys2/var/lib/pacman/local/dash-0.5.11.3-1/desc
index a3fe1bc9f..f42697437 100644
--- a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/desc
+++ b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/desc
@@ -2,7 +2,7 @@
 dash
 
 %VERSION%
-0.5.11.1-2
+0.5.11.3-1
 
 %BASE%
 dash
@@ -17,16 +17,16 @@ http://gondor.apana.org.au/~herbert/dash/
 x86_64
 
 %BUILDDATE%
-1595886297
+1610719150
 
 %INSTALLDATE%
-1599157253
+1613407320
 
 %PACKAGER%
-Unknown Packager
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-260325
+266405
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/files b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/dash-0.5.11.1-2/files
rename to msys2/var/lib/pacman/local/dash-0.5.11.3-1/files
diff --git a/msys2/var/lib/pacman/local/dash-0.5.11.1-2/install b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/dash-0.5.11.1-2/install
rename to msys2/var/lib/pacman/local/dash-0.5.11.3-1/install
diff --git a/msys2/var/lib/pacman/local/dash-0.5.11.3-1/mtree b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/mtree
new file mode 100644
index 000000000..3dd4b9d8d
Binary files /dev/null and b/msys2/var/lib/pacman/local/dash-0.5.11.3-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/db-5.3.28-3/desc b/msys2/var/lib/pacman/local/db-5.3.28-3/desc
index 6e602fffb..b89ebb472 100644
--- a/msys2/var/lib/pacman/local/db-5.3.28-3/desc
+++ b/msys2/var/lib/pacman/local/db-5.3.28-3/desc
@@ -20,7 +20,7 @@ x86_64
 1596190967
 
 %INSTALLDATE%
-1599157257
+1613407323
 
 %PACKAGER%
 Unknown Packager
diff --git a/msys2/var/lib/pacman/local/file-5.39-1/mtree b/msys2/var/lib/pacman/local/file-5.39-1/mtree
deleted file mode 100644
index 8068cee86..000000000
Binary files a/msys2/var/lib/pacman/local/file-5.39-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/file-5.39-1/desc b/msys2/var/lib/pacman/local/file-5.39-2/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/file-5.39-1/desc
rename to msys2/var/lib/pacman/local/file-5.39-2/desc
index 701844adb..05a5268f7 100644
--- a/msys2/var/lib/pacman/local/file-5.39-1/desc
+++ b/msys2/var/lib/pacman/local/file-5.39-2/desc
@@ -2,7 +2,7 @@
 file
 
 %VERSION%
-5.39-1
+5.39-2
 
 %BASE%
 file
@@ -17,16 +17,16 @@ https://www.darwinsys.com/file/
 x86_64
 
 %BUILDDATE%
-1592897441
+1603746826
 
 %INSTALLDATE%
-1599157253
+1613407320
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/6e7d6a99/329884236)
 
 %SIZE%
-10459332
+10468541
 
 %REASON%
 1
@@ -43,4 +43,5 @@ pgp
 %DEPENDS%
 gcc-libs
 zlib
+libbz2
 
diff --git a/msys2/var/lib/pacman/local/file-5.39-1/files b/msys2/var/lib/pacman/local/file-5.39-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/file-5.39-1/files
rename to msys2/var/lib/pacman/local/file-5.39-2/files
diff --git a/msys2/var/lib/pacman/local/file-5.39-2/mtree b/msys2/var/lib/pacman/local/file-5.39-2/mtree
new file mode 100644
index 000000000..0864267d6
Binary files /dev/null and b/msys2/var/lib/pacman/local/file-5.39-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/filesystem-2020.02-7/mtree b/msys2/var/lib/pacman/local/filesystem-2020.02-7/mtree
deleted file mode 100644
index c149abf58..000000000
Binary files a/msys2/var/lib/pacman/local/filesystem-2020.02-7/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/filesystem-2020.02-7/desc b/msys2/var/lib/pacman/local/filesystem-2021.02-1/desc
similarity index 77%
rename from msys2/var/lib/pacman/local/filesystem-2020.02-7/desc
rename to msys2/var/lib/pacman/local/filesystem-2021.02-1/desc
index 28e8bb7e8..77724cae8 100644
--- a/msys2/var/lib/pacman/local/filesystem-2020.02-7/desc
+++ b/msys2/var/lib/pacman/local/filesystem-2021.02-1/desc
@@ -2,7 +2,7 @@
 filesystem
 
 %VERSION%
-2020.02-7
+2021.02-1
 
 %BASE%
 filesystem
@@ -17,16 +17,16 @@ https://sourceforge.net/projects/msys2/
 x86_64
 
 %BUILDDATE%
-1597306595
+1613139602
 
 %INSTALLDATE%
-1599157253
+1613407320
 
 %PACKAGER%
-CI (msys2-devtools/d57e4175/206758805)
+CI (msys2-autobuild/571bdbec/561237203)
 
 %SIZE%
-150660
+151194
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/filesystem-2020.02-7/files b/msys2/var/lib/pacman/local/filesystem-2021.02-1/files
similarity index 97%
rename from msys2/var/lib/pacman/local/filesystem-2020.02-7/files
rename to msys2/var/lib/pacman/local/filesystem-2021.02-1/files
index 833794a3d..fcc43d582 100644
--- a/msys2/var/lib/pacman/local/filesystem-2020.02-7/files
+++ b/msys2/var/lib/pacman/local/filesystem-2021.02-1/files
@@ -101,7 +101,7 @@ var/tmp/
 %BACKUP%
 etc/fstab	f457a96e4e5a0ae070b7ac8bfada1bc6
 etc/shells	bb51026508581e55bbefe36e2b799108
-etc/profile	4dd19884ad38b30eb10da2ee683d870a
+etc/profile	afd25252cbef8c3a9ea0ed7891561a2b
 etc/bash.bashrc	f73f00ca9b5b7c78815974f8d52bfb9e
 etc/bash.bash_logout	85a89469cff3cbad812fa22cc1d81c3e
 etc/skel/.bashrc	3557e690044ba2524f12a1410c1a6159
diff --git a/msys2/var/lib/pacman/local/filesystem-2021.02-1/mtree b/msys2/var/lib/pacman/local/filesystem-2021.02-1/mtree
new file mode 100644
index 000000000..68d6137d4
Binary files /dev/null and b/msys2/var/lib/pacman/local/filesystem-2021.02-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/findutils-4.7.0-1/desc b/msys2/var/lib/pacman/local/findutils-4.7.0-1/desc
index 266f4cd8a..c20e5b15f 100644
--- a/msys2/var/lib/pacman/local/findutils-4.7.0-1/desc
+++ b/msys2/var/lib/pacman/local/findutils-4.7.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1569908782
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/gawk-5.1.0-1/desc b/msys2/var/lib/pacman/local/gawk-5.1.0-1/desc
index 9c98bb3fc..b9765d690 100644
--- a/msys2/var/lib/pacman/local/gawk-5.1.0-1/desc
+++ b/msys2/var/lib/pacman/local/gawk-5.1.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1586938450
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/desc b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/desc
similarity index 70%
rename from msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/desc
rename to msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/desc
index c8906be07..9452ed348 100644
--- a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/desc
+++ b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/desc
@@ -2,7 +2,7 @@
 gcc-libs
 
 %VERSION%
-9.3.0-1
+10.2.0-1
 
 %BASE%
 gcc
@@ -17,22 +17,22 @@ https://gcc.gnu.org/
 x86_64
 
 %BUILDDATE%
-1584723878
+1603718719
 
 %INSTALLDATE%
-1599157238
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/6e7d6a99/329091173)
 
 %SIZE%
-5190332
+5295834
 
 %REASON%
 1
 
 %GROUPS%
-base
+msys2-devel
 
 %LICENSE%
 GPL
@@ -43,6 +43,3 @@ custom
 %VALIDATION%
 pgp
 
-%DEPENDS%
-msys2-runtime
-
diff --git a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/files b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/files
rename to msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/files
diff --git a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/install b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/install
rename to msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/install
diff --git a/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/mtree b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/mtree
new file mode 100644
index 000000000..76b85a41f
Binary files /dev/null and b/msys2/var/lib/pacman/local/gcc-libs-10.2.0-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/mtree b/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/mtree
deleted file mode 100644
index 87d0cb56b..000000000
Binary files a/msys2/var/lib/pacman/local/gcc-libs-9.3.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/mtree b/msys2/var/lib/pacman/local/gdbm-1.18.1-3/mtree
deleted file mode 100644
index 8c3305549..000000000
Binary files a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/desc b/msys2/var/lib/pacman/local/gdbm-1.19-1/desc
similarity index 74%
rename from msys2/var/lib/pacman/local/gdbm-1.18.1-3/desc
rename to msys2/var/lib/pacman/local/gdbm-1.19-1/desc
index 96c0dc524..3bc4e81c5 100644
--- a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/desc
+++ b/msys2/var/lib/pacman/local/gdbm-1.19-1/desc
@@ -2,7 +2,7 @@
 gdbm
 
 %VERSION%
-1.18.1-3
+1.19-1
 
 %BASE%
 gdbm
@@ -17,16 +17,16 @@ https://www.gnu.org/software/gdbm/gdbm.html
 x86_64
 
 %BUILDDATE%
-1589784322
+1610718799
 
 %INSTALLDATE%
-1599157257
+1613407324
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-376684
+420718
 
 %REASON%
 1
@@ -41,5 +41,5 @@ GPL3
 pgp
 
 %DEPENDS%
-libgdbm=1.18.1
+libgdbm=1.19
 
diff --git a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/files b/msys2/var/lib/pacman/local/gdbm-1.19-1/files
similarity index 94%
rename from msys2/var/lib/pacman/local/gdbm-1.18.1-3/files
rename to msys2/var/lib/pacman/local/gdbm-1.19-1/files
index 600870b42..a859d5f72 100644
--- a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/files
+++ b/msys2/var/lib/pacman/local/gdbm-1.19-1/files
@@ -35,6 +35,9 @@ usr/share/locale/pl/LC_MESSAGES/gdbm.mo
 usr/share/locale/pt_BR/
 usr/share/locale/pt_BR/LC_MESSAGES/
 usr/share/locale/pt_BR/LC_MESSAGES/gdbm.mo
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/ru/LC_MESSAGES/gdbm.mo
 usr/share/locale/sr/
 usr/share/locale/sr/LC_MESSAGES/
 usr/share/locale/sr/LC_MESSAGES/gdbm.mo
diff --git a/msys2/var/lib/pacman/local/gdbm-1.18.1-3/install b/msys2/var/lib/pacman/local/gdbm-1.19-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/gdbm-1.18.1-3/install
rename to msys2/var/lib/pacman/local/gdbm-1.19-1/install
diff --git a/msys2/var/lib/pacman/local/gdbm-1.19-1/mtree b/msys2/var/lib/pacman/local/gdbm-1.19-1/mtree
new file mode 100644
index 000000000..fb7741932
Binary files /dev/null and b/msys2/var/lib/pacman/local/gdbm-1.19-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/getent-2.18.90-2/desc b/msys2/var/lib/pacman/local/getent-2.18.90-2/desc
index 98258e0cd..08397933c 100644
--- a/msys2/var/lib/pacman/local/getent-2.18.90-2/desc
+++ b/msys2/var/lib/pacman/local/getent-2.18.90-2/desc
@@ -17,7 +17,7 @@ x86_64
 1485923869
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/gettext-0.19.8.1-1/desc b/msys2/var/lib/pacman/local/gettext-0.19.8.1-1/desc
index 9466255b6..839323e71 100644
--- a/msys2/var/lib/pacman/local/gettext-0.19.8.1-1/desc
+++ b/msys2/var/lib/pacman/local/gettext-0.19.8.1-1/desc
@@ -20,7 +20,7 @@ x86_64
 1496228139
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/glib2-2.54.3-3/mtree b/msys2/var/lib/pacman/local/glib2-2.54.3-3/mtree
deleted file mode 100644
index afedfacb2..000000000
Binary files a/msys2/var/lib/pacman/local/glib2-2.54.3-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/glib2-2.54.3-3/desc b/msys2/var/lib/pacman/local/glib2-2.66.6-1/desc
similarity index 81%
rename from msys2/var/lib/pacman/local/glib2-2.54.3-3/desc
rename to msys2/var/lib/pacman/local/glib2-2.66.6-1/desc
index 88b923bb1..ae324698c 100644
--- a/msys2/var/lib/pacman/local/glib2-2.54.3-3/desc
+++ b/msys2/var/lib/pacman/local/glib2-2.66.6-1/desc
@@ -2,7 +2,7 @@
 glib2
 
 %VERSION%
-2.54.3-3
+2.66.6-1
 
 %BASE%
 glib2
@@ -17,16 +17,16 @@ https://www.gtk.org/
 x86_64
 
 %BUILDDATE%
-1587060797
+1612521129
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/04735f8c/540070067)
 
 %SIZE%
-11050138
+12319300
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/glib2-2.54.3-3/files b/msys2/var/lib/pacman/local/glib2-2.66.6-1/files
similarity index 99%
rename from msys2/var/lib/pacman/local/glib2-2.54.3-3/files
rename to msys2/var/lib/pacman/local/glib2-2.66.6-1/files
index 7d054157e..1a0450298 100644
--- a/msys2/var/lib/pacman/local/glib2-2.54.3-3/files
+++ b/msys2/var/lib/pacman/local/glib2-2.66.6-1/files
@@ -22,6 +22,7 @@ usr/share/bash-completion/
 usr/share/bash-completion/completions/
 usr/share/bash-completion/completions/gapplication
 usr/share/bash-completion/completions/gdbus
+usr/share/bash-completion/completions/gio
 usr/share/bash-completion/completions/gresource
 usr/share/bash-completion/completions/gsettings
 usr/share/gdb/
diff --git a/msys2/var/lib/pacman/local/glib2-2.66.6-1/mtree b/msys2/var/lib/pacman/local/glib2-2.66.6-1/mtree
new file mode 100644
index 000000000..a88eb1e3e
Binary files /dev/null and b/msys2/var/lib/pacman/local/glib2-2.66.6-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/gmp-6.2.0-1/mtree b/msys2/var/lib/pacman/local/gmp-6.2.0-1/mtree
deleted file mode 100644
index d1087844e..000000000
Binary files a/msys2/var/lib/pacman/local/gmp-6.2.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/gmp-6.2.0-1/desc b/msys2/var/lib/pacman/local/gmp-6.2.1-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/gmp-6.2.0-1/desc
rename to msys2/var/lib/pacman/local/gmp-6.2.1-1/desc
index a89a8f5b0..96fab9caf 100644
--- a/msys2/var/lib/pacman/local/gmp-6.2.0-1/desc
+++ b/msys2/var/lib/pacman/local/gmp-6.2.1-1/desc
@@ -2,7 +2,7 @@
 gmp
 
 %VERSION%
-6.2.0-1
+6.2.1-1
 
 %BASE%
 gmp
@@ -17,16 +17,16 @@ https://gmplib.org/
 x86_64
 
 %BUILDDATE%
-1581924412
+1608478656
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434077555)
 
 %SIZE%
-730299
+742111
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/gmp-6.2.0-1/files b/msys2/var/lib/pacman/local/gmp-6.2.1-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/gmp-6.2.0-1/files
rename to msys2/var/lib/pacman/local/gmp-6.2.1-1/files
diff --git a/msys2/var/lib/pacman/local/gmp-6.2.0-1/install b/msys2/var/lib/pacman/local/gmp-6.2.1-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/gmp-6.2.0-1/install
rename to msys2/var/lib/pacman/local/gmp-6.2.1-1/install
diff --git a/msys2/var/lib/pacman/local/gmp-6.2.1-1/mtree b/msys2/var/lib/pacman/local/gmp-6.2.1-1/mtree
new file mode 100644
index 000000000..b35983eb7
Binary files /dev/null and b/msys2/var/lib/pacman/local/gmp-6.2.1-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/install b/msys2/var/lib/pacman/local/gnupg-2.2.21-1/install
deleted file mode 100644
index 8d6650bd1..000000000
--- a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/install
+++ /dev/null
@@ -1,25 +0,0 @@
-info_dir=usr/share/info
-info_files="gnupg.info gnupg.info-1 gnupg.info-2"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-  # See FS#42798 and FS#47371
-  dirmngr </dev/null &>/dev/null
-  if usr/bin/pacman-key -l >/dev/null 2>&1; then
-    usr/bin/pacman-key --populate msys2
-  fi
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in $info_files; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/mtree b/msys2/var/lib/pacman/local/gnupg-2.2.21-1/mtree
deleted file mode 100644
index 96dd55a5d..000000000
Binary files a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/desc b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/desc
similarity index 82%
rename from msys2/var/lib/pacman/local/gnupg-2.2.21-1/desc
rename to msys2/var/lib/pacman/local/gnupg-2.2.27-1/desc
index ba6292b5a..71d5dfd03 100644
--- a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/desc
+++ b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/desc
@@ -2,7 +2,7 @@
 gnupg
 
 %VERSION%
-2.2.21-1
+2.2.27-1
 
 %BASE%
 gnupg
@@ -17,16 +17,16 @@ https://gnupg.org/
 x86_64
 
 %BUILDDATE%
-1594718676
+1610723247
 
 %INSTALLDATE%
-1599157255
+1613407323
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-9355049
+9541720
 
 %REASON%
 1
@@ -60,5 +60,5 @@ curl: gpg2keys_curl
 
 %PROVIDES%
 dirmngr
-gnupg2=2.2.21
+gnupg2=2.2.27
 
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/files b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/files
similarity index 98%
rename from msys2/var/lib/pacman/local/gnupg-2.2.21-1/files
rename to msys2/var/lib/pacman/local/gnupg-2.2.27-1/files
index 695a9b9cd..9f562d6a4 100644
--- a/msys2/var/lib/pacman/local/gnupg-2.2.21-1/files
+++ b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/files
@@ -13,6 +13,7 @@ usr/bin/gpgconf.exe
 usr/bin/gpgparsemail.exe
 usr/bin/gpgscm.exe
 usr/bin/gpgsm.exe
+usr/bin/gpgsplit.exe
 usr/bin/gpgtar.exe
 usr/bin/gpgv.exe
 usr/bin/kbxutil.exe
@@ -30,6 +31,7 @@ usr/share/doc/gnupg/
 usr/share/doc/gnupg/DCO
 usr/share/doc/gnupg/DETAILS
 usr/share/doc/gnupg/examples/
+usr/share/doc/gnupg/examples/Automatic.prf
 usr/share/doc/gnupg/examples/debug.prf
 usr/share/doc/gnupg/examples/gpgconf.conf
 usr/share/doc/gnupg/examples/pwpattern.list
@@ -45,7 +47,7 @@ usr/share/doc/gnupg/examples/systemd-user/gpg-agent.service
 usr/share/doc/gnupg/examples/systemd-user/gpg-agent.socket
 usr/share/doc/gnupg/examples/systemd-user/README
 usr/share/doc/gnupg/examples/trustlist.txt
-usr/share/doc/gnupg/examples/vsnfd.prf
+usr/share/doc/gnupg/examples/VS-NfD.prf
 usr/share/doc/gnupg/FAQ
 usr/share/doc/gnupg/HACKING
 usr/share/doc/gnupg/KEYSERVER
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.27-1/install b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/install
new file mode 100644
index 000000000..54bcfad93
--- /dev/null
+++ b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/install
@@ -0,0 +1,7 @@
+post_upgrade() {
+  # See FS#42798 and FS#47371
+  dirmngr </dev/null &>/dev/null
+  if usr/bin/pacman-key -l >/dev/null 2>&1; then
+    usr/bin/pacman-key --populate msys2
+  fi
+}
diff --git a/msys2/var/lib/pacman/local/gnupg-2.2.27-1/mtree b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/mtree
new file mode 100644
index 000000000..f777872ea
Binary files /dev/null and b/msys2/var/lib/pacman/local/gnupg-2.2.27-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/grep-3.0-2/desc b/msys2/var/lib/pacman/local/grep-3.0-2/desc
index e6e387530..32047b6e7 100644
--- a/msys2/var/lib/pacman/local/grep-3.0-2/desc
+++ b/msys2/var/lib/pacman/local/grep-3.0-2/desc
@@ -20,7 +20,7 @@ x86_64
 1544007219
 
 %INSTALLDATE%
-1599157253
+1613407320
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/gzip-1.10-1/desc b/msys2/var/lib/pacman/local/gzip-1.10-1/desc
index eb891da4a..3ced9cca2 100644
--- a/msys2/var/lib/pacman/local/gzip-1.10-1/desc
+++ b/msys2/var/lib/pacman/local/gzip-1.10-1/desc
@@ -20,7 +20,7 @@ x86_64
 1547616118
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/heimdal-libs-7.7.0-2/desc b/msys2/var/lib/pacman/local/heimdal-libs-7.7.0-2/desc
index b166fd799..12b4c774a 100644
--- a/msys2/var/lib/pacman/local/heimdal-libs-7.7.0-2/desc
+++ b/msys2/var/lib/pacman/local/heimdal-libs-7.7.0-2/desc
@@ -20,7 +20,7 @@ x86_64
 1598301435
 
 %INSTALLDATE%
-1599157251
+1613407319
 
 %PACKAGER%
 CI (msys2-autobuild/d1574a20/222597704)
diff --git a/msys2/var/lib/pacman/local/icu-67.1-1/files b/msys2/var/lib/pacman/local/icu-67.1-1/files
deleted file mode 100644
index 4122deeb8..000000000
--- a/msys2/var/lib/pacman/local/icu-67.1-1/files
+++ /dev/null
@@ -1,10 +0,0 @@
-%FILES%
-usr/
-usr/bin/
-usr/bin/msys-icudata67.dll
-usr/bin/msys-icui18n67.dll
-usr/bin/msys-icuio67.dll
-usr/bin/msys-icutest67.dll
-usr/bin/msys-icutu67.dll
-usr/bin/msys-icuuc67.dll
-
diff --git a/msys2/var/lib/pacman/local/icu-67.1-1/mtree b/msys2/var/lib/pacman/local/icu-67.1-1/mtree
deleted file mode 100644
index 2bdbe7d54..000000000
Binary files a/msys2/var/lib/pacman/local/icu-67.1-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/icu-67.1-1/desc b/msys2/var/lib/pacman/local/icu-68.2-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/icu-67.1-1/desc
rename to msys2/var/lib/pacman/local/icu-68.2-1/desc
index 0f48ac688..d4c61caf9 100644
--- a/msys2/var/lib/pacman/local/icu-67.1-1/desc
+++ b/msys2/var/lib/pacman/local/icu-68.2-1/desc
@@ -2,7 +2,7 @@
 icu
 
 %VERSION%
-67.1-1
+68.2-1
 
 %BASE%
 icu
@@ -17,16 +17,16 @@ http://www.icu-project.org/
 x86_64
 
 %BUILDDATE%
-1595234517
+1610718043
 
 %INSTALLDATE%
-1599157240
+1613407307
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-32991260
+33434237
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/icu-68.2-1/files b/msys2/var/lib/pacman/local/icu-68.2-1/files
new file mode 100644
index 000000000..6ad133758
--- /dev/null
+++ b/msys2/var/lib/pacman/local/icu-68.2-1/files
@@ -0,0 +1,10 @@
+%FILES%
+usr/
+usr/bin/
+usr/bin/msys-icudata68.dll
+usr/bin/msys-icui18n68.dll
+usr/bin/msys-icuio68.dll
+usr/bin/msys-icutest68.dll
+usr/bin/msys-icutu68.dll
+usr/bin/msys-icuuc68.dll
+
diff --git a/msys2/var/lib/pacman/local/icu-68.2-1/mtree b/msys2/var/lib/pacman/local/icu-68.2-1/mtree
new file mode 100644
index 000000000..471bb46c3
Binary files /dev/null and b/msys2/var/lib/pacman/local/icu-68.2-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/inetutils-1.9.4-2/desc b/msys2/var/lib/pacman/local/inetutils-1.9.4-2/desc
index 15681e559..b3556bbd5 100644
--- a/msys2/var/lib/pacman/local/inetutils-1.9.4-2/desc
+++ b/msys2/var/lib/pacman/local/inetutils-1.9.4-2/desc
@@ -20,7 +20,7 @@ x86_64
 1556608263
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/info-6.7-2/mtree b/msys2/var/lib/pacman/local/info-6.7-2/mtree
deleted file mode 100644
index f92fa6adb..000000000
Binary files a/msys2/var/lib/pacman/local/info-6.7-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/info-6.7-2/desc b/msys2/var/lib/pacman/local/info-6.7-3/desc
similarity index 82%
rename from msys2/var/lib/pacman/local/info-6.7-2/desc
rename to msys2/var/lib/pacman/local/info-6.7-3/desc
index bd8ca1bc9..78b022eb7 100644
--- a/msys2/var/lib/pacman/local/info-6.7-2/desc
+++ b/msys2/var/lib/pacman/local/info-6.7-3/desc
@@ -2,7 +2,7 @@
 info
 
 %VERSION%
-6.7-2
+6.7-3
 
 %BASE%
 texinfo
@@ -17,16 +17,16 @@ https://www.gnu.org/software/texinfo/
 x86_64
 
 %BUILDDATE%
-1592890323
+1599215574
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/0178d212/239112892)
 
 %SIZE%
-418880
+418885
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/info-6.7-2/files b/msys2/var/lib/pacman/local/info-6.7-3/files
similarity index 100%
rename from msys2/var/lib/pacman/local/info-6.7-2/files
rename to msys2/var/lib/pacman/local/info-6.7-3/files
diff --git a/msys2/var/lib/pacman/local/info-6.7-3/mtree b/msys2/var/lib/pacman/local/info-6.7-3/mtree
new file mode 100644
index 000000000..c8e410858
Binary files /dev/null and b/msys2/var/lib/pacman/local/info-6.7-3/mtree differ
diff --git a/msys2/var/lib/pacman/local/less-551-1/mtree b/msys2/var/lib/pacman/local/less-551-1/mtree
deleted file mode 100644
index d4cdb714d..000000000
Binary files a/msys2/var/lib/pacman/local/less-551-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/less-551-1/desc b/msys2/var/lib/pacman/local/less-563-2/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/less-551-1/desc
rename to msys2/var/lib/pacman/local/less-563-2/desc
index bb7f435e3..507a69b28 100644
--- a/msys2/var/lib/pacman/local/less-551-1/desc
+++ b/msys2/var/lib/pacman/local/less-563-2/desc
@@ -2,7 +2,7 @@
 less
 
 %VERSION%
-551-1
+563-2
 
 %BASE%
 less
@@ -17,23 +17,20 @@ http://www.greenwoodsoftware.com/less
 x86_64
 
 %BUILDDATE%
-1560289285
+1603610836
 
 %INSTALLDATE%
-1599157248
+1613407315
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/b3385361/326974552)
 
 %SIZE%
-209920
+211757
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 GPL3
 
diff --git a/msys2/var/lib/pacman/local/less-551-1/files b/msys2/var/lib/pacman/local/less-563-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/less-551-1/files
rename to msys2/var/lib/pacman/local/less-563-2/files
diff --git a/msys2/var/lib/pacman/local/less-563-2/mtree b/msys2/var/lib/pacman/local/less-563-2/mtree
new file mode 100644
index 000000000..7d93932e7
Binary files /dev/null and b/msys2/var/lib/pacman/local/less-563-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libargp-20110921-2/desc b/msys2/var/lib/pacman/local/libargp-20110921-2/desc
index f0a9d602c..ed53dc955 100644
--- a/msys2/var/lib/pacman/local/libargp-20110921-2/desc
+++ b/msys2/var/lib/pacman/local/libargp-20110921-2/desc
@@ -20,7 +20,7 @@ x86_64
 1538484763
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libasprintf-0.19.8.1-1/desc b/msys2/var/lib/pacman/local/libasprintf-0.19.8.1-1/desc
index 856f158da..91ef00452 100644
--- a/msys2/var/lib/pacman/local/libasprintf-0.19.8.1-1/desc
+++ b/msys2/var/lib/pacman/local/libasprintf-0.19.8.1-1/desc
@@ -20,7 +20,7 @@ x86_64
 1496228167
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/mtree b/msys2/var/lib/pacman/local/libassuan-2.5.3-1/mtree
deleted file mode 100644
index 1be2debc2..000000000
Binary files a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/desc b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/desc
similarity index 80%
rename from msys2/var/lib/pacman/local/libassuan-2.5.3-1/desc
rename to msys2/var/lib/pacman/local/libassuan-2.5.4-1/desc
index 1b24da3b2..87df04287 100644
--- a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/desc
+++ b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/desc
@@ -2,7 +2,7 @@
 libassuan
 
 %VERSION%
-2.5.3-1
+2.5.4-1
 
 %BASE%
 libassuan
@@ -17,16 +17,16 @@ https://gnupg.org/related_software/libassuan
 x86_64
 
 %BUILDDATE%
-1550641999
+1608495677
 
 %INSTALLDATE%
-1599157254
+1613407322
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434377774)
 
 %SIZE%
-149504
+151577
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/files b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libassuan-2.5.3-1/files
rename to msys2/var/lib/pacman/local/libassuan-2.5.4-1/files
diff --git a/msys2/var/lib/pacman/local/libassuan-2.5.3-1/install b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libassuan-2.5.3-1/install
rename to msys2/var/lib/pacman/local/libassuan-2.5.4-1/install
diff --git a/msys2/var/lib/pacman/local/libassuan-2.5.4-1/mtree b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/mtree
new file mode 100644
index 000000000..9851c45b3
Binary files /dev/null and b/msys2/var/lib/pacman/local/libassuan-2.5.4-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libbz2-1.0.8-2/desc b/msys2/var/lib/pacman/local/libbz2-1.0.8-2/desc
index 998f3b07c..a60644904 100644
--- a/msys2/var/lib/pacman/local/libbz2-1.0.8-2/desc
+++ b/msys2/var/lib/pacman/local/libbz2-1.0.8-2/desc
@@ -20,7 +20,7 @@ x86_64
 1587055041
 
 %INSTALLDATE%
-1599157238
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libcrypt-2.1-2/desc b/msys2/var/lib/pacman/local/libcrypt-2.1-2/desc
index aa04306e5..67e539381 100644
--- a/msys2/var/lib/pacman/local/libcrypt-2.1-2/desc
+++ b/msys2/var/lib/pacman/local/libcrypt-2.1-2/desc
@@ -20,7 +20,7 @@ x86_64
 1532680008
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libcurl-7.71.1-1/mtree b/msys2/var/lib/pacman/local/libcurl-7.71.1-1/mtree
deleted file mode 100644
index 886852bca..000000000
Binary files a/msys2/var/lib/pacman/local/libcurl-7.71.1-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libcurl-7.71.1-1/desc b/msys2/var/lib/pacman/local/libcurl-7.74.0-4/desc
similarity index 81%
rename from msys2/var/lib/pacman/local/libcurl-7.71.1-1/desc
rename to msys2/var/lib/pacman/local/libcurl-7.74.0-4/desc
index c82d91312..18a9715e4 100644
--- a/msys2/var/lib/pacman/local/libcurl-7.71.1-1/desc
+++ b/msys2/var/lib/pacman/local/libcurl-7.74.0-4/desc
@@ -2,7 +2,7 @@
 libcurl
 
 %VERSION%
-7.71.1-1
+7.74.0-4
 
 %BASE%
 curl
@@ -17,16 +17,16 @@ https://curl.haxx.se
 x86_64
 
 %BUILDDATE%
-1594717164
+1608526923
 
 %INSTALLDATE%
-1599157252
+1613407319
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434829238)
 
 %SIZE%
-594736
+573030
 
 %REASON%
 1
@@ -53,4 +53,5 @@ libpsl
 libssh2
 openssl
 zlib
+libzstd
 
diff --git a/msys2/var/lib/pacman/local/libcurl-7.71.1-1/files b/msys2/var/lib/pacman/local/libcurl-7.74.0-4/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libcurl-7.71.1-1/files
rename to msys2/var/lib/pacman/local/libcurl-7.74.0-4/files
diff --git a/msys2/var/lib/pacman/local/libcurl-7.74.0-4/mtree b/msys2/var/lib/pacman/local/libcurl-7.74.0-4/mtree
new file mode 100644
index 000000000..0ae174482
Binary files /dev/null and b/msys2/var/lib/pacman/local/libcurl-7.74.0-4/mtree differ
diff --git a/msys2/var/lib/pacman/local/libdb-5.3.28-3/desc b/msys2/var/lib/pacman/local/libdb-5.3.28-3/desc
index 3f90bbc1c..216c21386 100644
--- a/msys2/var/lib/pacman/local/libdb-5.3.28-3/desc
+++ b/msys2/var/lib/pacman/local/libdb-5.3.28-3/desc
@@ -20,7 +20,7 @@ x86_64
 1596190967
 
 %INSTALLDATE%
-1599157249
+1613407317
 
 %PACKAGER%
 Unknown Packager
diff --git a/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/mtree b/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/mtree
deleted file mode 100644
index e09c557e1..000000000
Binary files a/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/desc b/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/desc
similarity index 77%
rename from msys2/var/lib/pacman/local/libedit-20191231_3.1-1/desc
rename to msys2/var/lib/pacman/local/libedit-20191231_3.1-2/desc
index f33aa1ce1..85c28f09c 100644
--- a/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/desc
+++ b/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/desc
@@ -2,7 +2,7 @@
 libedit
 
 %VERSION%
-20191231_3.1-1
+20191231_3.1-2
 
 %BASE%
 libedit
@@ -17,16 +17,16 @@ https://www.thrysoee.dk/editline/
 x86_64
 
 %BUILDDATE%
-1579088888
+1606472451
 
 %INSTALLDATE%
-1599157249
+1613407317
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/599a5db8/386873721)
 
 %SIZE%
-487094
+498870
 
 %REASON%
 1
@@ -41,7 +41,6 @@ BSD
 pgp
 
 %DEPENDS%
-msys2-runtime
 ncurses
 sh
 
diff --git a/msys2/var/lib/pacman/local/libedit-20191231_3.1-1/files b/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libedit-20191231_3.1-1/files
rename to msys2/var/lib/pacman/local/libedit-20191231_3.1-2/files
diff --git a/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/mtree b/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/mtree
new file mode 100644
index 000000000..e7f2c59af
Binary files /dev/null and b/msys2/var/lib/pacman/local/libedit-20191231_3.1-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libexpat-2.2.9-1/desc b/msys2/var/lib/pacman/local/libexpat-2.2.10-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/libexpat-2.2.9-1/desc
rename to msys2/var/lib/pacman/local/libexpat-2.2.10-1/desc
index 026c92eee..55f5de7a7 100644
--- a/msys2/var/lib/pacman/local/libexpat-2.2.9-1/desc
+++ b/msys2/var/lib/pacman/local/libexpat-2.2.10-1/desc
@@ -2,7 +2,7 @@
 libexpat
 
 %VERSION%
-2.2.9-1
+2.2.10-1
 
 %BASE%
 expat
@@ -17,16 +17,16 @@ https://expat.sourceforge.io/
 x86_64
 
 %BUILDDATE%
-1571035473
+1603462769
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dcf3c2cf/324294766)
 
 %SIZE%
-150528
+158141
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libexpat-2.2.9-1/files b/msys2/var/lib/pacman/local/libexpat-2.2.10-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libexpat-2.2.9-1/files
rename to msys2/var/lib/pacman/local/libexpat-2.2.10-1/files
diff --git a/msys2/var/lib/pacman/local/libexpat-2.2.10-1/mtree b/msys2/var/lib/pacman/local/libexpat-2.2.10-1/mtree
new file mode 100644
index 000000000..9e359d3d0
Binary files /dev/null and b/msys2/var/lib/pacman/local/libexpat-2.2.10-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libexpat-2.2.9-1/mtree b/msys2/var/lib/pacman/local/libexpat-2.2.9-1/mtree
deleted file mode 100644
index 2ba7b537d..000000000
Binary files a/msys2/var/lib/pacman/local/libexpat-2.2.9-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libffi-3.3-1/desc b/msys2/var/lib/pacman/local/libffi-3.3-1/desc
index 621bf0057..cdfbb59ff 100644
--- a/msys2/var/lib/pacman/local/libffi-3.3-1/desc
+++ b/msys2/var/lib/pacman/local/libffi-3.3-1/desc
@@ -20,7 +20,7 @@ x86_64
 1586985077
 
 %INSTALLDATE%
-1599157248
+1613407315
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/mtree b/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/mtree
deleted file mode 100644
index 9b3d69e44..000000000
Binary files a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/desc b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/desc
rename to msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/desc
index 480afd5ff..bd44fb362 100644
--- a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/desc
+++ b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/desc
@@ -2,7 +2,7 @@
 libgcrypt
 
 %VERSION%
-1.8.6-1
+1.8.7-1
 
 %BASE%
 libgcrypt
@@ -17,16 +17,16 @@ https://gnupg.org
 x86_64
 
 %BUILDDATE%
-1594714908
+1603700272
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/6e7d6a99/328625740)
 
 %SIZE%
-1254087
+1254090
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/files b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/files
rename to msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/files
diff --git a/msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/install b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libgcrypt-1.8.6-1/install
rename to msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/install
diff --git a/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/mtree b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/mtree
new file mode 100644
index 000000000..e8150e7b5
Binary files /dev/null and b/msys2/var/lib/pacman/local/libgcrypt-1.8.7-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/mtree b/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/mtree
deleted file mode 100644
index 8dd4a24bd..000000000
Binary files a/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/desc b/msys2/var/lib/pacman/local/libgdbm-1.19-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/libgdbm-1.18.1-3/desc
rename to msys2/var/lib/pacman/local/libgdbm-1.19-1/desc
index b3a8f8636..cda07b723 100644
--- a/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/desc
+++ b/msys2/var/lib/pacman/local/libgdbm-1.19-1/desc
@@ -2,7 +2,7 @@
 libgdbm
 
 %VERSION%
-1.18.1-3
+1.19-1
 
 %BASE%
 gdbm
@@ -17,16 +17,16 @@ https://www.gnu.org/software/gdbm/gdbm.html
 x86_64
 
 %BUILDDATE%
-1589784322
+1610718799
 
 %INSTALLDATE%
-1599157257
+1613407323
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-60928
+65952
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libgdbm-1.18.1-3/files b/msys2/var/lib/pacman/local/libgdbm-1.19-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libgdbm-1.18.1-3/files
rename to msys2/var/lib/pacman/local/libgdbm-1.19-1/files
diff --git a/msys2/var/lib/pacman/local/libgdbm-1.19-1/mtree b/msys2/var/lib/pacman/local/libgdbm-1.19-1/mtree
new file mode 100644
index 000000000..1422d8a89
Binary files /dev/null and b/msys2/var/lib/pacman/local/libgdbm-1.19-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libgettextpo-0.19.8.1-1/desc b/msys2/var/lib/pacman/local/libgettextpo-0.19.8.1-1/desc
index d1349dbf0..142f5c6a1 100644
--- a/msys2/var/lib/pacman/local/libgettextpo-0.19.8.1-1/desc
+++ b/msys2/var/lib/pacman/local/libgettextpo-0.19.8.1-1/desc
@@ -20,7 +20,7 @@ x86_64
 1496228161
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/mtree b/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/mtree
deleted file mode 100644
index 12c262d70..000000000
Binary files a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/desc b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/desc
similarity index 82%
rename from msys2/var/lib/pacman/local/libgnutls-3.6.14-1/desc
rename to msys2/var/lib/pacman/local/libgnutls-3.7.0-1/desc
index 576bc8b8f..314c6fd70 100644
--- a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/desc
+++ b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/desc
@@ -2,7 +2,7 @@
 libgnutls
 
 %VERSION%
-3.6.14-1
+3.7.0-1
 
 %BASE%
 gnutls
@@ -17,16 +17,16 @@ https://www.gnutls.org/
 x86_64
 
 %BUILDDATE%
-1591452866
+1607638585
 
 %INSTALLDATE%
-1599157254
+1613407322
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/378bff86/414000399)
 
 %SIZE%
-2584757
+2850374
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/files b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libgnutls-3.6.14-1/files
rename to msys2/var/lib/pacman/local/libgnutls-3.7.0-1/files
diff --git a/msys2/var/lib/pacman/local/libgnutls-3.6.14-1/install b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libgnutls-3.6.14-1/install
rename to msys2/var/lib/pacman/local/libgnutls-3.7.0-1/install
diff --git a/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/mtree b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/mtree
new file mode 100644
index 000000000..5f9a260b7
Binary files /dev/null and b/msys2/var/lib/pacman/local/libgnutls-3.7.0-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libgpg-error-1.38-1/mtree b/msys2/var/lib/pacman/local/libgpg-error-1.38-1/mtree
deleted file mode 100644
index 38ab9aae3..000000000
Binary files a/msys2/var/lib/pacman/local/libgpg-error-1.38-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libgpg-error-1.38-1/desc b/msys2/var/lib/pacman/local/libgpg-error-1.41-2/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/libgpg-error-1.38-1/desc
rename to msys2/var/lib/pacman/local/libgpg-error-1.41-2/desc
index 9efd28243..092479e6f 100644
--- a/msys2/var/lib/pacman/local/libgpg-error-1.38-1/desc
+++ b/msys2/var/lib/pacman/local/libgpg-error-1.41-2/desc
@@ -2,7 +2,7 @@
 libgpg-error
 
 %VERSION%
-1.38-1
+1.41-2
 
 %BASE%
 libgpg-error
@@ -17,16 +17,16 @@ https://gnupg.org
 x86_64
 
 %BUILDDATE%
-1590991436
+1610719224
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-661917
+677890
 
 %REASON%
 1
@@ -41,7 +41,6 @@ LGPL
 pgp
 
 %DEPENDS%
-msys2-runtime
 sh
 libiconv
 libintl
diff --git a/msys2/var/lib/pacman/local/libgpg-error-1.38-1/files b/msys2/var/lib/pacman/local/libgpg-error-1.41-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libgpg-error-1.38-1/files
rename to msys2/var/lib/pacman/local/libgpg-error-1.41-2/files
diff --git a/msys2/var/lib/pacman/local/libgpg-error-1.41-2/mtree b/msys2/var/lib/pacman/local/libgpg-error-1.41-2/mtree
new file mode 100644
index 000000000..9bf6e126f
Binary files /dev/null and b/msys2/var/lib/pacman/local/libgpg-error-1.41-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/mtree b/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/mtree
deleted file mode 100644
index 80ad2a5c2..000000000
Binary files a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/desc b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libgpgme-1.14.0-1/desc
rename to msys2/var/lib/pacman/local/libgpgme-1.15.1-1/desc
index 8b0bf394b..f20ff935a 100644
--- a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/desc
+++ b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/desc
@@ -2,7 +2,7 @@
 libgpgme
 
 %VERSION%
-1.14.0-1
+1.15.1-1
 
 %BASE%
 gpgme
@@ -17,16 +17,16 @@ https://gnupg.org/related_software/gpgme/
 x86_64
 
 %BUILDDATE%
-1594962739
+1610724826
 
 %INSTALLDATE%
-1599157263
+1613407330
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-841960
+872842
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/files b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libgpgme-1.14.0-1/files
rename to msys2/var/lib/pacman/local/libgpgme-1.15.1-1/files
diff --git a/msys2/var/lib/pacman/local/libgpgme-1.14.0-1/install b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libgpgme-1.14.0-1/install
rename to msys2/var/lib/pacman/local/libgpgme-1.15.1-1/install
diff --git a/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/mtree b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/mtree
new file mode 100644
index 000000000..1633890d8
Binary files /dev/null and b/msys2/var/lib/pacman/local/libgpgme-1.15.1-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libhogweed-3.6-1/mtree b/msys2/var/lib/pacman/local/libhogweed-3.6-1/mtree
deleted file mode 100644
index 046fe0b7f..000000000
Binary files a/msys2/var/lib/pacman/local/libhogweed-3.6-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libhogweed-3.6-1/desc b/msys2/var/lib/pacman/local/libhogweed-3.7-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/libhogweed-3.6-1/desc
rename to msys2/var/lib/pacman/local/libhogweed-3.7-1/desc
index 7586d16f9..dc313781a 100644
--- a/msys2/var/lib/pacman/local/libhogweed-3.6-1/desc
+++ b/msys2/var/lib/pacman/local/libhogweed-3.7-1/desc
@@ -2,7 +2,7 @@
 libhogweed
 
 %VERSION%
-3.6-1
+3.7-1
 
 %BASE%
 nettle
@@ -17,16 +17,16 @@ https://www.lysator.liu.se/~nisse/nettle/
 x86_64
 
 %BUILDDATE%
-1589793593
+1610718588
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-258560
+270943
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libhogweed-3.6-1/files b/msys2/var/lib/pacman/local/libhogweed-3.7-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libhogweed-3.6-1/files
rename to msys2/var/lib/pacman/local/libhogweed-3.7-1/files
diff --git a/msys2/var/lib/pacman/local/libhogweed-3.7-1/mtree b/msys2/var/lib/pacman/local/libhogweed-3.7-1/mtree
new file mode 100644
index 000000000..1b88e384c
Binary files /dev/null and b/msys2/var/lib/pacman/local/libhogweed-3.7-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libiconv-1.16-1/mtree b/msys2/var/lib/pacman/local/libiconv-1.16-1/mtree
deleted file mode 100644
index bb83fc2e7..000000000
Binary files a/msys2/var/lib/pacman/local/libiconv-1.16-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libiconv-1.16-1/desc b/msys2/var/lib/pacman/local/libiconv-1.16-2/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/libiconv-1.16-1/desc
rename to msys2/var/lib/pacman/local/libiconv-1.16-2/desc
index 182379409..73d2a863e 100644
--- a/msys2/var/lib/pacman/local/libiconv-1.16-1/desc
+++ b/msys2/var/lib/pacman/local/libiconv-1.16-2/desc
@@ -2,7 +2,7 @@
 libiconv
 
 %VERSION%
-1.16-1
+1.16-2
 
 %BASE%
 libiconv
@@ -17,16 +17,16 @@ https://www.gnu.org/software/libiconv/
 x86_64
 
 %BUILDDATE%
-1559886988
+1599582030
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/11198cf8/244877582)
 
 %SIZE%
-1210368
+1309889
 
 %REASON%
 1
@@ -42,4 +42,5 @@ pgp
 
 %DEPENDS%
 gcc-libs
+libintl
 
diff --git a/msys2/var/lib/pacman/local/libiconv-1.16-1/files b/msys2/var/lib/pacman/local/libiconv-1.16-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libiconv-1.16-1/files
rename to msys2/var/lib/pacman/local/libiconv-1.16-2/files
diff --git a/msys2/var/lib/pacman/local/libiconv-1.16-2/mtree b/msys2/var/lib/pacman/local/libiconv-1.16-2/mtree
new file mode 100644
index 000000000..b8a31eef2
Binary files /dev/null and b/msys2/var/lib/pacman/local/libiconv-1.16-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libidn2-2.3.0-1/desc b/msys2/var/lib/pacman/local/libidn2-2.3.0-1/desc
index a667bd549..d47609a89 100644
--- a/msys2/var/lib/pacman/local/libidn2-2.3.0-1/desc
+++ b/msys2/var/lib/pacman/local/libidn2-2.3.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1579072198
 
 %INSTALLDATE%
-1599157251
+1613407319
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libintl-0.19.8.1-1/desc b/msys2/var/lib/pacman/local/libintl-0.19.8.1-1/desc
index 38d1e5b68..c3e4f02d4 100644
--- a/msys2/var/lib/pacman/local/libintl-0.19.8.1-1/desc
+++ b/msys2/var/lib/pacman/local/libintl-0.19.8.1-1/desc
@@ -20,7 +20,7 @@ x86_64
 1496228176
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libksba-1.4.0-1/desc b/msys2/var/lib/pacman/local/libksba-1.4.0-1/desc
index 119df5f32..b36f7db3f 100644
--- a/msys2/var/lib/pacman/local/libksba-1.4.0-1/desc
+++ b/msys2/var/lib/pacman/local/libksba-1.4.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1591447572
 
 %INSTALLDATE%
-1599157254
+1613407322
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/liblz4-1.9.2-1/mtree b/msys2/var/lib/pacman/local/liblz4-1.9.2-1/mtree
deleted file mode 100644
index 8c5a69162..000000000
Binary files a/msys2/var/lib/pacman/local/liblz4-1.9.2-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/liblz4-1.9.2-1/desc b/msys2/var/lib/pacman/local/liblz4-1.9.3-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/liblz4-1.9.2-1/desc
rename to msys2/var/lib/pacman/local/liblz4-1.9.3-1/desc
index efdbd8b34..046de514d 100644
--- a/msys2/var/lib/pacman/local/liblz4-1.9.2-1/desc
+++ b/msys2/var/lib/pacman/local/liblz4-1.9.3-1/desc
@@ -2,7 +2,7 @@
 liblz4
 
 %VERSION%
-1.9.2-1
+1.9.3-1
 
 %BASE%
 lz4
@@ -17,16 +17,16 @@ https://lz4.github.io/lz4/
 x86_64
 
 %BUILDDATE%
-1569828213
+1607636972
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/378bff86/414000399)
 
 %SIZE%
-193536
+197871
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/liblz4-1.9.2-1/files b/msys2/var/lib/pacman/local/liblz4-1.9.3-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/liblz4-1.9.2-1/files
rename to msys2/var/lib/pacman/local/liblz4-1.9.3-1/files
diff --git a/msys2/var/lib/pacman/local/liblz4-1.9.3-1/mtree b/msys2/var/lib/pacman/local/liblz4-1.9.3-1/mtree
new file mode 100644
index 000000000..1c23645fb
Binary files /dev/null and b/msys2/var/lib/pacman/local/liblz4-1.9.3-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/liblzma-5.2.5-1/desc b/msys2/var/lib/pacman/local/liblzma-5.2.5-1/desc
index 743e4feaf..433de319a 100644
--- a/msys2/var/lib/pacman/local/liblzma-5.2.5-1/desc
+++ b/msys2/var/lib/pacman/local/liblzma-5.2.5-1/desc
@@ -20,7 +20,7 @@ x86_64
 1584529151
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libmetalink-0.1.3-3/desc b/msys2/var/lib/pacman/local/libmetalink-0.1.3-3/desc
index 71a3c6def..ef3af40b9 100644
--- a/msys2/var/lib/pacman/local/libmetalink-0.1.3-3/desc
+++ b/msys2/var/lib/pacman/local/libmetalink-0.1.3-3/desc
@@ -20,7 +20,7 @@ x86_64
 1596399854
 
 %INSTALLDATE%
-1599157252
+1613407319
 
 %PACKAGER%
 CI (msys2-devtools/e835e769/192445856)
diff --git a/msys2/var/lib/pacman/local/libnettle-3.6-1/mtree b/msys2/var/lib/pacman/local/libnettle-3.6-1/mtree
deleted file mode 100644
index 3626e02cb..000000000
Binary files a/msys2/var/lib/pacman/local/libnettle-3.6-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libnettle-3.6-1/desc b/msys2/var/lib/pacman/local/libnettle-3.7-1/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libnettle-3.6-1/desc
rename to msys2/var/lib/pacman/local/libnettle-3.7-1/desc
index d77702e90..9955eb4a1 100644
--- a/msys2/var/lib/pacman/local/libnettle-3.6-1/desc
+++ b/msys2/var/lib/pacman/local/libnettle-3.7-1/desc
@@ -2,7 +2,7 @@
 libnettle
 
 %VERSION%
-3.6-1
+3.7-1
 
 %BASE%
 nettle
@@ -17,16 +17,16 @@ https://www.lysator.liu.se/~nisse/nettle/
 x86_64
 
 %BUILDDATE%
-1589793593
+1610718588
 
 %INSTALLDATE%
-1599157239
+1613407306
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-228864
+258995
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libnettle-3.6-1/files b/msys2/var/lib/pacman/local/libnettle-3.7-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libnettle-3.6-1/files
rename to msys2/var/lib/pacman/local/libnettle-3.7-1/files
diff --git a/msys2/var/lib/pacman/local/libnettle-3.7-1/mtree b/msys2/var/lib/pacman/local/libnettle-3.7-1/mtree
new file mode 100644
index 000000000..22f01c8b1
Binary files /dev/null and b/msys2/var/lib/pacman/local/libnettle-3.7-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libnghttp2-1.41.0-1/desc b/msys2/var/lib/pacman/local/libnghttp2-1.41.0-1/desc
index c7155e051..dc3cb449d 100644
--- a/msys2/var/lib/pacman/local/libnghttp2-1.41.0-1/desc
+++ b/msys2/var/lib/pacman/local/libnghttp2-1.41.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1591451525
 
 %INSTALLDATE%
-1599157252
+1613407319
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libnpth-1.6-1/desc b/msys2/var/lib/pacman/local/libnpth-1.6-1/desc
index de7d41b78..94a82efe4 100644
--- a/msys2/var/lib/pacman/local/libnpth-1.6-1/desc
+++ b/msys2/var/lib/pacman/local/libnpth-1.6-1/desc
@@ -20,7 +20,7 @@ x86_64
 1533712407
 
 %INSTALLDATE%
-1599157255
+1613407322
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/mtree b/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/mtree
deleted file mode 100644
index d1bcab88b..000000000
Binary files a/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/desc b/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/desc
rename to msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/desc
index 8e33a4e87..2255c3aba 100644
--- a/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/desc
+++ b/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/desc
@@ -2,7 +2,7 @@
 libopenssl
 
 %VERSION%
-1.1.1.g-3
+1.1.1.i-1
 
 %BASE%
 openssl
@@ -17,16 +17,16 @@ https://www.openssl.org
 x86_64
 
 %BUILDDATE%
-1596981541
+1607637112
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
-CI (msys2-devtools/9c8729eb/201364660)
+CI (msys2-autobuild/378bff86/414000399)
 
 %SIZE%
-3024133
+3078881
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/files b/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libopenssl-1.1.1.g-3/files
rename to msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/files
diff --git a/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/mtree b/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/mtree
new file mode 100644
index 000000000..88a055b05
Binary files /dev/null and b/msys2/var/lib/pacman/local/libopenssl-1.1.1.i-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/mtree b/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/mtree
deleted file mode 100644
index f0af9710e..000000000
Binary files a/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/desc b/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/desc
rename to msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/desc
index 6c70dfbbc..ef81e3d81 100644
--- a/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/desc
+++ b/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/desc
@@ -2,7 +2,7 @@
 libp11-kit
 
 %VERSION%
-0.23.20-2
+0.23.22-2
 
 %BASE%
 p11-kit
@@ -17,16 +17,16 @@ https://p11-glue.freedesktop.org/p11-kit.html
 x86_64
 
 %BUILDDATE%
-1587063359
+1610722793
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-968704
+1088463
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/files b/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libp11-kit-0.23.20-2/files
rename to msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/files
diff --git a/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/mtree b/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/mtree
new file mode 100644
index 000000000..94b58b7b8
Binary files /dev/null and b/msys2/var/lib/pacman/local/libp11-kit-0.23.22-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libpcre-8.44-1/desc b/msys2/var/lib/pacman/local/libpcre-8.44-1/desc
index 6ffbf97cd..3c27b95de 100644
--- a/msys2/var/lib/pacman/local/libpcre-8.44-1/desc
+++ b/msys2/var/lib/pacman/local/libpcre-8.44-1/desc
@@ -20,7 +20,7 @@ x86_64
 1584444106
 
 %INSTALLDATE%
-1599157248
+1613407315
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/mtree b/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/mtree
deleted file mode 100644
index 66b8d7537..000000000
Binary files a/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/desc b/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/libpcre2_8-10.35-1/desc
rename to msys2/var/lib/pacman/local/libpcre2_8-10.36-1/desc
index 8eea8a02d..d046e1a7c 100644
--- a/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/desc
+++ b/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/desc
@@ -2,7 +2,7 @@
 libpcre2_8
 
 %VERSION%
-10.35-1
+10.36-1
 
 %BASE%
 pcre2
@@ -17,16 +17,16 @@ https://www.pcre.org/
 x86_64
 
 %BUILDDATE%
-1589802920
+1607638233
 
 %INSTALLDATE%
-1599157263
+1613407330
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/378bff86/414000399)
 
 %SIZE%
-370176
+361942
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libpcre2_8-10.35-1/files b/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libpcre2_8-10.35-1/files
rename to msys2/var/lib/pacman/local/libpcre2_8-10.36-1/files
diff --git a/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/mtree b/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/mtree
new file mode 100644
index 000000000..5fff62617
Binary files /dev/null and b/msys2/var/lib/pacman/local/libpcre2_8-10.36-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libpsl-0.21.0-1/mtree b/msys2/var/lib/pacman/local/libpsl-0.21.0-1/mtree
deleted file mode 100644
index a52cd556c..000000000
Binary files a/msys2/var/lib/pacman/local/libpsl-0.21.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libpsl-0.21.0-1/desc b/msys2/var/lib/pacman/local/libpsl-0.21.1-2/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libpsl-0.21.0-1/desc
rename to msys2/var/lib/pacman/local/libpsl-0.21.1-2/desc
index 389ae4f0a..089a6dafe 100644
--- a/msys2/var/lib/pacman/local/libpsl-0.21.0-1/desc
+++ b/msys2/var/lib/pacman/local/libpsl-0.21.1-2/desc
@@ -2,7 +2,7 @@
 libpsl
 
 %VERSION%
-0.21.0-1
+0.21.1-2
 
 %BASE%
 libpsl
@@ -17,16 +17,16 @@ https://github.com/rockdaboot/libpsl
 x86_64
 
 %BUILDDATE%
-1560147349
+1603608788
 
 %INSTALLDATE%
-1599157252
+1613407319
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/b3385361/326974552)
 
 %SIZE%
-110592
+110676
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libpsl-0.21.0-1/files b/msys2/var/lib/pacman/local/libpsl-0.21.1-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libpsl-0.21.0-1/files
rename to msys2/var/lib/pacman/local/libpsl-0.21.1-2/files
diff --git a/msys2/var/lib/pacman/local/libpsl-0.21.1-2/mtree b/msys2/var/lib/pacman/local/libpsl-0.21.1-2/mtree
new file mode 100644
index 000000000..bf6d286c8
Binary files /dev/null and b/msys2/var/lib/pacman/local/libpsl-0.21.1-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/mtree b/msys2/var/lib/pacman/local/libreadline-8.0.004-1/mtree
deleted file mode 100644
index 663bcfb8b..000000000
Binary files a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/desc b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/libreadline-8.0.004-1/desc
rename to msys2/var/lib/pacman/local/libreadline-8.1.0-1/desc
index 74bd4c8ed..26ac645b1 100644
--- a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/desc
+++ b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/desc
@@ -2,7 +2,7 @@
 libreadline
 
 %VERSION%
-8.0.004-1
+8.1.0-1
 
 %BASE%
 readline
@@ -17,16 +17,16 @@ https://tiswww.case.edu/php/chet/readline/rltop.html
 x86_64
 
 %BUILDDATE%
-1581922970
+1608495510
 
 %INSTALLDATE%
-1599157246
+1613407314
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434377774)
 
 %SIZE%
-553139
+589759
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/files b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libreadline-8.0.004-1/files
rename to msys2/var/lib/pacman/local/libreadline-8.1.0-1/files
diff --git a/msys2/var/lib/pacman/local/libreadline-8.0.004-1/install b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libreadline-8.0.004-1/install
rename to msys2/var/lib/pacman/local/libreadline-8.1.0-1/install
diff --git a/msys2/var/lib/pacman/local/libreadline-8.1.0-1/mtree b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/mtree
new file mode 100644
index 000000000..b905a5ea9
Binary files /dev/null and b/msys2/var/lib/pacman/local/libreadline-8.1.0-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/mtree b/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/mtree
deleted file mode 100644
index ee84b8cbb..000000000
Binary files a/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/desc b/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/libsqlite-3.33.0-1/desc
rename to msys2/var/lib/pacman/local/libsqlite-3.34.0-1/desc
index 9aee95c8b..fbd41171b 100644
--- a/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/desc
+++ b/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/desc
@@ -2,7 +2,7 @@
 libsqlite
 
 %VERSION%
-3.33.0-1
+3.34.0-1
 
 %BASE%
 sqlite
@@ -17,16 +17,16 @@ https://www.sqlite.org/
 x86_64
 
 %BUILDDATE%
-1598861570
+1607416684
 
 %INSTALLDATE%
-1599157251
+1613407319
 
 %PACKAGER%
-CI (msys2-autobuild/dcde5668/232291295)
+CI (msys2-autobuild/c220de72/407794967)
 
 %SIZE%
-1151049
+1260135
 
 %REASON%
 1
@@ -52,5 +52,5 @@ sqlite-rbu<3.33.0
 sqlite-vfslog<3.33.0
 
 %PROVIDES%
-libsqlite=3.33.0
+libsqlite=3.34.0
 
diff --git a/msys2/var/lib/pacman/local/libsqlite-3.33.0-1/files b/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libsqlite-3.33.0-1/files
rename to msys2/var/lib/pacman/local/libsqlite-3.34.0-1/files
diff --git a/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/mtree b/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/mtree
new file mode 100644
index 000000000..450aba7db
Binary files /dev/null and b/msys2/var/lib/pacman/local/libsqlite-3.34.0-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/libssh2-1.9.0-1/desc b/msys2/var/lib/pacman/local/libssh2-1.9.0-1/desc
index fda10db0d..cd827c1ce 100644
--- a/msys2/var/lib/pacman/local/libssh2-1.9.0-1/desc
+++ b/msys2/var/lib/pacman/local/libssh2-1.9.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1569828870
 
 %INSTALLDATE%
-1599157252
+1613407319
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libtasn1-4.16.0-1/desc b/msys2/var/lib/pacman/local/libtasn1-4.16.0-1/desc
index 5802b740c..0427cd3ff 100644
--- a/msys2/var/lib/pacman/local/libtasn1-4.16.0-1/desc
+++ b/msys2/var/lib/pacman/local/libtasn1-4.16.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1580973077
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libunistring-0.9.10-1/desc b/msys2/var/lib/pacman/local/libunistring-0.9.10-1/desc
index 129b8feff..f68e3ad9d 100644
--- a/msys2/var/lib/pacman/local/libunistring-0.9.10-1/desc
+++ b/msys2/var/lib/pacman/local/libunistring-0.9.10-1/desc
@@ -20,7 +20,7 @@ x86_64
 1530004479
 
 %INSTALLDATE%
-1599157251
+1613407319
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libutil-linux-2.35.2-1/desc b/msys2/var/lib/pacman/local/libutil-linux-2.35.2-1/desc
index 332773f70..f9c58da0c 100644
--- a/msys2/var/lib/pacman/local/libutil-linux-2.35.2-1/desc
+++ b/msys2/var/lib/pacman/local/libutil-linux-2.35.2-1/desc
@@ -20,7 +20,7 @@ x86_64
 1595318032
 
 %INSTALLDATE%
-1599157263
+1613407329
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/mtree b/msys2/var/lib/pacman/local/libxml2-2.9.10-5/mtree
deleted file mode 100644
index 6d2ace432..000000000
Binary files a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/desc b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/libxml2-2.9.10-5/desc
rename to msys2/var/lib/pacman/local/libxml2-2.9.10-7/desc
index a8fef3f4d..fe8d49bb7 100644
--- a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/desc
+++ b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/desc
@@ -2,7 +2,7 @@
 libxml2
 
 %VERSION%
-2.9.10-5
+2.9.10-7
 
 %BASE%
 libxml2
@@ -17,16 +17,16 @@ http://www.xmlsoft.org/
 x86_64
 
 %BUILDDATE%
-1595237038
+1610721604
 
 %INSTALLDATE%
-1599157246
+1613407314
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-1346483
+1392594
 
 %REASON%
 1
@@ -42,7 +42,7 @@ pgp
 
 %DEPENDS%
 coreutils
-icu>=67.1
+icu>=68.1
 liblzma
 libreadline
 ncurses
diff --git a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/files b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libxml2-2.9.10-5/files
rename to msys2/var/lib/pacman/local/libxml2-2.9.10-7/files
diff --git a/msys2/var/lib/pacman/local/libxml2-2.9.10-5/install b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/install
similarity index 100%
rename from msys2/var/lib/pacman/local/libxml2-2.9.10-5/install
rename to msys2/var/lib/pacman/local/libxml2-2.9.10-7/install
diff --git a/msys2/var/lib/pacman/local/libxml2-2.9.10-7/mtree b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/mtree
new file mode 100644
index 000000000..27ffdffec
Binary files /dev/null and b/msys2/var/lib/pacman/local/libxml2-2.9.10-7/mtree differ
diff --git a/msys2/var/lib/pacman/local/libxslt-1.1.34-3/desc b/msys2/var/lib/pacman/local/libxslt-1.1.34-3/desc
index d2d951aba..1c5c51cf2 100644
--- a/msys2/var/lib/pacman/local/libxslt-1.1.34-3/desc
+++ b/msys2/var/lib/pacman/local/libxslt-1.1.34-3/desc
@@ -20,7 +20,7 @@ x86_64
 1587193199
 
 %INSTALLDATE%
-1599157248
+1613407316
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/libzstd-1.4.5-2/mtree b/msys2/var/lib/pacman/local/libzstd-1.4.5-2/mtree
deleted file mode 100644
index 4aca069df..000000000
Binary files a/msys2/var/lib/pacman/local/libzstd-1.4.5-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/libzstd-1.4.5-2/desc b/msys2/var/lib/pacman/local/libzstd-1.4.8-1/desc
similarity index 77%
rename from msys2/var/lib/pacman/local/libzstd-1.4.5-2/desc
rename to msys2/var/lib/pacman/local/libzstd-1.4.8-1/desc
index 433f9e312..6ec1a8efd 100644
--- a/msys2/var/lib/pacman/local/libzstd-1.4.5-2/desc
+++ b/msys2/var/lib/pacman/local/libzstd-1.4.8-1/desc
@@ -2,7 +2,7 @@
 libzstd
 
 %VERSION%
-1.4.5-2
+1.4.8-1
 
 %BASE%
 zstd
@@ -17,16 +17,16 @@ https://facebook.github.io/zstd/
 x86_64
 
 %BUILDDATE%
-1590989948
+1608526739
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434829238)
 
 %SIZE%
-767488
+736194
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/libzstd-1.4.5-2/files b/msys2/var/lib/pacman/local/libzstd-1.4.8-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/libzstd-1.4.5-2/files
rename to msys2/var/lib/pacman/local/libzstd-1.4.8-1/files
diff --git a/msys2/var/lib/pacman/local/libzstd-1.4.8-1/mtree b/msys2/var/lib/pacman/local/libzstd-1.4.8-1/mtree
new file mode 100644
index 000000000..d06d317a9
Binary files /dev/null and b/msys2/var/lib/pacman/local/libzstd-1.4.8-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/mtree b/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/mtree
deleted file mode 100644
index fc9717d33..000000000
Binary files a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/desc b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/mintty-1~3.3.0-1/desc
rename to msys2/var/lib/pacman/local/mintty-1~3.4.4-2/desc
index 3f27ef821..3c8c69795 100644
--- a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/desc
+++ b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/desc
@@ -2,7 +2,7 @@
 mintty
 
 %VERSION%
-1~3.3.0-1
+1~3.4.4-2
 
 %BASE%
 mintty
@@ -17,16 +17,16 @@ https://mintty.github.io
 x86_64
 
 %BUILDDATE%
-1597162525
+1612728568
 
 %INSTALLDATE%
-1599157254
+1613407321
 
 %PACKAGER%
-CI (msys2-devtools/811dce8d/204287658)
+CI (msys2-autobuild/770dca45/545958421)
 
 %SIZE%
-2146472
+2218579
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/files b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/files
similarity index 98%
rename from msys2/var/lib/pacman/local/mintty-1~3.3.0-1/files
rename to msys2/var/lib/pacman/local/mintty-1~3.4.4-2/files
index 81220258d..d70001081 100644
--- a/msys2/var/lib/pacman/local/mintty-1~3.3.0-1/files
+++ b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/files
@@ -85,6 +85,7 @@ usr/share/mintty/sounds/vocal-yip.wav
 usr/share/mintty/themes/
 usr/share/mintty/themes/dracula
 usr/share/mintty/themes/flat-ui
+usr/share/mintty/themes/gruvbox
 usr/share/mintty/themes/html
 usr/share/mintty/themes/mintty
 usr/share/mintty/themes/nord
diff --git a/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/mtree b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/mtree
new file mode 100644
index 000000000..ecbdcbe0f
Binary files /dev/null and b/msys2/var/lib/pacman/local/mintty-1~3.4.4-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/mpfr-4.1.0-1/desc b/msys2/var/lib/pacman/local/mpfr-4.1.0-1/desc
index b8a7af08a..6f53a3cf8 100644
--- a/msys2/var/lib/pacman/local/mpfr-4.1.0-1/desc
+++ b/msys2/var/lib/pacman/local/mpfr-4.1.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1594968368
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/desc b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/desc
rename to msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/desc
index ded071dd1..bccac8c90 100644
--- a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/desc
+++ b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/desc
@@ -2,7 +2,7 @@
 msys2-keyring
 
 %VERSION%
-r21.b39fb11-1
+1~20210213-1
 
 %BASE%
 msys2-keyring
@@ -17,13 +17,13 @@ https://github.com/Alexpux/MSYS2-keyring
 any
 
 %BUILDDATE%
-1593408933
+1613244505
 
 %INSTALLDATE%
-1599157254
+1613407321
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/571bdbec/564357706)
 
 %SIZE%
 55159
diff --git a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/files b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/files
rename to msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/files
diff --git a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/install b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/install
rename to msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/install
diff --git a/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/mtree b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/mtree
new file mode 100644
index 000000000..afa6690d7
Binary files /dev/null and b/msys2/var/lib/pacman/local/msys2-keyring-1~20210213-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/mtree b/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/mtree
deleted file mode 100644
index b7d580c98..000000000
Binary files a/msys2/var/lib/pacman/local/msys2-keyring-r21.b39fb11-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/msys2-launcher-1.0-1/desc b/msys2/var/lib/pacman/local/msys2-launcher-1.0-1/desc
index ffcd15b12..c9c2dc328 100644
--- a/msys2/var/lib/pacman/local/msys2-launcher-1.0-1/desc
+++ b/msys2/var/lib/pacman/local/msys2-launcher-1.0-1/desc
@@ -20,7 +20,7 @@ x86_64
 1590831820
 
 %INSTALLDATE%
-1599157254
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/mtree b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/mtree
deleted file mode 100644
index 0553fa239..000000000
Binary files a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/desc b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/desc
similarity index 79%
rename from msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/desc
rename to msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/desc
index 9fe09d8c0..b97d08a9d 100644
--- a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/desc
+++ b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/desc
@@ -2,7 +2,7 @@
 msys2-runtime
 
 %VERSION%
-3.1.7-1
+3.1.7-4
 
 %BASE%
 msys2-runtime
@@ -17,16 +17,16 @@ https://www.cygwin.com/
 x86_64
 
 %BUILDDATE%
-1598525641
+1604838298
 
 %INSTALLDATE%
-1599157237
+1613407308
 
 %PACKAGER%
-CI (msys2-autobuild/d1574a20/226865386)
+CI (msys2-autobuild/6e7d6a99/352268253)
 
 %SIZE%
-12975638
+10003414
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/files b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/files
similarity index 100%
rename from msys2/var/lib/pacman/local/msys2-runtime-3.1.7-1/files
rename to msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/files
diff --git a/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/mtree b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/mtree
new file mode 100644
index 000000000..2b923a5db
Binary files /dev/null and b/msys2/var/lib/pacman/local/msys2-runtime-3.1.7-4/mtree differ
diff --git a/msys2/var/lib/pacman/local/nano-5.4-1/desc b/msys2/var/lib/pacman/local/nano-5.4-1/desc
new file mode 100644
index 000000000..c26909b8d
--- /dev/null
+++ b/msys2/var/lib/pacman/local/nano-5.4-1/desc
@@ -0,0 +1,48 @@
+%NAME%
+nano
+
+%VERSION%
+5.4-1
+
+%BASE%
+nano
+
+%DESC%
+Pico editor clone with enhancements
+
+%URL%
+https://www.nano-editor.org
+
+%ARCH%
+x86_64
+
+%BUILDDATE%
+1608502290
+
+%INSTALLDATE%
+1613407322
+
+%PACKAGER%
+CI (msys2-autobuild/dfb80bed/434377774)
+
+%SIZE%
+2733906
+
+%REASON%
+1
+
+%GROUPS%
+editors
+
+%LICENSE%
+GPL
+
+%VALIDATION%
+pgp
+
+%DEPENDS%
+file
+libintl
+ncurses
+sh
+
diff --git a/msys2/var/lib/pacman/local/nano-5.4-1/files b/msys2/var/lib/pacman/local/nano-5.4-1/files
new file mode 100644
index 000000000..e08067804
--- /dev/null
+++ b/msys2/var/lib/pacman/local/nano-5.4-1/files
@@ -0,0 +1,181 @@
+%FILES%
+etc/
+etc/nanorc
+usr/
+usr/bin/
+usr/bin/nano.exe
+usr/bin/rnano.exe
+usr/share/
+usr/share/doc/
+usr/share/doc/nano/
+usr/share/doc/nano/faq.html
+usr/share/doc/nano/nano.1.html
+usr/share/doc/nano/nano.html
+usr/share/doc/nano/nanorc.5.html
+usr/share/doc/nano/rnano.1.html
+usr/share/info/
+usr/share/info/nano.info.gz
+usr/share/locale/
+usr/share/locale/bg/
+usr/share/locale/bg/LC_MESSAGES/
+usr/share/locale/bg/LC_MESSAGES/nano.mo
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/ca/LC_MESSAGES/nano.mo
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/cs/LC_MESSAGES/nano.mo
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/da/LC_MESSAGES/nano.mo
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/de/LC_MESSAGES/nano.mo
+usr/share/locale/eo/
+usr/share/locale/eo/LC_MESSAGES/
+usr/share/locale/eo/LC_MESSAGES/nano.mo
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/es/LC_MESSAGES/nano.mo
+usr/share/locale/eu/
+usr/share/locale/eu/LC_MESSAGES/
+usr/share/locale/eu/LC_MESSAGES/nano.mo
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fi/LC_MESSAGES/nano.mo
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/fr/LC_MESSAGES/nano.mo
+usr/share/locale/ga/
+usr/share/locale/ga/LC_MESSAGES/
+usr/share/locale/ga/LC_MESSAGES/nano.mo
+usr/share/locale/gl/
+usr/share/locale/gl/LC_MESSAGES/
+usr/share/locale/gl/LC_MESSAGES/nano.mo
+usr/share/locale/hr/
+usr/share/locale/hr/LC_MESSAGES/
+usr/share/locale/hr/LC_MESSAGES/nano.mo
+usr/share/locale/hu/
+usr/share/locale/hu/LC_MESSAGES/
+usr/share/locale/hu/LC_MESSAGES/nano.mo
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/id/LC_MESSAGES/nano.mo
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/it/LC_MESSAGES/nano.mo
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/ja/LC_MESSAGES/nano.mo
+usr/share/locale/ko/
+usr/share/locale/ko/LC_MESSAGES/
+usr/share/locale/ko/LC_MESSAGES/nano.mo
+usr/share/locale/ms/
+usr/share/locale/ms/LC_MESSAGES/
+usr/share/locale/ms/LC_MESSAGES/nano.mo
+usr/share/locale/nb/
+usr/share/locale/nb/LC_MESSAGES/
+usr/share/locale/nb/LC_MESSAGES/nano.mo
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/nl/LC_MESSAGES/nano.mo
+usr/share/locale/nn/
+usr/share/locale/nn/LC_MESSAGES/
+usr/share/locale/nn/LC_MESSAGES/nano.mo
+usr/share/locale/pl/
+usr/share/locale/pl/LC_MESSAGES/
+usr/share/locale/pl/LC_MESSAGES/nano.mo
+usr/share/locale/pt/
+usr/share/locale/pt/LC_MESSAGES/
+usr/share/locale/pt/LC_MESSAGES/nano.mo
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/pt_BR/LC_MESSAGES/nano.mo
+usr/share/locale/ro/
+usr/share/locale/ro/LC_MESSAGES/
+usr/share/locale/ro/LC_MESSAGES/nano.mo
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/ru/LC_MESSAGES/nano.mo
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sl/LC_MESSAGES/nano.mo
+usr/share/locale/sr/
+usr/share/locale/sr/LC_MESSAGES/
+usr/share/locale/sr/LC_MESSAGES/nano.mo
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/sv/LC_MESSAGES/nano.mo
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/tr/LC_MESSAGES/nano.mo
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/uk/LC_MESSAGES/nano.mo
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
+usr/share/locale/vi/LC_MESSAGES/nano.mo
+usr/share/locale/zh_CN/
+usr/share/locale/zh_CN/LC_MESSAGES/
+usr/share/locale/zh_CN/LC_MESSAGES/nano.mo
+usr/share/locale/zh_TW/
+usr/share/locale/zh_TW/LC_MESSAGES/
+usr/share/locale/zh_TW/LC_MESSAGES/nano.mo
+usr/share/man/
+usr/share/man/man1/
+usr/share/man/man1/nano.1.gz
+usr/share/man/man1/rnano.1.gz
+usr/share/man/man5/
+usr/share/man/man5/nanorc.5.gz
+usr/share/nano/
+usr/share/nano/asm.nanorc
+usr/share/nano/autoconf.nanorc
+usr/share/nano/awk.nanorc
+usr/share/nano/c.nanorc
+usr/share/nano/changelog.nanorc
+usr/share/nano/cmake.nanorc
+usr/share/nano/css.nanorc
+usr/share/nano/default.nanorc
+usr/share/nano/elisp.nanorc
+usr/share/nano/email.nanorc
+usr/share/nano/extra/
+usr/share/nano/extra/ada.nanorc
+usr/share/nano/extra/debian.nanorc
+usr/share/nano/extra/fortran.nanorc
+usr/share/nano/extra/gentoo.nanorc
+usr/share/nano/extra/haskell.nanorc
+usr/share/nano/extra/povray.nanorc
+usr/share/nano/extra/spec.nanorc
+usr/share/nano/go.nanorc
+usr/share/nano/groff.nanorc
+usr/share/nano/guile.nanorc
+usr/share/nano/html.nanorc
+usr/share/nano/java.nanorc
+usr/share/nano/javascript.nanorc
+usr/share/nano/json.nanorc
+usr/share/nano/lua.nanorc
+usr/share/nano/makefile.nanorc
+usr/share/nano/man.nanorc
+usr/share/nano/markdown.nanorc
+usr/share/nano/nanohelp.nanorc
+usr/share/nano/nanorc.nanorc
+usr/share/nano/nftables.nanorc
+usr/share/nano/objc.nanorc
+usr/share/nano/ocaml.nanorc
+usr/share/nano/patch.nanorc
+usr/share/nano/perl.nanorc
+usr/share/nano/php.nanorc
+usr/share/nano/po.nanorc
+usr/share/nano/python.nanorc
+usr/share/nano/ruby.nanorc
+usr/share/nano/rust.nanorc
+usr/share/nano/sh.nanorc
+usr/share/nano/sql.nanorc
+usr/share/nano/tcl.nanorc
+usr/share/nano/tex.nanorc
+usr/share/nano/texinfo.nanorc
+usr/share/nano/xml.nanorc
+
+%BACKUP%
+etc/nanorc	4f273f7a52ecd77bebf27c1030811ed3
+
diff --git a/msys2/var/lib/pacman/local/nano-5.4-1/install b/msys2/var/lib/pacman/local/nano-5.4-1/install
new file mode 100644
index 000000000..1e8b65326
--- /dev/null
+++ b/msys2/var/lib/pacman/local/nano-5.4-1/install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=nano.info.gz
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/msys2/var/lib/pacman/local/nano-5.4-1/mtree b/msys2/var/lib/pacman/local/nano-5.4-1/mtree
new file mode 100644
index 000000000..19eccf174
Binary files /dev/null and b/msys2/var/lib/pacman/local/nano-5.4-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/ncurses-6.2-1/desc b/msys2/var/lib/pacman/local/ncurses-6.2-1/desc
index c184a3254..d5cd213c6 100644
--- a/msys2/var/lib/pacman/local/ncurses-6.2-1/desc
+++ b/msys2/var/lib/pacman/local/ncurses-6.2-1/desc
@@ -20,7 +20,7 @@ x86_64
 1581921893
 
 %INSTALLDATE%
-1599157246
+1613407314
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/nettle-3.6-1/mtree b/msys2/var/lib/pacman/local/nettle-3.6-1/mtree
deleted file mode 100644
index cfa0fcc77..000000000
Binary files a/msys2/var/lib/pacman/local/nettle-3.6-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/nettle-3.6-1/desc b/msys2/var/lib/pacman/local/nettle-3.7-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/nettle-3.6-1/desc
rename to msys2/var/lib/pacman/local/nettle-3.7-1/desc
index 1b69b65b4..fdc9ec815 100644
--- a/msys2/var/lib/pacman/local/nettle-3.6-1/desc
+++ b/msys2/var/lib/pacman/local/nettle-3.7-1/desc
@@ -2,7 +2,7 @@
 nettle
 
 %VERSION%
-3.6-1
+3.7-1
 
 %BASE%
 nettle
@@ -17,16 +17,16 @@ https://www.lysator.liu.se/~nisse/nettle/
 x86_64
 
 %BUILDDATE%
-1589793593
+1610718588
 
 %INSTALLDATE%
-1599157255
+1613407322
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-154712
+166595
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/nettle-3.6-1/files b/msys2/var/lib/pacman/local/nettle-3.7-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/nettle-3.6-1/files
rename to msys2/var/lib/pacman/local/nettle-3.7-1/files
diff --git a/msys2/var/lib/pacman/local/nettle-3.6-1/install b/msys2/var/lib/pacman/local/nettle-3.7-1/install
similarity index 100%
rename from msys2/var/lib/pacman/local/nettle-3.6-1/install
rename to msys2/var/lib/pacman/local/nettle-3.7-1/install
diff --git a/msys2/var/lib/pacman/local/nettle-3.7-1/mtree b/msys2/var/lib/pacman/local/nettle-3.7-1/mtree
new file mode 100644
index 000000000..955caea33
Binary files /dev/null and b/msys2/var/lib/pacman/local/nettle-3.7-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/mtree b/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/mtree
deleted file mode 100644
index 2ba361d8d..000000000
Binary files a/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/desc b/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/desc
similarity index 80%
rename from msys2/var/lib/pacman/local/openssl-1.1.1.g-3/desc
rename to msys2/var/lib/pacman/local/openssl-1.1.1.i-1/desc
index 13a042452..279ecf7db 100644
--- a/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/desc
+++ b/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/desc
@@ -2,7 +2,7 @@
 openssl
 
 %VERSION%
-1.1.1.g-3
+1.1.1.i-1
 
 %BASE%
 openssl
@@ -17,16 +17,16 @@ https://www.openssl.org
 x86_64
 
 %BUILDDATE%
-1596981541
+1607637112
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
-CI (msys2-devtools/9c8729eb/201364660)
+CI (msys2-autobuild/378bff86/414000399)
 
 %SIZE%
-1311466
+1312718
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/openssl-1.1.1.g-3/files b/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/openssl-1.1.1.g-3/files
rename to msys2/var/lib/pacman/local/openssl-1.1.1.i-1/files
diff --git a/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/mtree b/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/mtree
new file mode 100644
index 000000000..f56ba069b
Binary files /dev/null and b/msys2/var/lib/pacman/local/openssl-1.1.1.i-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/files b/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/files
deleted file mode 100644
index 25384480e..000000000
--- a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/files
+++ /dev/null
@@ -1,25 +0,0 @@
-%FILES%
-etc/
-etc/pkcs11/
-etc/pkcs11/pkcs11.conf.example
-usr/
-usr/bin/
-usr/bin/p11-kit.exe
-usr/bin/trust.exe
-usr/lib/
-usr/lib/pkcs11/
-usr/lib/pkcs11/p11-kit-client.dll
-usr/lib/pkcs11/p11-kit-trust.dll
-usr/libexec/
-usr/libexec/p11-kit/
-usr/libexec/p11-kit/p11-kit-remote.exe
-usr/libexec/p11-kit/p11-kit-server.exe
-usr/libexec/p11-kit/trust-extract-compat
-usr/share/
-usr/share/licenses/
-usr/share/licenses/p11-kit/
-usr/share/licenses/p11-kit/COPYING
-usr/share/p11-kit/
-usr/share/p11-kit/modules/
-usr/share/p11-kit/modules/p11-kit-trust.module
-
diff --git a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/mtree b/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/mtree
deleted file mode 100644
index 97b8f92a9..000000000
Binary files a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/desc b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/desc
similarity index 72%
rename from msys2/var/lib/pacman/local/p11-kit-0.23.20-2/desc
rename to msys2/var/lib/pacman/local/p11-kit-0.23.22-2/desc
index bf60f3e4a..e5aeb5e27 100644
--- a/msys2/var/lib/pacman/local/p11-kit-0.23.20-2/desc
+++ b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/desc
@@ -2,7 +2,7 @@
 p11-kit
 
 %VERSION%
-0.23.20-2
+0.23.22-2
 
 %BASE%
 p11-kit
@@ -17,16 +17,16 @@ https://p11-glue.freedesktop.org/p11-kit.html
 x86_64
 
 %BUILDDATE%
-1587063359
+1610722793
 
 %INSTALLDATE%
-1599157249
+1613407316
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-1378100
+2076219
 
 %REASON%
 1
@@ -38,5 +38,5 @@ BSD
 pgp
 
 %DEPENDS%
-libp11-kit=0.23.20
+libp11-kit=0.23.22
 
diff --git a/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/files b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/files
new file mode 100644
index 000000000..d4e52f853
--- /dev/null
+++ b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/files
@@ -0,0 +1,284 @@
+%FILES%
+etc/
+etc/pkcs11/
+etc/pkcs11/pkcs11.conf.example
+usr/
+usr/bin/
+usr/bin/p11-kit.exe
+usr/bin/trust.exe
+usr/lib/
+usr/lib/pkcs11/
+usr/lib/pkcs11/p11-kit-client.dll
+usr/lib/pkcs11/p11-kit-trust.dll
+usr/libexec/
+usr/libexec/p11-kit/
+usr/libexec/p11-kit/p11-kit-remote.exe
+usr/libexec/p11-kit/p11-kit-server.exe
+usr/libexec/p11-kit/trust-extract-compat
+usr/share/
+usr/share/gtk-doc/
+usr/share/gtk-doc/html/
+usr/share/gtk-doc/html/p11-kit/
+usr/share/gtk-doc/html/p11-kit/config-example.html
+usr/share/gtk-doc/html/p11-kit/config-files.html
+usr/share/gtk-doc/html/p11-kit/config.html
+usr/share/gtk-doc/html/p11-kit/devel-building-style.html
+usr/share/gtk-doc/html/p11-kit/devel-building.html
+usr/share/gtk-doc/html/p11-kit/devel-commands.html
+usr/share/gtk-doc/html/p11-kit/devel-debugging.html
+usr/share/gtk-doc/html/p11-kit/devel-paths.html
+usr/share/gtk-doc/html/p11-kit/devel-testing.html
+usr/share/gtk-doc/html/p11-kit/devel.html
+usr/share/gtk-doc/html/p11-kit/home.png
+usr/share/gtk-doc/html/p11-kit/index.html
+usr/share/gtk-doc/html/p11-kit/left-insensitive.png
+usr/share/gtk-doc/html/p11-kit/left.png
+usr/share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
+usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
+usr/share/gtk-doc/html/p11-kit/p11-kit-Modules.html
+usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
+usr/share/gtk-doc/html/p11-kit/p11-kit-URIs.html
+usr/share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
+usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
+usr/share/gtk-doc/html/p11-kit/p11-kit.html
+usr/share/gtk-doc/html/p11-kit/pkcs11-conf.html
+usr/share/gtk-doc/html/p11-kit/reference.html
+usr/share/gtk-doc/html/p11-kit/remoting.html
+usr/share/gtk-doc/html/p11-kit/right-insensitive.png
+usr/share/gtk-doc/html/p11-kit/right.png
+usr/share/gtk-doc/html/p11-kit/sharing-managed.html
+usr/share/gtk-doc/html/p11-kit/sharing.html
+usr/share/gtk-doc/html/p11-kit/style.css
+usr/share/gtk-doc/html/p11-kit/tools.html
+usr/share/gtk-doc/html/p11-kit/trust-disable.html
+usr/share/gtk-doc/html/p11-kit/trust-glib-networking.html
+usr/share/gtk-doc/html/p11-kit/trust-module.html
+usr/share/gtk-doc/html/p11-kit/trust-nss.html
+usr/share/gtk-doc/html/p11-kit/trust.html
+usr/share/gtk-doc/html/p11-kit/up-insensitive.png
+usr/share/gtk-doc/html/p11-kit/up.png
+usr/share/licenses/
+usr/share/licenses/p11-kit/
+usr/share/licenses/p11-kit/COPYING
+usr/share/locale/
+usr/share/locale/ar/
+usr/share/locale/ar/LC_MESSAGES/
+usr/share/locale/ar/LC_MESSAGES/p11-kit.mo
+usr/share/locale/as/
+usr/share/locale/as/LC_MESSAGES/
+usr/share/locale/as/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ast/
+usr/share/locale/ast/LC_MESSAGES/
+usr/share/locale/ast/LC_MESSAGES/p11-kit.mo
+usr/share/locale/az/
+usr/share/locale/az/LC_MESSAGES/
+usr/share/locale/az/LC_MESSAGES/p11-kit.mo
+usr/share/locale/bg/
+usr/share/locale/bg/LC_MESSAGES/
+usr/share/locale/bg/LC_MESSAGES/p11-kit.mo
+usr/share/locale/bn_IN/
+usr/share/locale/bn_IN/LC_MESSAGES/
+usr/share/locale/bn_IN/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ca/
+usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/ca/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ca@valencia/
+usr/share/locale/ca@valencia/LC_MESSAGES/
+usr/share/locale/ca@valencia/LC_MESSAGES/p11-kit.mo
+usr/share/locale/cs/
+usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/cs/LC_MESSAGES/p11-kit.mo
+usr/share/locale/cy/
+usr/share/locale/cy/LC_MESSAGES/
+usr/share/locale/cy/LC_MESSAGES/p11-kit.mo
+usr/share/locale/da/
+usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/da/LC_MESSAGES/p11-kit.mo
+usr/share/locale/de/
+usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/de/LC_MESSAGES/p11-kit.mo
+usr/share/locale/el/
+usr/share/locale/el/LC_MESSAGES/
+usr/share/locale/el/LC_MESSAGES/p11-kit.mo
+usr/share/locale/en_GB/
+usr/share/locale/en_GB/LC_MESSAGES/
+usr/share/locale/en_GB/LC_MESSAGES/p11-kit.mo
+usr/share/locale/eo/
+usr/share/locale/eo/LC_MESSAGES/
+usr/share/locale/eo/LC_MESSAGES/p11-kit.mo
+usr/share/locale/es/
+usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/es/LC_MESSAGES/p11-kit.mo
+usr/share/locale/et/
+usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/et/LC_MESSAGES/p11-kit.mo
+usr/share/locale/eu/
+usr/share/locale/eu/LC_MESSAGES/
+usr/share/locale/eu/LC_MESSAGES/p11-kit.mo
+usr/share/locale/fa/
+usr/share/locale/fa/LC_MESSAGES/
+usr/share/locale/fa/LC_MESSAGES/p11-kit.mo
+usr/share/locale/fi/
+usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fi/LC_MESSAGES/p11-kit.mo
+usr/share/locale/fo/
+usr/share/locale/fo/LC_MESSAGES/
+usr/share/locale/fo/LC_MESSAGES/p11-kit.mo
+usr/share/locale/fr/
+usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/fr/LC_MESSAGES/p11-kit.mo
+usr/share/locale/fur/
+usr/share/locale/fur/LC_MESSAGES/
+usr/share/locale/fur/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ga/
+usr/share/locale/ga/LC_MESSAGES/
+usr/share/locale/ga/LC_MESSAGES/p11-kit.mo
+usr/share/locale/gl/
+usr/share/locale/gl/LC_MESSAGES/
+usr/share/locale/gl/LC_MESSAGES/p11-kit.mo
+usr/share/locale/gu/
+usr/share/locale/gu/LC_MESSAGES/
+usr/share/locale/gu/LC_MESSAGES/p11-kit.mo
+usr/share/locale/he/
+usr/share/locale/he/LC_MESSAGES/
+usr/share/locale/he/LC_MESSAGES/p11-kit.mo
+usr/share/locale/hi/
+usr/share/locale/hi/LC_MESSAGES/
+usr/share/locale/hi/LC_MESSAGES/p11-kit.mo
+usr/share/locale/hr/
+usr/share/locale/hr/LC_MESSAGES/
+usr/share/locale/hr/LC_MESSAGES/p11-kit.mo
+usr/share/locale/hu/
+usr/share/locale/hu/LC_MESSAGES/
+usr/share/locale/hu/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ia/
+usr/share/locale/ia/LC_MESSAGES/
+usr/share/locale/ia/LC_MESSAGES/p11-kit.mo
+usr/share/locale/id/
+usr/share/locale/id/LC_MESSAGES/
+usr/share/locale/id/LC_MESSAGES/p11-kit.mo
+usr/share/locale/it/
+usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/it/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ja/
+usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/ja/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ka/
+usr/share/locale/ka/LC_MESSAGES/
+usr/share/locale/ka/LC_MESSAGES/p11-kit.mo
+usr/share/locale/kk/
+usr/share/locale/kk/LC_MESSAGES/
+usr/share/locale/kk/LC_MESSAGES/p11-kit.mo
+usr/share/locale/kn/
+usr/share/locale/kn/LC_MESSAGES/
+usr/share/locale/kn/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ko/
+usr/share/locale/ko/LC_MESSAGES/
+usr/share/locale/ko/LC_MESSAGES/p11-kit.mo
+usr/share/locale/lt/
+usr/share/locale/lt/LC_MESSAGES/
+usr/share/locale/lt/LC_MESSAGES/p11-kit.mo
+usr/share/locale/lv/
+usr/share/locale/lv/LC_MESSAGES/
+usr/share/locale/lv/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ml/
+usr/share/locale/ml/LC_MESSAGES/
+usr/share/locale/ml/LC_MESSAGES/p11-kit.mo
+usr/share/locale/mr/
+usr/share/locale/mr/LC_MESSAGES/
+usr/share/locale/mr/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ms/
+usr/share/locale/ms/LC_MESSAGES/
+usr/share/locale/ms/LC_MESSAGES/p11-kit.mo
+usr/share/locale/nb/
+usr/share/locale/nb/LC_MESSAGES/
+usr/share/locale/nb/LC_MESSAGES/p11-kit.mo
+usr/share/locale/nl/
+usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/nl/LC_MESSAGES/p11-kit.mo
+usr/share/locale/nn/
+usr/share/locale/nn/LC_MESSAGES/
+usr/share/locale/nn/LC_MESSAGES/p11-kit.mo
+usr/share/locale/oc/
+usr/share/locale/oc/LC_MESSAGES/
+usr/share/locale/oc/LC_MESSAGES/p11-kit.mo
+usr/share/locale/or/
+usr/share/locale/or/LC_MESSAGES/
+usr/share/locale/or/LC_MESSAGES/p11-kit.mo
+usr/share/locale/pa/
+usr/share/locale/pa/LC_MESSAGES/
+usr/share/locale/pa/LC_MESSAGES/p11-kit.mo
+usr/share/locale/pl/
+usr/share/locale/pl/LC_MESSAGES/
+usr/share/locale/pl/LC_MESSAGES/p11-kit.mo
+usr/share/locale/pt/
+usr/share/locale/pt/LC_MESSAGES/
+usr/share/locale/pt/LC_MESSAGES/p11-kit.mo
+usr/share/locale/pt_BR/
+usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/pt_BR/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ro/
+usr/share/locale/ro/LC_MESSAGES/
+usr/share/locale/ro/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ru/
+usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/ru/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sk/
+usr/share/locale/sk/LC_MESSAGES/
+usr/share/locale/sk/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sl/
+usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sl/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sq/
+usr/share/locale/sq/LC_MESSAGES/
+usr/share/locale/sq/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sr/
+usr/share/locale/sr/LC_MESSAGES/
+usr/share/locale/sr/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sr@latin/
+usr/share/locale/sr@latin/LC_MESSAGES/
+usr/share/locale/sr@latin/LC_MESSAGES/p11-kit.mo
+usr/share/locale/sv/
+usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/sv/LC_MESSAGES/p11-kit.mo
+usr/share/locale/ta/
+usr/share/locale/ta/LC_MESSAGES/
+usr/share/locale/ta/LC_MESSAGES/p11-kit.mo
+usr/share/locale/te/
+usr/share/locale/te/LC_MESSAGES/
+usr/share/locale/te/LC_MESSAGES/p11-kit.mo
+usr/share/locale/th/
+usr/share/locale/th/LC_MESSAGES/
+usr/share/locale/th/LC_MESSAGES/p11-kit.mo
+usr/share/locale/tr/
+usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/tr/LC_MESSAGES/p11-kit.mo
+usr/share/locale/uk/
+usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/uk/LC_MESSAGES/p11-kit.mo
+usr/share/locale/vi/
+usr/share/locale/vi/LC_MESSAGES/
+usr/share/locale/vi/LC_MESSAGES/p11-kit.mo
+usr/share/locale/wa/
+usr/share/locale/wa/LC_MESSAGES/
+usr/share/locale/wa/LC_MESSAGES/p11-kit.mo
+usr/share/locale/zh_CN/
+usr/share/locale/zh_CN/LC_MESSAGES/
+usr/share/locale/zh_CN/LC_MESSAGES/p11-kit.mo
+usr/share/locale/zh_HK/
+usr/share/locale/zh_HK/LC_MESSAGES/
+usr/share/locale/zh_HK/LC_MESSAGES/p11-kit.mo
+usr/share/locale/zh_TW/
+usr/share/locale/zh_TW/LC_MESSAGES/
+usr/share/locale/zh_TW/LC_MESSAGES/p11-kit.mo
+usr/share/man/
+usr/share/man/man1/
+usr/share/man/man1/trust.1.gz
+usr/share/man/man5/
+usr/share/man/man5/pkcs11.conf.5.gz
+usr/share/man/man8/
+usr/share/man/man8/p11-kit.8.gz
+usr/share/p11-kit/
+usr/share/p11-kit/modules/
+usr/share/p11-kit/modules/p11-kit-trust.module
+
diff --git a/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/mtree b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/mtree
new file mode 100644
index 000000000..85991f931
Binary files /dev/null and b/msys2/var/lib/pacman/local/p11-kit-0.23.22-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/pacman-5.2.2-3/desc b/msys2/var/lib/pacman/local/pacman-5.2.2-12/desc
similarity index 82%
rename from msys2/var/lib/pacman/local/pacman-5.2.2-3/desc
rename to msys2/var/lib/pacman/local/pacman-5.2.2-12/desc
index 72a969fd9..2d92e5097 100644
--- a/msys2/var/lib/pacman/local/pacman-5.2.2-3/desc
+++ b/msys2/var/lib/pacman/local/pacman-5.2.2-12/desc
@@ -2,7 +2,7 @@
 pacman
 
 %VERSION%
-5.2.2-3
+5.2.2-12
 
 %BASE%
 pacman
@@ -17,16 +17,16 @@ https://www.archlinux.org/pacman/
 x86_64
 
 %BUILDDATE%
-1598790253
+1613207822
 
 %INSTALLDATE%
-1599157257
+1613407323
 
 %PACKAGER%
-CI (msys2-autobuild/dcde5668/231199452)
+CI (msys2-autobuild/571bdbec/563416777)
 
 %SIZE%
-32100134
+32881789
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/pacman-5.2.2-3/files b/msys2/var/lib/pacman/local/pacman-5.2.2-12/files
similarity index 99%
rename from msys2/var/lib/pacman/local/pacman-5.2.2-3/files
rename to msys2/var/lib/pacman/local/pacman-5.2.2-12/files
index 0561e4747..358284277 100644
--- a/msys2/var/lib/pacman/local/pacman-5.2.2-3/files
+++ b/msys2/var/lib/pacman/local/pacman-5.2.2-12/files
@@ -9,7 +9,6 @@ etc/pacman.conf
 usr/
 usr/bin/
 usr/bin/makepkg
-usr/bin/makepkg-clang
 usr/bin/makepkg-mingw
 usr/bin/makepkg-template
 usr/bin/pacman-conf.exe
@@ -439,5 +438,5 @@ var/lib/pacman/
 etc/pacman.conf	d2b5a80387867fd5f064a6c3ec77fbba
 etc/makepkg.conf	c5145c3306f1ebef6f470ba2b296e01e
 etc/makepkg_mingw32.conf	2c725b85f42a79625c565c0d86c91750
-etc/makepkg_mingw64.conf	d9658e2cd5b652c02e22f4fd144a62c8
+etc/makepkg_mingw64.conf	4124ac78424d7d97c2fd31d6815b8888
 
diff --git a/msys2/var/lib/pacman/local/pacman-5.2.2-12/mtree b/msys2/var/lib/pacman/local/pacman-5.2.2-12/mtree
new file mode 100644
index 000000000..a49deb64f
Binary files /dev/null and b/msys2/var/lib/pacman/local/pacman-5.2.2-12/mtree differ
diff --git a/msys2/var/lib/pacman/local/pacman-5.2.2-3/mtree b/msys2/var/lib/pacman/local/pacman-5.2.2-3/mtree
deleted file mode 100644
index dab157906..000000000
Binary files a/msys2/var/lib/pacman/local/pacman-5.2.2-3/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/mtree b/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/mtree
deleted file mode 100644
index 134583ffa..000000000
Binary files a/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/desc b/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/desc
similarity index 81%
rename from msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/desc
rename to msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/desc
index 31b84cd66..e5a1f341d 100644
--- a/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/desc
+++ b/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/desc
@@ -2,7 +2,7 @@
 pacman-contrib
 
 %VERSION%
-1.3.0-1
+1.4.0-1
 
 %BASE%
 pacman-contrib
@@ -17,16 +17,16 @@ https://git.archlinux.org/pacman-contrib.git/about/
 x86_64
 
 %BUILDDATE%
-1591080511
+1603628225
 
 %INSTALLDATE%
-1599157260
+1613407327
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/b3385361/327177988)
 
 %SIZE%
-8954939
+9295883
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/files b/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/pacman-contrib-1.3.0-1/files
rename to msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/files
diff --git a/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/mtree b/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/mtree
new file mode 100644
index 000000000..e0e888cc3
Binary files /dev/null and b/msys2/var/lib/pacman/local/pacman-contrib-1.4.0-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/mtree b/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/mtree
deleted file mode 100644
index aff432410..000000000
Binary files a/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/desc b/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/desc
similarity index 64%
rename from msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/desc
rename to msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/desc
index 77a4b5556..e2be5200c 100644
--- a/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/desc
+++ b/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/desc
@@ -2,7 +2,7 @@
 pacman-mirrors
 
 %VERSION%
-20200329-1
+20210127-1
 
 %BASE%
 pacman-mirrors
@@ -11,29 +11,26 @@ pacman-mirrors
 MSYS2 mirror list for use by pacman
 
 %URL%
-https://msys2.sourceforge.io/
+https://www.msys2.org/dev/mirrors/
 
 %ARCH%
 any
 
 %BUILDDATE%
-1586937902
+1611779908
 
 %INSTALLDATE%
-1599157255
+1613407323
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/4eaa5d39/516139984)
 
 %SIZE%
-1626
+3831
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 GPL
 
diff --git a/msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/files b/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/pacman-mirrors-20200329-1/files
rename to msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/files
diff --git a/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/mtree b/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/mtree
new file mode 100644
index 000000000..d6aad3172
Binary files /dev/null and b/msys2/var/lib/pacman/local/pacman-mirrors-20210127-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/perl-5.32.0-2/desc b/msys2/var/lib/pacman/local/perl-5.32.0-2/desc
index 940e4fb2e..ed09c558d 100644
--- a/msys2/var/lib/pacman/local/perl-5.32.0-2/desc
+++ b/msys2/var/lib/pacman/local/perl-5.32.0-2/desc
@@ -20,7 +20,7 @@ x86_64
 1598564438
 
 %INSTALLDATE%
-1599157260
+1613407327
 
 %PACKAGER%
 CI (msys2-autobuild/dcde5668/227626603)
diff --git a/msys2/var/lib/pacman/local/pinentry-1.1.0-2/desc b/msys2/var/lib/pacman/local/pinentry-1.1.0-2/desc
index d6c22e631..951cad30f 100644
--- a/msys2/var/lib/pacman/local/pinentry-1.1.0-2/desc
+++ b/msys2/var/lib/pacman/local/pinentry-1.1.0-2/desc
@@ -20,7 +20,7 @@ x86_64
 1529987917
 
 %INSTALLDATE%
-1599157255
+1613407322
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/rebase-4.4.4-1/mtree b/msys2/var/lib/pacman/local/rebase-4.4.4-1/mtree
deleted file mode 100644
index 277366115..000000000
Binary files a/msys2/var/lib/pacman/local/rebase-4.4.4-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/rebase-4.4.4-1/desc b/msys2/var/lib/pacman/local/rebase-4.4.4-2/desc
similarity index 75%
rename from msys2/var/lib/pacman/local/rebase-4.4.4-1/desc
rename to msys2/var/lib/pacman/local/rebase-4.4.4-2/desc
index bc0c7687d..6d57d0c72 100644
--- a/msys2/var/lib/pacman/local/rebase-4.4.4-1/desc
+++ b/msys2/var/lib/pacman/local/rebase-4.4.4-2/desc
@@ -2,7 +2,7 @@
 rebase
 
 %VERSION%
-4.4.4-1
+4.4.4-2
 
 %BASE%
 rebase
@@ -17,23 +17,20 @@ https://www.cygwin.com/
 x86_64
 
 %BUILDDATE%
-1532678371
+1599386428
 
 %INSTALLDATE%
-1599157260
+1613407327
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/0178d212/241477599)
 
 %SIZE%
-916480
+971490
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 custom
 
@@ -41,6 +38,5 @@ custom
 pgp
 
 %DEPENDS%
-msys2-runtime
 dash
 
diff --git a/msys2/var/lib/pacman/local/rebase-4.4.4-1/files b/msys2/var/lib/pacman/local/rebase-4.4.4-2/files
similarity index 100%
rename from msys2/var/lib/pacman/local/rebase-4.4.4-1/files
rename to msys2/var/lib/pacman/local/rebase-4.4.4-2/files
diff --git a/msys2/var/lib/pacman/local/rebase-4.4.4-2/mtree b/msys2/var/lib/pacman/local/rebase-4.4.4-2/mtree
new file mode 100644
index 000000000..4dba0831d
Binary files /dev/null and b/msys2/var/lib/pacman/local/rebase-4.4.4-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/sed-4.8-1/desc b/msys2/var/lib/pacman/local/sed-4.8-1/desc
index fbd1cfbce..0444ea833 100644
--- a/msys2/var/lib/pacman/local/sed-4.8-1/desc
+++ b/msys2/var/lib/pacman/local/sed-4.8-1/desc
@@ -20,7 +20,7 @@ x86_64
 1579156783
 
 %INSTALLDATE%
-1599157247
+1613407315
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/tcl-8.6.10-1/desc b/msys2/var/lib/pacman/local/tcl-8.6.10-1/desc
index 5dc81fcbb..d866800b3 100644
--- a/msys2/var/lib/pacman/local/tcl-8.6.10-1/desc
+++ b/msys2/var/lib/pacman/local/tcl-8.6.10-1/desc
@@ -20,7 +20,7 @@ x86_64
 1585121528
 
 %INSTALLDATE%
-1599157251
+1613407319
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/tftp-hpa-5.2-3/desc b/msys2/var/lib/pacman/local/tftp-hpa-5.2-3/desc
index ab02aa847..292c2c845 100644
--- a/msys2/var/lib/pacman/local/tftp-hpa-5.2-3/desc
+++ b/msys2/var/lib/pacman/local/tftp-hpa-5.2-3/desc
@@ -20,7 +20,7 @@ x86_64
 1556610732
 
 %INSTALLDATE%
-1599157253
+1613407321
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/time-1.9-1/desc b/msys2/var/lib/pacman/local/time-1.9-1/desc
index 66bcdb2da..6197a8451 100644
--- a/msys2/var/lib/pacman/local/time-1.9-1/desc
+++ b/msys2/var/lib/pacman/local/time-1.9-1/desc
@@ -20,7 +20,7 @@ x86_64
 1532679224
 
 %INSTALLDATE%
-1599157260
+1613407327
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/tzcode-2020a-1/mtree b/msys2/var/lib/pacman/local/tzcode-2020a-1/mtree
deleted file mode 100644
index 4062d88f1..000000000
Binary files a/msys2/var/lib/pacman/local/tzcode-2020a-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/tzcode-2020a-1/desc b/msys2/var/lib/pacman/local/tzcode-2020f-1/desc
similarity index 76%
rename from msys2/var/lib/pacman/local/tzcode-2020a-1/desc
rename to msys2/var/lib/pacman/local/tzcode-2020f-1/desc
index 8ea3662ba..ed253414b 100644
--- a/msys2/var/lib/pacman/local/tzcode-2020a-1/desc
+++ b/msys2/var/lib/pacman/local/tzcode-2020f-1/desc
@@ -2,7 +2,7 @@
 tzcode
 
 %VERSION%
-2020a-1
+2020f-1
 
 %BASE%
 tzcode
@@ -17,23 +17,20 @@ https://www.iana.org/time-zones
 x86_64
 
 %BUILDDATE%
-1588174387
+1610719799
 
 %INSTALLDATE%
-1599157263
+1613407329
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-1825484
+1136287
 
 %REASON%
 1
 
-%GROUPS%
-base
-
 %LICENSE%
 GPL
 
diff --git a/msys2/var/lib/pacman/local/tzcode-2020a-1/files b/msys2/var/lib/pacman/local/tzcode-2020f-1/files
similarity index 99%
rename from msys2/var/lib/pacman/local/tzcode-2020a-1/files
rename to msys2/var/lib/pacman/local/tzcode-2020f-1/files
index c9a6481f5..16b9789b5 100644
--- a/msys2/var/lib/pacman/local/tzcode-2020a-1/files
+++ b/msys2/var/lib/pacman/local/tzcode-2020f-1/files
@@ -1221,7 +1221,6 @@ usr/share/zoneinfo/posix/US/Indiana-Starke
 usr/share/zoneinfo/posix/US/Michigan
 usr/share/zoneinfo/posix/US/Mountain
 usr/share/zoneinfo/posix/US/Pacific
-usr/share/zoneinfo/posix/US/Pacific-New
 usr/share/zoneinfo/posix/US/Samoa
 usr/share/zoneinfo/posix/UTC
 usr/share/zoneinfo/posix/W-SU
@@ -1840,7 +1839,6 @@ usr/share/zoneinfo/right/US/Indiana-Starke
 usr/share/zoneinfo/right/US/Michigan
 usr/share/zoneinfo/right/US/Mountain
 usr/share/zoneinfo/right/US/Pacific
-usr/share/zoneinfo/right/US/Pacific-New
 usr/share/zoneinfo/right/US/Samoa
 usr/share/zoneinfo/right/UTC
 usr/share/zoneinfo/right/W-SU
@@ -1865,7 +1863,6 @@ usr/share/zoneinfo/US/Indiana-Starke
 usr/share/zoneinfo/US/Michigan
 usr/share/zoneinfo/US/Mountain
 usr/share/zoneinfo/US/Pacific
-usr/share/zoneinfo/US/Pacific-New
 usr/share/zoneinfo/US/Samoa
 usr/share/zoneinfo/UTC
 usr/share/zoneinfo/W-SU
diff --git a/msys2/var/lib/pacman/local/tzcode-2020f-1/mtree b/msys2/var/lib/pacman/local/tzcode-2020f-1/mtree
new file mode 100644
index 000000000..67122e9e1
Binary files /dev/null and b/msys2/var/lib/pacman/local/tzcode-2020f-1/mtree differ
diff --git a/msys2/var/lib/pacman/local/util-linux-2.35.2-1/desc b/msys2/var/lib/pacman/local/util-linux-2.35.2-1/desc
index 435fbbf7f..cf62eab03 100644
--- a/msys2/var/lib/pacman/local/util-linux-2.35.2-1/desc
+++ b/msys2/var/lib/pacman/local/util-linux-2.35.2-1/desc
@@ -20,7 +20,7 @@ x86_64
 1595318032
 
 %INSTALLDATE%
-1599157263
+1613407330
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/wget-1.20.3-1/mtree b/msys2/var/lib/pacman/local/wget-1.20.3-1/mtree
deleted file mode 100644
index c5cb28836..000000000
Binary files a/msys2/var/lib/pacman/local/wget-1.20.3-1/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/wget-1.20.3-1/desc b/msys2/var/lib/pacman/local/wget-1.21.1-2/desc
similarity index 84%
rename from msys2/var/lib/pacman/local/wget-1.20.3-1/desc
rename to msys2/var/lib/pacman/local/wget-1.21.1-2/desc
index 5de89557d..8c2bbc9cc 100644
--- a/msys2/var/lib/pacman/local/wget-1.20.3-1/desc
+++ b/msys2/var/lib/pacman/local/wget-1.21.1-2/desc
@@ -2,7 +2,7 @@
 wget
 
 %VERSION%
-1.20.3-1
+1.21.1-2
 
 %BASE%
 wget
@@ -17,16 +17,16 @@ https://www.gnu.org/software/wget/
 x86_64
 
 %BUILDDATE%
-1555321442
+1610726958
 
 %INSTALLDATE%
-1599157263
+1613407330
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/9e2e1814/488022070)
 
 %SIZE%
-3003392
+3146120
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/wget-1.20.3-1/files b/msys2/var/lib/pacman/local/wget-1.21.1-2/files
similarity index 66%
rename from msys2/var/lib/pacman/local/wget-1.20.3-1/files
rename to msys2/var/lib/pacman/local/wget-1.21.1-2/files
index 0d414774a..472c1506c 100644
--- a/msys2/var/lib/pacman/local/wget-1.20.3-1/files
+++ b/msys2/var/lib/pacman/local/wget-1.21.1-2/files
@@ -8,53 +8,71 @@ usr/share/
 usr/share/info/
 usr/share/info/wget.info.gz
 usr/share/locale/
+usr/share/locale/af/
+usr/share/locale/af/LC_MESSAGES/
+usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/be/
 usr/share/locale/be/LC_MESSAGES/
+usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/be/LC_MESSAGES/wget.mo
 usr/share/locale/bg/
 usr/share/locale/bg/LC_MESSAGES/
+usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/bg/LC_MESSAGES/wget.mo
 usr/share/locale/ca/
 usr/share/locale/ca/LC_MESSAGES/
+usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/ca/LC_MESSAGES/wget.mo
 usr/share/locale/cs/
 usr/share/locale/cs/LC_MESSAGES/
+usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/cs/LC_MESSAGES/wget.mo
 usr/share/locale/da/
 usr/share/locale/da/LC_MESSAGES/
+usr/share/locale/da/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/da/LC_MESSAGES/wget.mo
 usr/share/locale/de/
 usr/share/locale/de/LC_MESSAGES/
+usr/share/locale/de/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/de/LC_MESSAGES/wget.mo
 usr/share/locale/el/
 usr/share/locale/el/LC_MESSAGES/
+usr/share/locale/el/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/el/LC_MESSAGES/wget.mo
 usr/share/locale/en_GB/
 usr/share/locale/en_GB/LC_MESSAGES/
 usr/share/locale/en_GB/LC_MESSAGES/wget.mo
 usr/share/locale/eo/
 usr/share/locale/eo/LC_MESSAGES/
+usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/eo/LC_MESSAGES/wget.mo
 usr/share/locale/es/
 usr/share/locale/es/LC_MESSAGES/
+usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/es/LC_MESSAGES/wget.mo
 usr/share/locale/et/
 usr/share/locale/et/LC_MESSAGES/
+usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/et/LC_MESSAGES/wget.mo
 usr/share/locale/eu/
 usr/share/locale/eu/LC_MESSAGES/
+usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/eu/LC_MESSAGES/wget.mo
 usr/share/locale/fi/
 usr/share/locale/fi/LC_MESSAGES/
+usr/share/locale/fi/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/fi/LC_MESSAGES/wget.mo
 usr/share/locale/fr/
 usr/share/locale/fr/LC_MESSAGES/
+usr/share/locale/fr/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/fr/LC_MESSAGES/wget.mo
 usr/share/locale/ga/
 usr/share/locale/ga/LC_MESSAGES/
+usr/share/locale/ga/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/ga/LC_MESSAGES/wget.mo
 usr/share/locale/gl/
 usr/share/locale/gl/LC_MESSAGES/
+usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/gl/LC_MESSAGES/wget.mo
 usr/share/locale/he/
 usr/share/locale/he/LC_MESSAGES/
@@ -64,66 +82,94 @@ usr/share/locale/hr/LC_MESSAGES/
 usr/share/locale/hr/LC_MESSAGES/wget.mo
 usr/share/locale/hu/
 usr/share/locale/hu/LC_MESSAGES/
+usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/hu/LC_MESSAGES/wget.mo
 usr/share/locale/id/
 usr/share/locale/id/LC_MESSAGES/
 usr/share/locale/id/LC_MESSAGES/wget.mo
 usr/share/locale/it/
 usr/share/locale/it/LC_MESSAGES/
+usr/share/locale/it/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/it/LC_MESSAGES/wget.mo
 usr/share/locale/ja/
 usr/share/locale/ja/LC_MESSAGES/
+usr/share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/ja/LC_MESSAGES/wget.mo
+usr/share/locale/ko/
+usr/share/locale/ko/LC_MESSAGES/
+usr/share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/lt/
 usr/share/locale/lt/LC_MESSAGES/
 usr/share/locale/lt/LC_MESSAGES/wget.mo
+usr/share/locale/ms/
+usr/share/locale/ms/LC_MESSAGES/
+usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/nb/
 usr/share/locale/nb/LC_MESSAGES/
+usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/nb/LC_MESSAGES/wget.mo
 usr/share/locale/nl/
 usr/share/locale/nl/LC_MESSAGES/
+usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/nl/LC_MESSAGES/wget.mo
 usr/share/locale/pl/
 usr/share/locale/pl/LC_MESSAGES/
+usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/pl/LC_MESSAGES/wget.mo
 usr/share/locale/pt/
 usr/share/locale/pt/LC_MESSAGES/
+usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/pt/LC_MESSAGES/wget.mo
 usr/share/locale/pt_BR/
 usr/share/locale/pt_BR/LC_MESSAGES/
+usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/pt_BR/LC_MESSAGES/wget.mo
 usr/share/locale/ro/
 usr/share/locale/ro/LC_MESSAGES/
+usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/ro/LC_MESSAGES/wget.mo
 usr/share/locale/ru/
 usr/share/locale/ru/LC_MESSAGES/
+usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/ru/LC_MESSAGES/wget.mo
+usr/share/locale/rw/
+usr/share/locale/rw/LC_MESSAGES/
+usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/sk/
 usr/share/locale/sk/LC_MESSAGES/
+usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/sk/LC_MESSAGES/wget.mo
 usr/share/locale/sl/
 usr/share/locale/sl/LC_MESSAGES/
+usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/sl/LC_MESSAGES/wget.mo
 usr/share/locale/sr/
 usr/share/locale/sr/LC_MESSAGES/
+usr/share/locale/sr/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/sr/LC_MESSAGES/wget.mo
 usr/share/locale/sv/
 usr/share/locale/sv/LC_MESSAGES/
+usr/share/locale/sv/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/sv/LC_MESSAGES/wget.mo
 usr/share/locale/tr/
 usr/share/locale/tr/LC_MESSAGES/
+usr/share/locale/tr/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/tr/LC_MESSAGES/wget.mo
 usr/share/locale/uk/
 usr/share/locale/uk/LC_MESSAGES/
+usr/share/locale/uk/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/uk/LC_MESSAGES/wget.mo
 usr/share/locale/vi/
 usr/share/locale/vi/LC_MESSAGES/
+usr/share/locale/vi/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/vi/LC_MESSAGES/wget.mo
 usr/share/locale/zh_CN/
 usr/share/locale/zh_CN/LC_MESSAGES/
+usr/share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/zh_CN/LC_MESSAGES/wget.mo
 usr/share/locale/zh_TW/
 usr/share/locale/zh_TW/LC_MESSAGES/
+usr/share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo
 usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
 usr/share/man/
 usr/share/man/man1/
diff --git a/msys2/var/lib/pacman/local/wget-1.20.3-1/install b/msys2/var/lib/pacman/local/wget-1.21.1-2/install
similarity index 100%
rename from msys2/var/lib/pacman/local/wget-1.20.3-1/install
rename to msys2/var/lib/pacman/local/wget-1.21.1-2/install
diff --git a/msys2/var/lib/pacman/local/wget-1.21.1-2/mtree b/msys2/var/lib/pacman/local/wget-1.21.1-2/mtree
new file mode 100644
index 000000000..d9be7fde3
Binary files /dev/null and b/msys2/var/lib/pacman/local/wget-1.21.1-2/mtree differ
diff --git a/msys2/var/lib/pacman/local/which-2.21-2/desc b/msys2/var/lib/pacman/local/which-2.21-2/desc
index 24d11a5a0..914d47cde 100644
--- a/msys2/var/lib/pacman/local/which-2.21-2/desc
+++ b/msys2/var/lib/pacman/local/which-2.21-2/desc
@@ -17,7 +17,7 @@ x86_64
 1437376459
 
 %INSTALLDATE%
-1599157255
+1613407323
 
 %PACKAGER%
 Alexpux <alexpux@jmail.com>
diff --git a/msys2/var/lib/pacman/local/xz-5.2.5-1/desc b/msys2/var/lib/pacman/local/xz-5.2.5-1/desc
index 4e1c49799..5f7ae9b8f 100644
--- a/msys2/var/lib/pacman/local/xz-5.2.5-1/desc
+++ b/msys2/var/lib/pacman/local/xz-5.2.5-1/desc
@@ -20,7 +20,7 @@ x86_64
 1584529151
 
 %INSTALLDATE%
-1599157255
+1613407323
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/zlib-1.2.11-1/desc b/msys2/var/lib/pacman/local/zlib-1.2.11-1/desc
index 5f70e3076..627294fdc 100644
--- a/msys2/var/lib/pacman/local/zlib-1.2.11-1/desc
+++ b/msys2/var/lib/pacman/local/zlib-1.2.11-1/desc
@@ -20,7 +20,7 @@ x86_64
 1485320558
 
 %INSTALLDATE%
-1599157246
+1613407314
 
 %PACKAGER%
 Alexey Pavlov <alexpux@gmail.com>
diff --git a/msys2/var/lib/pacman/local/zstd-1.4.5-2/mtree b/msys2/var/lib/pacman/local/zstd-1.4.5-2/mtree
deleted file mode 100644
index decd041a6..000000000
Binary files a/msys2/var/lib/pacman/local/zstd-1.4.5-2/mtree and /dev/null differ
diff --git a/msys2/var/lib/pacman/local/zstd-1.4.5-2/desc b/msys2/var/lib/pacman/local/zstd-1.4.8-1/desc
similarity index 78%
rename from msys2/var/lib/pacman/local/zstd-1.4.5-2/desc
rename to msys2/var/lib/pacman/local/zstd-1.4.8-1/desc
index ce3bfc226..d833a776c 100644
--- a/msys2/var/lib/pacman/local/zstd-1.4.5-2/desc
+++ b/msys2/var/lib/pacman/local/zstd-1.4.8-1/desc
@@ -2,7 +2,7 @@
 zstd
 
 %VERSION%
-1.4.5-2
+1.4.8-1
 
 %BASE%
 zstd
@@ -17,16 +17,16 @@ https://facebook.github.io/zstd/
 x86_64
 
 %BUILDDATE%
-1590989948
+1608526739
 
 %INSTALLDATE%
-1599157255
+1613407323
 
 %PACKAGER%
-Alexey Pavlov <alexpux@gmail.com>
+CI (msys2-autobuild/dfb80bed/434829238)
 
 %SIZE%
-3487202
+3396837
 
 %REASON%
 1
diff --git a/msys2/var/lib/pacman/local/zstd-1.4.5-2/files b/msys2/var/lib/pacman/local/zstd-1.4.8-1/files
similarity index 100%
rename from msys2/var/lib/pacman/local/zstd-1.4.5-2/files
rename to msys2/var/lib/pacman/local/zstd-1.4.8-1/files
diff --git a/msys2/var/lib/pacman/local/zstd-1.4.8-1/mtree b/msys2/var/lib/pacman/local/zstd-1.4.8-1/mtree
new file mode 100644
index 000000000..4de423a6e
Binary files /dev/null and b/msys2/var/lib/pacman/local/zstd-1.4.8-1/mtree differ
diff --git a/msys2/var/lib/pacman/sync/mingw32.db b/msys2/var/lib/pacman/sync/mingw32.db
index 9b02a94cf..25a08a0d6 100644
Binary files a/msys2/var/lib/pacman/sync/mingw32.db and b/msys2/var/lib/pacman/sync/mingw32.db differ
diff --git a/msys2/var/lib/pacman/sync/mingw32.db.sig b/msys2/var/lib/pacman/sync/mingw32.db.sig
index f7e19055d..b40f991d6 100644
Binary files a/msys2/var/lib/pacman/sync/mingw32.db.sig and b/msys2/var/lib/pacman/sync/mingw32.db.sig differ
diff --git a/msys2/var/lib/pacman/sync/mingw64.db b/msys2/var/lib/pacman/sync/mingw64.db
index 844ca5db2..fff2e2b1a 100644
Binary files a/msys2/var/lib/pacman/sync/mingw64.db and b/msys2/var/lib/pacman/sync/mingw64.db differ
diff --git a/msys2/var/lib/pacman/sync/mingw64.db.sig b/msys2/var/lib/pacman/sync/mingw64.db.sig
index e32319472..3dcf918ba 100644
Binary files a/msys2/var/lib/pacman/sync/mingw64.db.sig and b/msys2/var/lib/pacman/sync/mingw64.db.sig differ
diff --git a/msys2/var/lib/pacman/sync/msys.db b/msys2/var/lib/pacman/sync/msys.db
index c74d1c0bb..bb1d8039d 100644
Binary files a/msys2/var/lib/pacman/sync/msys.db and b/msys2/var/lib/pacman/sync/msys.db differ
diff --git a/msys2/var/lib/pacman/sync/msys.db.sig b/msys2/var/lib/pacman/sync/msys.db.sig
index 2e20e4be2..ea9848ca7 100644
Binary files a/msys2/var/lib/pacman/sync/msys.db.sig and b/msys2/var/lib/pacman/sync/msys.db.sig differ
diff --git a/msys2/var/log/pacman.log b/msys2/var/log/pacman.log
index 95143a210..ce3620086 100644
--- a/msys2/var/log/pacman.log
+++ b/msys2/var/log/pacman.log
@@ -1,104 +1,105 @@
-[2020-09-03T18:20:13+0000] [PACMAN] Running 'pacman -Syu --root /tmp/newmsys/msys64'
-[2020-09-03T18:20:13+0000] [PACMAN] synchronizing package lists
-[2020-09-03T18:20:14+0000] [PACMAN] starting core system upgrade
-[2020-09-03T18:20:14+0000] [PACMAN] starting full system upgrade
-[2020-09-03T18:20:15+0000] [PACMAN] Running 'pacman -S --noconfirm --root /tmp/newmsys/msys64 base'
-[2020-09-03T18:20:37+0000] [ALPM] transaction started
-[2020-09-03T18:20:37+0000] [ALPM] installed msys2-runtime (3.1.7-1)
-[2020-09-03T18:20:38+0000] [ALPM] installed bash (4.4.023-2)
-[2020-09-03T18:20:38+0000] [ALPM] installed bash-completion (2.10-1)
-[2020-09-03T18:20:38+0000] [ALPM] installed gcc-libs (9.3.0-1)
-[2020-09-03T18:20:38+0000] [ALPM] installed libbz2 (1.0.8-2)
-[2020-09-03T18:20:39+0000] [ALPM] installed libiconv (1.16-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libexpat (2.2.9-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libintl (0.19.8.1-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libgettextpo (0.19.8.1-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libasprintf (0.19.8.1-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed gettext (0.19.8.1-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed liblzma (5.2.5-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed liblz4 (1.9.2-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed gmp (6.2.0-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libhogweed (3.6-1)
-[2020-09-03T18:20:39+0000] [ALPM] installed libnettle (3.6-1)
-[2020-09-03T18:20:40+0000] [ALPM] installed coreutils (8.32-1)
-[2020-09-03T18:20:40+0000] [ALPM] installed icu (67.1-1)
-[2020-09-03T18:20:46+0000] [ALPM] installed ncurses (6.2-1)
-[2020-09-03T18:20:46+0000] [ALPM] installed libreadline (8.0.004-1)
-[2020-09-03T18:20:46+0000] [ALPM] installed zlib (1.2.11-1)
-[2020-09-03T18:20:46+0000] [ALPM] installed libxml2 (2.9.10-5)
-[2020-09-03T18:20:47+0000] [ALPM] installed libzstd (1.4.5-2)
-[2020-09-03T18:20:47+0000] [ALPM] installed bsdtar (3.4.3-1)
-[2020-09-03T18:20:47+0000] [ALPM] installed bzip2 (1.0.8-2)
-[2020-09-03T18:20:47+0000] [ALPM] installed libopenssl (1.1.1.g-3)
-[2020-09-03T18:20:47+0000] [ALPM] installed openssl (1.1.1.g-3)
-[2020-09-03T18:20:47+0000] [ALPM] installed findutils (4.7.0-1)
-[2020-09-03T18:20:47+0000] [ALPM] installed sed (4.8-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libffi (3.3-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libpcre (8.44-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed less (551-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed gzip (1.10-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libcrypt (2.1-2)
-[2020-09-03T18:20:48+0000] [ALPM] installed info (6.7-2)
-[2020-09-03T18:20:48+0000] [ALPM] installed libtasn1 (4.16.0-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libgpg-error (1.38-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libgcrypt (1.8.6-1)
-[2020-09-03T18:20:48+0000] [ALPM] installed libxslt (1.1.34-3)
-[2020-09-03T18:20:48+0000] [ALPM] installed glib2 (2.54.3-3)
-[2020-09-03T18:20:48+0000] [ALPM] installed libp11-kit (0.23.20-2)
-[2020-09-03T18:20:49+0000] [ALPM] installed p11-kit (0.23.20-2)
-[2020-09-03T18:20:49+0000] [ALPM] installed ca-certificates (20190110-1)
-[2020-09-03T18:20:49+0000] [ALPM] installed brotli (1.0.7-3)
-[2020-09-03T18:20:49+0000] [ALPM] installed libdb (5.3.28-3)
-[2020-09-03T18:20:49+0000] [ALPM] installed libedit (20191231_3.1-1)
-[2020-09-03T18:20:51+0000] [ALPM] installed tcl (8.6.10-1)
-[2020-09-03T18:20:51+0000] [ALPM] installed libsqlite (3.33.0-1)
-[2020-09-03T18:20:51+0000] [ALPM] installed heimdal-libs (7.7.0-2)
-[2020-09-03T18:20:51+0000] [ALPM] installed libunistring (0.9.10-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed libidn2 (2.3.0-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed libmetalink (0.1.3-3)
-[2020-09-03T18:20:52+0000] [ALPM] installed libnghttp2 (1.41.0-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed libpsl (0.21.0-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed libssh2 (1.9.0-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed libcurl (7.71.1-1)
-[2020-09-03T18:20:52+0000] [ALPM] installed curl (7.71.1-1)
-[2020-09-03T18:20:53+0000] [ALPM] installed grep (3.0-2)
-[2020-09-03T18:20:53+0000] [ALPM] installed filesystem (2020.02-7)
-[2020-09-03T18:20:53+0000] [ALPM] installed dash (0.5.11.1-2)
-[2020-09-03T18:20:53+0000] [ALPM] installed file (5.39-1)
-[2020-09-03T18:20:53+0000] [ALPM] installed mpfr (4.1.0-1)
-[2020-09-03T18:20:53+0000] [ALPM] installed gawk (5.1.0-1)
-[2020-09-03T18:20:53+0000] [ALPM] installed libargp (20110921-2)
-[2020-09-03T18:20:53+0000] [ALPM] installed getent (2.18.90-2)
-[2020-09-03T18:20:53+0000] [ALPM] installed tftp-hpa (5.2-3)
-[2020-09-03T18:20:53+0000] [ALPM] installed inetutils (1.9.4-2)
-[2020-09-03T18:20:54+0000] [ALPM] installed mintty (1~3.3.0-1)
-[2020-09-03T18:20:54+0000] [ALPM] installed msys2-keyring (r21.b39fb11-1)
-[2020-09-03T18:20:54+0000] [ALPM] installed msys2-launcher (1.0-1)
-[2020-09-03T18:20:54+0000] [ALPM] installed libassuan (2.5.3-1)
-[2020-09-03T18:20:54+0000] [ALPM] installed libgnutls (3.6.14-1)
-[2020-09-03T18:20:54+0000] [ALPM] installed libksba (1.4.0-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed libnpth (1.6-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed nettle (3.6-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed pinentry (1.1.0-2)
-[2020-09-03T18:20:55+0000] [ALPM] installed gnupg (2.2.21-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed pacman-mirrors (20200329-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed which (2.21-2)
-[2020-09-03T18:20:55+0000] [ALPM] installed xz (5.2.5-1)
-[2020-09-03T18:20:55+0000] [ALPM] installed zstd (1.4.5-2)
-[2020-09-03T18:20:57+0000] [ALPM] installed pacman (5.2.2-3)
-[2020-09-03T18:20:57+0000] [ALPM] installed db (5.3.28-3)
-[2020-09-03T18:20:57+0000] [ALPM] installed libgdbm (1.18.1-3)
-[2020-09-03T18:20:57+0000] [ALPM] installed gdbm (1.18.1-3)
-[2020-09-03T18:21:00+0000] [ALPM] installed perl (5.32.0-2)
-[2020-09-03T18:21:00+0000] [ALPM] installed pacman-contrib (1.3.0-1)
-[2020-09-03T18:21:00+0000] [ALPM] installed rebase (4.4.4-1)
-[2020-09-03T18:21:00+0000] [ALPM] installed time (1.9-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed tzcode (2020a-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed libutil-linux (2.35.2-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed util-linux (2.35.2-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed libgpgme (1.14.0-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed libpcre2_8 (10.35-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed wget (1.20.3-1)
-[2020-09-03T18:21:03+0000] [ALPM] installed base (2020.05-2)
-[2020-09-03T18:21:03+0000] [ALPM] transaction completed
-[2020-09-03T18:21:03+0000] [ALPM] running 'texinfo-install.hook'...
+[2021-02-15T16:40:22+0000] [PACMAN] Running 'pacman -Syu --root /tmp/newmsys/msys64'
+[2021-02-15T16:40:22+0000] [PACMAN] synchronizing package lists
+[2021-02-15T16:40:26+0000] [PACMAN] starting core system upgrade
+[2021-02-15T16:40:26+0000] [PACMAN] starting full system upgrade
+[2021-02-15T16:40:26+0000] [PACMAN] Running 'pacman -S --noconfirm --root /tmp/newmsys/msys64 base'
+[2021-02-15T16:41:45+0000] [ALPM] transaction started
+[2021-02-15T16:41:45+0000] [ALPM] installed bash (5.1.004-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed bash-completion (2.11-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed gcc-libs (10.2.0-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libbz2 (1.0.8-2)
+[2021-02-15T16:41:46+0000] [ALPM] installed libintl (0.19.8.1-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libiconv (1.16-2)
+[2021-02-15T16:41:46+0000] [ALPM] installed libexpat (2.2.10-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libgettextpo (0.19.8.1-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libasprintf (0.19.8.1-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed gettext (0.19.8.1-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed liblzma (5.2.5-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed liblz4 (1.9.3-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed gmp (6.2.1-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libhogweed (3.7-1)
+[2021-02-15T16:41:46+0000] [ALPM] installed libnettle (3.7-1)
+[2021-02-15T16:41:47+0000] [ALPM] installed coreutils (8.32-1)
+[2021-02-15T16:41:47+0000] [ALPM] installed icu (68.2-1)
+[2021-02-15T16:41:48+0000] [ALPM] installed msys2-runtime (3.1.7-4)
+[2021-02-15T16:41:54+0000] [ALPM] installed ncurses (6.2-1)
+[2021-02-15T16:41:54+0000] [ALPM] installed libreadline (8.1.0-1)
+[2021-02-15T16:41:54+0000] [ALPM] installed zlib (1.2.11-1)
+[2021-02-15T16:41:54+0000] [ALPM] installed libxml2 (2.9.10-7)
+[2021-02-15T16:41:55+0000] [ALPM] installed libzstd (1.4.8-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed bsdtar (3.5.1-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed bzip2 (1.0.8-2)
+[2021-02-15T16:41:55+0000] [ALPM] installed libopenssl (1.1.1.i-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed openssl (1.1.1.i-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed findutils (4.7.0-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed sed (4.8-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed libffi (3.3-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed libpcre (8.44-1)
+[2021-02-15T16:41:55+0000] [ALPM] installed less (563-2)
+[2021-02-15T16:41:56+0000] [ALPM] installed gzip (1.10-1)
+[2021-02-15T16:41:56+0000] [ALPM] installed libcrypt (2.1-2)
+[2021-02-15T16:41:56+0000] [ALPM] installed info (6.7-3)
+[2021-02-15T16:41:56+0000] [ALPM] installed libtasn1 (4.16.0-1)
+[2021-02-15T16:41:56+0000] [ALPM] installed libgpg-error (1.41-2)
+[2021-02-15T16:41:56+0000] [ALPM] installed libgcrypt (1.8.7-1)
+[2021-02-15T16:41:56+0000] [ALPM] installed libxslt (1.1.34-3)
+[2021-02-15T16:41:56+0000] [ALPM] installed glib2 (2.66.6-1)
+[2021-02-15T16:41:56+0000] [ALPM] installed libp11-kit (0.23.22-2)
+[2021-02-15T16:41:56+0000] [ALPM] installed p11-kit (0.23.22-2)
+[2021-02-15T16:41:56+0000] [ALPM] installed ca-certificates (20190110-1)
+[2021-02-15T16:41:57+0000] [ALPM] installed brotli (1.0.9-1)
+[2021-02-15T16:41:57+0000] [ALPM] installed libdb (5.3.28-3)
+[2021-02-15T16:41:57+0000] [ALPM] installed libedit (20191231_3.1-2)
+[2021-02-15T16:41:59+0000] [ALPM] installed tcl (8.6.10-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed libsqlite (3.34.0-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed heimdal-libs (7.7.0-2)
+[2021-02-15T16:41:59+0000] [ALPM] installed libunistring (0.9.10-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed libidn2 (2.3.0-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed libmetalink (0.1.3-3)
+[2021-02-15T16:41:59+0000] [ALPM] installed libnghttp2 (1.41.0-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed libpsl (0.21.1-2)
+[2021-02-15T16:41:59+0000] [ALPM] installed libssh2 (1.9.0-1)
+[2021-02-15T16:41:59+0000] [ALPM] installed libcurl (7.74.0-4)
+[2021-02-15T16:42:00+0000] [ALPM] installed curl (7.74.0-4)
+[2021-02-15T16:42:00+0000] [ALPM] installed grep (3.0-2)
+[2021-02-15T16:42:00+0000] [ALPM] installed filesystem (2021.02-1)
+[2021-02-15T16:42:00+0000] [ALPM] installed dash (0.5.11.3-1)
+[2021-02-15T16:42:00+0000] [ALPM] installed file (5.39-2)
+[2021-02-15T16:42:01+0000] [ALPM] installed mpfr (4.1.0-1)
+[2021-02-15T16:42:01+0000] [ALPM] installed gawk (5.1.0-1)
+[2021-02-15T16:42:01+0000] [ALPM] installed libargp (20110921-2)
+[2021-02-15T16:42:01+0000] [ALPM] installed getent (2.18.90-2)
+[2021-02-15T16:42:01+0000] [ALPM] installed tftp-hpa (5.2-3)
+[2021-02-15T16:42:01+0000] [ALPM] installed inetutils (1.9.4-2)
+[2021-02-15T16:42:01+0000] [ALPM] installed mintty (1~3.4.4-2)
+[2021-02-15T16:42:01+0000] [ALPM] installed msys2-keyring (1~20210213-1)
+[2021-02-15T16:42:01+0000] [ALPM] installed msys2-launcher (1.0-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed nano (5.4-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed libassuan (2.5.4-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed libgnutls (3.7.0-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed libksba (1.4.0-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed libnpth (1.6-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed nettle (3.7-1)
+[2021-02-15T16:42:02+0000] [ALPM] installed pinentry (1.1.0-2)
+[2021-02-15T16:42:03+0000] [ALPM] installed gnupg (2.2.27-1)
+[2021-02-15T16:42:03+0000] [ALPM] installed pacman-mirrors (20210127-1)
+[2021-02-15T16:42:03+0000] [ALPM] installed which (2.21-2)
+[2021-02-15T16:42:03+0000] [ALPM] installed xz (5.2.5-1)
+[2021-02-15T16:42:03+0000] [ALPM] installed zstd (1.4.8-1)
+[2021-02-15T16:42:03+0000] [ALPM] installed pacman (5.2.2-12)
+[2021-02-15T16:42:03+0000] [ALPM] installed db (5.3.28-3)
+[2021-02-15T16:42:03+0000] [ALPM] installed libgdbm (1.19-1)
+[2021-02-15T16:42:04+0000] [ALPM] installed gdbm (1.19-1)
+[2021-02-15T16:42:07+0000] [ALPM] installed perl (5.32.0-2)
+[2021-02-15T16:42:07+0000] [ALPM] installed pacman-contrib (1.4.0-1)
+[2021-02-15T16:42:07+0000] [ALPM] installed rebase (4.4.4-2)
+[2021-02-15T16:42:07+0000] [ALPM] installed time (1.9-1)
+[2021-02-15T16:42:09+0000] [ALPM] installed tzcode (2020f-1)
+[2021-02-15T16:42:09+0000] [ALPM] installed libutil-linux (2.35.2-1)
+[2021-02-15T16:42:10+0000] [ALPM] installed util-linux (2.35.2-1)
+[2021-02-15T16:42:10+0000] [ALPM] installed libgpgme (1.15.1-1)
+[2021-02-15T16:42:10+0000] [ALPM] installed libpcre2_8 (10.36-1)
+[2021-02-15T16:42:10+0000] [ALPM] installed wget (1.21.1-2)
+[2021-02-15T16:42:10+0000] [ALPM] installed base (2020.12-1)
+[2021-02-15T16:42:10+0000] [ALPM] transaction completed
+[2021-02-15T16:42:10+0000] [ALPM] running 'texinfo-install.hook'...