fix merge conflict

maddox · Jan 28, 2010 · 8003506 · 8003506
2 parents 0bf34d3 + 156494f
commit 8003506
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/magick-installer.sh b/magick-installer.sh
@@ -1,23 +1,41 @@
 #!/bin/sh
-set -e 
+set -e
+
+function download() {
+  url=$1
+  base=$(basename $1)
+
+  if [[ ! -e $base ]]; then
+    echo "curling $url"
+    curl -O $url
+  fi
+}
+
+download http://nongnu.askapache.com/freetype/freetype-2.3.9.tar.gz
+download http://surfnet.dl.sourceforge.net/project/libpng/libpng-stable/1.2.39/libpng-1.2.39.tar.gz
+download http://www.ijg.org/files/jpegsrc.v7.tar.gz
+download ftp://ftp.remotesensing.org/libtiff/tiff-3.8.2.tar.gz
+download http://voxel.dl.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz
+download http://www.littlecms.com/lcms-1.17.tar.gz
+download http://voxel.dl.sourceforge.net/project/ghostscript/GPL%20Ghostscript/8.70/ghostscript-8.70.tar.gz
+download http://voxel.dl.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
+download http://image_magick.veidrodis.com/image_magick/ImageMagick-6.5.6-1.tar.gz
 
-curl -O http://mirror.its.uidaho.edu/pub/savannah/freetype/freetype-2.3.9.tar.gz
 tar xzvf freetype-2.3.9.tar.gz
 cd freetype-2.3.9
 ./configure --prefix=/usr/local
 make
 sudo make install
 cd ..
 
-curl -O http://surfnet.dl.sourceforge.net/project/libpng/libpng-stable/1.2.39/libpng-1.2.39.tar.gz
 tar xzvf libpng-1.2.39.tar.gz
 cd libpng-1.2.39
 ./configure --prefix=/usr/local
 make
 sudo make install
 cd ..
 
-curl -O http://www.ijg.org/files/jpegsrc.v7.tar.gz
+
 tar xzvf jpegsrc.v7.tar.gz
 cd jpeg-7
 ln -s `which glibtool` ./libtool
@@ -27,43 +45,43 @@ make
 sudo make install
 cd ..
 
-curl -O ftp://ftp.remotesensing.org/libtiff/tiff-3.8.2.tar.gz
+
 tar xzvf tiff-3.8.2.tar.gz
 cd tiff-3.8.2
 ./configure --prefix=/usr/local
 make
 sudo make install
 cd ..
 
-curl -O http://voxel.dl.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz
+
 tar xzvf libwmf-0.2.8.4.tar.gz
 cd libwmf-0.2.8.4
 ./configure
 make
 sudo make install
 cd ..
 
-curl -O http://www.littlecms.com/lcms-1.17.tar.gz
+
 tar xzvf lcms-1.17.tar.gz
 cd lcms-1.17
 ./configure
 make
 sudo make install
 cd ..
 
-curl -O http://voxel.dl.sourceforge.net/project/ghostscript/GPL%20Ghostscript/8.70/ghostscript-8.70.tar.gz
+
 tar zxvf ghostscript-8.70.tar.gz
 cd ghostscript-8.70/
 ./configure  --prefix=/usr/local
 make
 sudo make install
 cd ..
 
-curl -O http://voxel.dl.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
+
 tar zxvf ghostscript-fonts-std-8.11.tar.gz
 sudo mv fonts /usr/local/share/ghostscript
 
-curl -O http://image_magick.veidrodis.com/image_magick/ImageMagick-6.5.6-1.tar.gz
+
 tar xzvf ImageMagick-6.5.6-1.tar.gz
 cd ImageMagick-6.5.6-1
 export CPPFLAGS=-I/usr/local/include