From eafcd5687e859993201fff451ab7c65d53285b63 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 16 Dec 2014 11:00:38 +0100
Subject: [PATCH] odstranen vypis chyb pri vytvareni symlinku; uprava hlasek
---
src/warden-server/sh/install.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index b2666fa..c545ae2 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -42,7 +42,6 @@ version()
err()
{
echo "FAILED!"
- echo
cat "$err"
rm -f "$err"
echo
@@ -63,7 +62,6 @@ errClean()
rm -f "${basedir}/uninstall.sh"
done
- echo
cat "$err"
rm -f "$err"
echo
@@ -110,7 +108,7 @@ oldPackageChck()
echo "FAILED!"
echo
echo "Package $old_package_version is already 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
fi
echo "OK"
@@ -183,7 +181,7 @@ createSymlinks()
for file in "${bin}/"*
do
echo "- making symlink: ${symbin}/${file##*/} -> $file"
- ln -s "$file" "${symbin}/${file##*/}"
+ ln -s "$file" "${symbin}/${file##*/}" 2>/dev/null
done
}
@@ -232,6 +230,7 @@ package_version=$(<"${dirname}/etc/package_version")
manifest="${dirname}/doc/MANIFEST"
+echo "Installation of Warden server package ($package_version)..."
echo
echo "----------------------- Checking for Dependencies -----------------------"
@@ -289,7 +288,7 @@ echo " - $watchdog_conf"
echo
echo "Warden server directory: $basedir"
echo
-echo "Please follow post-installation steps in ${doc}/INSTALL!"
+echo "Please follow post-installation steps in ${doc}/INSTALL."
echo
echo "Installation of $package_version package was SUCCESSFUL!!!"
echo
--
GitLab