]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Archive script with better error messages
authorFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 21 Sep 2014 13:23:21 +0000 (15:23 +0200)
committerFrederic Marchal <fmarchal@users.sourceforge.net>
Sun, 21 Sep 2014 13:23:21 +0000 (15:23 +0200)
When the version number isn't correct, the error message gives a clearer
indication about what is wrong.

archive.sh

index 9a8da29ffc4c1854d0d69a75537e40b578c4c595..f91bdee58bb3107306a85d62fe6be0bc9ce0e7f5 100755 (executable)
@@ -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=$(cat "$Sources/configure.in" | sed -n -e 's/^AC_INIT(\[sarg\],\[\([0-9][0-9]*\.[0-9][0-9]*.*\)\])/\1/p')
+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