From f25e87abc8030bde17e7151c5bf912e5a2a359ba Mon Sep 17 00:00:00 2001 From: jschauma Date: Thu, 26 Apr 2012 01:55:14 +0000 Subject: [PATCH] allow multiple '-f acronyms' arguments to be given, which makes this behave more consistently with ACRONYMSDB, which may also point to multiple files --- games/wtf/wtf | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/games/wtf/wtf b/games/wtf/wtf index 273d482bef15..22bb032574f7 100644 --- a/games/wtf/wtf +++ b/games/wtf/wtf @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: wtf,v 1.15 2007/08/06 21:14:36 hubertf Exp $ +# $NetBSD: wtf,v 1.16 2012/04/26 01:55:14 jschauma Exp $ # # Public domain # @@ -12,13 +12,6 @@ usage() { exit 1 } -acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`} - -if [ "$acronyms" = "" ]; then - echo "$PROGNAME: acronyms database not found!" >&2 - exit 1 -fi - args=`getopt f: $*` if [ $? -ne 0 ]; then usage @@ -27,7 +20,7 @@ set -- $args while [ $# -gt 0 ]; do case "$1" in -f) - acronyms=$2; shift + acronyms="$2 $acronyms"; shift ;; --) shift; break @@ -44,8 +37,17 @@ if [ $# -lt 1 ] ; then usage fi -for f in $acronyms -do +if [ "$acronyms" = "" ]; then + acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`} +fi + +if [ "$acronyms" = "" ]; then + echo "$PROGNAME: acronyms database not found!" >&2 + exit 1 +fi + + +for f in $acronyms ; do if [ ! -f $f ]; then echo "$PROGNAME: cannot open acronyms database file \`$f'" >&2 exit 1