From b8d0871aba5da0af0199a62fe1cba13612837313 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 13 Dec 2012 11:31:03 +0100
Subject: [PATCH] uprava vypisu pri update procesu
---
src/warden-server/sh/update.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 21f0a7f..0ef01fa 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -173,7 +173,7 @@ update_warden_dir()
update_conf_files()
{
- echo "Updating $apache_conf_file ... "
+ echo -n "Updating $apache_conf_file ... "
ssl_certificate_file=`cat $apache_conf_file | grep 'SSLCertificateFile'`
ssl_certificate_key_file=`cat $apache_conf_file | grep 'SSLCertificateKeyFile'`
@@ -214,7 +214,7 @@ $perl_switches
#-------------------------------------------------------------------------------
- echo "Updating $client_conf_file ... "
+ echo -n "Updating $client_conf_file ... "
uri=`cat $client_conf_file | grep '$URI'`
ssl_key_file=`cat $client_conf_file | grep '$SSL_KEY_FILE'`
@@ -254,7 +254,7 @@ $ssl_ca_file
#-------------------------------------------------------------------------------
- echo "Updating $server_conf_file ... "
+ echo -n "Updating $server_conf_file ... "
basedir=`cat $server_conf_file | grep '$BASEDIR'`
syslog=`cat $server_conf_file | grep '$SYSLOG' | head -n1`
@@ -381,6 +381,7 @@ package_version=`cat ${dirname}/warden-server/etc/package_version`
[[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
server_path="${prefix}/warden-server"
etc="${server_path}/etc"
+doc="${server_path}/doc"
old_package_version_file="${etc}/package_version"
apache_conf_file="${etc}/warden-apache.conf"
client_conf_file="${etc}/warden-client.conf"
@@ -419,13 +420,16 @@ update_warden_dir
update_conf_files
echo
-echo "Please check configuration file in ${conf_file}!"
+echo "Please check updated configuration files:"
+echo " - $apache_conf_file"
+echo " - $server_conf_file"
+echo " - $client_conf_file"
echo
echo "Warden server directory: $server_path"
echo
echo "Update from $old_package_version to $package_version package was SUCCESSFUL!!!"
echo
-echo "Please follow post-update steps in ${dirname}/doc/UPDATE!"
+echo "Please follow post-update steps in ${doc}/UPDATE!"
echo
# cleanup section
--
GitLab