Bug 22600: Set 'commandline' interface appropriately

This patch change Koha::Cron to be a more generic Koha::Script class and
update all commanline driven scripts to use it.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha/Cron.pm b/Koha/Script.pm
similarity index 52%
rename from Koha/Cron.pm
rename to Koha/Script.pm
index 95bd3a9..26efd12 100644 (file)
--- a/Koha/Cron.pm
+++ b/Koha/Script.pm
@@ -1,4 +1,4 @@
-package Koha::Cron;
+package Koha::Script;
 
 # Copyright PTFS Europe 2019
 # Copyright 2019 Koha Development Team
@@ -22,29 +22,50 @@ use Modern::Perl;
 
 =head1 NAME
 
-Koha::Cron - Koha Cron scripts base class
+Koha::Script - Koha scripts base class
 
 =head1 SYNOPSIS
 
-    use Koha::Cron;
+    use Koha::Script
+    use Koha::Script -cron;
 
 =head1 DESCRIPTION
 
-This class should be used in all cronscripts. It sets the interface and userenv appropriately.
+This class should be used in all scripts. It sets the interface and userenv appropriately.
 
 =cut
 
 use C4::Context;
 
-# Set userenv
-C4::Context->_new_userenv(1);
-C4::Context->set_userenv(
-    undef, undef, undef, 'CRON', 'CRON', undef,
-    undef, undef, undef, undef,  undef
-);
-
-# Set interface
-C4::Context->interface('cron');
+sub import {
+    my $class = shift;
+    my @flags = @_;
+
+    C4::Context->_new_userenv(1);
+    if ( ( $flags[0] || '' ) eq '-cron' ) {
+
+        # Set userenv
+        C4::Context->_new_userenv(1);
+        C4::Context->set_userenv(
+            undef, undef, undef, 'CRON', 'CRON', undef,
+            undef, undef, undef, undef,  undef
+        );
+
+        # Set interface
+        C4::Context->interface('cron');
+
+    }
+    else {
+        # Set userenv
+        C4::Context->set_userenv(
+            undef, undef, undef, 'CLI', 'CLI', undef,
+            undef, undef, undef, undef,  undef
+        );
+
+        # Set interface
+        C4::Context->interface('commandline');
+    }
+}
 
 =head1 AUTHOR
 

diff --git a/misc/admin/koha-preferences b/misc/admin/koha-preferences
index 15b7939..34e34b8 100755 (executable)
--- a/misc/admin/koha-preferences
+++ b/misc/admin/koha-preferences
@@ -18,6 +18,7 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
+use Koha::Script;
 use C4::Boolean;
 use C4::Context;
 use C4::Debug;

diff --git a/misc/batchCompareMARCvsFrameworks.pl b/misc/batchCompareMARCvsFrameworks.pl
index 9bbcde4..af8a667 100755 (executable)
--- a/misc/batchCompareMARCvsFrameworks.pl
+++ b/misc/batchCompareMARCvsFrameworks.pl
@@ -12,6 +12,7 @@ BEGIN {
 }
 
 # Koha modules used
+use Koha::Script;
 use C4::Context;
 use MARC::File::USMARC;
 use MARC::Record;

diff --git a/misc/batchDeleteUnusedSubfields.pl b/misc/batchDeleteUnusedSubfields.pl
index a1c5093..a80d4fd 100755 (executable)
--- a/misc/batchDeleteUnusedSubfields.pl
+++ b/misc/batchDeleteUnusedSubfields.pl
@@ -11,6 +11,7 @@ BEGIN {
 }
 
 # Koha modules used
+use Koha::Script;
 use MARC::Record;
 use C4::Context;
 use C4::Biblio;

diff --git a/misc/batchImportMARCWithBiblionumbers.pl b/misc/batchImportMARCWithBiblionumbers.pl
index 24692fd..36781c2 100755 (executable)
--- a/misc/batchImportMARCWithBiblionumbers.pl
+++ b/misc/batchImportMARCWithBiblionumbers.pl
@@ -12,6 +12,7 @@ BEGIN {
 
 # Koha modules used
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use MARC::Record;

diff --git a/misc/batchRebuildBiblioTables.pl b/misc/batchRebuildBiblioTables.pl
index 5db801b..f9bd218 100755 (executable)
--- a/misc/batchRebuildBiblioTables.pl
+++ b/misc/batchRebuildBiblioTables.pl
@@ -13,6 +13,7 @@ BEGIN {
 }
 
 # Koha modules used
+use Koha::Script;
 use MARC::Record;
 use C4::Context;
 use C4::Biblio;

diff --git a/misc/batchRebuildItemsTables.pl b/misc/batchRebuildItemsTables.pl
index 0e611dd..f1e1300 100755 (executable)
--- a/misc/batchRebuildItemsTables.pl
+++ b/misc/batchRebuildItemsTables.pl
@@ -8,6 +8,7 @@ use MARC::Record;
 use Pod::Usage;
 use Time::HiRes qw(gettimeofday);
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::Items;

diff --git a/misc/batchRepairMissingBiblionumbers.pl b/misc/batchRepairMissingBiblionumbers.pl
index ca8064c..695c452 100755 (executable)
--- a/misc/batchRepairMissingBiblionumbers.pl
+++ b/misc/batchRepairMissingBiblionumbers.pl
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 # Koha modules used
-
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 

diff --git a/misc/batchdeletebiblios.pl b/misc/batchdeletebiblios.pl
index 9bc999a..bcfd74e 100755 (executable)
--- a/misc/batchdeletebiblios.pl
+++ b/misc/batchdeletebiblios.pl
@@ -5,6 +5,7 @@ use Getopt::Long;
 use Pod::Usage;
 use IO::File;
 
+use Koha::Script;
 use C4::Biblio;
 
 my ($help, $files);

diff --git a/misc/check_sysprefs.pl b/misc/check_sysprefs.pl
index d69ee15..ce2e19e 100755 (executable)
--- a/misc/check_sysprefs.pl
+++ b/misc/check_sysprefs.pl
@@ -10,6 +10,7 @@ use warnings;
 
 use File::Find;
 
+use Koha::Script;
 use C4::Context;
 
 @ARGV = qw(.) unless @ARGV;

diff --git a/misc/commit_file.pl b/misc/commit_file.pl
index bd29df3..bb7dd03 100755 (executable)
--- a/misc/commit_file.pl
+++ b/misc/commit_file.pl
@@ -9,6 +9,7 @@ BEGIN {
     eval { require "$FindBin::Bin/kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::ImportBatch;
 use Getopt::Long;

diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl
index eeb0d7e..f0f1425 100755 (executable)
--- a/misc/cronjobs/advance_notices.pl
+++ b/misc/cronjobs/advance_notices.pl
@@ -49,7 +49,7 @@ BEGIN {
     use FindBin;
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Biblio;
 use C4::Context;
 use C4::Letters;

diff --git a/misc/cronjobs/automatic_item_modification_by_age.pl b/misc/cronjobs/automatic_item_modification_by_age.pl
index 6f04e54..364f61f 100755 (executable)
--- a/misc/cronjobs/automatic_item_modification_by_age.pl
+++ b/misc/cronjobs/automatic_item_modification_by_age.pl
@@ -6,7 +6,7 @@ use Getopt::Long;
 use Pod::Usage;
 use JSON;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Items;
 

diff --git a/misc/cronjobs/automatic_renewals.pl b/misc/cronjobs/automatic_renewals.pl
index 32017c9..8162472 100755 (executable)
--- a/misc/cronjobs/automatic_renewals.pl
+++ b/misc/cronjobs/automatic_renewals.pl
@@ -52,7 +52,7 @@ use Modern::Perl;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Circulation;
 use C4::Context;
 use C4::Log;

diff --git a/misc/cronjobs/batch_anonymise.pl b/misc/cronjobs/batch_anonymise.pl
index 654f61c..ea63dfa 100755 (executable)
--- a/misc/cronjobs/batch_anonymise.pl
+++ b/misc/cronjobs/batch_anonymise.pl
@@ -29,7 +29,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use Koha::Patrons;
 use Date::Calc qw(

diff --git a/misc/cronjobs/build_browser_and_cloud.pl b/misc/cronjobs/build_browser_and_cloud.pl
index a72c1f9..d180bcb 100755 (executable)
--- a/misc/cronjobs/build_browser_and_cloud.pl
+++ b/misc/cronjobs/build_browser_and_cloud.pl
@@ -10,7 +10,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Koha;
 use C4::Context;
 use C4::Biblio;

diff --git a/misc/cronjobs/cart_to_shelf.pl b/misc/cronjobs/cart_to_shelf.pl
index 0e35c96..414f6e3 100755 (executable)
--- a/misc/cronjobs/cart_to_shelf.pl
+++ b/misc/cronjobs/cart_to_shelf.pl
@@ -28,7 +28,7 @@ cart_to_shelf.pl  cron script to set items with location of CART to original she
 use strict;
 use warnings;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Items qw/ CartToShelf /;
 use C4::Log;
 

diff --git a/misc/cronjobs/check-url-quick.pl b/misc/cronjobs/check-url-quick.pl
index 5b596f0..93fcd97 100755 (executable)
--- a/misc/cronjobs/check-url-quick.pl
+++ b/misc/cronjobs/check-url-quick.pl
@@ -21,7 +21,7 @@ use Modern::Perl;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Biblio;
 use AnyEvent;

diff --git a/misc/cronjobs/check-url.pl b/misc/cronjobs/check-url.pl
index dc916c4..68a7b8e 100755 (executable)
--- a/misc/cronjobs/check-url.pl
+++ b/misc/cronjobs/check-url.pl
@@ -78,7 +78,7 @@ use strict;
 use warnings;
 use LWP::UserAgent;
 use HTTP::Request;
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Biblio;
 
 
@@ -148,7 +148,7 @@ use Carp;
 
 use Pod::Usage;
 use Getopt::Long;
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 
 

diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
index bc2404f..6ddb1ba 100755 (executable)
--- a/misc/cronjobs/cleanup_database.pl
+++ b/misc/cronjobs/cleanup_database.pl
@@ -34,7 +34,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Search;
 use C4::Search::History;

diff --git a/misc/cronjobs/cloud-kw.pl b/misc/cronjobs/cloud-kw.pl
index 4432183..46a972e 100755 (executable)
--- a/misc/cronjobs/cloud-kw.pl
+++ b/misc/cronjobs/cloud-kw.pl
@@ -26,7 +26,7 @@ use YAML::Syck;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Log;
 

diff --git a/misc/cronjobs/create_koc_db.pl b/misc/cronjobs/create_koc_db.pl
index d6d158e..3d92fe5 100755 (executable)
--- a/misc/cronjobs/create_koc_db.pl
+++ b/misc/cronjobs/create_koc_db.pl
@@ -95,7 +95,7 @@ use DBI;
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use English qw(-no_match_vars);
 

diff --git a/misc/cronjobs/delete_expired_opac_registrations.pl b/misc/cronjobs/delete_expired_opac_registrations.pl
index 47950b4..28dd3c7 100755 (executable)
--- a/misc/cronjobs/delete_expired_opac_registrations.pl
+++ b/misc/cronjobs/delete_expired_opac_registrations.pl
@@ -28,7 +28,7 @@ BEGIN {
     eval { my $lib = "$FindBin::Bin/../kohalib.pl"; require $lib };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 
 my $help;

diff --git a/misc/cronjobs/delete_items.pl b/misc/cronjobs/delete_items.pl
index bccc0e0..6c2962a 100755 (executable)
--- a/misc/cronjobs/delete_items.pl
+++ b/misc/cronjobs/delete_items.pl
@@ -2,7 +2,7 @@
 
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Items;
 use C4::Circulation;

diff --git a/misc/cronjobs/delete_patrons.pl b/misc/cronjobs/delete_patrons.pl
index 5f67213..e8e90dd 100755 (executable)
--- a/misc/cronjobs/delete_patrons.pl
+++ b/misc/cronjobs/delete_patrons.pl
@@ -5,7 +5,7 @@ use Modern::Perl;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Members;
 use Koha::DateUtils;
 use Koha::Patrons;

diff --git a/misc/cronjobs/delete_records_via_leader.pl b/misc/cronjobs/delete_records_via_leader.pl
index 11dc33d..80c9996 100755 (executable)
--- a/misc/cronjobs/delete_records_via_leader.pl
+++ b/misc/cronjobs/delete_records_via_leader.pl
@@ -33,7 +33,7 @@ BEGIN {
 
 use Getopt::Long;
 use Pod::Usage;
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Biblio;
 use C4::Items;
 use Koha::Database;

diff --git a/misc/cronjobs/edi_cron.pl b/misc/cronjobs/edi_cron.pl
index dfc1a2e..b345dc4 100755 (executable)
--- a/misc/cronjobs/edi_cron.pl
+++ b/misc/cronjobs/edi_cron.pl
@@ -29,7 +29,7 @@ use utf8;
 # can be run as frequently as required
 # log messages are appended to logdir/editrace.log
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use Log::Log4perl qw(:easy);
 use Koha::Database;

diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl
index ac74adc..f04da4b 100755 (executable)
--- a/misc/cronjobs/fines.pl
+++ b/misc/cronjobs/fines.pl
@@ -30,7 +30,7 @@ use strict;
 use warnings;
 use 5.010;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Overdues;
 use Getopt::Long;

diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl
index a0c85c8..6b64a76 100755 (executable)
--- a/misc/cronjobs/gather_print_notices.pl
+++ b/misc/cronjobs/gather_print_notices.pl
@@ -10,7 +10,7 @@ BEGIN {
 }
 
 use CGI qw( utf8 ); # NOT a CGI script, this is just to keep C4::Templates::gettemplate happy
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Debug;
 use C4::Letters;

diff --git a/misc/cronjobs/holds/auto_unsuspend_holds.pl b/misc/cronjobs/holds/auto_unsuspend_holds.pl
index 83d5d60..eb4fd87 100755 (executable)
--- a/misc/cronjobs/holds/auto_unsuspend_holds.pl
+++ b/misc/cronjobs/holds/auto_unsuspend_holds.pl
@@ -29,7 +29,7 @@ BEGIN {
 
 # cancel all expired hold requests
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Reserves;
 use C4::Log;
 

diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index 370a9da..ab138f9 100755 (executable)
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -15,7 +15,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::HoldsQueue qw(CreateQueue);
 use C4::Log;
 

diff --git a/misc/cronjobs/holds/cancel_expired_holds.pl b/misc/cronjobs/holds/cancel_expired_holds.pl
index 6de289b..9ef50de 100755 (executable)
--- a/misc/cronjobs/holds/cancel_expired_holds.pl
+++ b/misc/cronjobs/holds/cancel_expired_holds.pl
@@ -29,7 +29,7 @@ BEGIN {
 
 # cancel all expired hold requests
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Reserves;
 use C4::Log;
 

diff --git a/misc/cronjobs/holds/cancel_unfilled_holds.pl b/misc/cronjobs/holds/cancel_unfilled_holds.pl
index 0cae7fb..ba6a400 100755 (executable)
--- a/misc/cronjobs/holds/cancel_unfilled_holds.pl
+++ b/misc/cronjobs/holds/cancel_unfilled_holds.pl
@@ -28,7 +28,7 @@ BEGIN {
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Reserves;
 use C4::Log;
 use Koha::Holds;

diff --git a/misc/cronjobs/import_webservice_batch.pl b/misc/cronjobs/import_webservice_batch.pl
index 55de9be..aa18edc 100755 (executable)
--- a/misc/cronjobs/import_webservice_batch.pl
+++ b/misc/cronjobs/import_webservice_batch.pl
@@ -31,7 +31,7 @@ BEGIN {
 
 use Getopt::Long;
 use Pod::Usage;
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::ImportBatch;
 
 my ($help, $framework);

diff --git a/misc/cronjobs/j2a.pl b/misc/cronjobs/j2a.pl
index 4fb22fa..cdbb8f8 100755 (executable)
--- a/misc/cronjobs/j2a.pl
+++ b/misc/cronjobs/j2a.pl
@@ -26,7 +26,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Members;
 use Getopt::Long;

diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl
index 82d13b1..e1e91b6 100755 (executable)
--- a/misc/cronjobs/longoverdue.pl
+++ b/misc/cronjobs/longoverdue.pl
@@ -34,7 +34,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Items;
 use C4::Circulation qw/LostItem MarkIssueReturned/;

diff --git a/misc/cronjobs/membership_expiry.pl b/misc/cronjobs/membership_expiry.pl
index 3ce0537..5038ce1 100755 (executable)
--- a/misc/cronjobs/membership_expiry.pl
+++ b/misc/cronjobs/membership_expiry.pl
@@ -126,7 +126,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Letters;
 use C4::Log;

diff --git a/misc/cronjobs/merge_authorities.pl b/misc/cronjobs/merge_authorities.pl
index c2ef914..727d7d5 100755 (executable)
--- a/misc/cronjobs/merge_authorities.pl
+++ b/misc/cronjobs/merge_authorities.pl
@@ -5,7 +5,7 @@ use Getopt::Long;
 use Pod::Usage;
 use Time::HiRes qw(gettimeofday);
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::AuthoritiesMarc;
 use Koha::Authority::MergeRequests;
 

diff --git a/misc/cronjobs/notice_unprocessed_suggestions.pl b/misc/cronjobs/notice_unprocessed_suggestions.pl
index fa79e89..55205a1 100755 (executable)
--- a/misc/cronjobs/notice_unprocessed_suggestions.pl
+++ b/misc/cronjobs/notice_unprocessed_suggestions.pl
@@ -5,7 +5,7 @@ use Modern::Perl;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Budgets qw( GetBudget );
 use C4::Suggestions qw( GetUnprocessedSuggestions );
 use Koha::Libraries;

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 8c8f6a0..1f9015a 100755 (executable)
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -34,7 +34,7 @@ use Text::CSV_XS;
 use DateTime;
 use DateTime::Duration;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Letters;
 use C4::Overdues qw(GetFine GetOverdueMessageTransportTypes parse_overdues_letter);

diff --git a/misc/cronjobs/process_message_queue.pl b/misc/cronjobs/process_message_queue.pl
index c78d4c0..0532a5b 100755 (executable)
--- a/misc/cronjobs/process_message_queue.pl
+++ b/misc/cronjobs/process_message_queue.pl
@@ -26,7 +26,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Letters;
 use C4::Log;
 use Getopt::Long;

diff --git a/misc/cronjobs/purge_suggestions.pl b/misc/cronjobs/purge_suggestions.pl
index 5553657..9fdc26d 100755 (executable)
--- a/misc/cronjobs/purge_suggestions.pl
+++ b/misc/cronjobs/purge_suggestions.pl
@@ -29,7 +29,7 @@ BEGIN {
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Suggestions;
 use C4::Log;
 use C4::Context;

diff --git a/misc/cronjobs/reconcile_balances.pl b/misc/cronjobs/reconcile_balances.pl
index 8ff7e85..0dcae6c 100755 (executable)
--- a/misc/cronjobs/reconcile_balances.pl
+++ b/misc/cronjobs/reconcile_balances.pl
@@ -62,7 +62,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Log;
 
 use Koha::Account::Lines;

diff --git a/misc/cronjobs/remove_temporary_edifiles.pl b/misc/cronjobs/remove_temporary_edifiles.pl
index a38c911..7791717 100755 (executable)
--- a/misc/cronjobs/remove_temporary_edifiles.pl
+++ b/misc/cronjobs/remove_temporary_edifiles.pl
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 
 # this script will remove those older than 5 days

diff --git a/misc/cronjobs/rss/rss.pl b/misc/cronjobs/rss/rss.pl
index f9c5125..9b12372 100755 (executable)
--- a/misc/cronjobs/rss/rss.pl
+++ b/misc/cronjobs/rss/rss.pl
@@ -29,7 +29,7 @@ use Modern::Perl;
 
 use Template;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use Time::Local;
 use POSIX;

diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl
index a673a5b..b62639b 100755 (executable)
--- a/misc/cronjobs/runreport.pl
+++ b/misc/cronjobs/runreport.pl
@@ -20,7 +20,7 @@
 
 use Modern::Perl;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Reports::Guided; # 0.12
 use Koha::Reports;
 use C4::Context;

diff --git a/misc/cronjobs/serialsUpdate.pl b/misc/cronjobs/serialsUpdate.pl
index 6bf40c1..d69cf0f 100755 (executable)
--- a/misc/cronjobs/serialsUpdate.pl
+++ b/misc/cronjobs/serialsUpdate.pl
@@ -28,7 +28,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Debug;
 use C4::Serials;

diff --git a/misc/cronjobs/share_usage_with_koha_community.pl b/misc/cronjobs/share_usage_with_koha_community.pl
index 3173ab4..3484df3 100755 (executable)
--- a/misc/cronjobs/share_usage_with_koha_community.pl
+++ b/misc/cronjobs/share_usage_with_koha_community.pl
@@ -5,7 +5,7 @@ use Modern::Perl;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::UsageStats;
 use C4::Log;

diff --git a/misc/cronjobs/sitemap.pl b/misc/cronjobs/sitemap.pl
index 909ad6f..093afb1 100755 (executable)
--- a/misc/cronjobs/sitemap.pl
+++ b/misc/cronjobs/sitemap.pl
@@ -24,7 +24,7 @@ use utf8;
 use Pod::Usage;
 use Getopt::Long;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Biblio;
 use Koha::Sitemapper;
 

diff --git a/misc/cronjobs/social_data/get_report_social_data.pl b/misc/cronjobs/social_data/get_report_social_data.pl
index 5bb9867..c5e13aa 100755 (executable)
--- a/misc/cronjobs/social_data/get_report_social_data.pl
+++ b/misc/cronjobs/social_data/get_report_social_data.pl
@@ -2,7 +2,7 @@
 
 use Modern::Perl;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::SocialData;
 
 my $results = C4::SocialData::get_report;

diff --git a/misc/cronjobs/social_data/update_social_data.pl b/misc/cronjobs/social_data/update_social_data.pl
index 81bc1d0..58e3dc0 100755 (executable)
--- a/misc/cronjobs/social_data/update_social_data.pl
+++ b/misc/cronjobs/social_data/update_social_data.pl
@@ -2,7 +2,7 @@
 
 use Modern::Perl;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::SocialData;
 

diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl
index 1d4c2dc..2a98fea 100755 (executable)
--- a/misc/cronjobs/staticfines.pl
+++ b/misc/cronjobs/staticfines.pl
@@ -37,7 +37,7 @@ BEGIN {
 
 use Date::Calc qw/Date_to_Days/;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Circulation;
 use C4::Overdues;

diff --git a/misc/cronjobs/stockrotation.pl b/misc/cronjobs/stockrotation.pl
index d178ed8..69ae97e 100755 (executable)
--- a/misc/cronjobs/stockrotation.pl
+++ b/misc/cronjobs/stockrotation.pl
@@ -110,7 +110,7 @@ database updates have been performed.").
 use Modern::Perl;
 use Getopt::Long qw/HelpMessage :config gnu_getopt/;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Letters;
 use Koha::StockRotationRotas;

diff --git a/misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl b/misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl
index abf81cb..5584ddd 100755 (executable)
--- a/misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl
+++ b/misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl
@@ -31,7 +31,7 @@ BEGIN {
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 
 sub usage {

diff --git a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
index 216f39d..98a3d10 100755 (executable)
--- a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
+++ b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
@@ -31,7 +31,7 @@ BEGIN {
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Items;
 use C4::Letters;

diff --git a/misc/cronjobs/update_totalissues.pl b/misc/cronjobs/update_totalissues.pl
index 667b5ac..eb11861 100755 (executable)
--- a/misc/cronjobs/update_totalissues.pl
+++ b/misc/cronjobs/update_totalissues.pl
@@ -31,7 +31,7 @@ BEGIN {
 use Getopt::Long;
 use Pod::Usage;
 
-use Koha::Cron;
+use Koha::Script -cron;
 use C4::Context;
 use C4::Biblio;
 use C4::Log;

diff --git a/misc/devel/create_superlibrarian.pl b/misc/devel/create_superlibrarian.pl
index f17b1f5..28c67b6 100755 (executable)
--- a/misc/devel/create_superlibrarian.pl
+++ b/misc/devel/create_superlibrarian.pl
@@ -21,6 +21,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use Koha::Patrons;
 
 my ( $help, $surname, $userid, $password, $branchcode, $categorycode, $cardnumber );

diff --git a/misc/devel/populate_db.pl b/misc/devel/populate_db.pl
index e419e37..f2cb974 100755 (executable)
--- a/misc/devel/populate_db.pl
+++ b/misc/devel/populate_db.pl
@@ -22,6 +22,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use C4::Installer;
 use C4::Context;
 

diff --git a/misc/export_borrowers.pl b/misc/export_borrowers.pl
index 5f5c7f7..4733c3c 100755 (executable)
--- a/misc/export_borrowers.pl
+++ b/misc/export_borrowers.pl
@@ -23,6 +23,7 @@ use Modern::Perl;
 use Text::CSV;
 use Getopt::Long qw(:config no_ignore_case);
 
+use Koha::Script;
 use C4::Context;
 use Koha::Patrons;
 

diff --git a/misc/export_records.pl b/misc/export_records.pl
index a1eecc8..b5a7291 100755 (executable)
--- a/misc/export_records.pl
+++ b/misc/export_records.pl
@@ -22,6 +22,7 @@ use List::MoreUtils qw(uniq);
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use C4::Auth;
 use C4::Context;
 use C4::Record;

diff --git a/misc/exportauth.pl b/misc/exportauth.pl
index d6236d2..2f5e3dd 100755 (executable)
--- a/misc/exportauth.pl
+++ b/misc/exportauth.pl
@@ -12,6 +12,7 @@ BEGIN {
     eval { require "$FindBin::Bin/kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::Auth;

diff --git a/misc/import_patrons.pl b/misc/import_patrons.pl
index 8f639a5..f840601 100755 (executable)
--- a/misc/import_patrons.pl
+++ b/misc/import_patrons.pl
@@ -22,6 +22,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use Koha::Patrons::Import;
 my $Import = Koha::Patrons::Import->new();
 

diff --git a/misc/link_bibs_to_authorities.pl b/misc/link_bibs_to_authorities.pl
index 2711d16..699451a 100755 (executable)
--- a/misc/link_bibs_to_authorities.pl
+++ b/misc/link_bibs_to_authorities.pl
@@ -11,6 +11,7 @@ BEGIN {
     eval { require "$FindBin::Bin/kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use Getopt::Long;

diff --git a/misc/maintenance/UNIMARC_fix_collectiontitle.pl b/misc/maintenance/UNIMARC_fix_collectiontitle.pl
index d977222..4a97c18 100755 (executable)
--- a/misc/maintenance/UNIMARC_fix_collectiontitle.pl
+++ b/misc/maintenance/UNIMARC_fix_collectiontitle.pl
@@ -12,6 +12,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Biblio;
 
 sub process {

diff --git a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
index a46dc7b..e3db4d4 100755 (executable)
--- a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
+++ b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl
@@ -12,6 +12,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Biblio;
 use Getopt::Long;
 

diff --git a/misc/maintenance/auth_show_hidden_data.pl b/misc/maintenance/auth_show_hidden_data.pl
index 7f17945..91006d1 100755 (executable)
--- a/misc/maintenance/auth_show_hidden_data.pl
+++ b/misc/maintenance/auth_show_hidden_data.pl
@@ -25,6 +25,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use Koha::Authorities;
 use Koha::Authority::Subfields;
 use Koha::MetadataRecord::Authority;

diff --git a/misc/maintenance/borrowers-force-messaging-defaults.pl b/misc/maintenance/borrowers-force-messaging-defaults.pl
index d88d387..c446ca0 100755 (executable)
--- a/misc/maintenance/borrowers-force-messaging-defaults.pl
+++ b/misc/maintenance/borrowers-force-messaging-defaults.pl
@@ -26,6 +26,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::Members::Messaging;
 use Getopt::Long;

diff --git a/misc/maintenance/cmp_sysprefs.pl b/misc/maintenance/cmp_sysprefs.pl
index 936d3c6..250333f 100755 (executable)
--- a/misc/maintenance/cmp_sysprefs.pl
+++ b/misc/maintenance/cmp_sysprefs.pl
@@ -30,6 +30,7 @@ use open OUT => ':encoding(UTF-8)', ':std';
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use C4::Context;
 my $dbh = C4::Context->dbh;
 

diff --git a/misc/maintenance/fix_accountlines_date.pl b/misc/maintenance/fix_accountlines_date.pl
index 30479f4..0c7a92e 100755 (executable)
--- a/misc/maintenance/fix_accountlines_date.pl
+++ b/misc/maintenance/fix_accountlines_date.pl
@@ -26,6 +26,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use Getopt::Long;
 use Pod::Usage;

diff --git a/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl b/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
index 96ec288..c73ae8d 100755 (executable)
--- a/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
+++ b/misc/maintenance/fix_accountlines_rmdupfines_bug8253.pl
@@ -27,6 +27,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::Installer;
 

diff --git a/misc/maintenance/fix_mysql_constraints.pl b/misc/maintenance/fix_mysql_constraints.pl
index 0147224..00588b7 100755 (executable)
--- a/misc/maintenance/fix_mysql_constraints.pl
+++ b/misc/maintenance/fix_mysql_constraints.pl
@@ -30,6 +30,7 @@ use Getopt::Long;
 use Pod::Usage;
 use YAML;
 use Try::Tiny;
+use Koha::Script;
 use C4::Context;
 
 

diff --git a/misc/maintenance/fix_tags_weight.pl b/misc/maintenance/fix_tags_weight.pl
index 7dc3801..a1f8085 100755 (executable)
--- a/misc/maintenance/fix_tags_weight.pl
+++ b/misc/maintenance/fix_tags_weight.pl
@@ -22,6 +22,7 @@ use Modern::Perl;
 use C4::Context;
 use C4::Tags;
 
+use Koha::Script;
 use Koha::Database;
 use Koha::Tags;
 use Koha::Tags::Approvals;

diff --git a/misc/maintenance/make_zebra_dom_cfg_from_record_abs b/misc/maintenance/make_zebra_dom_cfg_from_record_abs
index 3518e65..d62b978 100755 (executable)
--- a/misc/maintenance/make_zebra_dom_cfg_from_record_abs
+++ b/misc/maintenance/make_zebra_dom_cfg_from_record_abs
@@ -20,6 +20,7 @@ use strict;
 use warnings;
 use 5.010;
 
+use Koha::Script;
 use Koha::Indexer::Utils;
 
 use Getopt::Long;

diff --git a/misc/maintenance/process_record_through_filter.pl b/misc/maintenance/process_record_through_filter.pl
index baf137a..a9d92d3 100755 (executable)
--- a/misc/maintenance/process_record_through_filter.pl
+++ b/misc/maintenance/process_record_through_filter.pl
@@ -6,6 +6,8 @@
 
 use strict;
 use warnings;
+
+use Koha::Script;
 use Koha::RecordProcessor;
 use Data::Dumper;
 use C4::Biblio;

diff --git a/misc/maintenance/remove_items_from_biblioitems.pl b/misc/maintenance/remove_items_from_biblioitems.pl
index 597195e..d78ad69 100755 (executable)
--- a/misc/maintenance/remove_items_from_biblioitems.pl
+++ b/misc/maintenance/remove_items_from_biblioitems.pl
@@ -22,6 +22,7 @@ use strict;
 use warnings;
 $|=1;
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use Getopt::Long;

diff --git a/misc/maintenance/sanitize_records.pl b/misc/maintenance/sanitize_records.pl
index 2c8000c..b2547cc 100755 (executable)
--- a/misc/maintenance/sanitize_records.pl
+++ b/misc/maintenance/sanitize_records.pl
@@ -18,6 +18,8 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
+
+use Koha::Script;
 use C4::Charset qw( SanitizeRecord );
 use C4::Context;
 use DBI;

diff --git a/misc/maintenance/search_for_data_inconsistencies.pl b/misc/maintenance/search_for_data_inconsistencies.pl
index 525d8c7..fa5aa20 100755 (executable)
--- a/misc/maintenance/search_for_data_inconsistencies.pl
+++ b/misc/maintenance/search_for_data_inconsistencies.pl
@@ -17,6 +17,7 @@
 
 use Modern::Perl;
 
+use Koha::Script;
 use Koha::Items;
 use Koha::Biblioitems;
 use Koha::ItemTypes;

diff --git a/misc/maintenance/touch_all_biblios.pl b/misc/maintenance/touch_all_biblios.pl
index b6a5add..f0630b7 100755 (executable)
--- a/misc/maintenance/touch_all_biblios.pl
+++ b/misc/maintenance/touch_all_biblios.pl
@@ -28,6 +28,8 @@ BEGIN {
 
 # possible modules to use
 use Getopt::Long;
+
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use Pod::Usage;

diff --git a/misc/maintenance/touch_all_items.pl b/misc/maintenance/touch_all_items.pl
index 12dca00..9b3093a 100755 (executable)
--- a/misc/maintenance/touch_all_items.pl
+++ b/misc/maintenance/touch_all_items.pl
@@ -28,6 +28,8 @@ BEGIN {
 
 # possible modules to use
 use Getopt::Long;
+
+use Koha::Script;
 use C4::Context;
 use C4::Items;
 use Pod::Usage;

diff --git a/misc/maintenance/update_authorities.pl b/misc/maintenance/update_authorities.pl
index 97b6cc3..a854f5a 100755 (executable)
--- a/misc/maintenance/update_authorities.pl
+++ b/misc/maintenance/update_authorities.pl
@@ -23,6 +23,7 @@ use Getopt::Long;
 use List::MoreUtils qw/uniq/;
 use Pod::Usage;
 
+use Koha::Script;
 use C4::AuthoritiesMarc qw/AddAuthority DelAuthority GetAuthority merge/;
 
 my ( @authid, $confirm, $delete, $help, $merge, $reference, $renumber, $verbose );

diff --git a/misc/migration_tools/buildCOUNTRY.pl b/misc/migration_tools/buildCOUNTRY.pl
index 5cd2da4..daca8e5 100755 (executable)
--- a/misc/migration_tools/buildCOUNTRY.pl
+++ b/misc/migration_tools/buildCOUNTRY.pl
@@ -6,6 +6,7 @@ use strict;
 #use warnings; FIXME - Bug 2505
 
 # Koha modules used
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::AuthoritiesMarc;

diff --git a/misc/migration_tools/buildEDITORS.pl b/misc/migration_tools/buildEDITORS.pl
index f5e1a71..37ece96 100755 (executable)
--- a/misc/migration_tools/buildEDITORS.pl
+++ b/misc/migration_tools/buildEDITORS.pl
@@ -8,6 +8,7 @@ use strict;
 use MARC::File::USMARC;
 use MARC::Record;
 use MARC::Batch;
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::AuthoritiesMarc;

diff --git a/misc/migration_tools/buildLANG.pl b/misc/migration_tools/buildLANG.pl
index 18c27ac..5e0a5ab 100755 (executable)
--- a/misc/migration_tools/buildLANG.pl
+++ b/misc/migration_tools/buildLANG.pl
@@ -6,6 +6,7 @@ use strict;
 #use warnings; FIXME - Bug 2505
 
 # Koha modules used
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::AuthoritiesMarc;

diff --git a/misc/migration_tools/build_oai_sets.pl b/misc/migration_tools/build_oai_sets.pl
index 40dfa1b..a19cc4c 100755 (executable)
--- a/misc/migration_tools/build_oai_sets.pl
+++ b/misc/migration_tools/build_oai_sets.pl
@@ -42,6 +42,7 @@ use MARC::File::XML;
 use List::MoreUtils qw/uniq/;
 use Getopt::Std;
 
+use Koha::Script;
 use C4::Context;
 use C4::Charset qw/StripNonXmlChars/;
 use C4::Biblio;

diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl
index bd80a69..5e03ca1 100755 (executable)
--- a/misc/migration_tools/bulkmarcimport.pl
+++ b/misc/migration_tools/bulkmarcimport.pl
@@ -17,6 +17,7 @@ use MARC::Record;
 use MARC::Batch;
 use MARC::Charset;
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::Koha;

diff --git a/misc/migration_tools/checkNonIndexedBiblios.pl b/misc/migration_tools/checkNonIndexedBiblios.pl
index bd47431..d03acbf 100755 (executable)
--- a/misc/migration_tools/checkNonIndexedBiblios.pl
+++ b/misc/migration_tools/checkNonIndexedBiblios.pl
@@ -33,6 +33,7 @@ BEGIN {
 
 # Koha modules used
 use MARC::Record;
+use Koha::Script;
 use C4::Context;
 use Getopt::Long;
 

diff --git a/misc/migration_tools/create_analytical_rel.pl b/misc/migration_tools/create_analytical_rel.pl
index a06305f..2de9c23 100755 (executable)
--- a/misc/migration_tools/create_analytical_rel.pl
+++ b/misc/migration_tools/create_analytical_rel.pl
@@ -9,6 +9,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::Items;

diff --git a/misc/migration_tools/fix_onloan.pl b/misc/migration_tools/fix_onloan.pl
index d6e63af..d70c3a5 100755 (executable)
--- a/misc/migration_tools/fix_onloan.pl
+++ b/misc/migration_tools/fix_onloan.pl
@@ -2,7 +2,9 @@
 
 use strict;
 #use warnings; FIXME - Bug 2505
-use  C4::Context;
+
+use Koha::Script;
+use C4::Context;
 use C4::Items;
 use C4::Biblio;
 

diff --git a/misc/migration_tools/import_lexile.pl b/misc/migration_tools/import_lexile.pl
index 131db44..520c357 100755 (executable)
--- a/misc/migration_tools/import_lexile.pl
+++ b/misc/migration_tools/import_lexile.pl
@@ -31,6 +31,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Text::CSV;
 
+use Koha::Script;
 use C4::Context;
 use C4::Biblio;
 use C4::Koha qw( GetVariationsOfISBN );

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index a79e7a8..65ccff5 100755 (executable)
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -17,6 +17,7 @@
 
 use Modern::Perl;
 
+use Koha::Script;
 use C4::Context;
 use Getopt::Long;
 use Fcntl qw(:flock);

diff --git a/misc/migration_tools/remove_unused_authorities.pl b/misc/migration_tools/remove_unused_authorities.pl
index f4e0ecb..bef6cbe 100755 (executable)
--- a/misc/migration_tools/remove_unused_authorities.pl
+++ b/misc/migration_tools/remove_unused_authorities.pl
@@ -23,6 +23,7 @@
 use strict;
 use warnings;
 
+use Koha::Script;
 use C4::Context;
 use C4::AuthoritiesMarc;
 use Getopt::Long;

diff --git a/misc/migration_tools/switch_marc21_series_info.pl b/misc/migration_tools/switch_marc21_series_info.pl
index 54823de..0bad3f2 100755 (executable)
--- a/misc/migration_tools/switch_marc21_series_info.pl
+++ b/misc/migration_tools/switch_marc21_series_info.pl
@@ -29,6 +29,7 @@ BEGIN {
     eval { require "$FindBin::Bin/../kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Biblio;
 use C4::Context;
 use Getopt::Long;

diff --git a/misc/migration_tools/upgradeitems.pl b/misc/migration_tools/upgradeitems.pl
index e3f11d6..cc63cd4 100755 (executable)
--- a/misc/migration_tools/upgradeitems.pl
+++ b/misc/migration_tools/upgradeitems.pl
@@ -2,7 +2,9 @@
 
 use strict;
 #use warnings; FIXME - Bug 2505
-use  C4::Context;
+
+use Koha::Script;
+use C4::Context;
 use C4::Items;
 use C4::Biblio;
 

diff --git a/misc/mod_zebraqueue.pl b/misc/mod_zebraqueue.pl
index 32fcc31..240aad4 100755 (executable)
--- a/misc/mod_zebraqueue.pl
+++ b/misc/mod_zebraqueue.pl
@@ -23,6 +23,7 @@ use Modern::Perl;
 use Getopt::Long;
 use Pod::Usage;
 
+use Koha::Script;
 use C4::Biblio;
 
 my @biblios;

diff --git a/misc/recreateIssueStatistics.pl b/misc/recreateIssueStatistics.pl
index 6ba83e1..2cafb4f 100755 (executable)
--- a/misc/recreateIssueStatistics.pl
+++ b/misc/recreateIssueStatistics.pl
@@ -22,6 +22,8 @@
 
 use strict;
 use warnings;
+
+use Koha::Script;
 use C4::Context;
 use C4::Items;
 use Data::Dumper;

diff --git a/misc/search_tools/rebuild_elastic_search.pl b/misc/search_tools/rebuild_elastic_search.pl
index caa9a3d..a233cf5 100755 (executable)
--- a/misc/search_tools/rebuild_elastic_search.pl
+++ b/misc/search_tools/rebuild_elastic_search.pl
@@ -83,6 +83,7 @@ Full documentation.
 
 use autodie;
 use Getopt::Long;
+use Koha::Script;
 use C4::Context;
 use Koha::MetadataRecord::Authority;
 use Koha::BiblioUtils;

diff --git a/misc/stage_file.pl b/misc/stage_file.pl
index b86f525..b856e3e 100755 (executable)
--- a/misc/stage_file.pl
+++ b/misc/stage_file.pl
@@ -27,6 +27,7 @@ BEGIN {
     eval { require "$FindBin::Bin/kohalib.pl" };
 }
 
+use Koha::Script;
 use C4::Context;
 use C4::ImportBatch;
 use C4::Matcher;

diff --git a/t/Koha/Cron.t b/t/Koha/Script.t
similarity index 83%
copy from t/Koha/Cron.t
copy to t/Koha/Script.t
index 05ecd25..7c758f4 100644 (file)
--- a/t/Koha/Cron.t
+++ b/t/Koha/Script.t
@@ -19,7 +19,7 @@ use Modern::Perl;
 
 use Test::More tests => 3;
 
-BEGIN { use_ok('Koha::Cron') }
+BEGIN { use_ok('Koha::Script') }
 
 use C4::Context;
 
@@ -27,11 +27,11 @@ my $userenv = C4::Context->userenv;
 is_deeply(
     $userenv,
     {
-        'surname'       => 'CRON',
+        'surname'       => 'CLI',
         'id'            => undef,
         'flags'         => undef,
         'cardnumber'    => undef,
-        'firstname'     => 'CRON',
+        'firstname'     => 'CLI',
         'branchname'    => undef,
         'branchprinter' => undef,
         'emailaddress'  => undef,
@@ -39,10 +39,10 @@ is_deeply(
         'shibboleth'    => undef,
         'branch'        => undef
     },
-    "Context userenv set correctly"
+    "Context userenv set correctly with no flags"
 );
 
 my $interface = C4::Context->interface;
-is($interface, 'cron', "Context interface set correctly");
+is( $interface, 'commandline', "Context interface set correctly with no flags" );
 
 1;

diff --git a/t/Koha/Cron.t b/t/Koha/Script_cron.t
similarity index 88%
rename from t/Koha/Cron.t
rename to t/Koha/Script_cron.t
index 05ecd25..d73aa82 100644 (file)
--- a/t/Koha/Cron.t
+++ b/t/Koha/Script_cron.t
@@ -19,7 +19,7 @@ use Modern::Perl;
 
 use Test::More tests => 3;
 
-BEGIN { use_ok('Koha::Cron') }
+BEGIN { use_ok( "Koha::Script", '-cron' ) }
 
 use C4::Context;
 
@@ -39,10 +39,10 @@ is_deeply(
         'shibboleth'    => undef,
         'branch'        => undef
     },
-    "Context userenv set correctly"
+    "Context userenv set correctly with -cron"
 );
 
 my $interface = C4::Context->interface;
-is($interface, 'cron', "Context interface set correctly");
+is( $interface, 'cron', "Context interface set correctly with -cron" );
 
 1;