diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-09-07 13:41:30 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-09-07 13:41:30 +0100 |
| commit | 0801b544777b92d01278321ac250045938fa7595 (patch) | |
| tree | 522efcc642c49e4d44a18fe9b66b2fa66b4c9bd6 /bin/install_perl_modules | |
| parent | 77ae49afb00e1dc1bd528f179ac0b32512feae3d (diff) | |
| parent | f2c893ed4a773d3658b5645ef4329689a8b908f1 (diff) | |
Merge branch '1202-improve-gettext-extract-and-more'
Diffstat (limited to 'bin/install_perl_modules')
| -rwxr-xr-x | bin/install_perl_modules | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 409fd054e..3e43b5bb7 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -4,18 +4,13 @@ set -e DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && 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 |