github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 18:03:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

systemctl completions: Use --plain where appropriate

Browse Source 
The --plain flag drops the '●'-glyph and generally makes the output more
suitable for automated processing.
This commit is contained in:
Jouke Witteveen 2020-04-18 10:55:56 +02:00 committed by Fabian Homborg
parent 8e418f5205
commit 93b86bbe63
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/functions/__fish_systemctl.fish
View File

@ -74,12 +74,11 @@ function __fish_systemctl --description 'Call systemctl with some options from t
# Output looks like # Output looks like
# systemd-tmpfiles-clean.timer [more whitespace] loaded active waiting Daily Cleanup[...] # systemd-tmpfiles-clean.timer [more whitespace] loaded active waiting Daily Cleanup[...]
# Use the last part as the description. # Use the last part as the description.
# Note that in some cases this prints a "●" or "*" (with C locale) marker at the beginning of the line. We have to remove it. systemctl --full --no-legend --no-pager --plain --all list-units $passflags | string replace -r "(?: +(\S+)){4}" \t'$1'
systemctl --no-legend --no-pager --all list-units $passflags | string trim -c ' *●' | string replace -r "(?: +(\S+)){4}" \t'$1'
# We need this for disabled/static units. Also instance units without an active instance. # We need this for disabled/static units. Also instance units without an active instance.
# Output looks like # Output looks like
# systemd-tmpfiles-clean.timer static # systemd-tmpfiles-clean.timer static
# Just use the state as the description, since we won't get it here. # Just use the state as the description, since we won't get it here.
# This is an issue for units that appear in both. # This is an issue for units that appear in both.
systemctl --no-legend --no-pager --all list-unit-files $passflags | string trim -c ' *●' | string replace -r "(?: +(\S+)){1}" \t'$1' systemctl --full --no-legend --no-pager --plain --all list-unit-files $passflags | string replace -r "(?: +(\S+)){1}" \t'$1'
end end

8
share/functions/__fish_systemctl_services.fish
View File

@ -1,13 +1,13 @@
function __fish_systemctl_services function __fish_systemctl_services
if type -q systemctl if type -q systemctl
if __fish_contains_opt user if __fish_contains_opt user
systemctl --user list-unit-files --no-legend --type=service 2>/dev/null $argv | cut -f 1 -d ' ' systemctl --user list-unit-files --full --no-legend --no-pager --plain --type=service 2>/dev/null $argv | cut -f 1 -d ' '
systemctl --user list-units --state=loaded --no-legend --type=service 2>/dev/null | cut -f 1 -d ' ' systemctl --user list-units --state=loaded --full --no-legend --no-pager --plain --type=service 2>/dev/null | cut -f 1 -d ' '
else else
# list-unit-files will also show disabled units # list-unit-files will also show disabled units
systemctl list-unit-files --no-legend --type=service 2>/dev/null $argv | cut -f 1 -d ' ' systemctl list-unit-files --full --no-legend --no-pager --plain --type=service 2>/dev/null $argv | cut -f 1 -d ' '
# list-units will not show disabled units but will show instances (like wpa_supplicant@wlan0.service) # list-units will not show disabled units but will show instances (like wpa_supplicant@wlan0.service)
systemctl list-units --state=loaded --no-legend --type=service 2>/dev/null | cut -f 1 -d ' ' systemctl list-units --state=loaded --full --no-legend --no-pager --plain --type=service 2>/dev/null | cut -f 1 -d ' '
end end
end end
end end