Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

completions/sv.fish: update completion for sv, a part of runit.

Browse source 
This should fix finding the correct active svdir in most cases.

Search for services in the following order:

$SVDIR                      - User defined override
/run/runit/runsvdir/current - Value patched in by Void[1]
/run/runit/service          - Value patched in by Artix[2]
/etc/service                - Value patched in by Debian[3]
/services                   - Default value for runit[4]

Also don't use /etc for searching since it is not guaranteed that there
is an instance of runsvdir running in that directory.

Finally return quietly if there is no svdir.

[1] 75403cef76/srcpkgs/runit/template (L29)
[2] c9d691ce86/x86_64/core/PKGBUILD (L9)
[3] https://sources.debian.org/src/runit/2.1.2-41/debian/patches/0001-default-directory-for-services-on-Debian-is-etc-servi.diff/
[4] hard-coded in sv.c

Closes #8738
This commit is contained in:
lelgenio 2022-02-18 00:00:12 -03:00 committed by Johannes Altmanninger
parent c0be74c55a
commit 02c34a30eb
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
share/completions/sv.fish
View file

@ -10,15 +10,24 @@ set -l commands \
shutdown force-stop force-reload force-restart force-shutdown \ shutdown force-stop force-reload force-restart force-shutdown \
try-restart check try-restart check
function __fish_complete_sv_list_services function __fish_complete_sv_list_services
for dir in $SVDIR /run/runit/service/ /etc/runit/current /etc/runit/runsvdir/ set -l svdir
test -d $dir for candidate_svdir in \
and break "$SVDIR" \
/run/runit/runsvdir/current \
/run/runit/service \
/etc/services \
/services
if test -d $candidate_svdir
set svdir $candidate_svdir
break
end
end end
set -l services (string match -r '[^/]*$' $dir/*) set -q svdir[1]; or return
set -l out (sv status $services 2>/dev/null) set -l services (command ls $svdir)
and string replace -r "^(\w+: )(.*?):" '$2\t$1$2:' $out set -l sv_status (sv status $services 2>/dev/null |
string replace -ar ';.*$' '')
and string replace -r "^(\w+: )(.*?):" '$2\t$1' $sv_status
or printf "%s\n" $services or printf "%s\n" $services
end end