# HG changeset patch
# User Igor Chubin <igor@chub.in>
# Date 1274087684 -10800
# Node ID 1318aa5898ee54beafb49fe2e5096f1aec4d5215
# Parent  4b9d13c78de28b6bbbe696470b9799a17ce2104f
minifix:getopts

diff -r 4b9d13c78de2 -r 1318aa5898ee new-words.sh
--- a/new-words.sh	Sun May 16 22:16:31 2010 +0300
+++ b/new-words.sh	Mon May 17 12:14:44 2010 +0300
@@ -39,8 +39,7 @@
 export ORIGINAL_TEXT=`mktemp /tmp/new-words-XXXXXXXXXX-orig`
 editor=${EDITOR:-vim}
 
-#----------------------------------------------------
-# command line options processing
+# language detection
 
 LANGUAGE=en
 my_name="`echo $0 | sed s@.*/@@ | sed s/-.*// `"
@@ -52,43 +51,39 @@
     fi
 done
 [ "${my_name}" = "new" ] || LANGUAGE="$my_name"
+
+#----------------------------------------------------
+# command line options processing
+
+STAT_ONLY=NO
+NEED_TO_USE_VOCABULARY_WHEN_SORT=NO
+DONT_ADD_MARKS=NO
+NON_INTERACTIVE_MODE=NO
+while getopts l:skmnp opt
+do
+    case "$opt" in
+      s)  STAT_ONLY=YES;;
+      k)  NEED_TO_USE_VOCABULARY_WHEN_SORT=YES;;
+      l)  LANGUAGE="$OPTARG";;
+      m)  DONT_ADD_MARKS=YES;;
+      n)  NON_INTERACTIVE_MODE=YES;;
+      p)  PAGES="$OPTARG";;
+      \?)       # unknown flag
+          show_usage
+          exit 1;;
+    esac
+done
+shift `expr $OPTIND - 1`
+
 if [ "$1" = "-l" ]
 then
     LANGUAGE="$2"
-    VOCABULARY="$LANGUAGE".txt
     shift 2
 fi
+
 VOCABULARY=${LANGUAGE}.txt
 NOTES_FILE=notes-${LANGUAGE}.txt
 
-STAT_ONLY=NO
-if [ "$1" = "-s" ]
-then
-    STAT_ONLY=YES
-    shift
-fi
-
-NEED_TO_USE_VOCABULARY_WHEN_SORT=NO
-if [ "$1" = "-k" ]
-then
-    NEED_TO_USE_VOCABULARY_WHEN_SORT=YES
-    shift
-fi
-
-DONT_ADD_MARKS=NO
-if [ "$1" = "-m" ]
-then
-    DONT_ADD_MARKS=YES
-    shift
-fi
-
-NON_INTERACTIVE_MODE=NO
-if [ "$1" = "-n" ]
-then
-    NON_INTERACTIVE_MODE=YES
-    shift
-fi
-
 #----------------------------------------------------
 
 get_words()
@@ -235,6 +230,7 @@
     @prefixes=qw(
         ab an auf aus bei dazwischen ein fest heraus her hinaus hin los mit nach voraus vorbei vor weg weiter zurück zusammen zu
         be emp ent er ge miss ver zer durch über um unter wieder);
+    @prefixes=();
     for $pref (@prefixes) {
         s/^$pref//;
     }