From 6beece4440a3194b417c7a3f52387db467428acb Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 24 Jan 2012 17:20:01 +0100
Subject: [PATCH] pridano kopirovani uninstall.sh skriptu do nainstalovaneho
warden-client balicku; zmena vypisu
---
packages/build-client.sh | 4 ++--
src/warden-client/sh/install.sh | 10 ++++++++--
src/warden-client/sh/uninstall.sh | 11 ++++++++++-
src/warden-client/sh/update.sh | 8 +++++++-
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/packages/build-client.sh b/packages/build-client.sh
index b3d099d..044ec39 100755
--- a/packages/build-client.sh
+++ b/packages/build-client.sh
@@ -31,7 +31,7 @@
# otherwise) arising in any way out of the use of this software, even
# if advised of the possibility of such damage.
-VERSION="1.0.0"
+VERSION="1.1.0"
err()
{
@@ -52,7 +52,7 @@ err()
#-------------------------------------------------------------------------------
# edit when you build new package
-version="1.0.1"
+version="1.1.0"
package_name="warden-client"
package="$package_name-$version"
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index 590f2f9..e16a42c 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -185,14 +185,20 @@ installation_dir_chck()
make_warden_dir()
{
- echo -n "Making warden client directory ... "
+ echo -n "Creating warden client directory ... "
cp -R `dirname $0`/warden-client $prefix 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
echo "OK"
else
err_clean
fi
- cp -u CHANGELOG INSTALL LICENSE README README.cesnet "$client_path/doc"
+
+ files=(CHANGELOG INSTALL LICENSE README README.cesnet)
+ for file in ${files[@]};
+ do
+ cp -u "`dirname $0`/$file" "$client_path/doc"
+ done
+ cp -u "`dirname $0`/uninstall.sh" "$client_path"
}
diff --git a/src/warden-client/sh/uninstall.sh b/src/warden-client/sh/uninstall.sh
index 7cca8b4..c5de1e4 100755
--- a/src/warden-client/sh/uninstall.sh
+++ b/src/warden-client/sh/uninstall.sh
@@ -169,7 +169,7 @@ uninstall_warden-client()
else
err_clean
fi
-}
+
#-------------------------------------------------------------------------------
# MAIN
@@ -205,10 +205,19 @@ backup_dir="/tmp/warden-backup"
echo
echo "------------------------- Uninstallation process --------------------------------"
+
+# check if $prefix directory exist
installation_dir_chck
+
+# check if $prefix/warden-client directory exist
warden_dir_chck
+
+# make backup of currently installed warden-client package
backup
+
+# do uninstallation
uninstall_warden-client
+
echo
echo "Uninstallation was SUCCESSFUL!!!"
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index c541e37..952e8a6 100755
--- a/src/warden-client/sh/update.sh
+++ b/src/warden-client/sh/update.sh
@@ -213,7 +213,13 @@ update_warden_dir()
else
err_clean
fi
- cp -u CHANGELOG INSTALL LICENSE README README.cesnet "$client_path/doc"
+
+ files=(CHANGELOG INSTALL LICENSE README README.cesnet)
+ for file in ${files[@]};
+ do
+ cp -u "`dirname $0`/$file" "$client_path/doc"
+ done
+ cp -u "`dirname $0`/uninstall.sh" "$client_path"
}
--
GitLab