zmena zpusobu verzovani balicku (warden-client/package_version.txt ->...

zmena zpusobu verzovani balicku (warden-client/package_version.txt -> warden-client/etc/package_version)

packages/build-client.sh

@@ -94,10 +94,6 @@ cp ../src/$package_name/doc/README.cesnet $package 2> $err; ret_val=`echo $?`
 if [ $ret_val -ne 0 ]; then
   err
 fi
-cp ../src/$package_name/package_version.txt $package 2> $err; ret_val=`echo $?`
-if [ $ret_val -ne 0 ]; then
-  err
-fi
 
 echo "OK"
 
@@ -119,6 +115,10 @@ mkdir -p $etc 2> $err; ret_val=`echo $?`
 if [ $ret_val -ne 0 ]; then
   err
 fi
+cp ../src/$package_name/etc/package_version $etc 2> $err; ret_val=`echo $?`
+if [ $ret_val -ne 0 ]; then
+  err
+fi
 echo "OK"
 
 

src/warden-client/doc/README

@@ -45,6 +45,7 @@ A. Overall Information
 	README.cesnet
       etc/
         warden-client.conf
+	package_version
       lib/
         WardenClientConf.pm
         WardenClientSend.pm

src/warden-client/sh/install.sh

@@ -143,7 +143,7 @@ params_chck()
 
 old_client_chck()
 {
-	old_package_version_file="$client_path/package_version.txt"
+	old_package_version_file="$etc/package_version"
 	if [ -f $old_package_version_file ]; then
 		old_package_version=`cat $old_package_version_file`
 		echo "Sorry, but $old_package_version package is installed!"
@@ -195,10 +195,9 @@ make_warden_dir()
 	files=(CHANGELOG INSTALL LICENSE README README.cesnet)
 	for file in ${files[@]};
 	do
-		cp -u $dirname/$file "$client_path/doc"
+		cp $dirname/$file "$client_path/doc"
 	done
-	cp -u $dirname/uninstall.sh "$client_path"
-	cp -u $dirname/package_version.txt "$client_path"
+	cp $dirname/uninstall.sh "$client_path"
 }
 
 
@@ -310,7 +309,7 @@ params_chck
 
 # create variables
 dirname=`dirname $0`
-package_version=`cat $dirname/package_version.txt`
+package_version=`cat $dirname/warden-client/etc/package_version`
 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="$client_path/package_version.txt"
+old_package_version_file="$etc/package_version"
 err="/tmp/warden-err"
 backup_dir="/tmp/warden-backup"
 

src/warden-client/sh/update.sh

@@ -220,10 +220,10 @@ update_warden_dir()
 	files=(CHANGELOG INSTALL LICENSE README README.cesnet)
 	for file in ${files[@]};
 	do  
-		cp -u "$dirname/$file" "$client_path/doc"
+		cp "$dirname/$file" "$client_path/doc"
 	done
-	cp -u "$dirname/uninstall.sh" "$client_path"
-	cp -u "$dirname/package_version.txt" "$client_path"
+	cp "$dirname/uninstall.sh" "$client_path"
+	cp "$dirname/warden-client/etc/package_version" "$etc"
 }
 
 
@@ -311,11 +311,11 @@ params_chck
 
 # create variables
 dirname=`dirname $0`
-package_version=`cat $dirname/package_version.txt`
+package_version=`cat $dirname/warden-client/etc/package_version`
 [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix
 client_path="$prefix/warden-client"
 etc="$client_path/etc"
-old_package_version_file="$client_path/package_version.txt"
+old_package_version_file="$etc/package_version"
 conf_file="$etc/warden-client.conf"
 err="/tmp/warden-err"
 backup_dir="/tmp/warden-backup"