88 lines
3.5 KiB
Diff
88 lines
3.5 KiB
Diff
|
Based on c317a1a19cd9584e07ee43f1b6fafc26c2c75cca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Cook <llua@gmx.com>
|
||
|
|
Date: Sun, 27 Jul 2014 15:07:03 -0400
|
||
|
|
Subject: [PATCH] shell-completion: prevent mangling unit names (bash)
|
||
|
|
|
||
|
|
This fixes the issue noted by Zbigniew in most cases.
|
||
|
|
if a unit's name is enclosed in single quotes completion still
|
||
|
|
will not happen after the first `\'.
|
||
|
|
|
||
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=78388
|
||
|
|
---
|
||
|
|
shell-completion/bash/systemctl.in | 13 ++++++++++++-
|
||
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git shell-completion/bash/systemctl.in shell-completion/bash/systemctl.in
|
||
|
|
index 69ef04b..64b15df 100644
|
||
|
|
--- shell-completion/bash/systemctl
|
||
|
|
+++ shell-completion/bash/systemctl
|
||
|
|
@@ -158,20 +158,25 @@ _systemctl () {
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
|
||
|
|
comps=$( __get_all_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then
|
||
|
|
comps=$( __get_enabled_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
|
||
|
|
comps=$( __get_disabled_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then
|
||
|
|
comps=$( __get_disabled_units $mode;
|
||
|
|
__get_enabled_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
|
||
|
|
comps=$( __filter_units_by_property $mode CanStart yes \
|
||
|
|
$( __get_startable_units $mode))
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
|
||
|
|
comps=$( __filter_units_by_property $mode CanStart yes \
|
||
|
|
@@ -179,24 +184,30 @@ _systemctl () {
|
||
|
|
| while read -r line; do \
|
||
|
|
[[ "$line" =~ \.(device|snapshot|socket|timer)$ ]] || echo " $line"; \
|
||
|
|
done ))
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
|
||
|
|
comps=$( __filter_units_by_property $mode CanStop yes \
|
||
|
|
$( __get_active_units $mode ) )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
|
||
|
|
comps=$( __filter_units_by_property $mode CanReload yes \
|
||
|
|
$( __get_active_units $mode ) )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
|
||
|
|
comps=$( __filter_units_by_property $mode AllowIsolate yes \
|
||
|
|
$( __get_all_units $mode ) )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
|
||
|
|
comps=$( __get_failed_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then
|
||
|
|
comps=$( __get_masked_units $mode )
|
||
|
|
+ compopt -o filenames
|
||
|
|
|
||
|
|
elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then
|
||
|
|
comps=''
|
||
|
|
@@ -221,7 +232,7 @@ _systemctl () {
|
||
|
|
| { while read -r a b; do echo " $a"; done; } )
|
||
|
|
fi
|
||
|
|
|
||
|
|
- COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
|
||
|
|
+ COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") )
|
||
|
|
return 0
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|