From eef6c5cb33d8292ce247fcd49578cc9fa1acf6cb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 23 Oct 2019 11:00:23 +0000
Subject: [PATCH] Build: Recognize gettext 0.20
---
apps/desktopgui/bundle-messages.sh | 2 +-
apps/i2psnark/java/bundle-messages.sh | 2 +-
apps/i2ptunnel/java/bundle-messages-proxy.sh | 2 +-
apps/i2ptunnel/java/bundle-messages.sh | 2 +-
apps/ministreaming/java/bundle-messages.sh | 2 +-
apps/routerconsole/java/bundle-messages-countries.sh | 2 +-
apps/routerconsole/java/bundle-messages-news.sh | 2 +-
apps/routerconsole/java/bundle-messages.sh | 2 +-
apps/susidns/src/bundle-messages.sh | 2 +-
apps/susimail/bundle-messages.sh | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 14b001fe75..4981beadec 100644
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -105,7 +105,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index 3e2ca35074..fb269d8248 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -96,7 +96,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh
index d14b2e7251..43f3c613e0 100755
--- a/apps/i2ptunnel/java/bundle-messages-proxy.sh
+++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh
@@ -98,7 +98,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index ca1885bb07..c0ef7010ef 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -97,7 +97,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh
index 101ff2f983..76c128f2a6 100755
--- a/apps/ministreaming/java/bundle-messages.sh
+++ b/apps/ministreaming/java/bundle-messages.sh
@@ -96,7 +96,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh
index 9e736d101f..27ca2240b6 100755
--- a/apps/routerconsole/java/bundle-messages-countries.sh
+++ b/apps/routerconsole/java/bundle-messages-countries.sh
@@ -112,7 +112,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh
index 0bc13a4927..1f03424276 100755
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ b/apps/routerconsole/java/bundle-messages-news.sh
@@ -98,7 +98,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index cdeaedf978..50a63c6e04 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -126,7 +126,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index 076b00caf0..c5a10ef73c 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -104,7 +104,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index f0dc92f86c..caf11eda77 100644
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -96,7 +96,7 @@ do
# only generate for non-source language
echo "Generating ${CLASS}_$LG ResourceBundle..."
- msgfmt -V | grep -q '0\.19'
+ msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
if [ $? -ne 0 ]
then
# slow way
--
GitLab