From 4ab40559b5e3f076b02f75cc69ca9bcd7e59ed73 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 30 Aug 2012 09:55:16 +0200 Subject: [PATCH] =?utf8?q?Task-Server:=20Absolute=20Pfade=20f=C3=BCr=20@IN?= =?utf8?q?C=20verwenden?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Außerdem Wiederverwendung von SL::System::Process, um das kivitendo-Systemverzeichnis zu finden. --- scripts/task_server.pl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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); -- 2.20.1