fix numbering of variants to be 1 and 2 (closes: #867586)

[deb_pkgs/scowl.git] / src / split-words

diff --git a/src/split-words b/src/split-words
index 991a8ef47ab35936aaf5c7d92d13148d88ed559c..aacd8ec61bb31a8b791d65cba075af05fe993628 100755 (executable)
--- a/src/split-words
+++ b/src/split-words
@@ -2,20 +2,20 @@
 
 rm -f working/*.$1.pre
 
-comm -12 working/words.$1 r/varcon/american.lst \
+comm -12 working/words.$1 working/american.lst \
   > working/american-all.$1.pre
 
-comm -12 working/words.$1 r/varcon/british.lst \
+comm -12 working/words.$1 working/british.lst \
   > working/british-all.$1.pre
 
-comm -12 working/words.$1 r/varcon/british_z.lst \
+comm -12 working/words.$1 working/british_z.lst \
   > working/british_z-all.$1.pre
 
-comm -12 working/words.$1 r/varcon/canadian.lst \
+comm -12 working/words.$1 working/canadian.lst \
   > working/canadian-all.$1.pre
 
-comm -12 working/words.$1 working/variant_0.lst   \
-  > working/variant_0-all.$1.pre
+comm -12 working/words.$1 working/australian.lst \
+  > working/australian-all.$1.pre
 
 comm -12 working/words.$1 working/variant_1.lst   \
   > working/variant_1-all.$1.pre
@@ -23,6 +23,37 @@ comm -12 working/words.$1 working/variant_1.lst   \
 comm -12 working/words.$1 working/variant_2.lst   \
   > working/variant_2-all.$1.pre
 
+comm -12 working/words.$1 working/variant_3.lst   \
+  > working/variant_3-all.$1.pre
+
+comm -12 working/words.$1 working/british_variant_1.lst   \
+  > working/british_variant_1-all.$1.pre
+
+comm -12 working/words.$1 working/british_variant_2.lst   \
+  > working/british_variant_2-all.$1.pre
+
+comm -12 working/words.$1 working/canadian_variant_1.lst   \
+  > working/canadian_variant_1-all.$1.pre
+
+comm -12 working/words.$1 working/canadian_variant_2.lst   \
+  > working/canadian_variant_2-all.$1.pre
+
+comm -12 working/words.$1 working/australian_variant_1.lst   \
+  > working/australian_variant_1-all.$1.pre
+
+comm -12 working/words.$1 working/australian_variant_2.lst   \
+  > working/australian_variant_2-all.$1.pre
+
+#
+# Hack to get australian only words in
+#
+if [ $1 -eq 35 ]
+then
+  mv working/australian-all.$1.pre working/australian-all.$1.pre.pre
+  cat r/special/australian.35 | src/filter \
+    | cat - working/australian-all.$1.pre.pre | sort -u > working/australian-all.$1.pre
+fi
+
 cat working/*-all.$1.pre         \
   | sort | uniq                  \
   | comm -13 - working/words.$1  \