Updated msys2 to msys2-base-x86_64-20200903

msys2/usr/share/zsh/site-functions/_pacman

@@ -44,7 +44,6 @@ _pacman_opts_pkgfile=(
 	'*--nodeps[Skip dependency checks]'
 	'*--assume-installed[Add virtual package to satisfy dependencies]'
 	'--dbonly[Only remove database entry, do not remove files]'
-	'--force[Overwrite conflicting files]'
 	'--needed[Do not reinstall up to date packages]'
 	'--asdeps[mark packages as non-explicitly installed]'
 	'--asexplicit[mark packages as explicitly installed]'
@@ -101,8 +100,6 @@ _pacman_opts_database=(
 
 _pacman_opts_files=(
 	{-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages'
-	{-o,--owns}'[Query the package that owns]:files:_files'
-	{-s,--search}'[Search package file names for matching strings]:files:_files'
 	{-x,--regex}'[Enable searching using regular expressions]:regex:'
 	{-y,--refresh}'[Download fresh files databases from the server]'
 	'--machinereadable[Produce machine-readable output]'
@@ -135,7 +132,6 @@ _pacman_opts_sync_modifiers=(
 	'*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups'
 	'--asdeps[Install packages as non-explicitly installed]'
 	'--asexplicit[Install packages as explicitly installed]'
-	'--force[Overwrite conflicting files]'
 	'--print-format[Specify how the targets should be printed]'
 )
 
@@ -370,7 +366,7 @@ _pacman_get_command() {
 
 # main dispatcher
 _pacman_zsh_comp() {
-	local -a args cmds;
+	local -a args cmds
 	local tmp
 	args=( ${${${(M)words:#-*}#-}:#-*} )
 	for tmp in $words; do
@@ -465,7 +461,7 @@ _pacman_zsh_comp() {
 					if (( ${(w)#cmds} == 1 )); then
 						_pacman_action_help
 					else
-						return 0;
+						return 0
 					fi
 					;;
 				*--sync*)
@@ -554,7 +550,7 @@ _pacman_key() {
 				"$_key_longopts[@]"
 			;;
 		*)
-			i=$#;
+			i=$#
 			while [[ $words[$i] != -* ]] && [[ $words[$i] != "pacman-key" ]];do
 				i=$(($i-1))
 			done
@@ -681,7 +677,7 @@ _makepkg(){
 		*)
 			i=$#
 			while [[ $words[i] != -* ]] && [[ $words[$i] != "makepkg" ]];do
-				i=$((i-1));
+				i=$((i-1))
 			done
 			case $words[$i] in
 				-*)

msys2/usr/share/zsh/site-functions/_pkgfile

@@ -1,82 +0,0 @@
-#compdef pkgfile
-
-_repos(){
-	local -a cmd repositories
-	repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
-	# Uniq the array
-	typeset -U repositories
-	compadd "$@" -a repositories
-}
-
-_compression(){
-    local -a cmd _comps
-    _comps=('none' 'gzip' 'bzip2' 'lzma' 'lzop' 'lz4' 'xz')
-    typeset -U _comps
-    compadd "$@" -a _comps
-}
-
-_action_none(){
-  _arguments \
-    "$_shortopts[@]" \
-    "$_longopts[@]"
-}
-
-_longopts=(
-    '--help[display this help and exit]'
-    '--list[list contents of a package]'
-    '--search[search for packages containing the target (default)]'
-    '--update[update repo files lists]'
-    '--binaries[return only files contained in a bin dir]'
-    '--directories[match directories in searches]'
-    '--glob[enable matching with glob characters]'
-    '--ignorecase[use case-insensitive matching]'
-    '--quiet[output less when listing]'
-    '--repo[search a specific repo]: :_repos'
-    '--regex[enable matching with regular expressions]'
-    '--version[display program version]'
-    '--verbose[output more]'
-    '--raw[disable output justification]'
-    '--null[null terminate output]'
-    '--compress=[compress downloaded repos]: :_compression'
-    '--config=[use an alternate pacman config]: :_files'
-    '--cachedir=[use an alternate cache directory]: :_files -/'
-    )
-
-_shortopts=(
-    '*-h[display this help and exit]'
-    '*-l[list contents of a package]'
-    '*-s[search for packages containing the target (default)]'
-    '*-u[update repo files lists]'
-    '*-b[return only files contained in a bin dir]'
-    '*-d[match directories in searches]'
-    '*-g[enable matching with glob characters]'
-    '*-i[use case-insensitive matching]'
-    '*-q[output less when listing]'
-    '*-R[search a specific repo]: :_repos'
-    '*-r[enable matching with regular expressions]'
-    '*-V[display program version]'
-    '*-v[output more]'
-    '*-w[disable output justification]'
-    '*-0[null terminate output]'
-    '*-z[compress downloaded repos]: :_compression'
-    '*-C[use an alternate pacman config]: :_files'
-    '*-D[use an alternate cache directory]: :_files -/'
-    )
-
-_pkgfile() {
-  case $words[CURRENT] in
-    -*)
-        _arguments -s -w : \
-            "$_shortopts[@]" \
-            "$_longopts[@]"
-        ;;
-    --*)
-        _arguments -s : \
-            "$_longopts[@]"
-      ;;
-    *)
-        _action_none;;
-  esac
-}
-
-_pkgfile "$@"