More fixes to ImageMagick install on Circle

jenm999 · Nov 24, 2016 · eb59b66 · eb59b66
1 parent 524b683
commit eb59b66
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/test/ensure-pebble-test-environment.sh b/test/ensure-pebble-test-environment.sh
@@ -51,12 +51,11 @@ if [ ! -e ~/imagemagick ]; then
   cd ~/imagemagick
   wget http://www.imagemagick.org/download/ImageMagick.tar.gz
   tar -xvzf ImageMagick.tar.gz
-  IMAGEMAGICK_PATH=`ls -1 | grep ^ImageMagick-`
-  cd $IMAGEMAGICK_PATH
+  cd `ls -1 | grep ^ImageMagick-`
   ./configure
   make
 fi
-cd ~/imagemagick/$IMAGEMAGICK_PATH
+cd ~/imagemagick/`ls -1 ~/imagemagick/ | grep ^ImageMagick-`
 sudo make install
 sudo ldconfig /usr/local/lib
 (convert logo: logo.gif && rm logo.gif) || { echo "ImageMagick install failed"; exit 1; }