From 7864211cff68f058fc25d8124f84c5322b0d6dbe Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 25 Dec 2014 09:54:37 +0100
Subject: [PATCH] bugfix: vypisovani chybovych hlasek rm pri vraceni zmen;
chybova hlaska oznacena prefixem Error:
---
src/warden-server/sh/install.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index ba13adc..0baba2a 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -42,7 +42,7 @@ version()
err()
{
echo "FAILED!"
- cat "$err"
+ echo -n "Error: " && cat "$err"
rm -f "$err"
echo
echo "Installation of $package_version package FAILED!!!"
@@ -53,15 +53,15 @@ err()
errClean()
{
echo "FAILED!"
+ echo -n "Error: " && cat "$err"
echo " -> Uninstalling server package ..."
for file in $(<"$manifest")
do
- rm -f "${basedir}/$file"
+ rm -f "${basedir}/$file" 2> /dev/null
directory="${file%/*}"
- rmdir --ignore-fail-on-non-empty "${basedir}/$directory"
+ rmdir --ignore-fail-on-non-empty "${basedir}/$directory" 2> /dev/null
done
- rm -f "${basedir}/uninstall.sh"
- cat "$err"
+ rm -f "${basedir}/uninstall.sh" 2> /dev/null
rm -f "$err"
echo
echo "Installation of $package_version package FAILED!!!"
--
GitLab