diff --git a/src/warden-server/sh/install.sh b/src/warden-server/sh/install.sh
index 59ce173a9f545982efaf13faadb24fc471615ec3..9a84db6b8b7077486581d31d1e6c86c04d242bca 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:"