Fix unbound variables.

cross-rs · Nov 22, 2019 · aba8c1f · aba8c1f
1 parent 69bff31
commit aba8c1f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/ci/test.sh b/ci/test.sh
@@ -42,7 +42,7 @@ main() {
     export QEMU_STRACE=1
 
     # test `cross check`
-    if [ ! -z $STD ]; then
+    if [[ ! -z ${STD:-} ]]; then
         td=$(mktemp -d)
         cargo init --lib --name foo $td
         pushd $td
@@ -53,7 +53,7 @@ main() {
     fi
 
     # `cross build` test for targets where `std` is not available
-    if [ -z "$STD" ]; then
+    if [[ -z "${STD:-}" ]]; then
         td=$(mktemp -d)
 
         git clone \
@@ -99,9 +99,9 @@ EOF
         rm -rf $td
     fi
 
-    if [ $RUN ]; then
+    if [[ ${RUN:-} ]]; then
         # `cross test` test
-        if [ $DYLIB ]; then
+        if [[ ${DYLIB:-} ]]; then
             td=$(mktemp -d)
 
             pushd $td
@@ -151,15 +151,15 @@ EOF
     fi
 
     # Test C++ support
-    if [ $CPP ]; then
+    if [[ ${CPP:-} ]]; then
         td=$(mktemp -d)
 
         git clone --depth 1 https://github.com/japaric/hellopp $td
 
         pushd $td
         cargo update -p gcc
         retry cargo fetch
-        if [ $RUN ]; then
+        if [[ ${RUN:-} ]]; then
             cross_run --target $TARGET
         else
             cross build --target $TARGET
@@ -171,7 +171,7 @@ EOF
 }
 
 cross_run() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross run "$@"
     else
         for runner in $RUNNERS; do
@@ -182,7 +182,7 @@ cross_run() {
 }
 
 cross_test() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross test "$@"
     else
         for runner in $RUNNERS; do
@@ -193,7 +193,7 @@ cross_test() {
 }
 
 cross_bench() {
-    if [ -z "$RUNNERS" ]; then
+    if [[ -z "${RUNNERS:-}" ]]; then
         cross bench "$@"
     else
         for runner in $RUNNERS; do

diff --git a/docker/android-system.sh b/docker/android-system.sh
@@ -90,11 +90,13 @@ EOF
     # FATAL: kernel did not supply AT_SECURE
     sed -i -e 's/if (!kernel_supplied_AT_SECURE)/if (false)/g' bionic/linker/linker_environ.cpp
 
+    set +u
     source build/envsetup.sh
     lunch aosp_$arch-user
     mmma bionic/
     mmma external/mksh/
     mmma system/core/toolbox/
+    set -u
 
     if [ $arch = "arm" ]; then
         mv out/target/product/generic/system/ /

diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -13,6 +13,9 @@ main() {
 
     local dropbear="dropbear-bin"
 
+    local deps=
+    local kernel=
+
     # select debian arch and kernel version
     case $arch in
         aarch64)