Merge pull request #19 from rlipscombe/bsd-options

fix: some compatibility issues with non GNU environments
inaka · Oct 19, 2022 · 81ccb60 · 81ccb60
2 parents f7088da + 5350d30
commit 81ccb60
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/plugins.mk b/plugins.mk
@@ -46,12 +46,13 @@ endif
 		cd elvis-$(ELVIS_VERSION) && \
 		$(ELVIS_REBAR3) escriptize
 	$(gen_verbose) cp $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/_build/default/bin/elvis $(ELVIS)
-	$(gen_verbose) cp --no-clobber $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/elvis.config $(ELVIS_CONFIG)
+	$(gen_verbose) [ -e $(ELVIS_CONFIG) ] || \
+		cp -n $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)/elvis.config $(ELVIS_CONFIG)
 	$(verbose) chmod +x $(ELVIS)
 	$(verbose) rm -rf $(ELVIS_BUILD_DIR)/elvis-$(ELVIS_VERSION)
 	$(verbose) rm $(ELVIS_BUILD_DIR)/$(ELVIS_CODE_ARCHIVE)
-	$(verbose) rm --force $(ELVIS_BUILD_DIR)/rebar3
-	$(verbose) rmdir --ignore-fail-on-non-empty $(ELVIS_BUILD_DIR)
+	$(verbose) rm -f $(ELVIS_BUILD_DIR)/rebar3
+	$(if $(shell ls -A $(ELVIS_BUILD_DIR)/),,$(verbose) rmdir $(ELVIS_BUILD_DIR))
 
 elvis: $(ELVIS)
 	$(verbose) $(ELVIS) rock -c $(ELVIS_CONFIG) $(ELVIS_OPTS)