Bump rustix from 0.37.23 to 0.37.25 in /client (#1350)

[signal-cli] / gradlew

diff --git a/gradlew b/gradlew
index 79a61d421cc4e272926b1d590728d0bbfc224b0d..0adc8e1a53214b5f72ec3dfc95f7eacd239b7f27 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum


@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
     fi
 else
     JAVACMD=java

-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."

+    fi

 fi
 
 # Increase the maximum file descriptors if we can.
 fi
 
 # Increase the maximum file descriptors if we can.


@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
     done
 fi
 

+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+

 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in