From a558e7f2695b65471cb6ea96eb7a96865a466b7a Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 4 Oct 2016 00:51:59 -0400 Subject: [PATCH] safed a remove statement, other cleaning. --- scripts/clam/cpp/rules.def | 2 +- scripts/core/functions.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 85602532..208728d9 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -246,7 +246,7 @@ ifeq "$(COMPILER)" "VISUAL_CPP" LOCAL_HEADERS += $(THIRD_PARTY_DIR)/openssl/include LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/openssl/lib LIBS_USED += libcrypto.lib libssl.lib - $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) +#no, yuck. $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) endif endif diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 629bd59b..65aa9410 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -547,7 +547,9 @@ if [ -z "$skip_all" ]; then { local dir="$1"; shift pushd "$dir" &>/dev/null + if [ $? -ne 0 ]; then echo failed to enter dir--quitting.; fi rm -rf $* &>/dev/null + if [ $? -ne 0 ]; then echo received a failure code when removing.; fi popd &>/dev/null } -- 2.34.1