Use env in shebang lines, and remove unneeded ones

29 files changed, 13 insertions, 51 deletions

diff --git a/bin/emptyhomes/make_welsh_po b/bin/emptyhomes/make_welsh_po
index a85e7c35b..568ccdcde 100755
--- a/bin/emptyhomes/make_welsh_po
+++ b/bin/emptyhomes/make_welsh_po
@@ -1,5 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+
 use strict;
+use warnings;
 
 # Given a translation of the Empty Homes version of the FixMyStreet .po file,
 # fix it all up to go direct from FixMyStreet -> EH translation.
diff --git a/bin/geocode b/bin/geocode
index 254cf1578..2b85ff572 100755
--- a/bin/geocode
+++ b/bin/geocode
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 =head1 NAME
 
diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch
index 5ebd8bbcb..92b687552 100755
--- a/bin/gettext-nget-patch
+++ b/bin/gettext-nget-patch
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # xgettext doesn't deal with TT files, but xgettext.pl doesn't find nget()s, sigh.
 # This will find the nget()s and output a .po file excerpt.
diff --git a/bin/handlemail b/bin/handlemail
index 8bc016241..5d4ac753c 100755
--- a/bin/handlemail
+++ b/bin/handlemail
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # handlemail:
 # Handle an individual incoming mail message.
@@ -14,6 +14,7 @@
 my $rcsid = ''; $rcsid .= '$Id: handlemail,v 1.2 2009-02-11 11:04:48 matthew Exp $';
 
 use strict;
+use warnings;
 require 5.8.0;
 
 # Horrible boilerplate to set up appropriate library paths.
diff --git a/bin/make_po b/bin/make_po
index ad1fc1a89..a5b145ecb 100755
--- a/bin/make_po
+++ b/bin/make_po
@@ -1,5 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+
 use strict;
+use warnings;
 
 # Generates a version of .po file, which is a translation
 # into a language the same as English, with replacement as specified in PoChange
diff --git a/bin/open311-update-reports b/bin/open311-update-reports
index 3b77fef89..a964ba8c9 100755
--- a/bin/open311-update-reports
+++ b/bin/open311-update-reports
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # This script utilises the standard Open311 way of getting updates on reports
 # (by fetching all reports for a body and looking for updates). If possible,
diff --git a/bin/update-schema b/bin/update-schema
index 30fc1396b..af0da3601 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 =head1 NAME
 
diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm
index ac7f85596..28268c08e 100755
--- a/perllib/CronFns.pm
+++ b/perllib/CronFns.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl -w
-
 # CronFns.pm:
 # Shared functions for cron-run scripts
 #
diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm
index 0c621e9d0..9567c2b38 100644
--- a/perllib/CrossSell.pm
+++ b/perllib/CrossSell.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl -w
-#
 # CrossSell.pm:
 # Adverts from FixMyStreet to another site.
 #
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index 2a318ea5a..b5be152a8 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet::Geocode
 # The geocoding functions for FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm
index 85eef3d0f..702e19814 100644
--- a/perllib/FixMyStreet/Geocode/Bing.pm
+++ b/perllib/FixMyStreet/Geocode/Bing.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet::Geocode::Bing
 # Geocoding with Bing for FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Geocode/FixaMinGata.pm b/perllib/FixMyStreet/Geocode/FixaMinGata.pm
index 2db25f504..2ea92c422 100644
--- a/perllib/FixMyStreet/Geocode/FixaMinGata.pm
+++ b/perllib/FixMyStreet/Geocode/FixaMinGata.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Geocode::FixaMinGata
 # OpenStreetmap forward and reverse geocoding for FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm
index fd65b89b1..11ff8ef80 100644
--- a/perllib/FixMyStreet/Geocode/Google.pm
+++ b/perllib/FixMyStreet/Geocode/Google.pm
@@ -1,6 +1,4 @@
-#!/usr/bin/perl
-#
-# FixMyStreet::Geocode
+# FixMyStreet::Geocode::Google
 # The geocoding functions for FixMyStreet.
 #
 # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm
index fd14b0acc..919940f78 100644
--- a/perllib/FixMyStreet/Geocode/OSM.pm
+++ b/perllib/FixMyStreet/Geocode/OSM.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Geocode::OSM
 # OpenStreetmap forward and reverse geocoding for FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm
index 84fd83fc7..1f0b4fc16 100644
--- a/perllib/FixMyStreet/Geocode/Zurich.pm
+++ b/perllib/FixMyStreet/Geocode/Zurich.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet::Geocode::Zurich
 # Geocoding with Zurich web service.
 #
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index f2dd0da6d..7d490fde3 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map
 # Adding the ability to have different maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 676e70bf6..09c951a5f 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::Bing
 # Bing maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index 20821236f..fc8726b34 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::Bromley
 # Bromley have slightly different tiles, with trees etc.
 #
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 62849a157..96e265a4d 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::FMS
 # Bing and OS StreetView maps on FixMyStreet, using OpenLayers.
 #
diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm
index 9deefc033..172d2d60e 100644
--- a/perllib/FixMyStreet/Map/Google.pm
+++ b/perllib/FixMyStreet/Map/Google.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::Google
 # Google maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/GoogleOL.pm b/perllib/FixMyStreet/Map/GoogleOL.pm
index 64baf8d36..2dfb697e5 100644
--- a/perllib/FixMyStreet/Map/GoogleOL.pm
+++ b/perllib/FixMyStreet/Map/GoogleOL.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::GoogleOL
 # Google maps on FixMyStreet, using OpenLayers.
 #
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 82ddd293b..df2d16b82 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::OSM
 # OSM maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/OSM/CycleMap.pm b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
index 71b86de8f..8f1de39d2 100644
--- a/perllib/FixMyStreet/Map/OSM/CycleMap.pm
+++ b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::OSM::CycleMap
 # OSM CycleMap maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
index a7f1b334e..2c3cbaf00 100644
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::OSM::CycleMap
 # OSM CycleMap maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm
index 8fe4744a4..c70dd93aa 100644
--- a/perllib/FixMyStreet/Map/OSM/StreetView.pm
+++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::OSM::StreetView
 # OSM StreetView maps on FixMyStreet.
 #
diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm
index e09f8c90f..d667a4701 100644
--- a/perllib/FixMyStreet/Map/Zurich.pm
+++ b/perllib/FixMyStreet/Map/Zurich.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # FixMyStreet:Map::Zurich
 # Zurich have their own tileserver.
 #
diff --git a/perllib/Geo/Coordinates/CH1903.pm b/perllib/Geo/Coordinates/CH1903.pm
index 612182152..6611af9f2 100644
--- a/perllib/Geo/Coordinates/CH1903.pm
+++ b/perllib/Geo/Coordinates/CH1903.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # Geo::Coordinates::CH1903
 # Conversion between WGS84 and Swiss CH1903.
 #
diff --git a/perllib/PoChange.pm b/perllib/PoChange.pm
index f26161889..1e00c1426 100644
--- a/perllib/PoChange.pm
+++ b/perllib/PoChange.pm
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
 use strict;
 
 package PoChange;
diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index 6d6d5bcde..7f95d1f5a 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-#
 # Utils.pm:
 # Various generic utilities for FixMyStreet.
 #