zmena adresare package_version.txt

src/warden-client/sh/install.sh

@@ -143,8 +143,9 @@ params_chck()
 
 old_client_chck()
 {
-	old_package_version_file="$etc/package_version.txt"
+	old_package_version_file="$client_path/package_version.txt"
 	if [ -f $old_package_version_file ]; then
+		old_package_version=`cat $old_package_version_file`
 		echo "Sorry, but $old_package_version package is installed!"
 		echo "For update of warden client package please use update.sh script."
 		exit 1
@@ -197,6 +198,7 @@ make_warden_dir()
 		cp -u $dirname/$file "$client_path/doc"
 	done
 	cp -u $dirname/uninstall.sh "$client_path"
+	cp -u $dirname/package_version.txt "$client_path"
 }
 
 
@@ -308,7 +310,7 @@ params_chck
 
 # create variables
 dirname=`dirname $0`
-package_version=`cat $dirname/warden-client/etc/package_version.txt`
+package_version=`cat $dirname/warden-client/package_version.txt`
 key_file=`basename $key`
 cert_file=`basename $cert`
 [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix

src/warden-client/sh/uninstall.sh

@@ -199,7 +199,7 @@ params_chck
 [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
 client_path="$prefix/warden-client"
 etc="$client_path/etc"
-old_package_version_file="$etc/package_version.txt"
+old_package_version_file="$client_path/package_version.txt"
 err="/tmp/warden-err"
 backup_dir="/tmp/warden-backup"
 

src/warden-client/sh/update.sh

@@ -207,7 +207,6 @@ update_warden_dir()
 {
 	echo -n "Updating warden client directory ... "
 	rsync -q --recursive --archive --delete   --exclude="$dirname/warden-client/etc"\
-  						  --include="$dirname/warden-client/etc/package_version.txt"\
 						  --exclude="$dirname/warden-client/var"\
 						  warden-client $prefix 2> $err; ret_val=`echo $?`
 	if [ $ret_val -eq 0 ]; then
@@ -309,11 +308,11 @@ params_chck
 
 # create variables
 dirname=`dirname $0`
-package_version=`cat $dirname/warden-client/etc/package_version.txt`
+package_version=`cat $dirname/warden-client/package_version.txt`
 [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
 client_path="$prefix/warden-client"
 etc="$client_path/etc"
-old_package_version_file="$etc/package_version.txt"
+old_package_version_file="$client_path/package_version.txt"
 conf_file="$etc/warden-client.conf"
 err="/tmp/warden-err"
 backup_dir="/tmp/warden-backup"
@@ -334,9 +333,6 @@ modules_chck
 echo
 echo "------------------------- Update process --------------------------------"
 
-# check installation directory
-installation_dir_chck
-
 # check warden client directory
 warden_dir_chck