Skip to content
Snippets Groups Projects
Commit f5fc9d5a authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

bugfix: vyraz konjunkce v podmince; uprava informativnich vypisu; chybovy...

bugfix: vyraz konjunkce v podmince; uprava informativnich vypisu; chybovy vystup presmerovan do /dev/null
parent 386a65d6
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ paramsChck() ...@@ -84,7 +84,7 @@ paramsChck()
wardenDirChck() wardenDirChck()
{ {
echo -n "Checking Warden server directory ... " echo -n "Checking Warden server directory ... "
if [[ ! -d "$basedir" ]] && ; then if [[ ! -d "$basedir" ]]; then
echo "FAILED!" echo "FAILED!"
echo "Warden server package is not installed!" echo "Warden server package is not installed!"
exit 1 exit 1
...@@ -135,14 +135,14 @@ uninstallWardenServer() ...@@ -135,14 +135,14 @@ uninstallWardenServer()
rmdir --ignore-fail-on-non-empty "${basedir}/$directory" 2> "$err" || errClean rmdir --ignore-fail-on-non-empty "${basedir}/$directory" 2> "$err" || errClean
done done
rm -f "${basedir}/uninstall.sh" rm -f "${basedir}/uninstall.sh"
rmdir --ignore-fail-on-non-empty "$basedir" rmdir --ignore-fail-on-non-empty "$basedir" 2> /dev/null
echo "OK" echo "OK"
} }
deleteSymlinks() deleteSymlinks()
{ {
echo -n "Deleting symlinks from $symbin ..." echo -n "Deleting symlinks from $symbin ... "
for file in "$symbin/"* for file in "$symbin/"*
do do
rm -f "${symbin}/${file##*/}" 2> /dev/null rm -f "${symbin}/${file##*/}" 2> /dev/null
...@@ -199,7 +199,7 @@ uninstallWardenServer || exit 1 ...@@ -199,7 +199,7 @@ uninstallWardenServer || exit 1
[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && deleteSymlinks [[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && deleteSymlinks
echo echo
echo "Please follow post-uninstallation steps in $uninstall!" echo "Please follow post-uninstallation steps in ${uninstall}."
echo echo
echo "Uninstallation of $package_version package was SUCCESSFUL!!!" echo "Uninstallation of $package_version package was SUCCESSFUL!!!"
echo echo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment