diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /bin/install_perl_modules | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'bin/install_perl_modules')
| -rwxr-xr-x | bin/install_perl_modules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 0563baf96..2df4ffbf8 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -2,7 +2,7 @@ DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )" -$DIR/bin/cpanm -l local Carton +$DIR/bin/cpanm -l $DIR/local Carton export PATH=$DIR/local/bin:$PATH export PERL5LIB=$DIR/local/lib/perl5 @@ -17,7 +17,7 @@ if [ $HAVE_IM -ne 0 ] then read -p "Image::Magick is not installed. Do you want to attempt to install it?" yn case $yn in - [Yy]* ) ./local/bin/carton install Image::Magick;; + [Yy]* ) $DIR/local/bin/carton install Image::Magick;; * ) echo 'You will need to install it for FixMyStreet to work';; esac fi |