From 519c8e302f34766d973bdf725e719b26b236a9ad Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Sun, 4 Jan 2015 07:23:13 +0100
Subject: [PATCH] presun funkce removeSymlinks; pridano odstraneni koncoveho
lomitka z adresare symbolickych odkazu
---
src/warden-server/sh/uninstall.sh | 38 ++++++++++++++++---------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index c1bf306..fafaeaf 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -123,6 +123,22 @@ createBackup()
}
+removeSymlinks()
+{
+ echo -n "Checking symbolic links directory $symbin ... "
+ if [[ -d $symbin && -w $symbin ]]; then
+ echo "OK"
+ for file in "$bin/"*
+ do
+ echo "- removing symlink: ${symbin}/${file##*/} -> $file"
+ rm -f "${symbin}/${file##*/}" 2> /dev/null
+ done
+ else
+ echo "FAILED!"
+ fi
+}
+
+
uninstallWardenServer()
{
echo -n "Uninstalling $package_version package ... "
@@ -140,22 +156,6 @@ uninstallWardenServer()
}
-removeSymlinks()
-{
- echo -n "Checking symbolic links directory $symbin ... "
- if [[ -d $symbin && -w $symbin ]]; then
- echo "OK"
- for file in "$bin/"*
- do
- echo "- removing symlink: ${symbin}/${file##*/} -> $file"
- rm -f "${symbin}/${file##*/}" 2> /dev/null
- done
- else
- echo "FAILED!"
- fi
-}
-
-
#-------------------------------------------------------------------------------
# MAIN
#-------------------------------------------------------------------------------
@@ -172,6 +172,7 @@ done
# remove last char (slash) from name of directories
[[ "$basedir" == */ ]] && basedir="${basedir%?}"
+[[ "$symbin" == */ ]] && symbin="${symbin%?}"
# params test
paramsChck
@@ -197,11 +198,12 @@ getPackageVersion
# make backup of currently installed warden-server package
createBackup
+# remove symlinks from $symbin (if -s option is set)
+[[ ! -z "$symbin" ]] && removeSymlinks
+
# uninstall Warden server
uninstallWardenServer || exit 1
-# remove symlinks from $symbin (if -s option is set)
-[[ ! -z "$symbin" ]] && removeSymlinks
echo
echo "------------------------- Summary ---------------------------------------"
--
GitLab