Skip to content

Commit bcbec74

Browse files
committed
fix unix binaries
1 parent 5296f03 commit bcbec74

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

Wurstpack/wurstscript/grill

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
RUNTIME="$HOME/.wurst/wurst-runtime/bin/java"
5-
6-
# Resolve script dir (absolute)
74
DIR="$(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"
108
if [[ ! -f "$JAR" ]]; then
11-
JAR="$DIR/../grill/grill.jar"
9+
JAR="$DIR/../grill-cli/grill.jar"
1210
fi
1311

1412
if [[ ! -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
1917
fi
2018

@@ -25,4 +23,4 @@ if [[ ! -x "$RUNTIME" ]]; then
2523
exit 3
2624
fi
2725

28-
exec "$RUNTIME" -jar "$JAR" "$@"
26+
exec "$RUNTIME" -Dfile.encoding=UTF-8 -jar "$JAR" "$@"

Wurstpack/wurstscript/wurstscript

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
RUNTIME="$HOME/.wurst/wurst-runtime/bin/java"
5-
6-
# Resolve script dir (absolute)
74
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5+
RUNTIME="$DIR/wurst-runtime/bin/java"
86

97
JAR="$DIR/wurst-compiler/wurstscript.jar"
108
if [[ ! -f "$JAR" ]]; then
@@ -25,4 +23,4 @@ if [[ ! -x "$RUNTIME" ]]; then
2523
exit 3
2624
fi
2725

28-
exec "$RUNTIME" -jar "$JAR" "$@"
26+
exec "$RUNTIME" -Dfile.encoding=UTF-8 -jar "$JAR" "$@"

de.peeeq.wurstscript/deploy.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)