fix: use pathcmd=$(type -P -- "$1") for arbitrary cmds

If the command name starts with `-`, `type` is confused and tries to parse it as an option to `type`. In the current setup, the option starting with `-` does not happen because we do not set up the completion settings for such command names, but it is better to put them on a safe side.
scop · Apr 4, 2024 · 8795ca9 · 8795ca9
1 parent 350b1b7
commit 8795ca9
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 27 deletions.
diff --git a/completions/_nox b/completions/_nox
@@ -4,7 +4,7 @@
 # This serves as a fallback in case the completion is not installed otherwise.
 
 eval -- "$(
-    pathcmd=$(type -P "$1" 2>/dev/null | command sed 's,/[^/]*$,,')
+    pathcmd=$(type -P -- "$1" 2>/dev/null | command sed 's,/[^/]*$,,')
     [[ $pathcmd ]] && PATH=$pathcmd${PATH:+:$PATH}
     register-python-argcomplete --shell bash "$1" 2>/dev/null ||
         register-python-argcomplete3 --shell bash "$1" 2>/dev/null

diff --git a/completions/add_members b/completions/add_members
@@ -24,7 +24,7 @@ _comp_cmd_add_members()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_xfunc list_lists mailman_lists
     fi
 

diff --git a/completions/apt-get b/completions/apt-get
@@ -33,7 +33,7 @@ _comp_cmd_apt_get()
             source)
                 # Prefer `apt-cache` in the same dir as command
                 local pathcmd
-                pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+                pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
                 _comp_compgen -x apt-cache packages
                 _comp_compgen -a split -- "$(apt-cache dumpavail |
                     _comp_awk '$1 == "Source:" { print $2 }' | sort -u)"
@@ -79,7 +79,7 @@ _comp_cmd_apt_get()
         --target-release | --default-release | -${noargopts}t)
             # Prefer `apt-cache` in the same dir as command
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen_split -- "$(apt-cache policy | command sed -ne \
                 's/^ *release.*[ ,]o=\(Debian\|Ubuntu\),a=\(\w*\).*/\2/p')"
             return

diff --git a/completions/arch b/completions/arch
@@ -34,7 +34,7 @@ _comp_have_command mailmanctl &&
                 1)
                     # Prefer `list_lists` in the same dir as command
                     local pathcmd
-                    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+                    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
                     _comp_compgen -x list_lists mailman_lists
                     ;;
                 2)

diff --git a/completions/change_pw b/completions/change_pw
@@ -9,7 +9,7 @@ _comp_cmd_change_pw()
         -l | --listname)
             # Prefer `list_lists` in the same dir as command
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen -x list_lists mailman_lists
             return
             ;;

diff --git a/completions/check_db b/completions/check_db
@@ -10,7 +10,7 @@ _comp_cmd_check_db()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/clone_member b/completions/clone_member
@@ -9,7 +9,7 @@ _comp_cmd_clone_member()
         -l | --listname)
             # Prefer `list_lists` in the same dir as command
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen -x list_lists mailman_lists
             return
             ;;

diff --git a/completions/config_list b/completions/config_list
@@ -20,7 +20,7 @@ _comp_cmd_config_list()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_xfunc list_lists mailman_lists
     fi
 

diff --git a/completions/find_member b/completions/find_member
@@ -9,7 +9,7 @@ _comp_cmd_find_member()
         -l | -x | --listname | --exclude)
             # Prefer `list_lists` in the same dir as command
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen -x list_lists mailman_lists
             return
             ;;

diff --git a/completions/inject b/completions/inject
@@ -9,7 +9,7 @@ _comp_cmd_inject()
         -l | --listname)
             # Prefer `list_lists` in the same dir as command
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen -x list_lists mailman_lists
             return
             ;;

diff --git a/completions/list_admins b/completions/list_admins
@@ -10,7 +10,7 @@ _comp_cmd_list_admins()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/list_members b/completions/list_members
@@ -28,7 +28,7 @@ _comp_cmd_list_members()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/list_owners b/completions/list_owners
@@ -10,7 +10,7 @@ _comp_cmd_list_owners()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/mysql b/completions/mysql
@@ -24,7 +24,7 @@ _comp_cmd_mysql()
 
     # Prefer `mysqlshow` in the same dir as the command
     local pathcmd
-    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
 
     local noargopts='!(-*|*[uDhSPeI]*)'
     # shellcheck disable=SC2254

diff --git a/completions/newlist b/completions/newlist
@@ -19,7 +19,7 @@ _comp_cmd_newlist()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 } &&

diff --git a/completions/perl b/completions/perl
@@ -107,7 +107,7 @@ _comp_cmd_perldoc()
 
     # Prefer `perl` in the same dir in utility functions
     local pathcmd
-    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
 
     case $prev in
         -*[hVnoMwL])

diff --git a/completions/pydoc b/completions/pydoc
@@ -25,7 +25,7 @@ _comp_cmd_pydoc()
     if ! _comp_looks_like_path "$cur"; then
         # Prefer python in the same dir for resolving modules
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -ax python modules
     fi
 

diff --git a/completions/remove_members b/completions/remove_members
@@ -20,7 +20,7 @@ _comp_cmd_remove_members()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/rmlist b/completions/rmlist
@@ -10,7 +10,7 @@ _comp_cmd_rmlist()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/rpm b/completions/rpm
@@ -262,7 +262,7 @@ _comp_cmd_rpmbuild()
         --target | --eval | -${noargopts}E | --buildpolicy)
             # Prefer `rpm` in the same dir in utility functions
             local pathcmd
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             ;;&
         --target)
             _comp_cmd_rpm__buildarchs

diff --git a/completions/ssh b/completions/ssh
@@ -404,7 +404,7 @@ _comp_cmd_sftp()
 
     # Prefer `ssh` from same dir for resolving options, etc
     local pathcmd
-    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
 
     _comp_xfunc_ssh_compgen_suboption_check && return
 
@@ -556,7 +556,7 @@ _comp_cmd_scp()
 
     # Prefer `ssh` from same dir for resolving options, remote files, etc
     local pathcmd
-    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
 
     _comp_xfunc_ssh_compgen_suboption_check && {
         ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]/%/ }")

diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id
@@ -7,7 +7,7 @@ _comp_cmd_ssh_copy_id()
 
     # Prefer `ssh` from same dir for resolving options, etc
     local pathcmd
-    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+    pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
 
     _comp_compgen -x ssh suboption_check && return
 

diff --git a/completions/ssh-keygen b/completions/ssh-keygen
@@ -101,7 +101,7 @@ _comp_cmd_ssh_keygen()
         -*t)
             # Prefer `ssh` from same dir for resolving options, etc
             local pathcmd protocols
-            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
             _comp_compgen -v protocols -x ssh query protocol-version
             local types='dsa ecdsa ecdsa-sk ed25519 ed25519-sk rsa'
             if [[ ${protocols[*]} == *1* ]]; then

diff --git a/completions/sync_members b/completions/sync_members
@@ -24,7 +24,7 @@ _comp_cmd_sync_members()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi
 

diff --git a/completions/withlist b/completions/withlist
@@ -10,7 +10,7 @@ _comp_cmd_withlist()
     else
         # Prefer `list_lists` in the same dir as command
         local pathcmd
-        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        pathcmd=$(type -P -- "$1") && local PATH=${pathcmd%/*}:$PATH
         _comp_compgen -x list_lists mailman_lists
     fi