From 3409f4d169c56f46471a51173b34faf50acd228d Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 22 Dec 2011 09:51:32 +0000
Subject: work in progress new module install scripts

---
 bin/install_perl_modules | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 bin/install_perl_modules

(limited to 'bin/install_perl_modules')

diff --git a/bin/install_perl_modules b/bin/install_perl_modules
new file mode 100755
index 000000000..19c3dca95
--- /dev/null
+++ b/bin/install_perl_modules
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+curl -LO http://xrl.us/cpanm
+mv cpanm bin
+chmod +x bin/cpanm 
+./bin/cpanm -l local Carton
+
+export PATH=local/bin:$PATH
+export PERL5LIB=local/lib/perl5
+
+./local/bin/carton install --deployment
+
+perl -MImage::Magick -e 'exit()' >/dev/null 2>&1
+
+HAVE_IM=$?
+
+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;;
+        * ) echo 'You will need to install it for FixMyStreet to work';;
+    esac
+fi
-- 
cgit v1.2.3


From 9cc7c8c6b6dc2865fa1e9b613f6770b97650a87c Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Fri, 23 Dec 2011 16:57:49 +0000
Subject: if carton was already installed then it may not be in ./local/bin

---
 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 19c3dca95..7a3841aa2 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -8,7 +8,7 @@ chmod +x bin/cpanm
 export PATH=local/bin:$PATH
 export PERL5LIB=local/lib/perl5
 
-./local/bin/carton install --deployment
+carton install --deployment
 
 perl -MImage::Magick -e 'exit()' >/dev/null 2>&1
 
-- 
cgit v1.2.3


From 8b9396bc92caad2610b51615c85552430af17c71 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 12 Jan 2012 13:58:15 +0000
Subject: use full path in env variables to be on safe side

---
 bin/install_perl_modules | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'bin/install_perl_modules')

diff --git a/bin/install_perl_modules b/bin/install_perl_modules
index 7a3841aa2..c73050c18 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -1,12 +1,14 @@
 #!/bin/bash
 
+DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 curl -LO http://xrl.us/cpanm
-mv cpanm bin
-chmod +x bin/cpanm 
-./bin/cpanm -l local Carton
+mv cpanm $DIR/bin
+chmod +x $DIR/bin/cpanm 
+$DIR/bin/cpanm -l local Carton
 
-export PATH=local/bin:$PATH
-export PERL5LIB=local/lib/perl5
+export PATH=$DIR/local/bin:$PATH
+export PERL5LIB=$DIR/local/lib/perl5
 
 carton install --deployment
 
-- 
cgit v1.2.3


From 89c7b827c10b44a456cf1a30919050a6839fe2b4 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 12 Jan 2012 14:34:18 +0000
Subject: strip /bin from the end of the path

---
 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 c73050c18..ece7e7bce 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )"
 
 curl -LO http://xrl.us/cpanm
 mv cpanm $DIR/bin
-- 
cgit v1.2.3