Archive script with better error messages

When the version number isn't correct, the error message gives a clearer
indication about what is wrong.

Conflicts:
	archive.sh

diff --git a/archive.sh b/archive.sh
index 6e3b58219551bc6c367a7f1589a52536e7575c1d..29c84b2682b5fe9e752591a746b983a9373be51c 100755 (executable)
--- a/archive.sh
+++ b/archive.sh
@@ -6,17 +6,21 @@ Target=".."
 # check version number in every file
 Version=$(cat "$Sources/CMakeLists.txt" | sed -n -e 's/^SET(sarg_VERSION \([0-9]\))/\1/p')
 if [ -z "$Version" ] ; then
-       echo "No version found"
+       echo "No version found in CMakeLists.txt"
        exit 1
 fi
 Revision=$(cat "$Sources/CMakeLists.txt" | sed -n -e 's/^SET(sarg_REVISION "\([0-9][0-9]*.*\)")/\1/p')
 if [ -z "$Revision" ] ; then
-       echo "No revision found"
+       echo "No revision found in CMakeLists.txt"
        exit 1
 fi
 Version="$Version.$Revision"
 
 VersionCheck=$(sed -n -e 's/^AC_INIT(\[sarg\],\[\([0-9][0-9]*\.[0-9][0-9]*.*\)\])/\1/p' "$Sources/configure.in")
+if [ -z "$VersionCheck" ] ; then
+       echo "No version found in configure.in"
+       exit 1
+fi
 if [ "x$Version" != "x$VersionCheck" ] ; then
        echo "CMakeLists and configure doesn't refer to the same version"
        exit 1