odstranena force volba u prikazu rm; pridana kontrola upgradu z verze 2.0 na...

odstranena force volba u prikazu rm; pridana kontrola upgradu z verze 2.0 na 2.1; pridano vytvoreni chybejicich adresaru ve strukture stavajiciho warden serveru

src/warden-server/sh/update.sh

@@ -51,10 +51,10 @@ errClean()
 {
 	echo "FAILED!"
 	echo " -> Reverting changes of Warden server package ... OK"
-	rm -rf ${server_path}/* > /dev/null 2>&1
+	rm -r ${server_path}/* > /dev/null 2>&1
 	cp -R ${backup_dir}/* $server_path
 	cat $err
-	rm -rf $err $backup
+	rm -r $err $backup
 	echo
 	echo "Update from $old_package_version to $package_version package FAILED!!!"
 	exit 1
@@ -95,6 +95,9 @@ oldPackageChck()
 		if [ "$old_package_version" == "$package_version" ]; then
 			echo "Sorry, but $package_version package is already installed!"
 			exit 1
+		elif [ "$old_package_version" == "warden-server-2.0" ]; then
+			echo "Sorry, first of all you must upgrade to package warden-server-2.1!"
+			exit 1
 		fi
 	else
 		echo "Sorry, but Warden server package is not yet installed!"
@@ -133,7 +136,7 @@ modulesChck()
 backup()
 {
 	echo -n "Making Warden server backup ... "
-	mkdir $backup
+	mkdir "$backup"
 	if cp -R "${basedir}/"* "$backup" 2> "$err"; then
 		echo "OK"
 	else
@@ -147,6 +150,8 @@ updateWardenDir()
 	echo -n "Updating Warden server ... "
         for file in $(<"$manifest")
         do
+		dir="$basedir/${file%/*}"
+		[[ ! -d "$dir" ]] && mkdir -p "$dir"
 		cp "$file" "${basedir}/$file" 2> "$err" || errClean
         done
 	echo "OK"