diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/java-skylark/src/main/java/com/example/myproject/Greeter.java | 3 | ||||
| -rwxr-xr-x | examples/shell/bin.sh | 3 | ||||
| -rwxr-xr-x | examples/shell/lib.sh | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java index 143a71dfd4..b4d8516dc9 100644 --- a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java +++ b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java @@ -29,8 +29,7 @@ public class Greeter { public void hello(String obj) throws Exception { String greeting = "Hello"; try { - String greetFile = getRunfiles() - + "/io_bazel/examples/java-skylark/src/main/resources/greeting.txt"; + String greetFile = getRunfiles() + "/examples/java-skylark/src/main/resources/greeting.txt"; greeting = convertStreamToString(new FileInputStream(greetFile)); } catch (FileNotFoundException e) { // use default. diff --git a/examples/shell/bin.sh b/examples/shell/bin.sh index 5b51ccf06c..02345b0157 100755 --- a/examples/shell/bin.sh +++ b/examples/shell/bin.sh @@ -18,8 +18,9 @@ set -eu # This allows the script to be both a binary and a library script. If our binary has defined # RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} +RUNFILES=${RUNFILES:-$0.runfiles} source "${RUNFILES}/examples/shell/lib.sh" showfile + diff --git a/examples/shell/lib.sh b/examples/shell/lib.sh index 495ef3d422..979a2c6b67 100755 --- a/examples/shell/lib.sh +++ b/examples/shell/lib.sh @@ -18,8 +18,9 @@ set -eu # This allows the script to be both a binary and a library script. If our binary has defined # RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} +RUNFILES=${RUNFILES:-$0.runfiles} function showfile { cat "${RUNFILES}/examples/shell/data/file.txt" } + |