diff options
| author | Marius Halden <marius.h@lden.org> | 2015-10-27 13:27:03 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2015-10-27 13:27:03 +0100 |
| commit | 4fb5331abd2fa4c89ebeb89bc92a245fadd0aa19 (patch) | |
| tree | 23632b448612e3845a6e8b1aed6490151395de2a /bin/install_perl_modules | |
| parent | e609613b5041a15491417eaa9ae129dd1e7531dd (diff) | |
| parent | ac39951581a0eefe069c8a707bb89977227d0bce (diff) | |
Merge tag 'v1.7' into fiksgatami-dev
Diffstat (limited to 'bin/install_perl_modules')
| -rwxr-xr-x | bin/install_perl_modules | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 409fd054e..d757facb6 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -2,20 +2,15 @@ set -e -DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )" +DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd | sed -e 's/\/bin$//' )" -$DIR/bin/cpanm -l $DIR/local-carton Carton - -export PATH=$DIR/local-carton/bin:$PATH -export PERL5LIB=$DIR/local-carton/lib/perl5 - -carton install --deployment --without uk --without zurich --without open311-endpoint +$DIR/vendor/bin/carton install --deployment --without uk --without zurich --without open311-endpoint if ! perl -MImage::Magick -e 'exit()' >/dev/null 2>&1 then read -p "Image::Magick is not installed. Do you want to attempt to install it?" yn case $yn in - [Yy]* ) $DIR/local-carton/bin/carton install Image::Magick;; + [Yy]* ) $DIR/vendor/bin/carton install Image::Magick;; * ) echo 'You will need to install it for FixMyStreet to work';; esac fi |