From b19e5b24eb1d11e7cf06d65417dd876cbfa15338 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 10 Jun 2013 10:35:19 +0200
Subject: [PATCH] upraveno hledani cesty k adresari knihoven "lib" pomoci
__FILE__; odstranen update cest z instalacniho skriptu
---
src/warden-server/lib/Warden.pm | 8 ++++----
src/warden-server/sh/install.sh | 16 ----------------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/src/warden-server/lib/Warden.pm b/src/warden-server/lib/Warden.pm
index a056969..d9edf83 100755
--- a/src/warden-server/lib/Warden.pm
+++ b/src/warden-server/lib/Warden.pm
@@ -23,8 +23,8 @@ use SOAP::Lite;
use Carp;
use File::Basename;
-my $basedir = "/opt/warden-server/";
-use lib $basedir . "lib";
+my $lib = File::Basename::dirname(__FILE__);
+use lib $lib;
use WardenCommon;
@@ -33,8 +33,8 @@ use WardenCommon;
# VARIABLES
################################################################################
our $VERSION = "2.2";
-my $etc = $basedir . "etc";
-our $FILENAME = File::Basename::basename($0);
+our $FILENAME = File::Basename::basename(__FILE__);
+my $etc = "$lib/../etc";
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 3fa9534..92fdd8b 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -248,19 +248,6 @@ PerlSwitches -I $lib
}
-changeServerPath()
-{
- echo -n "Update server prefix path ... ";
- perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm 2> $err; ret_val=`echo $?`
-
- if [ $ret_val -eq 0 ]; then
- echo "OK"
- else
- errClean
- fi
-}
-
-
createSymlinks()
{
echo "Creating symbolic links ..."
@@ -341,9 +328,6 @@ makeServerConf
# create Apache configuration file
makeApacheConf
-# update prefix in lib directory path
-changeServerPath
-
# crate symlinks from warden server bin directory to /usr/local/bin
createSymlinks
--
GitLab