From 4cda38388cf86e861a9dbe8f8cd11b85ee983182 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Fri, 8 Feb 2013 11:44:50 +0100
Subject: [PATCH] pridana kontrola parametru -d
---
src/warden-server/sh/install.sh | 4 ++--
src/warden-server/sh/uninstall.sh | 6 ++++--
src/warden-server/sh/update.sh | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 70a7feb..425e899 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -74,8 +74,8 @@ root_chck()
params_chck()
{
if [ -z $prefix ]; then
- prefix=/opt
- echo "Warning: parameter -d <directory> is not set - default installation directory is ${prefix}!"
+ echo "Parameter -d <directory> is not set!"
+ exit 1
fi
if [ -z $key ]; then
echo "Parameter -k <ssl_key_file> is not set!"
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index d9bdcbf..417ca43 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -74,19 +74,21 @@ root_chck()
params_chck()
{
if [ -z $prefix ]; then
- prefix=/opt
- echo "Warning: parameter -d <directory> is not set - default uninstallation directory is ${prefix}!"
+ echo "Parameter -d <direcotry> is not set!"
+ exit 1
fi
}
obtain_package_version()
{
+ echo -n "Obtaing package version ... "
if [ -f $old_package_version_file ]; then
package_version=`cat $old_package_version_file`
else
package_version="unknown"
fi
+ echo "OK"
}
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index bc0810e..f29fe54 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -73,8 +73,8 @@ root_chck()
params_chck()
{
if [ -z $prefix ]; then
- prefix=/opt
- echo "Warning: parameter -d <directory> is not set - default update directory is ${prefix}!"
+ echo "Parameter -d <direcotry> is not set!"
+ exit 1
fi
}
--
GitLab