revert updatovani serverovych cest; zmena nazvu funkci dle Stabni kultury

src/warden-server/sh/install.sh

@@ -49,7 +49,7 @@ err()
 }
 
 
-err_clean()
+errClean()
 {
 	echo "FAILED!"
 	echo " -> Uninstalling server package ... OK"
@@ -62,7 +62,7 @@ err_clean()
 }
 
 
-root_chck()
+rootChck()
 {
 	if [ $UID -ne 0 ]; then
 		echo "You must be root for running this script!"
@@ -71,7 +71,7 @@ root_chck()
 }
 
 
-params_chck()
+paramsChck()
 {
 	if [ -z $prefix ]; then
 		prefix=/opt
@@ -92,7 +92,7 @@ params_chck()
 }
 
 
-old_package_chck()
+oldPackageChck()
 {
 	old_package_version_file="${etc}/package_version"
 	if [ -f $old_package_version_file ]; then
@@ -104,7 +104,7 @@ old_package_chck()
 }
 
 
-perl_chck()
+perlChck()
 {
 	echo -n "Checking Perl interpreter ... "
 	if which perl 1> /dev/null; then
@@ -116,7 +116,7 @@ perl_chck()
 	fi
 }
 
-modules_chck()
+modulesChck()
 {
 	for module in ${modules[@]};
 	do
@@ -130,20 +130,20 @@ modules_chck()
 }
 
 
-make_warden_dir()
+makeWardenDir()
 {
 	echo -n "Creating Warden server directory ... "
 	test -d $prefix || mkdir -p $prefix
 	if cp -R ${dirname}/warden-server $prefix 2> $err; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
 	cp ${dirname}/uninstall.sh $server_path
 }
 
 
-make_server_conf()
+makeServerConf()
 {
 	echo -n "Creating server configuration file ... "
 	echo "# 
@@ -207,11 +207,11 @@ make_server_conf()
 	if [ $ret_val -eq 0 ]; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
 }
 
-make_apache_conf()
+makeApacheConf()
 {
 	echo -n "Creating Apache configuration file ... "
 	echo "#
@@ -243,27 +243,25 @@ PerlSwitches -I $lib
 	if [ $ret_val -eq 0 ]; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
 }
 
 
 changeServerPath()
 {
-	echo "Update server path ...";
-	for file in `ls -1 $bin`
-	do
-		echo "- update server path: ${bin}/$file"
-		perl -pi -e "s#/opt#${prefix}#" ${bin}/$file
-	done
-
-	echo "- update server path: ${lib}/Warden.pm"
-	perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm
-	
+	echo -n "Update server path ...";
+	perl -pi -e "s#/opt#${prefix}#" ${lib}/Warden.pm 2> $err; ret_val=`echo $?`
+
+        if [ $ret_val -eq 0 ]; then
+                echo "OK"
+        else
+                errClean
+        fi
 }
 
 
-create_symlinks()
+createSymlinks()
 {
 	echo "Creating symbolic links ..."
 	for file in `ls -1 $bin`
@@ -295,10 +293,10 @@ while getopts "d:k:c:a:Vh" options; do
 done
 
 # root test
-root_chck
+rootChck
 
 # params test
-params_chck
+paramsChck
 
 # create variables
 dirname=`dirname $0`
@@ -320,34 +318,34 @@ doc="${server_path}/doc"
 err="/tmp/warden-err"
 
 # check if warden-server is installed
-old_package_chck
+oldPackageChck
 
 echo
 echo "------------------------- Dependencies check-in -------------------------"
 
 # Perl interpreter test
-perl_chck
+perlChck
 
 # Perl modules test
-modules_chck
+modulesChck
 
 echo
 echo "------------------------- Installation process --------------------------"
 
 # make warden server directory
-make_warden_dir
+makeWardenDir
 
 # create server configuration file
-make_server_conf
+makeServerConf
 
 # create Apache configuration file
-make_apache_conf
+makeApacheConf
 
-#update paths in utilities
+# update prefix in lib directory path
 changeServerPath
 
 # crate symlinks from warden server bin directory to /usr/local/bin
-create_symlinks
+createSymlinks
 
 echo
 echo "Please check configuration files:"