aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/canonicalise-csv2
-rwxr-xr-xbin/canonicalise-eha2
-rwxr-xr-xbin/handlemail2
-rwxr-xr-xbin/import-categories2
-rwxr-xr-xbin/import-flickr2
-rwxr-xr-xbin/load-contacts2
-rwxr-xr-xbin/rotate-photos2
-rwxr-xr-xbin/send-alerts2
-rwxr-xr-xbin/send-questionnaires2
-rwxr-xr-xbin/send-questionnaires-eha2
-rwxr-xr-xbin/send-reports2
-rwxr-xr-xbin/test-mailin4
-rwxr-xr-xbin/test-run2
-rwxr-xr-xbin/update-areas2
14 files changed, 15 insertions, 15 deletions
diff --git a/bin/canonicalise-csv b/bin/canonicalise-csv
index c745ef459..c0a7fc60b 100755
--- a/bin/canonicalise-csv
+++ b/bin/canonicalise-csv
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
use mySociety::MaPit;
diff --git a/bin/canonicalise-eha b/bin/canonicalise-eha
index b334e471b..1030982fa 100755
--- a/bin/canonicalise-eha
+++ b/bin/canonicalise-eha
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
use mySociety::MaPit;
diff --git a/bin/handlemail b/bin/handlemail
index e1a218eaf..c5854a9ab 100755
--- a/bin/handlemail
+++ b/bin/handlemail
@@ -19,7 +19,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
BEGIN {
diff --git a/bin/import-categories b/bin/import-categories
index f7fceeeeb..add12d3d0 100755
--- a/bin/import-categories
+++ b/bin/import-categories
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
use mySociety::DBHandle qw(dbh select_all);
diff --git a/bin/import-flickr b/bin/import-flickr
index 86ab6af97..992a6ac8e 100755
--- a/bin/import-flickr
+++ b/bin/import-flickr
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use File::Slurp;
use LWP::Simple;
diff --git a/bin/load-contacts b/bin/load-contacts
index 9c0d460b3..0fa76ca11 100755
--- a/bin/load-contacts
+++ b/bin/load-contacts
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
use mySociety::DBHandle qw(dbh select_all);
diff --git a/bin/rotate-photos b/bin/rotate-photos
index 2b4068ceb..84c713926 100755
--- a/bin/rotate-photos
+++ b/bin/rotate-photos
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Utils;
use mySociety::Config;
diff --git a/bin/send-alerts b/bin/send-alerts
index 1cf3686f9..57eeb16ae 100755
--- a/bin/send-alerts
+++ b/bin/send-alerts
@@ -16,7 +16,7 @@ use CGI; # XXX
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use CronFns;
use mySociety::Config;
diff --git a/bin/send-questionnaires b/bin/send-questionnaires
index 37d160fef..840f70b2c 100755
--- a/bin/send-questionnaires
+++ b/bin/send-questionnaires
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use File::Slurp;
use CGI; # XXX Awkward kludge
use CronFns;
diff --git a/bin/send-questionnaires-eha b/bin/send-questionnaires-eha
index 71fee3e89..18375b8c6 100755
--- a/bin/send-questionnaires-eha
+++ b/bin/send-questionnaires-eha
@@ -16,7 +16,7 @@ use CGI; # XXX
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use File::Slurp;
use CronFns;
diff --git a/bin/send-reports b/bin/send-reports
index c021b1dd3..30a3b3235 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Error qw(:try);
use File::Slurp;
use CGI; # Trying awkward kludge
diff --git a/bin/test-mailin b/bin/test-mailin
index 33f8ab80c..96e2022c0 100755
--- a/bin/test-mailin
+++ b/bin/test-mailin
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../../perllib
+#!/usr/bin/perl -w -I../commonlib/perllib
#
# test-mailin:
# Receives incoming mail for the test harness, and stores it in the database
@@ -15,7 +15,7 @@
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
chdir $FindBin::Bin;
use File::Slurp;
diff --git a/bin/test-run b/bin/test-run
index 0e87e4321..b0969053a 100755
--- a/bin/test-run
+++ b/bin/test-run
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../../perllib
+#!/usr/bin/perl -w -I../commonlib/perllib
#
# test-run:
# Test harness for FixMyStreet. Makes sure we haven't broken the code.
diff --git a/bin/update-areas b/bin/update-areas
index b161d039b..ed463708a 100755
--- a/bin/update-areas
+++ b/bin/update-areas
@@ -14,7 +14,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
use mySociety::DBHandle qw(dbh select_all);