From f5fc9d5a2af6121ad695e89c446df32faddedb1b Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Fri, 26 Dec 2014 22:38:11 +0100
Subject: [PATCH] bugfix: vyraz konjunkce v podmince; uprava informativnich
vypisu; chybovy vystup presmerovan do /dev/null
---
src/warden-server/sh/uninstall.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index 77aef7c..d83a5ac 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -84,7 +84,7 @@ paramsChck()
wardenDirChck()
{
echo -n "Checking Warden server directory ... "
- if [[ ! -d "$basedir" ]] && ; then
+ if [[ ! -d "$basedir" ]]; then
echo "FAILED!"
echo "Warden server package is not installed!"
exit 1
@@ -135,14 +135,14 @@ uninstallWardenServer()
rmdir --ignore-fail-on-non-empty "${basedir}/$directory" 2> "$err" || errClean
done
rm -f "${basedir}/uninstall.sh"
- rmdir --ignore-fail-on-non-empty "$basedir"
+ rmdir --ignore-fail-on-non-empty "$basedir" 2> /dev/null
echo "OK"
}
deleteSymlinks()
{
- echo -n "Deleting symlinks from $symbin ..."
+ echo -n "Deleting symlinks from $symbin ... "
for file in "$symbin/"*
do
rm -f "${symbin}/${file##*/}" 2> /dev/null
@@ -199,7 +199,7 @@ uninstallWardenServer || exit 1
[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && deleteSymlinks
echo
-echo "Please follow post-uninstallation steps in $uninstall!"
+echo "Please follow post-uninstallation steps in ${uninstall}."
echo
echo "Uninstallation of $package_version package was SUCCESSFUL!!!"
echo
--
GitLab