code refactors revert

gradlew

@@ -1,19 +1,14 @@
-#!/usr/bin/
+#!/usr/bin/env sh
-env sh
 
 #
-
 # Copyright 2015 the original author or authors.
 #
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-
 #      https://www.apache.org/licenses/LICENSE-2.0
 #
-
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,11 +18,7 @@ env sh
 
 ##############################################################################
 ##
-##
+##  Gradle start up script for UN*X
-Gradle start
-up script
-for
-UN *X
 ##
 ##############################################################################
 
@@ -36,29 +27,21 @@ UN *X
 PRG="$0"
 # Need this for relative symlinks.
 while [ -h "$PRG" ] ; do
-ls =
+    ls=`ls -ld "$PRG"`
-`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-link =
+    if expr "$link" : '/.*' > /dev/null; then
-`expr "$ls" : '.*-> \(.*\)$'`
-if expr "$link" : '/.*' > /dev/
-null;
-then
         PRG="$link"
     else
-PRG =
+        PRG=`dirname "$PRG"`"/$link"
-`dirname "$PRG"`"/$link"
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/
+cd "`dirname \"$PRG\"`/" >/dev/null
-null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/
+cd "$SAVED" >/dev/null
-null
 
 APP_NAME="Gradle"
-APP_BASE_NAME =
+APP_BASE_NAME=`basename "$0"`
-`basename "$0"`
 
 # 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"'
@@ -67,17 +50,14 @@ DEFAULT_JVM_OPTS = '"-Xmx64m" "-Xms64m"'
 MAX_FD="maximum"
 
 warn () {
-    echo
+    echo "$*"
-    "$*"
 }
 
 die () {
     echo
+    echo "$*"
     echo
-    "$*"
+    exit 1
-    echo
-    exit
-    1
 }
 
 # OS specific support (must be 'true' or 'false').
@@ -85,17 +65,19 @@ cygwin = false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`"
+case "`uname`" in
-in
+  CYGWIN* )
-        CYGWIN
+    cygwin=true
-* )
+    ;;
-cygwin = true;;
   Darwin* )
-darwin = true;;
+    darwin=true
+    ;;
   MINGW* )
-msys = true;;
+    msys=true
+    ;;
   NONSTOP* )
-nonstop = true;;
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -103,63 +85,36 @@ esac
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
-if [ -x "$JAVA_HOME/jre/sh/java" ];
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-then
         # IBM's JDK on AIX uses strange locations for the executables
         JAVACMD="$JAVA_HOME/jre/sh/java"
     else
         JAVACMD="$JAVA_HOME/bin/java"
     fi
-if [ ! -x "$JAVACMD" ];
+    if [ ! -x "$JAVACMD" ] ; then
-then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-        die
-"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
-Please set
+Please set the JAVA_HOME variable in your environment to match the
-the JAVA_HOME
+location of your Java installation."
-variable in
-your environment
-to match
-the
-        location
-of your
-Java installation
-."
     fi
 else
     JAVACMD="java"
-which java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
->/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
-Please set
+Please set the JAVA_HOME variable in your environment to match the
-the JAVA_HOME
+location of your Java installation."
-variable in
-your environment
-to match
-the
-        location
-of your
-Java installation
-."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ];
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-then
+    MAX_FD_LIMIT=`ulimit -H -n`
-        MAX_FD_LIMIT =
-`ulimit -H -n`
     if [ $? -eq 0 ] ; then
-if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ];
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-then
             MAX_FD="$MAX_FD_LIMIT"
         fi
-        ulimit
+        ulimit -n $MAX_FD
--
+        if [ $? -ne 0 ] ; then
-n $MAX_FD
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-if [ $? -ne 0 ];
-then
-        warn
-"Could not set maximum file descriptor limit: $MAX_FD"
         fi
     else
         warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
@@ -167,72 +122,43 @@ fi
 fi
 
 # For Darwin, add options to specify how the application appears in the dock
-if
+if $darwin; then
-$darwin;
-then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ];
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-        APP_HOME =
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-`cygpath --path --mixed "$APP_HOME"`
-CLASSPATH =
-`cygpath --path --mixed "$CLASSPATH"`
 
-JAVACMD =
+    JAVACMD=`cygpath --unix "$JAVACMD"`
-`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
-ROOTDIRSRAW =
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-`find -L / -maxdepth 1 -mindepth 1 -
-type d
-2>/dev/null`
     SEP=""
-for
+    for dir in $ROOTDIRSRAW ; do
-dir in
-$ROOTDIRSRAW;
-do
         ROOTDIRS="$ROOTDIRS$SEP$dir"
         SEP="|"
     done
     OURCYGPATTERN="(^($ROOTDIRS))"
     # Add a user-defined pattern to the cygpath arguments
-if [ "$GRADLE_CYGPATTERN" != "" ];
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-then
         OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
     fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
     i=0
-for
+    for arg in "$@" ; do
-arg in
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-"$@"; do
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-CHECK =
-`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-CHECK2 =
-`echo "$arg"|egrep -c "^-"`                                 ### Determine if
-an option
 
-if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then                    ###
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-Added a
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-condition
-        eval
-`
-echo args$i
-`=`cygpath --path --ignore --mixed "$arg"`
         else
-eval `
+            eval `echo args$i`="\"$arg\""
-echo args$i
-`="\"$arg\""
         fi
-        i =
+        i=`expr $i + 1`
-`
-expr $i
-+ 1`
     done
-case
+    case $i in
-$i in
         0) set -- ;;
         1) set -- "$args0" ;;
         2) set -- "$args0" "$args1" ;;
@@ -247,25 +173,13 @@ esac
 fi
 
 # Escape application args
-
 save () {
-    for
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    i
+    echo " "
-    do printf % s\\n
-    "$i" | sed
-    "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/";
-    done
-    echo
-    " "
 }
-
+APP_ARGS=`save "$@"`
-APP_ARGS =
-`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
---
-$DEFAULT_JVM_OPTS $JAVA_OPTS
-$GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"