Skip to content

Commit 72b16fc

Browse files
authored
fix wizard creation (SynoCommunity#4496)
- fix missing wizards introduced with SynoCommunity#4489 - working solution for packages without wizards as expected by SynoCommunity#4489
1 parent 065b609 commit 72b16fc

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

mk/spksrc.spk.mk

+7-1
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,16 @@ ifneq ($(strip $(WIZARDS_DIR)),)
312312
@mkdir -p $(DSM_WIZARDS_DIR)
313313
@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) \;
314314
endif
315-
ifneq ($(wildcard $(DSM_WIZARDS_DIR)/.*),)
315+
ifneq ($(strip $(WIZARDS_DIR)),)
316316
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -not -name "*.sh" -print -exec chmod 0644 {} \;
317317
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -name "*.sh" -print -exec chmod 0755 {} \;
318318
$(eval SPK_CONTENT += WIZARD_UIFILES)
319+
else
320+
ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
321+
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -not -name "*.sh" -print -exec chmod 0644 {} \;
322+
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -name "*.sh" -print -exec chmod 0755 {} \;
323+
$(eval SPK_CONTENT += WIZARD_UIFILES)
324+
endif
319325
endif
320326

321327
.PHONY: conf

spk/demoservice/PLIST

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bin:README
1+
rsc:README

0 commit comments

Comments
 (0)