From 231fbc863fc7062b0163a3a8a4bb2f6041fa12de Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 31 Oct 2013 15:07:02 +0100
Subject: [PATCH] pridany uvozovky k promennym
---
src/warden-server/sh/install.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 59ce173..9a84db6 100755
--- a/src/warden-server/sh/install.sh
+++ b/src/warden-server/sh/install.sh
@@ -97,7 +97,7 @@ paramsChck()
oldPackageChck()
{
echo -n "Checking previous Warden server installation ... "
- old_package_version_file=$(find $basedir -name package_version)
+ old_package_version_file=$(find "$basedir" -name package_version)
if [ -f "$old_package_version_file" ]; then
echo "FAILED!"
echo
@@ -198,8 +198,8 @@ while getopts "d:k:c:a:s:Vh" options; do
done
# remove last char (slash) from name of directories
-[[ $basedir == */ ]] && basedir="${basedir%?}"
-[[ $symbin == */ ]] && symbin="${symbin%?}"
+[[ "$basedir" == */ ]] && basedir="${basedir%?}"
+[[ "$symbin" == */ ]] && symbin="${symbin%?}"
# params test
paramsChck
@@ -222,13 +222,13 @@ apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl"
package_version=$(<"${dirname}/etc/package_version")
manifest="${dirname}/doc/MANIFEST"
-manifest="${dirname}/doc/MANIFEST"
+
echo
echo "----------------------- Checking for Dependencies -----------------------"
# check if warden-server is installed
-[[ ! -z $basedir ]] && [[ -d $basedir ]] && oldPackageChck
+[[ ! -z "$basedir" ]] && [[ -d "$basedir" ]] && oldPackageChck
# Perl interpreter test
perlChck
@@ -269,8 +269,8 @@ doTemplate \
# create MANIFEST file
createManifest
-# crate symlinks from warden server bin to user path if -s option is set
-[[ ! -z $symbin ]] && [[ -d $symbin ]] && [[ -w $symbin ]] && createSymlinks
+# crate symlinks from warden server bin to user path (if -s option is set)
+[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && createSymlinks
echo
echo "Please check configuration files:"
--
GitLab