fix wizard creation

- fix missing wizards introduced with SynoCommunity#4489 - working solution for packages without wizards as expected by SynoCommunity#4489
hgy59 · Mar 14, 2021 · d2241f3 · d2241f3
1 parent 065b609
commit d2241f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk
@@ -312,10 +312,16 @@ ifneq ($(strip $(WIZARDS_DIR)),)
 	@mkdir -p $(DSM_WIZARDS_DIR)
 	@find $${SPKSRC_WIZARDS_DIR} -maxdepth 1 -type f -and \( -name "install_uifile" -or -name "install_uifile_???" -or -name "install_uifile.sh" -or -name "install_uifile_???.sh" -or -name "upgrade_uifile" -or -name "upgrade_uifile_???" -or -name "upgrade_uifile.sh" -or -name "upgrade_uifile_???.sh" -or -name "uninstall_uifile" -or -name "uninstall_uifile_???" -or -name "uninstall_uifile.sh" -or -name "uninstall_uifile_???.sh" \) -print -exec cp -f {} $(DSM_WIZARDS_DIR) \;
 endif
-ifneq ($(wildcard $(DSM_WIZARDS_DIR)/.*),)
+ifneq ($(strip $(WIZARDS_DIR)),)
 	@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -not -name "*.sh" -print -exec chmod 0644 {} \;
 	@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -name "*.sh" -print -exec chmod 0755 {} \;
 	$(eval SPK_CONTENT += WIZARD_UIFILES)
+else
+ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
+	@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -not -name "*.sh" -print -exec chmod 0644 {} \;
+	@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -name "*.sh" -print -exec chmod 0755 {} \;
+	$(eval SPK_CONTENT += WIZARD_UIFILES)
+endif
 endif
 
 .PHONY: conf

diff --git a/spk/demoservice/PLIST b/spk/demoservice/PLIST
@@ -1 +1 @@
-bin:README
+rsc:README