Remove version printing on linux (eProsima#71)

* It's on stderr and noisy Signed-off-by: Ryan Friedman <[email protected]> Co-authored-by: Antonio Cuadros <[email protected]> Co-authored-by: Pablo Garrido <[email protected]>
ArduPilot · Aug 24, 2024 · 93b118a · 93b118a
1 parent 2e552e9
commit 93b118a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/scripts/microxrceddsgen b/scripts/microxrceddsgen
@@ -4,9 +4,7 @@ dir="`dirname \"$0\"`"
 
 java_exec=java
 
-java -version &>/dev/null
-
-if [ $? != 0 ]; then
+if ! hash ${jave_exec}; then
     [ -z "$JAVA_HOME" ] && { echo "Java binary cannot be found. Please, make sure its location is in the PATH environment variable or set JAVA_HOME environment variable."; exit 1; }
     java_exec="${JAVA_HOME}/bin/java"
 fi

diff --git a/scripts/microxrceddsgen.in b/scripts/microxrceddsgen.in
@@ -4,9 +4,7 @@ dir="`dirname \"$0\"`"
 
 java_exec=java
 
-java -version &>/dev/null
-
-if [ $? != 0 ]; then
+if ! hash ${jave_exec}; then
     [ -z "$JAVA_HOME" ] && { echo "Java binary cannot be found. Please, make sure its location is in the PATH environment variable or set JAVA_HOME environment variable."; exit 1; }
     java_exec="${JAVA_HOME}/bin/java"
 fi