@@ -52,45 +52,35 @@ function usage { sqlite3 "$database" "SELECT buffername FROM buffer WHERE buffername != '' ORDER BY buffername" | column echo echo " PATTERN a simple pattern, use * for wildcard matching" - echo - # TODO: - echo "NOTE: order of options is not exchangable, i.e. first -u, then -b then pattern..." } if [[ "$database" == "" || ! -f "$database" ]]; then echo "BAD DATABASE: $database" echo usage - exit + exit 1 fi -if [[ "$1" == "-u" ]]; then - shift 1 - if [[ "$1" == "" ]]; then - usage - exit +while getopts "u:b:" flag +do + if [[ "$flag" == "u" ]]; then + user="$OPTARG" + elif [[ "$flag" == "b" ]]; then + buffer="$OPTARG" fi - user="$1" - shift 1 -fi +done -if [[ "$1" == "-b" ]]; then - shift 1 - if [[ "$1" == "" ]]; then - usage - exit - fi - buffer="$1" - shift 1 -fi +shift $(($OPTIND - 1)) -if [[ "$1" == "" && "$user" == "" && "$buffer" == "" ]]; then +pattern="$1" + +if [[ "$pattern" == "" && "$user" == "" && "$buffer" == "" ]]; then + echo "pattern required" + echo usage - exit + exit 1 fi -pattern="$1" - # escape ' pattern=${pattern//\'/\'\'} # escape % quassellog f4760d3c67b491c201b33cff423429073d56243f Milian Wolff mail@milianw.de http://github.com/milianw/shell-helpers/commit/b50e4118c04267c7debe284d202290bf4142a635 b50e4118c04267c7debe284d202290bf4142a635 2009-09-02T09:26:52-07:00 2009-09-02T09:26:52-07:00 use getopts for argument evaluation 63087bcf1b1deb96447c2727d4d044ed27424e77 Milian Wolff mail@milianw.de