From c507dbefe9048aca52386027976607a549391513 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 3 Sep 2015 18:03:58 +0100 Subject: Bundle carton. This was generated using 'carton fatpack' as follows: bin/cpanm -L local-carton --with-recommends Carton export PERL5LIB=/lib/perl5/ local-carton/bin/carton fatpack (It needs to be an absolute path in order to locate the meta files.) This was done on a Debian squeeze box to make sure any too-old core modules were updated and included in the bundle. --- bin/install_perl_modules | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'bin/install_perl_modules') 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 -- cgit v1.2.3 From 9a13d4aab8954939a75bf26f52761ac4f7a100d0 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Oct 2015 09:34:15 +0100 Subject: Fix non-working scripts when CDPATH is set. If the CDPATH environment variable is set (so cd can look in multiple places), cd prints out the resulting directory when used. This confuses a command sequence used in a couple of places doing (cd && pwd) to get a directory path. Make sure we ignore any output from cd. --- bin/install_perl_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/install_perl_modules') diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 3e43b5bb7..d757facb6 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -2,7 +2,7 @@ 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/vendor/bin/carton install --deployment --without uk --without zurich --without open311-endpoint -- cgit v1.2.3