From ddfc4764f9714e04b57e99fc4af9552d19bd0b30 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Sun, 2 Nov 2014 19:40:32 +0100
Subject: [PATCH] pridana mezera pred vypisem detailu chyby
---
src/warden-server/sh/install.sh | 2 ++
src/warden-server/sh/uninstall.sh | 2 ++
src/warden-server/sh/update.sh | 5 +++--
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index b3bf711..2fed15c 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -42,6 +42,7 @@ version()
err()
{
echo "FAILED!"
+ echo
cat "$err"
rm -f "$err"
echo
@@ -62,6 +63,7 @@ errClean()
rm -f "${basedir}/uninstall.sh"
done
+ echo
cat "$err"
rm -f "$err"
echo
diff --git a/src/warden-server/sh/uninstall.sh b/src/warden-server/sh/uninstall.sh
index 66db837..2f2f47e 100755
--- a/src/warden-server/sh/uninstall.sh
+++ b/src/warden-server/sh/uninstall.sh
@@ -38,6 +38,7 @@ version()
err()
{
echo "FAILED!"
+ echo
cat "$err"
rm -f "$err"
rm -rf "$backup"
@@ -59,6 +60,7 @@ errClean()
ln -s "${bin}/${file##*/}" "${symbin}/${file##*/}"
done
fi
+ echo
cat "$err"
rm -f "$err"
rm -rf "$backup"
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 95fc10e..8e5328d 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -54,8 +54,9 @@ errClean()
echo " -> Reverting changes of Warden server package ... OK"
rm -r "${basedir}/"* > /dev/null 2>&1
cp -R "${backup}/"* "$basedir"
- cat $err
- rm -r $err $backup
+ echo
+ cat "$err"
+ rm -r "$err" "$backup"
echo
echo "Update from $old_package_version to $package_version package FAILED!!!"
exit 1
--
GitLab