verze beta1: pridano vytvareni MANIFEST filu po instalaci; uprava examplu;...

verze beta1: pridano vytvareni MANIFEST filu po instalaci; uprava examplu; oprava chyby pri vypisovani package_version

src/warden-server/sh/install.sh

@@ -23,7 +23,7 @@ usage()
 	echo "-h                        print this help"
 	echo "-V                        print script version number and exit"
 	echo
-	echo "Example: $ ./${0##*/} -d /opt -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/tcs-ca-bundle.pem -s /usr/local/bin"
+	echo "Example: $ ./${0##*/} -d /opt/warden-server-2.2 -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/tcs-ca-bundle.pem -s /usr/local/bin"
 	echo
 	echo "For more information about installation process, see README file (section Installation)."
 	echo
@@ -144,8 +144,8 @@ createWardenDir()
 			cp -R "$dir" "$basedir" 2> "$err" || errClean
 		fi
 	done
+	rm -f "${etc}/"*.tmpl
 	ln -s "${sh}/uninstall.sh" "$basedir"
-	rm -f "${etc}/"*.tmpl "${doc}/MANIFEST"
 	echo "OK"
 }
 
@@ -161,6 +161,14 @@ doTemplate()
 }
 
 
+createManifest()
+{
+	echo -n "Creating MANIFEST file ... "
+	cd "$basedir" && find . -mindepth 2 -type f | sed 's/.\///' | sort > "${doc}/MANIFEST" && cd $OLDPWD 2> "$err" || errClean
+	echo "OK"
+}
+
+
 createSymlinks()
 {
 	echo "Creating symbolic links to $symbin ..."
@@ -212,6 +220,7 @@ watchdog_conf="${etc}/warden-watchdog.conf"
 server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
 apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
 watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl"
+package_version=$(<"${dirname}/etc/package_version")
 manifest="${dirname}/doc/MANIFEST"
 manifest="${dirname}/doc/MANIFEST"
 
@@ -257,13 +266,17 @@ doTemplate \
         < $watchdog_conf_tmpl \
         > $watchdog_conf && echo "OK" || errClean
 
+# create MANIFEST file
+createManifest
+
 # crate symlinks from warden server bin to user path if -s option is set
 [[ ! -z $symbin ]] && [[ -d $symbin ]] && [[ -w $symbin ]] && createSymlinks
 
 echo
 echo "Please check configuration files:"
 echo " - $server_conf"
-echo " - $apache_conf"
+echo " - $server_conf"
+echo " - $watchdog_conf"
 echo
 echo "Warden server directory: $basedir"
 echo