From bd2b16fbbe43e5d879ee85da7259bdd649e4394e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 11 Sep 2013 16:05:59 -0400 Subject: libreblacklist: Fix a bug in the -h flag, adjust the unit test to catch it. --- src/lib/libreblacklist | 2 +- test/lib-blacklist-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index bbba1ce..6800526 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -122,7 +122,7 @@ if [[ "${0##*/}" == libreblacklist ]]; then cmd=$(<<<"$sec" sed -n '$s/^blacklist-//p') if [[ "$cmd" == "$1" ]]; then <<<"$sec" sed '$d' | - while read -r line; do _ "$line"; done | + while read -r line; do print "$line"; done | sed "s/blacklist-/${0##*/} /g" | fmt -us return 0 diff --git a/test/lib-blacklist-test.sh b/test/lib-blacklist-test.sh index 9c8e84d..0083242 100644 --- a/test/lib-blacklist-test.sh +++ b/test/lib-blacklist-test.sh @@ -127,7 +127,7 @@ it_displays_help_when_given_h() { it_displays_help_when_given_h_cat() { LANG=C libreblacklist -h cat >$tmpdir/stdout 2>$tmpdir/stderr - [[ "$(sed 1q $tmpdir/stdout)" =~ 'Usage: libreblacklist cat' ]] + [[ "$(sed 1q $tmpdir/stdout)" == 'Usage: libreblacklist cat' ]] [[ -z "$(cat $tmpdir/stderr)" ]] } -- cgit v1.2.3