From 98f177ccf1f160b6250fbaa5a334b6d47cf68fe8 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Wed, 2 Oct 2013 16:22:53 +0200
Subject: [PATCH] upravena funkce errClean na mazani podle balickoveho MANIFEST
souboru
---
src/warden-server/sh/install.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 2344f50..3740dcf 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -53,7 +53,14 @@ errClean()
{
echo "FAILED!"
echo " -> Uninstalling server package ... OK"
- rm -rf "$basedir/"* > /dev/null 2>&1 # BUG: smaze vse na co ma USER pravo
+ for file in $(<"$manifest")
+ do
+ directory="${file%/*}"
+ rm -f "${basedir}/$file"
+ rmdir --ignore-fail-on-non-empty "${basedir}/$directory"
+ rm -f "${basedir}/uninstall.sh"
+
+ done
cat "$err"
rm -f "$err" "$modules_file"
echo
@@ -94,7 +101,7 @@ oldPackageChck()
if [ -f "$old_package_version_file" ]; then
echo "FAILED!"
echo
- old_package_version=$(< "$old_package_version_file")
+ old_package_version=$(<"$old_package_version_file")
echo "Sorry, but $old_package_version package is installed!"
echo "For update of warden server package please use update.sh"
exit 1
@@ -138,7 +145,7 @@ createWardenDir()
fi
done
ln -s "${sh}/uninstall.sh" "$basedir"
- rm -f "${etc}/"*.tmpl
+ rm -f "${etc}/"*.tmpl "${doc}/MANIFEST"
echo "OK"
}
@@ -205,7 +212,8 @@ watchdog_conf="${etc}/warden-watchdog.conf"
server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl"
-package_version=$(< "${dirname}/etc/package_version")
+manifest="${dirname}/doc/MANIFEST"
+manifest="${dirname}/doc/MANIFEST"
echo
echo "----------------------- Checking for Dependencies -----------------------"
--
GitLab