4 Commits
0.3.1 ... 0.3.5

Author SHA1 Message Date
fbt
32b26b5783 cfg_path bugfix
Signed-off-by: fbt <fbt@fleshless.org>
2017-12-10 20:13:51 +03:00
fbt
6f2db37dff Show the config path in the info
Signed-off-by: fbt <fbt@fleshless.org>
2017-12-10 19:48:22 +03:00
fbt
842662f3d5 Actually, let's move softly
Signed-off-by: fbt <fbt@fleshless.org>
2017-12-10 19:42:25 +03:00
fbt
d9f22bf634 init.d -> services
Signed-off-by: fbt <fbt@fleshless.org>
2017-12-10 19:27:51 +03:00
2 changed files with 19 additions and 4 deletions

View File

@@ -7,4 +7,3 @@ Services
--------
A service is a script in the ssm's init.d directory.
By default it's /etc/ssm/init.d for system services and $XDG_CONFIG_HOME/ssm/init.d for user ones.
ssm creates relevant dirs if they don't exist.

22
ssm
View File

@@ -280,6 +280,7 @@ info() {
"$_status_label" "$_status"
"Exec" "${service_command[*]} ${service_args[*]}"
"Respawn" "${service_respawn:-false}"
"Config path" "${service_config}"
)
[[ "$_status" == 'yes' ]] && {
@@ -349,9 +350,18 @@ main() {
default XDG_CONFIG_HOME "$HOME/.config"
default XDG_RUNTIME_DIR "/run/user/$UID"
service_path=( "$XDG_CONFIG_HOME/ssm/init.d" )
service_path=( "$XDG_CONFIG_HOME/ssm/services" )
cfg_path=( "$XDG_CONFIG_HOME/ssm" )
# Warn the user of deprecated stuff.
if [[ -d "$XDG_CONFIG_HOME/ssm/init.d" ]]; then
printf 'WARNING: `%s` was renamed to `%s`! Please move your scripts accordingly!\n' \
"$XDG_CONFIG_HOME/ssm/init.d" \
"$XDG_CONFIG_HOME/ssm/services" >&2
service_path+=( "$XDG_CONFIG_HOME/ssm/init.d" )
fi
rundir="$XDG_RUNTIME_DIR/ssm"
logdir="$HOME/log/ssm"
else
@@ -359,11 +369,17 @@ main() {
logdir='/var/log/ssm'
fi
# Warn the user of deprecated stuff.
if [[ -d "/etc/ssm/init.d" ]]; then
printf 'WARNING: `/etc/ssm/init.d` was renamed to `/etc/ssm/services`! Please move your scripts accordingly!\n' >&2
service_path+=( "/etc/ssm/init.d" )
fi
# Common service path
service_path+=( '/etc/ssm/init.d' "$rundir/services" "$usrdir/services" )
service_path+=( '/etc/ssm/services' "$rundir/services" "$usrdir/services" )
# Common config path
cfg_path+=( '/etc/ssm/conf.d' )
cfg_path+=( '/etc/ssm' )
# Load custom functions
for (( idx=${#cfg_path[@]}-1; idx>=0; idx-- )); do