aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
index cb883c82ce..98833add25 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
@@ -49,7 +49,7 @@ filegroup(
outs = [tool + "_runner.sh"],
srcs = [],
cmd = "\n".join(["cat > $@ << 'EOF'",
- "#!/bin/bash -e",
+ "#!/bin/bash -eu",
"BINARY=$${0##*-out/host/bin/}",
"DIRNAME=$$(dirname $$BINARY)",
"SDK=$${0}.runfiles/$${DIRNAME}",
@@ -130,11 +130,11 @@ genrule(
srcs = [],
outs = ["apkbuilder_binary.sh"],
cmd = "\n".join(["cat > $@ << 'EOF'",
- "#!/bin/bash -e",
+ "#!/bin/bash -eu",
"BINARY=$${0##*-out/host/bin/}",
"DIRNAME=$$(dirname $$BINARY)",
"APKBUILDER=$${0}.runfiles/$${DIRNAME}/apkbuilder",
- "if [[ \"$$KEYSTORE\" != \"\" ]]; then",
+ "if [[ -n \"$${KEYSTORE-}\" ]]; then",
" mkdir -p /tmp/keystore/.android",
" cp $$KEYSTORE /tmp/keystore/.android/debug.keystore",
" export ANDROID_SDK_HOME=/tmp/keystore",