diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-03-07 13:58:10 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2014-03-07 13:58:10 +0000 |
| commit | 8d1bb4a529c2286cf2bbece5383b5814e8bd72b5 (patch) | |
| tree | 90ea7e523e9f9254a79517bb8aa5d30d385d52de /bin | |
| parent | 5142527974866602ac7fe42e97bdcceef2c62ed9 (diff) | |
| parent | a70342b06acf65564b6a932e0c2374bd8af7ff3e (diff) | |
Merge branch 'cpanfile-fixes'
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/install_perl_modules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 2311ae5f1..883ced235 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -4,18 +4,18 @@ set -e DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )" -$DIR/bin/cpanm -l $DIR/local Carton +$DIR/bin/cpanm -l $DIR/local-carton Carton -export PATH=$DIR/local/bin:$PATH -export PERL5LIB=$DIR/local/lib/perl5 +export PATH=$DIR/local-carton/bin:$PATH +export PERL5LIB=$DIR/local-carton/lib/perl5 -carton install --deployment +carton install --deployment --without uk 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/bin/carton install Image::Magick;; + [Yy]* ) $DIR/local-carton/bin/carton install Image::Magick;; * ) echo 'You will need to install it for FixMyStreet to work';; esac fi |