init.d and reverse functions load order

Signed-off-by: fbt <fbt@fleshless.org>

ssm

@@ -4,11 +4,13 @@ shopt -s nullglob
 # Utility functions
 ## Make setting default values a bit less awkward
 default() {
-	declare -n _p=$1
+	declare -n _p=$1; shift
 
-	if ! [[ "$_p" ]]; then
-		_p=$2
-	fi
+	[[ "$_p" ]] || {
+		for v in "$@"; do
+			_p+=( "$v" )
+		done
+	}
 }
 
 ## Die. Why not?
@@ -96,7 +98,7 @@ pid_wait() {
 
 ## See if NAME is a function
 is_function() {
-	declare name=$1 name_tupe
+	declare name=$1 name_type
 
 	name_type=$( type -t "$name" )
 
@@ -109,7 +111,7 @@ is_function() {
 
 ## Simple timer
 timer() {
-	declare cnt timeout=$1
+	declare cnt=0 timeout=$1
 	shift
 
 	while ! "$@"; do
@@ -188,6 +190,8 @@ depend_ready() {
 super_start() {
 	(( service_running )) && return 3
 
+	rm -f "$service_stopped_flag"
+
 	[[ -f "${service_command[0]}" ]] || return 9
 
 	depend "${service_depends[@]}" || return 7
@@ -250,6 +254,7 @@ super_stop() {
 
 		nullexec kill -n "$service_stop_signal" "$service_pid" || return 1
 		pid_wait "$service_pid" || return 5
+		> "$service_stopped_flag"
 
 		return 0
 	fi
@@ -273,7 +278,7 @@ info() {
 		"Name"            "$service_name"
 		"Type"            "$_type"
 		"$_status_label"  "$_status"
-		"Exec"            "$service_command ${service_args[*]}"
+		"Exec"            "${service_command[*]} ${service_args[*]}"
 		"Respawn"         "${service_respawn:-false}"
 	)
 
@@ -312,12 +317,14 @@ restart() {
 	"$0" "$service_name" start
 }
 
-logs() { "${PAGER:-less}" "$service_logfile"; }
+logs() { ${PAGER:-less} "$service_logfile"; }
 
 ## Status is a bit of a special case. It's talkative.
 status() {
 	(( service_running )) && return 0
 	(( service_enabled )) && return 0
+	(( service_stopped )) && return 7
+
 	return 1
 }
 
@@ -335,25 +342,36 @@ main() {
 	# Let's set some defaults
 	service_managed=1
 
+	usrdir='/usr/share/ssm'
+
 	if (( $UID )); then
 		# XDG stuff
 		default XDG_CONFIG_HOME "$HOME/.config"
 		default XDG_RUNTIME_DIR "/run/user/$UID"
 
-		cfgdir="$XDG_CONFIG_HOME/ssm"
+		service_path=( "$XDG_CONFIG_HOME/ssm/init.d" )
+		cfg_path=( "$XDG_CONFIG_HOME/ssm" )
+
 		rundir="$XDG_RUNTIME_DIR/ssm"
 		logdir="$HOME/log/ssm"
 	else
-		cfgdir='/etc/ssm'
 		rundir='/run/ssm'
 		logdir='/var/log/ssm'
 	fi
 
-	service_path+=( "$cfgdir/init.d" "$rundir/services" )
+	# Common service path
+	service_path+=( '/etc/ssm/init.d' "$rundir/services" "$usrdir/services" )
+
+	# Common config path
+	cfg_path+=( '/etc/ssm/conf.d' )
 
 	# Load custom functions
-	for f in "$cfgdir/functions"/*; do
-		source "$f" || die 9 "Failed to source functions from $f"
+	for (( idx=${#cfg_path[@]}-1; idx>=0; idx-- )); do
+		cfg_dir="${cfg_path[idx]}"
+
+		for f in "$cfg_dir/functions"/*; do
+			source "$f" || die 9 "Failed to source functions from $f"
+		done
 	done
 	
 	# Now create the needed runtime stuff
@@ -367,7 +385,10 @@ main() {
 		service_config=$1
 	else
 		for i in "${service_path[@]}"; do
-			[[ -f "$i/$1" ]] && service_config="$i/$1"
+			[[ -f "$i/$1" ]] && {
+				service_config="$i/$1"
+				break
+			}
 		done
 	fi
 
@@ -381,12 +402,15 @@ main() {
 	svc_pidfile="$rundir/$service_name.pid"
 
 	# Get the service defaults
-	[[ -f "$cfgdir/conf.d/$service_name" ]] && {
-		source "$cfgdir/conf.d/$service_name" || die 5 "Failed to read service defaults: $cfgdir/conf.d/$service_name"
-	}
+	for p in "${cfg_path[@]}"; do
+		[[ -f "$p/conf.d/$service_name" ]] && {
+			source "$p/conf.d/$service_name" || die 5 "Failed to read service defaults: $p/conf.d/$service_name"
+			break
+		}
+	done
 
 	# Get the service config
-	source -- "$service_config" "${@:3}" || die 7 "Failed to read the service config: $cfgdir/init.d/$service_name"
+	source -- "$service_config" "${@:3}" || die 7 "Failed to read the service config: $service_config"
 	
 	# Legacy
 	[[ "$service_args" ]] && service_command=( "${service_command[@]}" "${service_args[@]}" )
@@ -402,17 +426,16 @@ main() {
 	fi
 
 	# Service-level defaults
-	default service_pidfile "$svc_pidfile"
-	default service_logfile "$logdir/$service_name.log"
-	default service_stop_timeout 30
-	default service_ready_timeout 15
-	default service_stop_signal 15
-	default service_reload_signal 1
-	default service_ready_flag "$rundir/$service_name.ready"
-	default service_enabled_flag "$rundir/$service_name.enabled"
-
-	# default does not support arrays
-	[[ "$service_signals" ]] || service_signals=( 1 10 12 )
+	default service_pidfile         "$svc_pidfile"
+	default service_logfile         "$logdir/$service_name.log"
+	default service_ready_flag      "$rundir/$service_name.ready"
+	default service_enabled_flag    "$rundir/$service_name.enabled"
+	default service_stopped_flag    "$rundir/$service_name.stopped"
+	default service_stop_timeout    30
+	default service_ready_timeout   15
+	default service_stop_signal     15
+	default service_reload_signal   1
+	default service_signals         1 10 12
 
 	# Let's see if there's a PID
 	if [[ -f "$service_pidfile" ]]; then
@@ -430,9 +453,20 @@ main() {
 		service_enabled=1
 	fi
 
+	# Let's see if the service was deliberately stopped
+	if [[ -f "$service_stopped_flag" ]]; then
+		# Ooh, it was.
+		service_stopped=1
+	fi
+
 	# Check if action is even defined
 	is_function "$2" || die 17 "Function $2 is not defined for $service_name."
 
+	# cd into the workdir, if defined.
+	[[ "$service_workdir" ]] && {
+		cd "$service_workdir" || die $?
+	}
+
 	# Run pre_$action function
 	if is_function "pre_$2"; then
 		"pre_$2" || {
@@ -475,7 +509,8 @@ main() {
 			else
 				result "$res" \
 					0 "$service_name is running" \
-					1 "$service_name is not running"
+					1 "$service_name is not running" \
+					7 "$service_name was stopped"
 			fi
 		;;
 	esac