From 6c7b2f54aa5b3139c8abbe1799254eaf3981b1fe Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Wed, 1 Feb 2012 10:56:09 +0100
Subject: [PATCH] vytvoreni funkci; uprava nazvu promennych
---
src/warden-client/sh/install.sh | 4 ++--
src/warden-client/sh/uninstall.sh | 31 +++++++++++++++++--------------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index bfe0793..983f933 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -143,8 +143,8 @@ params_chck()
old_client_chck()
{
- old_package_version="$etc/package_version.txt"
- if [ -f $old_package_version ]; then
+ old_package_version_file="$etc/package_version.txt"
+ if [ -f $old_package_version_file ]; then
echo "Sorry, but $old_package_version package is installed!"
echo "For update of warden client package please use update.sh script."
exit 1
diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh
index 1c8d12d..01424a3 100755
--- a/src/warden-client/sh/uninstall.sh
+++ b/src/warden-client/sh/uninstall.sh
@@ -63,8 +63,7 @@ err()
{
echo "FAILED!"
cat $err
- rm -rf $err
- rm -rf $backup_dir
+ rm -rf $err $backup_dir
echo
echo "Uninstallation of $package_version package FAILED!!!"
exit 1
@@ -78,8 +77,7 @@ err_clean()
rm -rf "$client_path/*" > /dev/null 2>&1
cp -R "$backup_dir/*" $client_path
cat $err
- rm -rf $err
- rm -rf $backup_dir
+ rm -rf $err $backup_dir
echo
echo "Uninstallation of $package_version package FAILED!!!"
exit 1
@@ -124,6 +122,16 @@ params_chck()
}
+obtain_package_version()
+{
+ if [ -f $old_package_version_file ]; then
+ package_version=`cat $old_package_version_file`
+ else
+ package_version="unknown"
+ fi
+}
+
+
uninstallation_dir_chck()
{
echo -n "Checking uninstallation directory ... "
@@ -160,7 +168,7 @@ backup()
fi
}
-uninstall_warden-client()
+uninstall_warden_client()
{
echo -n "Uninstalling $package_version package ... "
rm -rf $client_path 2> $err; ret_val=`echo $?`
@@ -200,16 +208,12 @@ params_chck
# create variables
client_path="$prefix/warden-client"
etc="$client_path/etc"
+old_package_version_file="$etc/package_version.txt"
err="/tmp/warden-err"
backup_dir="/tmp/warden-backup"
# obtain version of installed warden-client package
-old_package_version="$etc/package_verion.txt"
-if [ -f $old_package_version ]; then
- package_version=`cat $etc/package_version.txt`
-else
- package_version="unknown"
-fi
+obtain_package_version
echo
echo "------------------------- Uninstallation process --------------------------------"
@@ -224,13 +228,12 @@ warden_dir_chck
backup
# do uninstallation
-uninstall_warden-client
+uninstall_warden_client
echo
echo "Uninstallation of $package_version package was SUCCESSFUL!!!"
# cleanup section
-rm -rf $err
-rm -rf $backup_dir
+rm -rf $err $backup_dir
exit 0
--
GitLab