X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=blobdiff_plain;f=data%2FdownloadInputs.sh;h=0929f63687146349e7ae8a5511183e31eeba9acb;hp=3135eb04bbd6f35ed20e1a6b9ebc548fd147e7a8;hb=HEAD;hpb=f73bc969da1b56b315b7de9660a1f5e0ee5fddcc

diff --git a/data/downloadInputs.sh b/data/downloadInputs.sh
index 3135eb0..0929f63 100755
--- a/data/downloadInputs.sh
+++ b/data/downloadInputs.sh
@@ -9,43 +9,43 @@ echo "Note that unzipping is slow."
 L=en
 echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
 WIKI=${L}wiktionary-latest-pages-articles.xml
-curl --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
-bunzip2 ${WIKI}.bz2
-mv ${WIKI} inputs/${L}wiktionary-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
 
 echo "Downloading from: http://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en-devel/"
 CHEMNITZ=de-en.txt
-curl --remote-name http://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en-devel/${CHEMNITZ}.gz
-gunzip ${CHEMNITZ}.gz
-mv ${CHEMNITZ} inputs/de-en_chemnitz.txt
+curl -L --remote-name http://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en-devel/${CHEMNITZ}.gz
+mv ${CHEMNITZ}.gz inputs/de-en_chemnitz.txt.gz
 
 L=fr
 echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
 WIKI=${L}wiktionary-latest-pages-articles.xml
-curl --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
-bunzip2 --force ${WIKI}.bz2
-mv ${WIKI} inputs/${L}wiktionary-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
 
 L=it
 echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
 WIKI=${L}wiktionary-latest-pages-articles.xml
-curl --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
-bunzip2 ${WIKI}.bz2
-mv ${WIKI} inputs/${L}wiktionary-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
 
 L=de
 echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
 WIKI=${L}wiktionary-latest-pages-articles.xml
-curl --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
-bunzip2 ${WIKI}.bz2
-mv ${WIKI} inputs/${L}wiktionary-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
 
 L=es
 echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
 WIKI=${L}wiktionary-latest-pages-articles.xml
-curl --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
-bunzip2 ${WIKI}.bz2
-mv ${WIKI} inputs/${L}wiktionary-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
+
+L=pt
+echo "Downloading from: http://dumps.wikimedia.org/${L}wiktionary/"
+WIKI=${L}wiktionary-latest-pages-articles.xml
+curl -L --remote-name http://dumps.wikimedia.org/${L}wiktionary/latest/${WIKI}.bz2
+mv ${WIKI}.bz2 inputs/${L}wiktionary-pages-articles.xml.bz2
 
 echo "Done.  Now run WiktionarySplitter to split apart enwiktionary."