dynamicke zjistovani package_version jiz drive nainstalovaneho balicku serveru...

dynamicke zjistovani package_version jiz drive nainstalovaneho balicku serveru (pouzit find namisto tvrde cesty) + pridana kontrola zdali je vubec nejaky predchozi balicek nainstalovan; odstranena prace s meziadresarem warden-server v instalacnim balicku

src/warden-server/sh/install.sh

@@ -90,7 +90,7 @@ paramsChck()
 oldPackageChck()
 {
 	echo -n "Checking previous Warden server installation ... "
-	old_package_version_file="${etc}/package_version"
+	old_package_version_file=`find $basedir -name package_version`
 	if [ -f "$old_package_version_file" ]; then
 		echo "FAILED!"
 		echo
@@ -118,7 +118,7 @@ perlChck()
 
 modulesChck()
 {
-	sed '/^use [A-Z]/!d; /Warden/d' `find "${dirname}/warden-server" -type f` 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u > "$modules_file"
+	sed '/^use [A-Z]/!d; /Warden/d' `find "${dirname}" -type f` 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u > "$modules_file"
 	for module in $(<"$modules_file");
 	do
 		echo -n "Checking $module module ... "
@@ -131,9 +131,15 @@ createWardenDir()
 {
 	echo -n "Creating Warden server directory ... "
 	test -d "$basedir" && test -w "$basedir" || mkdir -p "$basedir" 2> "$err" || err
-	cp -R "${dirname}/warden-server/"* "$basedir" 2> "$err" && echo "OK" || errClean
+	for dir in "${dirname}/"*
+	do
+		if [ -d "$dir" ]; then
+			cp -R "$dir" "$basedir" 2> "$err" || errClean
+		fi
+	done
+	ln -s "${sh}/uninstall.sh" "$basedir"
 	rm -f "${etc}/${server_conf_tmpl##*/}" "${etc}/${apache_conf_tmpl##*/}"
-	cp "${dirname}/uninstall.sh" "$basedir"
+	echo "OK"
 }
 
 
@@ -191,17 +197,18 @@ bin="${basedir}/bin"
 lib="${basedir}/lib"
 doc="${basedir}/doc"
 etc="${basedir}/etc"
+sh="${basedir}/sh"
 server_conf="${etc}/warden-server.conf"
 apache_conf="${etc}/warden-apache.conf"
-server_conf_tmpl="${dirname}/warden-server/etc/warden-server.conf.tmpl"
-apache_conf_tmpl="${dirname}/warden-server/etc/warden-apache.conf.tmpl"
-package_version=$(< "${dirname}/warden-server/etc/package_version")
+server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
+apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
+package_version=$(< "${dirname}/etc/package_version")
 
 echo
 echo "----------------------- Checking for Dependencies -----------------------"
 
 # check if warden-server is installed
-oldPackageChck
+[[ ! -z $basedir ]] && [[ -d $basedir ]] && oldPackageChck
 
 # Perl interpreter test
 perlChck