From 0ea141244b071c05040c2260bf7109cb22273aed Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 24 Jan 2012 18:57:51 +0100
Subject: [PATCH] doplneni o verzi jakeho balicku se jedna
---
src/warden-client/sh/install.sh | 7 ++++---
src/warden-client/sh/uninstall.sh | 9 +++++----
src/warden-client/sh/update.sh | 8 +++++---
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index 008e2ab..d8afba6 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -69,7 +69,7 @@ err()
cat $err
rm -rf $err
echo
- echo "Installation FAILED!!!"
+ echo "Installation of $package_name package FAILED!!!"
exit 1
}
@@ -82,7 +82,7 @@ err_clean()
cat $err
rm -rf $err
echo
- echo "Installation FAILED!!!"
+ echo "Installation of $package_name package FAILED!!!"
exit 1
}
@@ -308,6 +308,7 @@ root_chck
params_chck
# create variables
+package_name="warden-client-$VERSION"
key_file=`basename $key`
cert_file=`basename $cert`
client_path="$prefix/warden-client"
@@ -349,7 +350,7 @@ change_permissions
echo
echo "Please check configuration file in $conf_file!"
echo
-echo "Installation was SUCCESSFUL!!!"
+echo "Installation of $package_name package was SUCCESSFUL!!!"
# cleanup section
rm -rf $err
diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh
index f71c47c..81d9364 100755
--- a/src/warden-client/sh/uninstall.sh
+++ b/src/warden-client/sh/uninstall.sh
@@ -46,7 +46,7 @@ usage()
echo "Example: ./`basename $0` -d /opt"
echo
echo "Note: You must be root for running this script."
- echo " For more information about update process, see README file (section Uninstallation)."
+ echo " For more information about uninstallation process, see README file (section Uninstallation)."
echo
exit 0
}
@@ -66,7 +66,7 @@ err()
rm -rf $err
rm -rf $backup_dir
echo
- echo "Update FAILED!!!"
+ echo "Uninstallation of $package_name package FAILED!!!"
exit 1
}
@@ -81,7 +81,7 @@ err_clean()
rm -rf $err
rm -rf $backup_dir
echo
- echo "Update FAILED!!!"
+ echo "Uninstallation of $package_name package FAILED!!!"
exit 1
}
@@ -198,6 +198,7 @@ root_chck
params_chck
# create variables
+package_name="warden-client-$VERSION"
client_path="$prefix/warden-client"
err="/tmp/warden-err"
backup_dir="/tmp/warden-backup"
@@ -219,7 +220,7 @@ backup
uninstall_warden-client
echo
-echo "Uninstallation was SUCCESSFUL!!!"
+echo "Uninstallation of $package_name package was SUCCESSFUL!!!"
# cleanup section
rm -rf $err
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index 952e8a6..daf0d59 100755
--- a/src/warden-client/sh/update.sh
+++ b/src/warden-client/sh/update.sh
@@ -67,7 +67,7 @@ err()
rm -rf $err
rm -rf $backup_dir
echo
- echo "Update FAILED!!!"
+ echo "Update to $package_name package FAILED!!!"
exit 1
}
@@ -82,7 +82,7 @@ err_clean()
rm -rf $err
rm -rf $backup_dir
echo
- echo "Update FAILED!!!"
+ echo "Update to $package_name package FAILED!!!"
exit 1
}
@@ -179,6 +179,7 @@ warden_dir_chck()
fi
}
+
backup()
{
echo -n "Backing-up warden client directory ... "
@@ -305,6 +306,7 @@ root_chck
params_chck
# create variables
+package_name="warden-client-$VERSION"
client_path="$prefix/warden-client"
etc="$client_path/etc"
conf_file="$etc/warden-client.conf"
@@ -349,7 +351,7 @@ change_permissions
echo
echo "Please check configuration file in $conf_file!"
echo
-echo "Update was SUCCESSFUL!!!"
+echo "Update to $package_name package was SUCCESSFUL!!!"
# cleanup section
rm -rf $err
--
GitLab