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

upravena funkce errClean na mazani podle balickoveho MANIFEST souboru

parent 59754cbb
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,14 @@ errClean() ...@@ -53,7 +53,14 @@ errClean()
{ {
echo "FAILED!" echo "FAILED!"
echo " -> Uninstalling server package ... OK" 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" cat "$err"
rm -f "$err" "$modules_file" rm -f "$err" "$modules_file"
echo echo
...@@ -94,7 +101,7 @@ oldPackageChck() ...@@ -94,7 +101,7 @@ oldPackageChck()
if [ -f "$old_package_version_file" ]; then if [ -f "$old_package_version_file" ]; then
echo "FAILED!" echo "FAILED!"
echo 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 "Sorry, but $old_package_version package is installed!"
echo "For update of warden server package please use update.sh" echo "For update of warden server package please use update.sh"
exit 1 exit 1
...@@ -138,7 +145,7 @@ createWardenDir() ...@@ -138,7 +145,7 @@ createWardenDir()
fi fi
done done
ln -s "${sh}/uninstall.sh" "$basedir" ln -s "${sh}/uninstall.sh" "$basedir"
rm -f "${etc}/"*.tmpl rm -f "${etc}/"*.tmpl "${doc}/MANIFEST"
echo "OK" echo "OK"
} }
...@@ -205,7 +212,8 @@ watchdog_conf="${etc}/warden-watchdog.conf" ...@@ -205,7 +212,8 @@ watchdog_conf="${etc}/warden-watchdog.conf"
server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl" server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl" apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.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
echo "----------------------- Checking for Dependencies -----------------------" echo "----------------------- Checking for Dependencies -----------------------"
......
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