From 898b831b751d3a9288aa3f8ebd69d07c86b374bc Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 3 Oct 2011 20:40:28 +0000 Subject: some cosmetic stuff --- pwgrep.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pwgrep.sh') diff --git a/pwgrep.sh b/pwgrep.sh index 5b48474..29177d1 100755 --- a/pwgrep.sh +++ b/pwgrep.sh @@ -202,22 +202,20 @@ pwfls () { pwfls $store done - elif [ -z "$arg" ]; then + else local dir=$WORKDIR/$FILESTOREDIR - if [ -z "$USEFILESTORECAT" ]; then + + if [ -z "$USEFILESTORECATEGORY" ]; then info Available file store categories: dir=$WORKDIR/$FILESTOREDIR + info "(You may use '`basename $0` -d ' to display containing files.)" else info Available files in store $FILESTORECATEGORY dir=$WORKDIR/$FILESTOREDIR/$FILESTORECATEGORY fi + [ ! -e $dir ] && error "Category ($dir) does not exist" ls $dir - else - local -r dir=$WORKDIR/$FILESTOREDIR/$arg - [ ! -e $dir ] && error "Category $arg ($dir) does not exist" - info "All stored files (category $arg):" - ls $dir | sed -n '/.gpg$/ { s/.gpg$//; p; }' | sort fi } @@ -350,7 +348,7 @@ set_opts () { # Alternate DB DB=$(echo $ARGS | $AWK '{ print $2 }') FILESTORECATEGORY=$DB - USEFILESTORECAT=1 + USEFILESTORECATEGORY=1 ARGS=$(echo $ARGS | $SED "s/-d $DB//") DB=$DB.gpg set_opts -- cgit v1.2.3