zmena nazvu funkci dle Stabni kultury

src/warden-server/sh/uninstall.sh

@@ -44,7 +44,7 @@ err()
 }
 
 
-err_clean()
+errClean()
 {
 	echo "FAILED!"
 	echo " -> Reverting changes of warden 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
@@ -80,7 +80,7 @@ params_chck()
 }
 
 
-obtain_package_version()
+obtainPackageVersion()
 {
 	if [ -f $old_package_version_file ]; then 
 		package_version=`cat $old_package_version_file`
@@ -90,7 +90,7 @@ obtain_package_version()
 }
 
 
-warden_dir_chck()
+wardenDirChck()
 {
 	echo -n "Checking Warden server directory ... "
 	if [ ! -d $server_path ]; then
@@ -115,7 +115,7 @@ backup()
 }
 
 
-delete_symlinks()
+deleteSymlinks()
 {
 	echo -n "Deleting symlinks from /usr/local/bin ..."
 	for file in `ls -1 $bin`
@@ -126,14 +126,14 @@ delete_symlinks()
 }
 
 
-uninstall_warden_server()
+uninstallWardenServer()
 {
 	echo -n "Uninstalling $package_version package ... "
 	cp ${doc}/UNINSTALL $uninstall_file
 	if rm -rf $server_path 2> $err; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
 }
 
@@ -154,10 +154,10 @@ while getopts "d:Vh" options; do
 done
 
 # root test
-root_chck
+rootChck
 
 # params test
-params_chck
+paramsChck
 
 # create variables
 [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
@@ -173,22 +173,22 @@ err="/tmp/warden-err"
 backup_dir="/tmp/warden-backup"
 
 # obtain version of installed warden-server package
-obtain_package_version
+obtainPackageVersion
 
 echo
 echo "------------------------- Uninstallation process --------------------------------"
 
 # check if $prefix/warden-server directory exist
-warden_dir_chck
+wardenDirChck
 
 # make backup of currently installed warden-server package
 backup
 
 # delete symbolic links
-delete_symlinks
+deleteSymlinks
 
 # do uninstallation
-uninstall_warden_server
+uninstallWardenServer
 
 echo
 echo "Please follow post-uninstallation steps in $uninstall_file!"

src/warden-server/sh/update.sh

@@ -47,7 +47,7 @@ err()
 }
 
 
-err_clean()
+errClean()
 {
 	echo "FAILED!"
 	echo " -> Reverting changes of Warden server package ... OK"
@@ -61,7 +61,7 @@ err_clean()
 }
 
 
-root_chck()
+rootChck()
 {
 	if [ $UID -ne 0 ]; then
 		echo "You must be root for running this script!"
@@ -70,7 +70,7 @@ root_chck()
 }
 
 
-params_chck()
+paramsChck()
 {
 	if [ -z $prefix ]; then
 		prefix=/opt
@@ -79,7 +79,7 @@ params_chck()
 }
 
 
-obtain_package_version()
+obtainPackageVersion()
 {
 	if [ -f $old_package_version_file ]; then 
 		old_package_version=`cat $old_package_version_file`
@@ -95,7 +95,7 @@ obtain_package_version()
 }
 
 
-perl_chck()
+perlChck()
 {
 	echo -n "Checking Perl interpreter ... "
 	if which perl 1> /dev/null; then
@@ -108,7 +108,7 @@ perl_chck()
 }
 
 
-modules_chck()
+modulesChck()
 {
 	for module in ${modules[@]};
 	do
@@ -122,7 +122,7 @@ modules_chck()
 }
 
 
-warden_dir_chck()
+wardenDirChck()
 {
 	echo -n "Checking Warden server directory ... "
 	if [ ! -d $server_path ]; then
@@ -147,7 +147,7 @@ backup()
 }
 
 
-obtain_warden_user()
+obtainWardenUser()
 {
 	echo -n "Obtaining Warden server directory owner ... "
 	if user=`stat -c %U $server_conf_file` 2> $err; then
@@ -158,20 +158,20 @@ obtain_warden_user()
 }
 
 
-update_warden_dir()
+updateWardenDir()
 { 
 	echo -n "Updating Warden server directory ... "
 	if rsync -q --recursive --archive --delete --exclude='etc' --exclude='sh' ${dirname}/warden-server $prefix 2> $err; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
 	cp ${dirname}/warden-server/etc/package_version $etc
 	cp ${dirname}/uninstall.sh $server_path
 }
 
 
-update_conf_files()
+updateConfFiles()
 {
         echo -n "Updating $apache_conf_file ... "
 
@@ -208,7 +208,7 @@ $perl_switches
 	if [ $ret_val -eq 0 ]; then
 		echo "OK"
 	else
-		err_clean
+		errClean
 	fi
  
 
@@ -305,7 +305,7 @@ $valid_strings" > $server_conf_file 2> $err; ret_val=`echo $?`
         if [ $ret_val -eq 0 ]; then
                 echo "OK"
         else
-                err_clean
+                errClean
         fi
 }
 
@@ -329,10 +329,10 @@ while getopts "d:Vh" options; do
 done
 
 # root test
-root_chck
+rootChck
 
 # params test
-params_chck
+paramsChck
 
 # create variables
 dirname=`dirname $0`
@@ -348,34 +348,34 @@ err="/tmp/warden-err"
 backup_dir="/tmp/warden-server-backup"
 
 # obtain version of old warden server
-obtain_package_version
+obtainPackageVersion
 
 echo
 echo "------------------------- Dependencies check-in -------------------------"
 
 # Perl interpreter test
-perl_chck
+perlChck
 
 # Perl modules test
-modules_chck
+modulesChck
 
 echo
 echo "------------------------- Update process --------------------------------"
 
 # check warden server directory
-warden_dir_chck
+wardenDirChck
 
 # backup old warden server installation
 backup
 
 # obtain current warden server user
-obtain_warden_user
+obtainWardenUser
 
 # make warden server directory
-update_warden_dir
+updateWardenDir
 
 # create conf files
-update_conf_files
+updateConfFiles
 
 echo
 echo "Please check updated configuration files:"