Skip to content
Snippets Groups Projects
Commit 4bce69b1 authored by Jan Soukal's avatar Jan Soukal
Browse files

Merge branch 'master' of homeproj.cesnet.cz:warden

parents fb3181dd 144df4fd
No related branches found
No related tags found
No related merge requests found
...@@ -128,6 +128,10 @@ obtain_package_version() ...@@ -128,6 +128,10 @@ obtain_package_version()
{ {
if [ -f $old_package_version_file ]; then if [ -f $old_package_version_file ]; then
old_package_version=`cat $old_package_version_file` old_package_version=`cat $old_package_version_file`
if [ "$old_package_version" == "$package_version" ]; then
echo "Sorry, but $package_version package is already installed!"
exit 1
fi
else else
echo "Sorry, but warden-client package is not installed!" echo "Sorry, but warden-client package is not installed!"
echo "For installation of warden client package please use install.sh script." echo "For installation of warden client package please use install.sh script."
...@@ -206,9 +210,9 @@ obtain_warden_user() ...@@ -206,9 +210,9 @@ obtain_warden_user()
update_warden_dir() update_warden_dir()
{ {
echo -n "Updating warden client directory ... " echo -n "Updating warden client directory ... "
rsync -q --recursive --archive --delete --exclude="$dirname/warden-client/etc"\ rsync -q --recursive --archive --delete --exclude="$dirname/warden-client/etc"\
--exclude="$dirname/warden-client/var"\ --exclude="$dirname/warden-client/var"\
warden-client $prefix 2> $err; ret_val=`echo $?` warden-client $client_path 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then if [ $ret_val -eq 0 ]; then
echo "OK" echo "OK"
else else
...@@ -221,6 +225,7 @@ update_warden_dir() ...@@ -221,6 +225,7 @@ update_warden_dir()
cp -u "$dirname/$file" "$client_path/doc" cp -u "$dirname/$file" "$client_path/doc"
done done
cp -u "$dirname/uninstall.sh" "$client_path" cp -u "$dirname/uninstall.sh" "$client_path"
cp -u "$dirname/package_version.txt" "$client_path"
} }
...@@ -282,7 +287,7 @@ change_permissions() ...@@ -282,7 +287,7 @@ change_permissions()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# list of used Perl modules # list of used Perl modules
modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::TCP FindBin) modules=(SOAP::Lite IO::Socket::SSL SOAP::Transport::TCP FindBin DateTime)
# OS test # OS test
os_chck os_chck
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment