From fd3c7e16ddc6838d9bc9c4ae23e7d6dada7e56c2 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Thu, 1 Oct 2020 22:31:57 +0800
Subject: [PATCH] ddns-scripts_aliyun: fix with upstream change

Fixes: #209
---
 package/lean/ddns-scripts_aliyun/Makefile     | 34 +++----------------
 .../ddns-scripts_aliyun/files/aliyun_com.json |  9 +++++
 .../{ => files}/update_aliyun_com.sh          |  0
 3 files changed, 13 insertions(+), 30 deletions(-)
 create mode 100644 package/lean/ddns-scripts_aliyun/files/aliyun_com.json
 rename package/lean/ddns-scripts_aliyun/{ => files}/update_aliyun_com.sh (100%)

diff --git a/package/lean/ddns-scripts_aliyun/Makefile b/package/lean/ddns-scripts_aliyun/Makefile
index c6c92b0ca9..1b9dd66e57 100644
--- a/package/lean/ddns-scripts_aliyun/Makefile
+++ b/package/lean/ddns-scripts_aliyun/Makefile
@@ -17,7 +17,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=IP Addresses and Names
 	TITLE:=DDNS extension for AliYun.com
 	PKGARCH:=all
-	DEPENDS:=+ddns-scripts +wget +openssl-util
+	DEPENDS:=ddns-scripts +wget +openssl-util
 endef
 
 define Package/$(PKG_NAME)/description
@@ -28,44 +28,18 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(CP) ./*.sh $(PKG_BUILD_DIR)
-endef
-
-define Package/$(PKG_NAME)/preinst
-	#!/bin/sh
-	# if NOT run buildroot then stop service
-	[ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1
-	exit 0 # suppress errors
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns
-endef
-
-define Package/$(PKG_NAME)/postinst
-	#!/bin/sh
-	# remove old services file entries
-	/bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1
-	/bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1
-	# and create new
-	printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services
-	printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6
-	# on real system restart service if enabled
-	[ -z "$${IPKG_INSTROOT}" ] && {
-		/etc/init.d/ddns enabled && \
-			/etc/init.d/ddns start >/dev/null 2>&1
-	}
-	exit 0 # suppress errors
+	$(INSTALL_DIR) $(1)/usr/lib/ddns $(1)/usr/share/ddns/services
+	$(INSTALL_BIN) $(CURDIR)/files/update_aliyun_com.sh $(1)/usr/lib/ddns
+	$(INSTALL_DATA) $(CURDIR)/files/aliyun_com.json /usr/share/ddns/services
 endef
 
 define Package/$(PKG_NAME)/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 '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1
-	/bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1
 	exit 0 # suppress errors
 endef
 
diff --git a/package/lean/ddns-scripts_aliyun/files/aliyun_com.json b/package/lean/ddns-scripts_aliyun/files/aliyun_com.json
new file mode 100644
index 0000000000..c1ad8a5545
--- /dev/null
+++ b/package/lean/ddns-scripts_aliyun/files/aliyun_com.json
@@ -0,0 +1,9 @@
+{
+	"name": "aliyun.com",
+	"ipv4": {
+		"url": "update_aliyun_com.sh"
+	},
+	"ipv6": {
+		"url": "update_aliyun_com.sh"
+	}
+}
diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/files/update_aliyun_com.sh
similarity index 100%
rename from package/lean/ddns-scripts_aliyun/update_aliyun_com.sh
rename to package/lean/ddns-scripts_aliyun/files/update_aliyun_com.sh