Skip to content
Snippets Groups Projects
Commit 32e1c11a authored by Simon Rose's avatar Simon Rose
Browse files

Fixed double negative, and removed old uninstall stage that deleted symbolic...

Fixed double negative, and removed old uninstall stage that deleted symbolic links that are no longer used.
parent 5262ac6d
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,6 @@ install_module: db ...@@ -38,7 +38,6 @@ install_module: db
## Uninstall : $(E3_MODULE_NAME) ## Uninstall : $(E3_MODULE_NAME)
uninstall: conf uninstall: conf
$(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall' $(QUIET) $(SUDOBASH) '$(E3_MODULE_MAKE_CMDS) uninstall'
$(SUDO) find $(E3_SITELIBS_PATH) -xtype l -delete
cellinstall: install_module cellinstall: install_module
...@@ -71,7 +70,7 @@ conf: module_name_check ...@@ -71,7 +70,7 @@ conf: module_name_check
## We should check that the module name satisfies a few conditions before we go on. ## We should check that the module name satisfies a few conditions before we go on.
module_name_check: module_name_check:
ifneq ($(shell echo $(E3_MODULE_NAME) | grep '^[a-z_][a-z0-9_]\+$$' &> /dev/null; echo $$?),1) ifneq ($(shell echo $(E3_MODULE_NAME) | grep '^[a-z_][a-z0-9_]\+$$' &> /dev/null; echo $$?),0)
$(error E3_MODULE_NAME '$(E3_MODULE_NAME)' is not valid. It should consist only of lowercase letters, numbers, and underscores.) $(error E3_MODULE_NAME '$(E3_MODULE_NAME)' is not valid. It should consist only of lowercase letters, numbers, and underscores.)
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment