From: George Sapkin <george@sapk.in>
Date: Sat, 1 Nov 2025 00:36:21 +0000 (+0200)
Subject: syncthing: improve argument handling readability
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e04e9eda6fc6ac550a0113da938584f17e6234b7;p=feed%2Fpackages.git

syncthing: improve argument handling readability

Remove reduntant checks when making directories.

Signed-off-by: George Sapkin <george@sapk.in>
---

diff --git a/utils/syncthing/files/stdiscosrv.init b/utils/syncthing/files/stdiscosrv.init
index bc1da536a5..d1d3476552 100644
--- a/utils/syncthing/files/stdiscosrv.init
+++ b/utils/syncthing/files/stdiscosrv.init
@@ -48,20 +48,26 @@ start_service() {
 
 	local group=$(id -gn $user)
 
-	[ -d "$db_dir" ] || mkdir -p "$db_dir"
+	mkdir -p "$db_dir"
 	[ -d "$conf_dir" ] && chown -R "$user":"$group" "$conf_dir"
 
 	procd_open_instance
+
 	procd_set_param command "$PROG"
 	procd_append_param command --cert="$cert"
-	[ "$compression" -eq 0 ] || procd_append_param command --compression
+	[ "$compression" -eq 0 ] || \
+		procd_append_param command --compression
 	procd_append_param command --db-dir="$db_dir"
-	[ -z "$db_flush_interval" ] || procd_append_param command --db-flush-interval="$db_flush_interval"
-	[ "$debug" -eq 0 ] || procd_append_param command --debug
-	[ "$http" -eq 0 ] || procd_append_param command --http
+	[ -z "$db_flush_interval" ] || \
+		procd_append_param command --db-flush-interval="$db_flush_interval"
+	[ "$debug" -eq 0 ] || \
+		procd_append_param command --debug
+	[ "$http" -eq 0 ] || \
+		procd_append_param command --http
 	procd_append_param command --key="$key"
 	procd_append_param command --listen="$listen"
-	[ -z "$metrics_listen" ] || procd_append_param command --metrics-listen="$metrics_listen"
+	[ -z "$metrics_listen" ] || \
+		procd_append_param command --metrics-listen="$metrics_listen"
 
 	procd_set_param nice "$nice"
 	procd_set_param term_timeout 15
@@ -70,6 +76,7 @@ start_service() {
 	procd_set_param respawn
 	procd_set_param stdout 1
 	procd_set_param stderr 1
+
 	procd_close_instance
 }
 
diff --git a/utils/syncthing/files/strelaysrv.init b/utils/syncthing/files/strelaysrv.init
index bdd472ba40..5bb53a9449 100644
--- a/utils/syncthing/files/strelaysrv.init
+++ b/utils/syncthing/files/strelaysrv.init
@@ -56,34 +56,51 @@ start_service() {
 
 	local group=$(id -gn $user)
 
-	[ -d "$keys" ] || mkdir -p "$keys"
+	mkdir -p "$keys"
 	[ -d "$keys" ] && chown -R "$user":"$group" "$keys"
 
 	config_get nice strelaysrv nice "0"
 
 	procd_open_instance
+
 	procd_set_param command "$PROG"
-	[ "$debug" -eq 0 ] || procd_append_param command -debug
-	[ -z "$ext_address" ] || procd_append_param command -ext-address="$ext_address"
-	[ -z "$global_rate" ] || procd_append_param command -global-rate="$global_rate"
+	[ "$debug" -eq 0 ] || \
+		procd_append_param command -debug
+	[ -z "$ext_address" ] || \
+		procd_append_param command -ext-address="$ext_address"
+	[ -z "$global_rate" ] || \
+		procd_append_param command -global-rate="$global_rate"
 	procd_append_param command -keys="$keys"
-	[ -z "$listen" ] || procd_append_param command -listen="$listen"
-	[ -z "$message_timeout" ] || procd_append_param command -message-timeout="$message_timeout"
-	[ "$nat" -eq 0 ] || procd_append_param command -nat
-	[ -z "$nat_lease" ] || procd_append_param command -nat-lease="$nat_lease"
-	[ -z "$nat_renewal" ] || procd_append_param command -nat-renewal="$nat_renewal"
-	[ -z "$nat_timeout" ] || procd_append_param command -nat-timeout="$nat_timeout"
-	[ -z "$network_timeout" ] || procd_append_param command -network-timeout="$network_timeout"
-	[ -z "$per_session_rate" ] || procd_append_param command -per-session-rate="$per_session_rate"
-	[ -z "$ping_interval" ] || procd_append_param command -ping-interval="$ping_interval"
+	[ -z "$listen" ] || \
+		procd_append_param command -listen="$listen"
+	[ -z "$message_timeout" ] || \
+		procd_append_param command -message-timeout="$message_timeout"
+	[ "$nat" -eq 0 ] || \
+		procd_append_param command -nat
+	[ -z "$nat_lease" ] || \
+		procd_append_param command -nat-lease="$nat_lease"
+	[ -z "$nat_renewal" ] || \
+		procd_append_param command -nat-renewal="$nat_renewal"
+	[ -z "$nat_timeout" ] || \
+		procd_append_param command -nat-timeout="$nat_timeout"
+	[ -z "$network_timeout" ] || \
+		procd_append_param command -network-timeout="$network_timeout"
+	[ -z "$per_session_rate" ] || \
+		procd_append_param command -per-session-rate="$per_session_rate"
+	[ -z "$ping_interval" ] || \
+		procd_append_param command -ping-interval="$ping_interval"
 	# pools is set to an empty value by default
 	procd_append_param command -pools="$pools"
-	[ "$pprof" -eq 0 ] || procd_append_param command -pprof
-	[ -z "$protocol" ] || procd_append_param command -protocol="$protocol"
-	[ -z "$provided_by" ] || procd_append_param command -provided-by="$provided_by"
+	[ "$pprof" -eq 0 ] || \
+		procd_append_param command -pprof
+	[ -z "$protocol" ] || \
+		procd_append_param command -protocol="$protocol"
+	[ -z "$provided_by" ] || \
+		procd_append_param command -provided-by="$provided_by"
 	# status-srv is set to an empty value by default
 	procd_append_param command -status-srv="$status_srv"
-	[ -z "$token" ] || procd_append_param command -token="$token"
+	[ -z "$token" ] || \
+		procd_append_param command -token="$token"
 
 	procd_set_param nice "$nice"
 	procd_set_param term_timeout 15
@@ -92,6 +109,7 @@ start_service() {
 	procd_set_param respawn
 	procd_set_param stdout 1
 	procd_set_param stderr 1
+
 	procd_close_instance
 }
 
diff --git a/utils/syncthing/files/syncthing.init b/utils/syncthing/files/syncthing.init
index 13c20dbd81..f51dc32b52 100644
--- a/utils/syncthing/files/syncthing.init
+++ b/utils/syncthing/files/syncthing.init
@@ -54,7 +54,7 @@ start_service() {
 
 	[ "$enabled" -gt 0 ] || return 0
 
-	[ -d "$home" ] || mkdir -p "$home"
+	mkdir -p "$home"
 	# A separate step to handle an upgrade use case
 	[ -d "$home" ] && chown -R $user:$group "$home"
 
@@ -69,15 +69,21 @@ start_service() {
 	procd_set_param command "$PROG"
 	procd_set_param env GOMAXPROCS="$macprocs"
 	procd_append_param command serve
-	[ -z "$db_delete_retention_interval" ] || procd_append_param command --db-delete-retention-interval="$db_delete_retention_interval"
-	[ -z "$db_maintenance_interval" ] || procd_append_param command --db-maintenance-interval="$db_maintenance_interval"
+	[ -z "$db_delete_retention_interval" ] || \
+		procd_append_param command --db-delete-retention-interval="$db_delete_retention_interval"
+	[ -z "$db_maintenance_interval" ] || \
+		procd_append_param command --db-maintenance-interval="$db_maintenance_interval"
 	procd_append_param command --gui-address="$gui_address"
-	[ -z "$gui_apikey" ] || procd_append_param command --gui_apikey="$gui_apikey"
+	[ -z "$gui_apikey" ] || \
+		procd_append_param command --gui_apikey="$gui_apikey"
 	procd_append_param command --home="$home"
 	procd_append_param command --log-file="$log_file"
-	[ -z "$log_level" ] || procd_append_param command --log-level="$log_level"
-	[ -z "$log_max_old_files" ] || procd_append_param command --log-max-old-files="$log_max_old_files"
-	[ -z "$log_max_size" ] || procd_append_param command --log-max-size="$log_max_size"
+	[ -z "$log_level" ] || \
+		procd_append_param command --log-level="$log_level"
+	[ -z "$log_max_old_files" ] || \
+		procd_append_param command --log-max-old-files="$log_max_old_files"
+	[ -z "$log_max_size" ] || \
+		procd_append_param command --log-max-size="$log_max_size"
 	procd_append_param command --no-browser
 	procd_append_param command --no-port-probing
 	procd_append_param command --no-restart