From: Daiki Ueno <ueno@gnu.org>
Date: Sun, 31 Aug 2014 22:34:54 +0000 (+0900)
Subject: gettext-tools: Make convert-archive more portable
X-Git-Tag: v0.19.2.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761098f61214e68d214ff058c69d3a621a37eb03;p=thirdparty%2Fgettext.git

gettext-tools: Make convert-archive more portable

* convert-archive.in: Don't use non-portable 'if ! COMMAND'.
Reported by Stefano Lattarini in:
<https://lists.gnu.org/archive/html/bug-gettext/2011-07/msg00002.html>.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 4fec55987..7f33358e3 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-01  Daiki Ueno  <ueno@gnu.org>
+
+	* convert-archive.in: Don't use non-portable 'if ! COMMAND'.
+	Reported by Stefano Lattarini in:
+	<https://lists.gnu.org/archive/html/bug-gettext/2011-07/msg00002.html>.
+
 2014-07-14  Daiki Ueno  <ueno@gnu.org>
 
 	* gettext 0.19.2 released.
diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/misc/convert-archive.in
index 0088576bf..e48f20b7d 100644
--- a/gettext-tools/misc/convert-archive.in
+++ b/gettext-tools/misc/convert-archive.in
@@ -64,9 +64,11 @@ func_fatal_error ()
 
 # Command-line option processing.
 
-if ! { { test $# = 2 || test $# = 3 || test $# = 4; } \
+if { { test $# = 2 || test $# = 3 || test $# = 4; } \
        && case "$1" in dir | cvs | git ) true;; *) false;; esac \
        && case "$2" in dir | cvs | git ) true;; *) false;; esac; }; then
+  :
+else
   echo "Usage: convert-archive {dir|cvs|git} {dir|cvs|git} [fromfile [tofile]]"
   exit 1
 fi