aboutsummaryrefslogtreecommitdiffstats
path: root/bin/install_perl_modules
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2014-02-26 11:40:22 +0000
committerMatthew Somerville <matthew@mysociety.org>2014-02-26 12:54:34 +0000
commit9f8907fc2e5627c6a963204bb025c6fbf342cb13 (patch)
tree9ea57ba2ca7da8d26deb9686002729e2fdc73fbf /bin/install_perl_modules
parent8a431b9edb079d095cd3c7e3db391548b1e5d859 (diff)
Install Carton in its own local::lib.
This keeps the dependencies of carton separate from those of FixMyStreet.
Diffstat (limited to 'bin/install_perl_modules')
-rwxr-xr-xbin/install_perl_modules8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules
index 2311ae5f1..d7378c697 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -4,10 +4,10 @@ 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
@@ -15,7 +15,7 @@ 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