From 463ed88dde82f162b6a6d33acf7d510bb96c32e1 Mon Sep 17 00:00:00 2001
From: Christian Schoenebeck <christian.schoenebeck@gmail.com>
Date: Mon, 26 Sep 2016 21:33:01 +0200
Subject: [PATCH] ddns-scripts: apply needed changes in uci-defaults

commands to apply changes introduced during release changes, moved from Makefile postinst to /etc/uci-defaults

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
---
 net/ddns-scripts/Makefile            | 17 ++++-------------
 net/ddns-scripts/files/ddns.defaults | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100755 net/ddns-scripts/files/ddns.defaults

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index e2bde8cd5..9975e1852 100755
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -116,6 +116,8 @@ endef
 
 ##### **********************************
 define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.defaults $(1)/etc/uci-defaults/ddns
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.hotplug $(1)/etc/hotplug.d/iface/95-ddns
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -132,19 +134,8 @@ define Package/$(PKG_NAME)/postinst
 	# if run within buildroot exit
 	[ -n "$${IPKG_INSTROOT}" ] && exit 0
 
-	# add new section "ddns" "global" if not exists
-	uci -q get ddns.global > /dev/null || uci -q set ddns.global='ddns'
-	uci -q get ddns.global.date_format > /dev/null || uci -q set ddns.global.date_format='%F %R'
-	uci -q get ddns.global.log_lines > /dev/null || uci -q set ddns.global.log_lines='250'
-	uci -q get ddns.global.allow_local_ip > /dev/null || uci -q set ddns.global.allow_local_ip='0'
-	uci -q commit ddns
-
-	# fix some service_name entries to new once
-	/bin/sed -i '/service_name/s/freedns.afraid.org/afraid.org/g' /etc/config/ddns
-	/bin/sed -i '/service_name/s/free.editdns.net/editdns.net/g' /etc/config/ddns
-	/bin/sed -i '/service_name/s/domains.google.com/google.com/g' /etc/config/ddns
-	/bin/sed -i '/service_name/s/spdns.de/spdyn.de/g' /etc/config/ddns
-	/bin/sed -i '/service_name/s/strato.de/strato.com/g' /etc/config/ddns
+	# apply changes introduced during release changes
+	/etc/uci-defaults/ddns
 
 	# clear LuCI indexcache
 	rm -f /tmp/luci-indexcache >/dev/null 2>&1
diff --git a/net/ddns-scripts/files/ddns.defaults b/net/ddns-scripts/files/ddns.defaults
new file mode 100755
index 000000000..61fc1208d
--- /dev/null
+++ b/net/ddns-scripts/files/ddns.defaults
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# add new section "ddns" "global" if not exists
+/sbin/uci -q get ddns.global > /dev/null		|| /sbin/uci -q set ddns.global='ddns'
+/sbin/uci -q get ddns.global.date_format > /dev/null	|| /sbin/uci -q set ddns.global.date_format='%F %R'
+/sbin/uci -q get ddns.global.log_lines > /dev/null	|| /sbin/uci -q set ddns.global.log_lines='250'
+/sbin/uci -q get ddns.global.allow_local_ip > /dev/null	|| /sbin/uci -q set ddns.global.allow_local_ip='0'
+/sbin/uci -q commit ddns
+
+# fix some service_name entries to new once
+/bin/sed -i \
+	-e '/service_name/s/CloudFlare/cloudflare\.com/g' \
+	-e '/service_name/s/NoIP\.com/no-ip\.com/g' \
+	-e '/service_name/s/No-IP\.com/no-ip\.com/g' \
+	-e '/service_name/s/freedns.afraid.org/afraid.org/g' \
+	-e '/service_name/s/free.editdns.net/editdns.net/g' \
+	-e '/service_name/s/domains.google.com/google.com/g' \
+	-e '/service_name/s/spdns.de/spdyn.de/g' \
+	-e '/service_name/s/strato.de/strato.com/g' \
+	/etc/config/ddns
+
+# clear LuCI indexcache
+rm -f /tmp/luci-indexcache >/dev/null 2>&1
+
+exit 0