From b6c1fbbec96733e91a164953706eeeb6c99fff91 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Sat, 27 Dec 2014 00:41:02 +0100
Subject: [PATCH] pridana funkce cleanOldFiles ktera zajisti smazani souboru ze
starych balicku; chybove hlasky byly opatreny prefixem Error:; uprava
informativnivh hlasek
---
src/warden-server/sh/update.sh | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 8e5328d..73ea562 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -38,8 +38,7 @@ version()
err()
{
echo "FAILED!"
- echo
- cat "$err"
+ echo -n "Error: " && cat "$err"
rm -f "$backup" 2>/dev/null
rm -f "$err"
echo
@@ -51,11 +50,11 @@ err()
errClean()
{
echo "FAILED!"
+ echo -n "Error: " && cat "$err"
echo " -> Reverting changes of Warden server package ... OK"
rm -r "${basedir}/"* > /dev/null 2>&1
cp -R "${backup}/"* "$basedir"
echo
- cat "$err"
rm -r "$err" "$backup"
echo
echo "Update from $old_package_version to $package_version package FAILED!!!"
@@ -103,7 +102,7 @@ oldPackageChck()
if [ "$old_package_version" == "$package_version" ]; then
echo "FAILED!"
echo
- echo "Package $package_version is already installed!"
+ echo "Package $package_version has been already installed!"
exit 1
elif [ "$old_package_version" == "warden-server-2.0" ]; then
echo "FAILED!"
@@ -115,7 +114,7 @@ oldPackageChck()
echo "FAILED!"
echo
echo "Warden server package is not yet installed!"
- echo "For installation of Warden server package please use install.sh"
+ echo "For installation of Warden server package please use install.sh."
exit 1
fi
echo "OK"
@@ -188,6 +187,17 @@ doTemplate()
}
+cleanOldFiles()
+{
+ echo -n "Cleaning old files ... "
+ rm -f "${etc}/warden-client.conf" 2> /dev/null
+ rm -f "${doc}/warden20to21.patch" 2> /dev/null
+ rm -f "${lib}/WardenConf.pm" 2> /dev/null
+ rm -f "${lib}/WardenStatus.pm" 2> /dev/null
+ rm -f "${lib}/WardenReg.pm" 2> /dev/null
+ echo "OK"
+}
+
createManifest()
{
echo -n "Creating MANIFEST file ... "
@@ -245,6 +255,7 @@ watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl.update"
package_version=$(<"${dirname}/etc/package_version")
manifest="${dirname}/doc/MANIFEST"
+echo "Update of Warden server package to $package_version ..."
echo
echo "------------------------- Dependencies check-in -------------------------"
@@ -258,7 +269,7 @@ oldPackageChck
perlChck
# Perl modules test
-modulesChck
+modulesChck || exit 1
echo
echo "------------------------- Update process --------------------------------"
@@ -267,7 +278,7 @@ echo "------------------------- Update process --------------------------------"
backup
# make warden server directory
-updateWardenDir
+updateWardenDir || exit 1
# update server configuration file
echo -n "Updating Warden server configuration file ... "
@@ -330,6 +341,9 @@ doTemplate \
< $watchdog_conf_tmpl \
> $watchdog_conf && echo "OK" || errClean
+# cleaning of files from old package - depend on package version
+cleanOldFiles
+
# create MANIFEST file
createManifest
--
GitLab