R/ssm
2
0
Fork 0
forked from Spark/ssm
Code Issues Pull Requests Releases Wiki Activity

just some silly refactoring

Browse Source 
Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2017-12-16 00:36:32 +03:00
parent 873f0f6809
commit c48486cacf
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssm
View File

@ -415,10 +415,9 @@ main() {
svc_pidfile="$rundir/$service_name.pid" svc_pidfile="$rundir/$service_name.pid"
# Get the service defaults # Get the service defaults
for p in "${cfg_path[@]}"; do for p in "${cfg_path[@]/%//$service_name}"; do
[[ -f "$p/conf.d/$service_name" ]] && { [[ -f "$p" ]] && {
source "$p/conf.d/$service_name" || die 5 "Failed to read service defaults: $p/conf.d/$service_name" source "$p" || die 5 "Failed to read service defaults: $p"
break
} }
done done
@ -431,7 +430,6 @@ main() {
[[ "$service_type" == 'oneshot' ]] && service_oneshot=1 [[ "$service_type" == 'oneshot' ]] && service_oneshot=1
(( service_oneshot )) && service_managed=0 (( service_oneshot )) && service_managed=0
[[ "$service_pidfile" ]] && service_managed=0 [[ "$service_pidfile" ]] && service_managed=0
if ! (( service_managed )); then if ! (( service_managed )); then