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" ]] || {
-		_p=$2
+		for v in "$@"; do
-	fi
+			_p+=( "$v" )
+		done
+	}
 }
 
 ## Die. Why not?
@@ -340,26 +342,37 @@ 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
+	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
 	for d in "$rundir" "$logdir"; do
@@ -372,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
 
@@ -386,12 +402,15 @@ main() {
 	svc_pidfile="$rundir/$service_name.pid"
 
 	# Get the service defaults
-	[[ -f "$cfgdir/conf.d/$service_name" ]] && {
+	for p in "${cfg_path[@]}"; do
-		source "$cfgdir/conf.d/$service_name" || die 5 "Failed to read service defaults: $cfgdir/conf.d/$service_name"
+		[[ -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[@]}" )
@@ -409,16 +428,14 @@ main() {
 	# Service-level defaults
 	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_ready_flag "$rundir/$service_name.ready"
+	default service_signals         1 10 12
-	default service_enabled_flag "$rundir/$service_name.enabled"
-	default service_stopped_flag "$rundir/$service_name.stopped"
-
-	# default does not support arrays
-	[[ "$service_signals" ]] || service_signals=( 1 10 12 )
 
 	# Let's see if there's a PID
 	if [[ -f "$service_pidfile" ]]; then