Skip to content

Commit 9900138

Browse files
committed
Framework: Fix unable to override uninstall wizard
1 parent 0f59242 commit 9900138

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mk/spksrc.spk.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ info-checksum:
304304
wizards:
305305
@$(MSG) "Preparing DSM Wizards"
306306
@mkdir -p $(DSM_WIZARDS_DIR)
307-
ifneq ($(strip $(WIZARDS_DIR)),)
308-
@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) \;
309-
endif
310307
ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
311308
@find $(SPKSRC_MK)wizard -maxdepth 1 -type f -and \( -name "uninstall_uifile" -or -name "uninstall_uifile_???" \) -print -exec cp -f {} $(DSM_WIZARDS_DIR) \;
309+
endif
310+
ifneq ($(strip $(WIZARDS_DIR)),)
311+
@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) \;
312312
endif
313313
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -not -name "*.sh" -print -exec chmod 0644 {} \;
314314
@find $(DSM_WIZARDS_DIR) -maxdepth 1 -type f -name "*.sh" -print -exec chmod 0755 {} \;

0 commit comments

Comments
 (0)