From beaa7ba5a58e7aa072fdc5f09f1903744dea153f Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 8 Feb 2011 20:57:41 -0800 Subject: [PATCH] assume dict is utf8-encoded but check and fail if it isn't --- xwords4/dawg/German/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwords4/dawg/German/Makefile b/xwords4/dawg/German/Makefile index 40bf56818..e29d7242e 100644 --- a/xwords4/dawg/German/Makefile +++ b/xwords4/dawg/German/Makefile @@ -27,11 +27,11 @@ include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/German/HansGerman.dict.gz $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile + file -z $(SOURCEDICT) | grep -q 'UTF-8 Unicode text' || exit 1 zcat $< \ - | iconv -f iso88591 -t utf8 \ | sed 's,.,\U\0,g' \ | sed -e 's/ß/SS/g' \ - | grep '^[A-ZÄÖÜ]*$$' \ + | grep '^[AÄBCDEFGHIJKLMNOÖPQRSTUÜVWXYZ]*$$' \ | gzip -c > $@ # Everything but creating of the Main.dict file is inherited from the