From 5a9b1b1b57f8ce6e56d66770758a5b2611a3a1fe Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Thu, 26 Feb 2015 21:50:45 +0100 Subject: [PATCH] Revert "Adjust filters a bit" - it doesn't work for .service Unfortunately, list-unit-files doesn't understand --state=loaded This needs a new function to explicitly use list-units This reverts commit 9f521b7694780c1e3606c6c58ad7aca78c5cfdca. --- share/completions/systemctl.fish | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/share/completions/systemctl.fish b/share/completions/systemctl.fish index 652581106..748462f93 100644 --- a/share/completions/systemctl.fish +++ b/share/completions/systemctl.fish @@ -29,25 +29,12 @@ complete -f -c systemctl -n "not __fish_seen_subcommand_from $commands" -a enabl complete -f -c systemctl -n "not __fish_seen_subcommand_from $commands" -a disable -d 'Disable one or more units' complete -f -c systemctl -n "not __fish_seen_subcommand_from $commands" -a isolate -d 'Start a unit and dependencies and disable all others' complete -f -c systemctl -n "not __fish_seen_subcommand_from $commands" -a set-default -d 'Set the default target to boot into' -for command in restart try-restart reload-or-restart reload-or-try-restart is-active is-failed is-enabled reenable loaded link list-dependencies show status\ - condrestart force-reload # these are aliases for try-restart and reload-or-try-restart, respectively. Intentionally don't offer them as command options +for command in start stop restart try-restart reload-or-restart reload-or-try-restart is-active is-failed is-enabled reenable mask loaded link list-dependencies show status for t in $types complete -f -c systemctl -n "__fish_seen_subcommand_from $command" -a "(eval __fish_systemctl_$t)" end end -for t in $types - complete -f -c systemctl -n "__fish_seen_subcommand_from unmask" -a "(eval __fish_systemctl_$t --state masked)" - # These are intentionally not documented so far (http://lists.freedesktop.org/archives/systemd-devel/2015-January/026805.html) - # and there's no performant way to do a "!masked" - # so we assume that LOADED can only be masked, loaded or not-found - complete -f -c systemctl -n "__fish_seen_subcommand_from mask" -a "(eval __fish_systemctl_$t --state loaded --state not-found)" - complete -f -c systemctl -n "__fish_seen_subcommand_from stop" -a "(eval __fish_systemctl_$t --state loaded,active,running)" - # Unfortunately, "--state=loaded,inactive" doesn't seem to work (systemd 218) - # at least filter out not-found and masked states (these error out) - complete -f -c systemctl -n "__fish_seen_subcommand_from start" -a "(eval __fish_systemctl_$t --state loaded)" -end - # Enable/Disable: Only show units with matching state for t in services sockets timers service_paths complete -f -c systemctl -n "__fish_seen_subcommand_from enable" -a "(eval __fish_systemctl_$t --state=disabled)" @@ -58,8 +45,6 @@ end # .device in particular creates too much noise for t in devices slices scopes swaps complete -f -c systemctl -n "__fish_seen_subcommand_from status" -a '(eval __fish_systemctl_$t)' - complete -f -c systemctl -n "__fish_seen_subcommand_from show" -a '(eval __fish_systemctl_$t)' - complete -f -c systemctl -n "__fish_seen_subcommand_from list-dependencies" -a '(eval __fish_systemctl_$t)' end complete -f -c systemctl -n "__fish_seen_subcommand_from isolate" -a '(__fish_systemctl_targets)' -d 'Target'