Produced by Araxis Merge on 12/7/2018 11:36:01 AM Central Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\SCRUB\MHED\MHED\VAR 4.10.0\var-web-release-4.10@e10f18de1ef\MockServices | gradlew | Mon Oct 22 23:25:20 2018 UTC |
| 2 | C:\MHED-scrubbed\MHED\MHED\VAR 4.10.0\var-web-release-4.10@e10f18de1ef\MockServices | gradlew | Fri Dec 7 13:06:56 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 5 | 318 |
| Changed | 5 | 10 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | #!/usr/bin /env bash | |
| 2 | ||
| 3 | ########## ########## ########## ########## ########## ########## ########## ######## | |
| 4 | ## | |
| 5 | ## Gradle start up script for UN*X | |
| 6 | ## | |
| 7 | ########## ########## ########## ########## ########## ########## ########## ######## | |
| 8 | ||
| 9 | # Add defa ult JVM op tions here . You can also use J AVA_OPTS a nd GRADLE_ OPTS to pa ss JVM opt ions to th is script. | |
| 10 | DEFAULT_JV M_OPTS="" | |
| 11 | ||
| 12 | APP_NAME=" Gradle" | |
| 13 | APP_BASE_N AME=`basen ame "$0"` | |
| 14 | ||
| 15 | # Use the maximum av ailable, o r set MAX_ FD != -1 t o use that value. | |
| 16 | MAX_FD="ma ximum" | |
| 17 | ||
| 18 | warn ( ) { | |
| 19 | echo " $*" | |
| 20 | } | |
| 21 | ||
| 22 | die ( ) { | |
| 23 | echo | |
| 24 | echo " $*" | |
| 25 | echo | |
| 26 | exit 1 | |
| 27 | } | |
| 28 | ||
| 29 | # OS speci fic suppor t (must be 'true' or 'false'). | |
| 30 | cygwin=fal se | |
| 31 | msys=false | |
| 32 | darwin=fal se | |
| 33 | case "`una me`" in | |
| 34 | CYGWIN* ) | |
| 35 | cygwin =true | |
| 36 | ;; | |
| 37 | Darwin* ) | |
| 38 | darwin =true | |
| 39 | ;; | |
| 40 | MINGW* ) | |
| 41 | msys=t rue | |
| 42 | ;; | |
| 43 | esac | |
| 44 | ||
| 45 | # For Cygw in, ensure paths are in UNIX f ormat befo re anythin g is touch ed. | |
| 46 | if $cygwin ; then | |
| 47 | [ -n " $JAVA_HOME " ] && JAV A_HOME=`cy gpath --un ix "$JAVA_ HOME"` | |
| 48 | fi | |
| 49 | ||
| 50 | # Attempt to set APP _HOME | |
| 51 | # Resolve links: $0 may be a l ink | |
| 52 | PRG="$0" | |
| 53 | # Need thi s for rela tive symli nks. | |
| 54 | while [ -h "$PRG" ] ; do | |
| 55 | ls=`ls -ld "$PRG "` | |
| 56 | link=` expr "$ls" : '.*-> \ (.*\)$'` | |
| 57 | if exp r "$link" : '/.*' > /dev/null; then | |
| 58 | PR G="$link" | |
| 59 | else | |
| 60 | PR G=`dirname "$PRG"`"/ $link" | |
| 61 | fi | |
| 62 | done | |
| 63 | SAVED="`pw d`" | |
| 64 | cd "`dirna me \"$PRG\ "`/" >&- | |
| 65 | APP_HOME=" `pwd -P`" | |
| 66 | cd "$SAVED " >&- | |
| 67 | ||
| 68 | CLASSPATH= $APP_HOME/ gradle/wra pper/gradl e-wrapper. jar | |
| 69 | ||
| 70 | # Determin e the Java command t o use to s tart the J VM. | |
| 71 | if [ -n "$ JAVA_HOME" ] ; then | |
| 72 | if [ - x "$JAVA_H OME/jre/sh /java" ] ; then | |
| 73 | # IBM's JDK on AIX use s strange locations for the ex ecutables | |
| 74 | JA
|
|
| 75 | else | |
| 76 | JA
|
|
| 77 | fi | |
| 78 | if [ ! -x "$JA
|
|
| 79 | di e "ERROR: JAVA_HOME is set to an invalid directory : $JAVA_HO ME | |
| 80 | ||
| 81 | Please set the JAVA_ HOME varia ble in you r environm ent to mat ch the | |
| 82 | location o f your Jav a installa tion." | |
| 83 | fi | |
| 84 | else | |
| 85 | JA
|
|
| 86 | which java >/dev /null 2>&1 || die "E RROR: JAVA _HOME is n ot set and no 'java' command c ould be fo und in you r PATH. | |
| 87 | ||
| 88 | Please set the JAVA_ HOME varia ble in you r environm ent to mat ch the | |
| 89 | location o f your Jav a installa tion." | |
| 90 | fi | |
| 91 | ||
| 92 | # Increase the maxim um file de scriptors if we can. | |
| 93 | if [ "$cyg win" = "fa lse" -a "$ darwin" = "false" ] ; then | |
| 94 | MAX_FD _LIMIT=`ul imit -H -n ` | |
| 95 | if [ $ ? -eq 0 ] ; then | |
| 96 | if [ "$MAX_F D" = "maxi mum" -o "$ MAX_FD" = "max" ] ; then | |
| 97 | MAX_FD=" $MAX_FD_LI MIT" | |
| 98 | fi | |
| 99 | ul imit -n $M AX_FD | |
| 100 | if [ $? -ne 0 ] ; then | |
| 101 | warn "Co uld not se t maximum file descr iptor limi t: $MAX_FD " | |
| 102 | fi | |
| 103 | else | |
| 104 | wa rn "Could not query maximum fi le descrip tor limit: $MAX_FD_L IMIT" | |
| 105 | fi | |
| 106 | fi | |
| 107 | ||
| 108 | # For Darw in, add op tions to s pecify how the appli cation app ears in th e dock | |
| 109 | if $darwin ; then | |
| 110 | GRADLE _OPTS="$GR ADLE_OPTS \"-Xdock:n ame=$APP_N AME\" \"-X dock:icon= $APP_HOME/ media/grad le.icns\"" | |
| 111 | fi | |
| 112 | ||
| 113 | # For Cygw in, switch paths to Windows fo rmat befor e running java | |
| 114 | if $cygwin ; then | |
| 115 | APP_HO ME=`cygpat h --path - -mixed "$A PP_HOME"` | |
| 116 | CLASSP ATH=`cygpa th --path --mixed "$ CLASSPATH" ` | |
| 117 | ||
| 118 | # We b uild the p attern for arguments to be con verted via cygpath | |
| 119 | ROOTDI RSRAW=`fin d -L / -ma xdepth 1 - mindepth 1 -type d 2 >/dev/null ` | |
| 120 | SEP="" | |
| 121 | for di r in $ROOT DIRSRAW ; do | |
| 122 | RO OTDIRS="$R OOTDIRS$SE P$dir" | |
| 123 | SE P="|" | |
| 124 | done | |
| 125 | OURCYG PATTERN="( ^($ROOTDIR S))" | |
| 126 | # Add a user-def ined patte rn to the cygpath ar guments | |
| 127 | if [ " $GRADLE_CY GPATTERN" != "" ] ; then | |
| 128 | OU RCYGPATTER N="$OURCYG PATTERN|($ GRADLE_CYG PATTERN)" | |
| 129 | fi | |
| 130 | # Now convert th e argument s - kludge to limit ourselves to /bin/sh | |
| 131 | i=0 | |
| 132 | for ar g in "$@" ; do | |
| 133 | CH ECK=`echo "$arg"|egr ep -c "$OU RCYGPATTER N" -` | |
| 134 | CH ECK2=`echo "$arg"|eg rep -c "^- "` ### D etermine i f an optio n | |
| 135 | ||
| 136 | if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### A dded a con dition | |
| 137 | eval `ec ho args$i` =`cygpath --path --i gnore --mi xed "$arg" ` | |
| 138 | el se | |
| 139 | eval `ec ho args$i` ="\"$arg\" " | |
| 140 | fi | |
| 141 | i= $((i+1)) | |
| 142 | done | |
| 143 | case $ i in | |
| 144 | (0 ) set -- ; ; | |
| 145 | (1 ) set -- " $args0" ;; | |
| 146 | (2 ) set -- " $args0" "$ args1" ;; | |
| 147 | (3 ) set -- " $args0" "$ args1" "$a rgs2" ;; | |
| 148 | (4 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" ;; | |
| 149 | (5 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" "$arg s4" ;; | |
| 150 | (6 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" "$arg s4" "$args 5" ;; | |
| 151 | (7 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" "$arg s4" "$args 5" "$args6 " ;; | |
| 152 | (8 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" "$arg s4" "$args 5" "$args6 " "$args7" ;; | |
| 153 | (9 ) set -- " $args0" "$ args1" "$a rgs2" "$ar gs3" "$arg s4" "$args 5" "$args6 " "$args7" "$args8" ;; | |
| 154 | esac | |
| 155 | fi | |
| 156 | ||
| 157 | # Split up the JVM_O PTS And GR ADLE_OPTS values int o an array , followin g the shel l quoting and substi tution rul es | |
| 158 | function s plitJvmOpt s() { | |
| 159 | JVM_OP TS=("$@") | |
| 160 | } | |
| 161 | eval split JvmOpts $D EFAULT_JVM _OPTS $JAV A_OPTS $GR ADLE_OPTS | |
| 162 | JVM_OPTS[$ {#JVM_OPTS [*]}]="-Do rg.gradle. appname=$A PP_BASE_NA ME" | |
| 163 | ||
| 164 | exec "$JA
|
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.