ddns-scripts: update bind-nsupdate to json

Signed-off-by: Florian Eckert <redacted>

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index fe9497787c27e03e7df1c2db2b30145b920dde7d..1a82b298cdf03e12a2f61cc6384265a4b43458d6 100755 (executable)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -432,17 +432,17 @@ endef
 define Package/ddns-scripts_nsupdate/install
        $(INSTALL_DIR) $(1)/etc/uci-defaults
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.defaults $(1)/etc/uci-defaults/ddns_nsupdate
+
        $(INSTALL_DIR) $(1)/usr/lib/ddns
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/update_nsupdate.sh $(1)/usr/lib/ddns
+       $(INSTALL_BIN) ./files/usr/lib/ddns/update_nsupdate.sh \
+               $(1)/usr/lib/ddns
+
+       $(INSTALL_DIR) $(1)/usr/share/ddns/services
+       $(INSTALL_DATA) ./files/usr/share/ddns/services/bind-nsupdate.json \
+               $(1)/usr/share/ddns/services
 endef
 define Package/ddns-scripts_nsupdate/postinst
        #!/bin/sh
-       # remove old services file entries
-       /bin/sed -i '/bind-nsupdate/d' $${IPKG_INSTROOT}/etc/ddns/services      >/dev/null 2>&1
-       /bin/sed -i '/bind-nsupdate/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1
-       # and create new
-       printf "%s\\t%s\\n" '"bind-nsupdate"' '"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services
-       printf "%s\\t%s\\n" '"bind-nsupdate"' '"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6
        # on real system restart service if enabled
        [ -z "$${IPKG_INSTROOT}" ] && {
                [ -x /etc/uci-defaults/ddns_nsupdate ] && \
@@ -457,9 +457,6 @@ define Package/ddns-scripts_nsupdate/prerm
        #!/bin/sh
        # if NOT run buildroot then stop service
        [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop                     >/dev/null 2>&1
-       # remove services file entries
-       /bin/sed -i '/bind-nsupdate/d' $${IPKG_INSTROOT}/etc/ddns/services      >/dev/null 2>&1
-       /bin/sed -i '/bind-nsupdate/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1
        exit 0  # suppress errors
 endef
 

diff --git a/net/ddns-scripts/files/update_nsupdate.sh b/net/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from net/ddns-scripts/files/update_nsupdate.sh
rename to net/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh

diff --git a/net/ddns-scripts/files/usr/share/ddns/services/bind-nsupdate.json b/net/ddns-scripts/files/usr/share/ddns/services/bind-nsupdate.json
new file mode 100644 (file)
index 0000000..f91806a
--- /dev/null
+++ b/net/ddns-scripts/files/usr/share/ddns/services/bind-nsupdate.json
@@ -0,0 +1,9 @@
+{
+       "name": "bind-nsupdate",
+       "ipv4": {
+               "url": "update_nsupdate.sh"
+       },
+       "ipv6": {
+               "url": "update_nsupdate.sh"
+       }
+}