From 2cabf98110c8e58e8bea04149a081ca899be16d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 15 Dec 2015 11:42:07 +0100 Subject: Make some rm -rf commands safer This way if for some unknown reason $(APP_TO_CLEAN) isn't defined, we don't delete the entire world. --- test/Makefile | 2 +- test/core_app.mk | 2 +- test/core_compat.mk | 2 +- test/core_deps.mk | 2 +- test/core_plugins.mk | 2 +- test/core_upgrade.mk | 2 +- test/plugin_bootstrap.mk | 2 +- test/plugin_c_src.mk | 2 +- test/plugin_dialyzer.mk | 2 +- test/plugin_erlydtl.mk | 2 +- test/plugin_shell.mk | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/Makefile b/test/Makefile index 237ca42..34d647f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -134,7 +134,7 @@ clean-core:: clean-core-clean-crash-dump clean-core-distclean-tmp clean-core-hel .PHONY: core-clean-crash-dump core-distclean-tmp core-help clean-core-clean-crash-dump clean-core-distclean-tmp clean-core-help clean-core-clean-crash-dump clean-core-distclean-tmp clean-core-help: - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) core-clean-crash-dump: build clean-core-clean-crash-dump diff --git a/test/core_app.mk b/test/core_app.mk index 0f1af19..a56b07e 100644 --- a/test/core_app.mk +++ b/test/core_app.mk @@ -9,7 +9,7 @@ CORE_APP_CLEAN_TARGETS = $(addprefix clean-,$(CORE_APP_TARGETS)) clean-core-app: $(CORE_APP_CLEAN_TARGETS) $(CORE_APP_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) core-app: $(CORE_APP_TARGETS) diff --git a/test/core_compat.mk b/test/core_compat.mk index 06d5211..9ded253 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -13,7 +13,7 @@ REBAR_BINARY = https://github.com/rebar/rebar/releases/download/2.6.0/rebar clean-core-compat: $(CORE_COMPAT_CLEAN_TARGETS) $(CORE_COMPAT_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) core-compat: $(CORE_COMPAT_TARGETS) diff --git a/test/core_deps.mk b/test/core_deps.mk index 283e0ef..093fe46 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -9,7 +9,7 @@ CORE_DEPS_CLEAN_TARGETS = $(addprefix clean-,$(CORE_DEPS_TARGETS)) clean-core-deps: $(CORE_DEPS_CLEAN_TARGETS) clean-core-deps-mv-moved clean-core-deps-mv-rebar-moved $(CORE_DEPS_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) clean-core-deps-mv-moved: $t rm -rf core_deps_mv-moved/ diff --git a/test/core_plugins.mk b/test/core_plugins.mk index 184c08f..3f68fc8 100644 --- a/test/core_plugins.mk +++ b/test/core_plugins.mk @@ -9,7 +9,7 @@ CORE_PLUGINS_CLEAN_TARGETS = $(addprefix clean-,$(CORE_PLUGINS_TARGETS)) clean-core-plugins: $(CORE_PLUGINS_CLEAN_TARGETS) $(CORE_PLUGINS_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) core-plugins: $(CORE_PLUGINS_TARGETS) diff --git a/test/core_upgrade.mk b/test/core_upgrade.mk index 60adaab..9b92c5c 100644 --- a/test/core_upgrade.mk +++ b/test/core_upgrade.mk @@ -9,7 +9,7 @@ CORE_UPGRADE_CLEAN_TARGETS = $(addprefix clean-,$(CORE_UPGRADE_TARGETS)) clean-core-upgrade: $(CORE_UPGRADE_CLEAN_TARGETS) $(CORE_UPGRADE_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) core-upgrade: $(CORE_UPGRADE_TARGETS) diff --git a/test/plugin_bootstrap.mk b/test/plugin_bootstrap.mk index 47a81d1..69c7e0a 100644 --- a/test/plugin_bootstrap.mk +++ b/test/plugin_bootstrap.mk @@ -9,7 +9,7 @@ BOOTSTRAP_CLEAN_TARGETS = $(addprefix clean-,$(BOOTSTRAP_TARGETS)) clean-bootstrap: $(BOOTSTRAP_CLEAN_TARGETS) $(BOOTSTRAP_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) bootstrap: $(BOOTSTRAP_TARGETS) diff --git a/test/plugin_c_src.mk b/test/plugin_c_src.mk index ac9c2a0..0642813 100644 --- a/test/plugin_c_src.mk +++ b/test/plugin_c_src.mk @@ -10,7 +10,7 @@ clean-c-src: $(C_SRC_CLEAN_TARGETS) clean-c_src: clean-c-src $(C_SRC_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) c-src: $(C_SRC_TARGETS) c_src: c-src diff --git a/test/plugin_dialyzer.mk b/test/plugin_dialyzer.mk index 29c8285..d255c90 100644 --- a/test/plugin_dialyzer.mk +++ b/test/plugin_dialyzer.mk @@ -9,7 +9,7 @@ DIALYZER_CLEAN_TARGETS = $(addprefix clean-,$(DIALYZER_TARGETS)) clean-dialyzer: $(DIALYZER_CLEAN_TARGETS) $(DIALYZER_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) dialyzer: $(DIALYZER_TARGETS) diff --git a/test/plugin_erlydtl.mk b/test/plugin_erlydtl.mk index acfd74c..f32bc06 100644 --- a/test/plugin_erlydtl.mk +++ b/test/plugin_erlydtl.mk @@ -9,7 +9,7 @@ ERLYDTL_CLEAN_TARGETS = $(addprefix clean-,$(ERLYDTL_TARGETS)) clean-erlydtl: $(ERLYDTL_CLEAN_TARGETS) $(ERLYDTL_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) erlydtl: $(ERLYDTL_TARGETS) diff --git a/test/plugin_shell.mk b/test/plugin_shell.mk index 474ef92..945ecb3 100644 --- a/test/plugin_shell.mk +++ b/test/plugin_shell.mk @@ -9,7 +9,7 @@ SHELL_CLEAN_TARGETS = $(addprefix clean-,$(SHELL_TARGETS)) clean-shell: $(SHELL_CLEAN_TARGETS) $(SHELL_CLEAN_TARGETS): - $t rm -rf $(APP_TO_CLEAN)/ + $t rm -rf $(APP_TO_CLEAN) shell: $(SHELL_TARGETS) -- cgit v1.2.3