From: Dana Jansens <danakj@orodu.net>
Date: Wed, 3 Aug 2011 21:26:43 +0000 (-0400)
Subject: Fix release scripts: test en .po files for correct version. correctly find previous... 
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9670bc5238f1326460ef59c057bce5999a81f952;p=dana%2Fopenbox.git

Fix release scripts: test en .po files for correct version. correctly find previous version tag in git and display it.
---

diff --git a/release/common b/release/common
index 8b03c035..56093c0a 100644
--- a/release/common
+++ b/release/common
@@ -15,6 +15,7 @@ clean() {
 
 error() {
   echo "error: $1"
+  test -n "$2" && echo "$2"
   clean
   exit 1
 }
@@ -39,9 +40,10 @@ test $? = 0 || error "git-checkout failed"
 
 # get last release
 if test -z "$LAST"; then
-    LAST=$(git describe --match 'release-*' $REV)
-    test $? == 0 || \
+    LAST=$(git describe --match 'release-*' --abbrev=0 $REV)
+    test $? = 0 || \
 	error "unable to find last release"
+    echo "Using previous release as $LAST"
 fi
 
 H="$(head -1 CHANGELOG|cut -d: -f 1)"
diff --git a/release/go b/release/go
index b51a8a7a..0fc252a9 100755
--- a/release/go
+++ b/release/go
@@ -28,6 +28,11 @@ echo -n "ok? (y/n) "
 read a
 test "$a" = "y" || error "aborted"
 
+#### TEST english po VERSIONS ####
+
+BAD_PO="$(grep Project-Id-Version po/en*.po|grep -v "openbox $VERSION\\\\n")"
+test -z "$BAD_PO" || error "wrong version in po files" "$BAD_PO"
+
 #### TEST COMPILATION ####
 
 # check that it builds