diff options
| -rwxr-xr-x | bin/canonicalise-csv | 2 | ||||
| -rwxr-xr-x | bin/canonicalise-eha | 2 | ||||
| -rwxr-xr-x | bin/handlemail | 2 | ||||
| -rwxr-xr-x | bin/import-categories | 2 | ||||
| -rwxr-xr-x | bin/import-flickr | 2 | ||||
| -rwxr-xr-x | bin/load-contacts | 2 | ||||
| -rwxr-xr-x | bin/rotate-photos | 2 | ||||
| -rwxr-xr-x | bin/send-alerts | 2 | ||||
| -rwxr-xr-x | bin/send-questionnaires | 2 | ||||
| -rwxr-xr-x | bin/send-questionnaires-eha | 2 | ||||
| -rwxr-xr-x | bin/send-reports | 2 | ||||
| -rwxr-xr-x | bin/test-mailin | 4 | ||||
| -rwxr-xr-x | bin/test-run | 2 | ||||
| -rwxr-xr-x | bin/update-areas | 2 | ||||
| -rwxr-xr-x | perllib/CronFns.pm | 2 | ||||
| -rw-r--r-- | perllib/Standard.pm | 2 | ||||
| -rwxr-xr-x | t/Cobrand.t | 2 | ||||
| -rwxr-xr-x | t/Page.t | 2 | ||||
| -rwxr-xr-x | t/Problems.t | 2 | ||||
| -rwxr-xr-x | web-admin/index.cgi | 2 | ||||
| -rwxr-xr-x | web/iphone/index.cgi | 2 | ||||
| -rwxr-xr-x | web/posters/index.cgi | 2 | ||||
| -rwxr-xr-x | web/upload.cgi | 2 |
23 files changed, 24 insertions, 24 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); diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm index f494ed022..0573b788d 100755 --- a/perllib/CronFns.pm +++ b/perllib/CronFns.pm @@ -16,7 +16,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::Locale; diff --git a/perllib/Standard.pm b/perllib/Standard.pm index 2a776e8c3..eda2d89fb 100644 --- a/perllib/Standard.pm +++ b/perllib/Standard.pm @@ -16,7 +16,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 Page; diff --git a/t/Cobrand.t b/t/Cobrand.t index 9821b4b1d..1f3321b0d 100755 --- a/t/Cobrand.t +++ b/t/Cobrand.t @@ -18,7 +18,7 @@ use Error qw(:try); use FindBin; use lib "$FindBin::Bin"; use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../../perllib"; +use lib "$FindBin::Bin/../commonlib/perllib"; use Cobrand; use mySociety::MockQuery; @@ -17,7 +17,7 @@ use Test::Exception; use FindBin; use lib "$FindBin::Bin"; use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../../perllib"; +use lib "$FindBin::Bin/../commonlib/perllib"; use Page; use mySociety::MockQuery; diff --git a/t/Problems.t b/t/Problems.t index cb2f5fef9..40b3b810c 100755 --- a/t/Problems.t +++ b/t/Problems.t @@ -17,6 +17,6 @@ use Test::Exception; use FindBin; use lib "$FindBin::Bin"; use lib "$FindBin::Bin/../perllib"; -use lib "$FindBin::Bin/../../perllib"; +use lib "$FindBin::Bin/../commonlib/perllib"; BEGIN { use_ok( 'Problems' ); } diff --git a/web-admin/index.cgi b/web-admin/index.cgi index 16de2a06e..dfe18d097 100755 --- a/web-admin/index.cgi +++ b/web-admin/index.cgi @@ -17,7 +17,7 @@ use strict; # 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 POSIX qw(strftime); use Digest::MD5 qw(md5_hex); diff --git a/web/iphone/index.cgi b/web/iphone/index.cgi index b14782300..cd5199482 100755 --- a/web/iphone/index.cgi +++ b/web/iphone/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w -I../../perllib -I../../../perllib +#!/usr/bin/perl -w -I../../perllib -I../../commonlib/perllib # iphone/index.cgi: # Screenshots of the iPhone FixMyStreet application, showing the flow diff --git a/web/posters/index.cgi b/web/posters/index.cgi index 12abcf1b9..f26252131 100755 --- a/web/posters/index.cgi +++ b/web/posters/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w -I../../perllib -I../../../perllib +#!/usr/bin/perl -w -I../../perllib -I../../commonlib/perllib # posters/index.cgi: # List of publicity stuff on FixMyStreet diff --git a/web/upload.cgi b/web/upload.cgi index 3114b7bb9..aa3f8ce61 100755 --- a/web/upload.cgi +++ b/web/upload.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w -I../perllib -I../../perllib +#!/usr/bin/perl -w -I../perllib -I../commonlib/perllib # upload.cgi: # Receiver of flash upload files |