From 46e9355a07d3ba6e1ea1d95a893d6ed4c8b31487 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 3 Apr 2019 14:29:38 +0200
Subject: [PATCH] Module: 'modules/fallback' nicht mehr in @INC aufnehmen

---
 dispatcher.pl                      | 1 -
 scripts/dbconnect.pl               | 1 -
 scripts/dbupgrade2_tool.pl         | 1 -
 scripts/find-use.pl                | 1 -
 scripts/installation_check.pl      | 1 -
 scripts/locales.pl                 | 1 -
 scripts/rose_auto_create_model.pl  | 1 -
 scripts/sync_files_from_backend.pl | 6 ++++--
 scripts/task_server.pl             | 1 -
 t/001compile.t                     | 2 +-
 t/request/post_multipart.t         | 2 --
 t/test.pl                          | 1 -
 12 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/dispatcher.pl b/dispatcher.pl
index e5621f6f5..a6364ab83 100755
--- a/dispatcher.pl
+++ b/dispatcher.pl
@@ -7,7 +7,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin);                       # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use SL::Dispatcher;
diff --git a/scripts/dbconnect.pl b/scripts/dbconnect.pl
index 9ba492f5d..734b030c4 100755
--- a/scripts/dbconnect.pl
+++ b/scripts/dbconnect.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use strict;
diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl
index 2231b119c..77c9cb737 100755
--- a/scripts/dbupgrade2_tool.pl
+++ b/scripts/dbupgrade2_tool.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use strict;
diff --git a/scripts/find-use.pl b/scripts/find-use.pl
index 61bfff751..c583ecc8e 100755
--- a/scripts/find-use.pl
+++ b/scripts/find-use.pl
@@ -5,7 +5,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use strict;
diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 140ecddc0..fa6083839 100755
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -6,7 +6,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 
   # this is a default dir. may be wrong in your installation, change it then
   $master_templates = $FindBin::Bin . '/../templates/print/';
diff --git a/scripts/locales.pl b/scripts/locales.pl
index a4827b491..8faea2148 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -14,7 +14,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use Carp;
diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl
index 111b0c7a4..5a0f7c23c 100755
--- a/scripts/rose_auto_create_model.pl
+++ b/scripts/rose_auto_create_model.pl
@@ -7,7 +7,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use CGI qw( -no_xhtml);
diff --git a/scripts/sync_files_from_backend.pl b/scripts/sync_files_from_backend.pl
index 2c361483f..b3b0c2c68 100755
--- a/scripts/sync_files_from_backend.pl
+++ b/scripts/sync_files_from_backend.pl
@@ -1,13 +1,15 @@
 #!/usr/bin/perl
 
 BEGIN {
+  use FindBin;
+
   if (! -d "bin" || ! -d "SL") {
     print("This tool must be run from the kivitendo ERP base directory.\n");
     exit(1);
   }
 
-  unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
-  push    @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift @INC, $FindBin::Bin . '/../modules/override'; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, $FindBin::Bin . '/..';
 }
 
 
diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index fcdef4929..3674eac76 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -9,7 +9,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 }
 
 use CGI qw( -no_xhtml);
diff --git a/t/001compile.t b/t/001compile.t
index 0d1657b19..044d60408 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -70,7 +70,7 @@ sub test_compile_file {
   my ($file, $T) = @{ $_[0] };
 
 
-  my $command = "$perlapp -w -c$T -Imodules/fallback -Imodules/override -It -MSupport::CanonialGlobals $file 2>&1";
+  my $command = "$perlapp -w -c$T -Imodules/override -It -MSupport::CanonialGlobals $file 2>&1";
   my $loginfo=`$command`;
 
   if ($loginfo =~ /syntax ok$/im) {
diff --git a/t/request/post_multipart.t b/t/request/post_multipart.t
index bdec8a4ad..bae6a43cc 100644
--- a/t/request/post_multipart.t
+++ b/t/request/post_multipart.t
@@ -2,7 +2,6 @@ use strict;
 use utf8;
 
 use lib 't';
-use lib 'modules/fallback';
 BEGIN {
   unshift @INC, 'modules/override';
 }
@@ -104,4 +103,3 @@ is_deeply $tt,
           'action' => 'CsvImport/dispatch',
           'FILENAME' => 'from_wikipedia.csv'
         };
-
diff --git a/t/test.pl b/t/test.pl
index dcc738b8b..ccdab4077 100755
--- a/t/test.pl
+++ b/t/test.pl
@@ -12,7 +12,6 @@ BEGIN {
 
   unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
   push   (@INC, $FindBin::Bin . '/..');                  # '.' will be removed from @INC soon.
-  push   (@INC, $FindBin::Bin . '/../modules/fallback'); # Only use our own versions of modules if there's no system version.
 
   $ENV{HARNESS_OPTIONS} = 'c';
 
-- 
2.20.1