From 2cfb59906d0a2d01f077ed6bc1e9f149ba54690c Mon Sep 17 00:00:00 2001 From: Gerric Chaplin Date: Sat, 12 Nov 2016 14:02:02 +0000 Subject: [PATCH 1/2] Rework so it works on Linux and OS X --- blcheck | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/blcheck b/blcheck index 7e4299b..eb932f6 100755 --- a/blcheck +++ b/blcheck @@ -348,7 +348,7 @@ for BL in $CONF_BLACKLISTS; do # It is a proper blacklist if [ "$BLACKLISTS" ]; then - BLACKLISTS=$(echo -e "$BLACKLISTS\n$DOMAIN") + BLACKLISTS="$BLACKLISTS $DOMAIN" else BLACKLISTS="$BL" fi @@ -357,7 +357,7 @@ for BL in $CONF_BLACKLISTS; do done # Make sure we have at least one blacklist -COUNT=$(($(echo "$BLACKLISTS" | wc -l))) +COUNT=$(($(echo $BLACKLISTS|wc -w))) if [ ! "$BLACKLISTS" ] || [ "$COUNT" -eq 0 ]; then error "No blacklists have been specified" fi @@ -387,7 +387,7 @@ for BL in $BLACKLISTS; do # Show percentage STATUS=$(printf " %3s" $((I * 100 / COUNT))) - STATUS="$STATUS%% " + STATUS="$STATUS% " # Show additional info if [ $VERBOSE -ge 3 ]; then @@ -473,4 +473,3 @@ if [ $VERBOSE -ge 0 ]; then fi exit $FAILED; - From 423695852d1b5c4d7fad4ea5f96e5d7d29474963 Mon Sep 17 00:00:00 2001 From: Gerric Chaplin Date: Sat, 12 Nov 2016 14:03:52 +0000 Subject: [PATCH 2/2] Rework so it works on Linux and OS X more fixes --- blcheck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blcheck b/blcheck index eb932f6..280b8a4 100755 --- a/blcheck +++ b/blcheck @@ -357,7 +357,7 @@ for BL in $CONF_BLACKLISTS; do done # Make sure we have at least one blacklist -COUNT=$(($(echo $BLACKLISTS|wc -w))) +COUNT=$(($(echo "$BLACKLISTS"|wc -w))) if [ ! "$BLACKLISTS" ] || [ "$COUNT" -eq 0 ]; then error "No blacklists have been specified" fi