Use try-with-ressource statements instead of manually closing stream

[signal-cli] / gradlew

diff --git a/gradlew b/gradlew
index 9aa616c273d8c0be67cb25eaac11e07209f5c034..4453ccea33d960069d9137ee65f6b21fc65e7e92 100755 (executable)
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

 
 ##############################################################################
 ##
 
 ##############################################################################
 ##


@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
     esac
 fi
 

-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "

 }
 }

-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong

-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

   cd "$(dirname "$0")"
 fi
 
   cd "$(dirname "$0")"
 fi
 

-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"