Bug 1240916 - Part 1: Fix dictionary upgrade scripts
authorKevin Atkinson <kevina@gnu.org>
Thu, 21 Jan 2016 14:35:29 -0500
changeset 281094 7459d6a6761054bad4e35a20591ccd9139a6fa94
parent 281093 e7a439abc3b9b1bbf3b2da7e7ccd17c360f7eedc
child 281095 e1208d0c3551e78a6b79a4c733e51b6e53d4211a
push id29930
push usercbook@mozilla.com
push dateFri, 22 Jan 2016 11:05:50 +0000
treeherdermozilla-central@7104d650a97d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1240916
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1240916 - Part 1: Fix dictionary upgrade scripts
extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/install-new-dict
extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/make-new-dict
--- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/install-new-dict
+++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/install-new-dict
@@ -17,17 +17,17 @@ if [ -e orig-bk ]; then echo "$0: direct
 mv orig orig-bk
 mkdir orig
 cp $SPELLER/en_US-custom.dic $SPELLER/en_US-custom.aff $SPELLER/README_en_US-custom.txt orig
 
 mkdir mozilla-bk
 mv ../en-US.dic ../en-US.aff ../README_en_US.txt mozilla-bk
 
 # Convert the affix file to ISO8859-1
-sed -i=bak -e '/^ICONV/d' -e 's/^SET UTF8$/SET ISO8859-1/' en_US-mozilla.aff
+sed -i=bak -e '/^ICONV/d' -e 's/^SET UTF-8$/SET ISO8859-1/' en_US-mozilla.aff
 
 # Convert the dictionary to ISO8859-1
 mv en_US-mozilla.dic en_US-mozilla-utf8.dic
 iconv -f utf-8 -t iso-8859-1 < en_US-mozilla-utf8.dic > en_US-mozilla.dic
 
 cp en_US-mozilla.aff ../en-US.aff
 cp en_US-mozilla.dic ../en-US.dic
 cp README_en_US-mozilla.txt ../README_en_US.txt
--- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/make-new-dict
+++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/make-new-dict
@@ -39,17 +39,17 @@ EOF
 cd $WKDIR
 
 # Note: Input and output of "expand" is always iso-8859-1.
 #       All expanded word list files are thus in iso-8859-1.
 
 expand $SPELLER/en.aff < $SPELLER/en.dic.supp > 0-special # input: ASCII
 
 # input in utf-8, expand expects iso-8859-1 so use iconv
-iconv -f utf-8 -t iso-8859-1 $ORIG/en_US-custom.dic | expand $ORIG/en_US-custom.aff > 1-base.txt
+iconv -f utf-8 -t iso-8859-1 $ORIG/en_US-custom.dic | expand $SPELLER/en_US-custom.aff > 1-base.txt
 
 expand ../en-US.aff < ../en-US.dic > 2-mozilla.txt # input: iso-8850-1
 
 # input in utf-8, expand expects iso-8859-1 so use iconv
 iconv -f utf-8 -t iso-8859-1 $SPELLER/en_US-custom.dic | expand $SPELLER/en_US-custom.aff > 3-upstream.txt 
 
 comm -23 1-base.txt 2-mozilla.txt > 2-mozilla-rem
 comm -13 1-base.txt 2-mozilla.txt > 2-mozilla-add