Spark
/
ssm
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

service path 

Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2021-01-24 19:36:37 +03:00
parent 608e7d4d9d
commit 7c584eb8ee
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssm
View File

@ -677,14 +677,6 @@ case "$0" in
(*) _self = "$PWD/$0";;
esac
# Warn the user of deprecated stuff.
for p in "/etc/ssm/init.d" "$XDG_CONFIG_HOME/ssm/init.d"; do
if [[ -d "$p" ]]; then
printf 'WARNING: `%s` was renamed to `%s`! Please move your scripts accordingly!\n' "$p" "${p%init.d}services" >&2
service_path += "$p"
fi
done
# Source the config
if cfg_file is file; then
source "$cfg_file" || die 37 "Failed to load config: $cfg_file"
@ -746,7 +738,11 @@ for d in "$rundir" "$rundir/current" "$logdir"; do
done
# Common service path
service_path += "$rundir/current" "$XDG_CONFIG_HOME/ssm/services" '/etc/ssm/services' "$usrdir/services"
if (( UID )); then
service_path += "$rundir/current" "$XDG_CONFIG_HOME/ssm/services" '/etc/ssm/services' "$usrdir/services"
else
service_path += "$rundir/current" '/etc/ssm/services' "$usrdir/services"
fi
# Special actions
if flag_list_services; then