From 1b0f24c5ba3d319145ac70e09e37d547a72390b4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 25 May 2017 16:19:31 -0400 Subject: libreblacklist: reformat some loops to be more readable --- src/lib/libreblacklist | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist index d6fc7f3..595b22d 100755 --- a/src/lib/libreblacklist +++ b/src/lib/libreblacklist @@ -46,22 +46,26 @@ else print "Tool for working with the nonfree software blacklist" echo print "Commands:" - usage-outside | while read -r sec; do sec="$(usage-inside "$sec")" - cmd=$(<<<"$sec" sed -n '$s/^blacklist-//p') - desc="$(_ "$(sed -n 2p <<<"$sec")")" - flag "$cmd" "${desc//blacklist-/${0##*/} }" - done + while read -r sec; do + sec="$(usage-inside "$sec")" + + cmd=$(<<<"$sec" sed -n '$s/^blacklist-//p') + desc="$(_ "$(sed -n 2p <<<"$sec")")" + flag "$cmd" "${desc//blacklist-/${0##*/} }" + done < <(usage-outside) else - usage-outside | while read -r sec; do sec="$(usage-inside "$sec")" - cmd=$(<<<"$sec" sed -n '$s/^blacklist-//p') - if [[ "$cmd" == "$1" ]]; then - <<<"$sec" sed '$d' | - while read -r line; do print "$line"; done | - sed "s/blacklist-/${0##*/} /g" | - fmt -us - return 0 - fi - done + while read -r sec; do + sec="$(usage-inside "$sec")" + + cmd=$(<<<"$sec" sed -n '$s/^blacklist-//p') + if [[ "$cmd" == "$1" ]]; then + <<<"$sec" sed '$d' | + while read -r line; do print "$line"; done | + sed "s/blacklist-/${0##*/} /g" | + fmt -us + return 0 + fi + done < <(usage-outside) fi } -- cgit v1.2.2