Move main bin scripts to separate packages.

Maintain old location wrappers.

3 files changed, 6 insertions, 9 deletions

diff --git a/bin/send-alerts b/bin/send-alerts
index eaebe9b66..5c8a5412c 100755
--- a/bin/send-alerts
+++ b/bin/send-alerts
@@ -17,14 +17,13 @@ BEGIN {
     require "$d/../setenv.pl";
 }
 
-use CGI; # XXX
 use CronFns;
 
 use FixMyStreet;
-use FixMyStreet::DB;
+use FixMyStreet::Script::Alerts;
 
 my $site = CronFns::site(FixMyStreet->config('BASE_URL'));
 CronFns::language($site);
 
-FixMyStreet::DB->resultset('AlertType')->email_alerts();
+FixMyStreet::Script::Alerts::send();
 
diff --git a/bin/send-questionnaires b/bin/send-questionnaires
index 15b8027f3..85eef810c 100755
--- a/bin/send-questionnaires
+++ b/bin/send-questionnaires
@@ -17,15 +17,14 @@ BEGIN {
     require "$d/../setenv.pl";
 }
 
-use CGI; # XXX Awkward kludge
 use CronFns;
 use FixMyStreet;
-use FixMyStreet::DB;
+use FixMyStreet::Script::Questionnaires;
 
 my %params;
 ( $params{verbose}, $params{nomail} ) = CronFns::options();
 $params{site} = CronFns::site(FixMyStreet->config('BASE_URL'));
 CronFns::language($params{site});
 
-FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires( \%params );
+FixMyStreet::Script::Questionnaires::send( \%params );
 
diff --git a/bin/send-reports b/bin/send-reports
index 2dfe415fa..81be691e7 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -17,13 +17,12 @@ BEGIN {
     require "$d/../setenv.pl";
 }
 
-use CGI; # XXX
 use CronFns;
 
 use FixMyStreet;
-use FixMyStreet::DB;
+use FixMyStreet::Script::Reports;
 
 my $site = CronFns::site(FixMyStreet->config('BASE_URL'));
 CronFns::language($site);
 
-FixMyStreet::DB->resultset('Problem')->send_reports();
+FixMyStreet::Script::Reports::send();