2 Commits
0.3.2 ... 0.3.4

Author SHA1 Message Date
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

16
ssm
View File

@@ -280,6 +280,7 @@ info() {
"$_status_label" "$_status" "$_status_label" "$_status"
"Exec" "${service_command[*]} ${service_args[*]}" "Exec" "${service_command[*]} ${service_args[*]}"
"Respawn" "${service_respawn:-false}" "Respawn" "${service_respawn:-false}"
"Config path" "${service_config}"
) )
[[ "$_status" == 'yes' ]] && { [[ "$_status" == 'yes' ]] && {
@@ -352,6 +353,15 @@ main() {
service_path=( "$XDG_CONFIG_HOME/ssm/services" ) service_path=( "$XDG_CONFIG_HOME/ssm/services" )
cfg_path=( "$XDG_CONFIG_HOME/ssm" ) 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" rundir="$XDG_RUNTIME_DIR/ssm"
logdir="$HOME/log/ssm" logdir="$HOME/log/ssm"
else else
@@ -359,6 +369,12 @@ main() {
logdir='/var/log/ssm' logdir='/var/log/ssm'
fi 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 # Common service path
service_path+=( '/etc/ssm/services' "$rundir/services" "$usrdir/services" ) service_path+=( '/etc/ssm/services' "$rundir/services" "$usrdir/services" )