File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
22set -euo pipefail
33
4- RUNTIME=" $HOME /.wurst/wurst-runtime/bin/java"
5-
6- # Resolve script dir (absolute)
74DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd) "
5+ RUNTIME=" $DIR /wurst-runtime/bin/java"
86
9- JAR=" $DIR /grill/grill.jar"
7+ JAR=" $DIR /grill-cli /grill.jar"
108if [[ ! -f " $JAR " ]]; then
11- JAR=" $DIR /../grill/grill.jar"
9+ JAR=" $DIR /../grill-cli /grill.jar"
1210fi
1311
1412if [[ ! -f " $JAR " ]]; then
1513 echo " [grill] ERROR: Missing jar. Searched:"
16- echo " $DIR /grill/grill.jar"
17- echo " $DIR /../grill/grill.jar"
14+ echo " $DIR /grill-cli /grill.jar"
15+ echo " $DIR /../grill-cli /grill.jar"
1816 exit 2
1917fi
2018
@@ -25,4 +23,4 @@ if [[ ! -x "$RUNTIME" ]]; then
2523 exit 3
2624fi
2725
28- exec " $RUNTIME " -jar " $JAR " " $@ "
26+ exec " $RUNTIME " -Dfile.encoding=UTF-8 - jar " $JAR " " $@ "
Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
22set -euo pipefail
33
4- RUNTIME=" $HOME /.wurst/wurst-runtime/bin/java"
5-
6- # Resolve script dir (absolute)
74DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd) "
5+ RUNTIME=" $DIR /wurst-runtime/bin/java"
86
97JAR=" $DIR /wurst-compiler/wurstscript.jar"
108if [[ ! -f " $JAR " ]]; then
@@ -25,4 +23,4 @@ if [[ ! -x "$RUNTIME" ]]; then
2523 exit 3
2624fi
2725
28- exec " $RUNTIME " -jar " $JAR " " $@ "
26+ exec " $RUNTIME " -Dfile.encoding=UTF-8 - jar " $JAR " " $@ "
Original file line number Diff line number Diff line change @@ -219,6 +219,7 @@ tasks.named("assembleSlimCompilerDist", Copy) { t ->
219219 from(" ../Wurstpack/wurstscript/grill" ) { into(" ." ) }
220220 } else {
221221 from(" ../Wurstpack/wurstscript/wurstscript" ) { into(" ." ) }
222+ from(" ../Wurstpack/wurstscript/grill" ) { into(" ." ) }
222223 }
223224}
224225
You can’t perform that action at this time.
0 commit comments