luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 15:33:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

completion: Invoke the command being completed

Browse Source 
As suggested by Ville Skyttä in
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4012#note_2084405,
make sure to invoke the copy of the command which is being completed
when asking for completions of a given subcommand.

This avoids accidentally invoking any old `gdbus`/`gresource`/etc.
binary which is hanging around in another part of `$PATH`.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall
2024-04-17 15:08:43 +01:00
parent 869ef92858
commit cc22637856
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gio/completion/gapplication
View File

@@ -7,6 +7,9 @@
####################################################################################################
__app() {
local gapplication_binary
gapplication_binary="$1"
case "${COMP_CWORD}" in
1)
# shellcheck disable=SC2207
@@ -18,7 +21,7 @@ __app() {
case "${COMP_WORDS[1]}" in
launch|action|list-actions)
# shellcheck disable=SC2207
COMPREPLY=($(compgen -W "$(gapplication list-apps)" -- "${COMP_WORDS[2]}"))
COMPREPLY=($(compgen -W "$("$gapplication_binary" list-apps)" -- "${COMP_WORDS[2]}"))
return 0
;;
@@ -36,7 +39,7 @@ __app() {
# Word 3 is the action name. This is the only one we can help with.
if [ "${COMP_CWORD}" == 3 ]; then
# shellcheck disable=SC2207
COMPREPLY=($(compgen -W "$(gapplication list-actions "${COMP_WORDS[2]}")" -- "${COMP_WORDS[3]}"))
COMPREPLY=($(compgen -W "$("$gapplication_binary" list-actions "${COMP_WORDS[2]}")" -- "${COMP_WORDS[3]}"))
return 0
else
COMPREPLY=()