From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 30 Aug 2012 07:55:16 +0000 (+0200)
Subject: Task-Server: Absolute Pfade für @INC verwenden
X-Git-Tag: release-3.0.0beta1~264^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4ab40559b5e3f076b02f75cc69ca9bcd7e59ed73;p=kivitendo-erp.git

Task-Server: Absolute Pfade für @INC verwenden

Außerdem Wiederverwendung von SL::System::Process, um das
kivitendo-Systemverzeichnis zu finden.
---

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index d84e8115b..2ad2f2d85 100755
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -3,16 +3,14 @@
 use strict;
 
 BEGIN {
-  require Cwd;
+  use SL::System::Process;
+  my $exe_dir = SL::System::Process::exe_dir;
 
-  my $dir =  $0;
-  $dir    =  Cwd::getcwd() . '/' . $dir unless $dir =~ m|^/|;
-  $dir    =~ s|[^/]+$|..|;
+  unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
+  push    @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
+  unshift @INC, $exe_dir;
 
-  chdir($dir) || die "Cannot change directory to ${dir}\n";
-
-  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.
+  chdir($exe_dir) || die "Cannot change directory to ${exe_dir}\n";
 }
 
 use CGI qw( -no_xhtml);