gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

s6.eclass: consistent style

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/28912
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2023-01-02 23:01:38 +01:00
parent fdc4dad8e5
commit 649cc28861
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
eclass/s6.eclass
View File

@@ -42,7 +42,7 @@ _s6_get_servicedir() {
# @DESCRIPTION:
# Output the path for the s6 service directory (not including ${D}).
s6_get_servicedir() {
debug-print-function ${FUNCNAME} "${@}"
debug-print-function ${FUNCNAME} "$@"
echo "${EPREFIX}$(_s6_get_servicedir)"
}
@@ -55,22 +55,22 @@ s6_get_servicedir() {
# run is the run script for the service.
# finish is the optional finish script for the service.
s6_install_service() {
debug-print-function ${FUNCNAME} "${@}"
debug-print-function ${FUNCNAME} "$@"
local name="$1"
local run="$2"
local finish="$3"
[[ $name ]] ||
[[ -z ${name} ]] &&
die "${ECLASS}.eclass: you must specify the s6 service name"
[[ $run ]] ||
[[ -z ${run} ]] &&
die "${ECLASS}.eclass: you must specify the s6 service run script"
(
local servicepath="$(_s6_get_servicedir)/$name"
exeinto "$servicepath"
newexe "$run" run
[[ $finish ]] && newexe "$finish" finish
local servicepath="$(_s6_get_servicedir)/${name}"
exeinto "${servicepath}"
newexe "${run}" run
[[ -n ${finish} ]] && newexe "${finish}" finish
)
}
@@ -81,18 +81,17 @@ s6_install_service() {
# default.
# servicename is the name of the service.
s6_service_down() {
debug-print-function ${FUNCNAME} "${@}"
debug-print-function ${FUNCNAME} "$@"
local name="$1"
[[ $name ]] ||
[[ -z ${name} ]] &&
die "${ECLASS}.eclass: you must specify the s6 service name"
(
touch "$T"/down || die
local servicepath="$(_s6_get_servicedir)/$name"
insinto "$servicepath"
doins "$T"/down
touch "${T}"/down || die
local servicepath="$(_s6_get_servicedir)/${name}"
insinto "${servicepath}"
doins "${T}"/down
)
}
@@ -103,17 +102,16 @@ s6_service_down() {
# leader.
# servicename is the name of the service.
s6_service_nosetsid() {
debug-print-function ${FUNCNAME} "${@}"
debug-print-function ${FUNCNAME} "$@"
local name="$1"
[[ $name ]] ||
[[ -z ${name} ]] &&
die "${ECLASS}.eclass: you must specify the s6 service name"
(
touch "$T"/nosetsid || die
local servicepath="$(_s6_get_servicedir)/$name"
insinto "$servicepath"
doins "$T"/nosetsid
touch "${T}"/nosetsid || die
local servicepath="$(_s6_get_servicedir)/${name}"
insinto "${servicepath}"
doins "${T}"/nosetsid
)
}