From 55aec2d0e8d63b894c7493d7b8fb53e973d0fa7c Mon Sep 17 00:00:00 2001 From: Tomas Plesnik <plesnik@ics.muni.cz> Date: Thu, 2 Feb 2012 10:51:01 +0100 Subject: [PATCH] pridano odstraneni posledniho znaku (/) z prefix --- src/warden-client/sh/install.sh | 1 + src/warden-client/sh/uninstall.sh | 1 + src/warden-client/sh/update.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh index e4480a3..af7fe7e 100755 --- a/src/warden-client/sh/install.sh +++ b/src/warden-client/sh/install.sh @@ -324,6 +324,7 @@ dirname=`dirname $0` package_version=`cat $dirname/warden-client/etc/package_version.txt` key_file=`basename $key` cert_file=`basename $cert` +[[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix client_path="$prefix/warden-client" etc="$client_path/etc" conf_file="$etc/warden-client.conf" diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh index a2e8a9f..d70f01e 100755 --- a/src/warden-client/sh/uninstall.sh +++ b/src/warden-client/sh/uninstall.sh @@ -206,6 +206,7 @@ root_chck params_chck # create variables +[[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix client_path="$prefix/warden-client" etc="$client_path/etc" old_package_version_file="$etc/package_version.txt" diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh index 2ed6bed..0009c7e 100755 --- a/src/warden-client/sh/update.sh +++ b/src/warden-client/sh/update.sh @@ -323,6 +323,7 @@ params_chck # create variables dirname=`dirname $0` package_version=`cat $dirname/warden-client/etc/package_version.txt` +[[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix client_path="$prefix/warden-client" etc="$client_path/etc" old_package_version_file="$etc/package_version.txt" -- GitLab