p910nd: init: line-break and conditionalize mDNS properties

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit d939c5c3aafcc10db5273bb242469eff0bea6d14)

diff --git a/net/p910nd/files/p910nd.init b/net/p910nd/files/p910nd.init
index ad0ddfe11c9bf55d6fc791fe9fc468794c8b2255..1c305a80f8b551d2a849230cf25ece2d4e1f0b2f 100644 (file)
--- a/net/p910nd/files/p910nd.init
+++ b/net/p910nd/files/p910nd.init
@@ -54,7 +54,19 @@ start_p910nd() {
                        config_get mdns_mfg "$section" mdns_mfg
                        config_get mdns_mdl "$section" mdns_mdl
                        config_get mdns_cmd "$section" mdns_cmd
-                       procd_add_mdns "pdl-datastream" "tcp" "$((port+9100))" "note=$mdns_note" "ty=$mdns_ty" "product=$mdns_product" "usb_MFG=$mdns_mfg" "usb_MDL=$mdns_mdl" "usb_CMD=$mdns_cmd"
+
+                       # Set initial arguments
+                       set -- "pdl-datastream" "tcp" "$((port+9100))"
+                       # bonjourprinting-1.2.1.pdf spec mandates (at least) MFG, MDL, CMD for Socket type
+                       [ -n "$mdns_note" ] && set -- "$@" "note=$mdns_note"
+                       [ -n "$mdns_ty" ] && set -- "$@" "ty=$mdns_ty"
+                       [ -n "$mdns_product" ] && set -- "$@" "product=$mdns_product"
+                       [ -n "$mdns_mfg" ] && set -- "$@" "usb_MFG=$mdns_mfg"
+                       [ -n "$mdns_mdl" ] && set -- "$@" "usb_MDL=$mdns_mdl"
+                       [ -n "$mdns_cmd" ] && set -- "$@" "usb_CMD=$mdns_cmd"
+
+                       # Call procd_add_mdns with the positional parameters
+                       procd_add_mdns "$@"
                fi
                procd_close_instance
        fi