arm64_make script changes

platform_tools/barelinux/bin/barelinux_make

Index: platform_tools/barelinux/bin/barelinux_make
diff --git a/platform_tools/barelinux/bin/barelinux_make b/platform_tools/barelinux/bin/barelinux_make
index 4f2400f8ca08e90ada1cb5a4b58e5057df53d79a..3db3b99fc486f105a5267f13d247f861dfa496f7 100755
--- a/platform_tools/barelinux/bin/barelinux_make
+++ b/platform_tools/barelinux/bin/barelinux_make
@@ -5,6 +5,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+set -e  # When any command fails, the shell will immediately exit.
+
+if echo $- | grep -q 'x'; then
+    # Debug mode
+    trap 'echo exit status = $?' EXIT
+fi
+
 usage() {
     cat >&2 <<EOF
 barelinux_make - this script builds a version of skia that does not
@@ -52,27 +59,17 @@ GYP_DEFINES="${GYP_DEFINES} $*"
 # If you move this script, this must be changed.
 SKIA_SRC_DIR="$(cd "$(dirname "$0")/../../.."; pwd)"
 
-try() {
-    # exit shell script on nonzero return code
-    "$@"
-    local ret=$?
-    if [ $ret != 0 ] ; then
-        echo "'$@' failed and returned ${ret}." >&2
-        return $ret
-    fi
-}
-is_set() {
-    test "$1" && test "$(eval echo \${$1})";
-}
-
 # Set a reasonable default.
-is_set SKIA_OUT || export SKIA_OUT="${SKIA_SRC_DIR}/out/barelinux"
+if ! test "$SKIA_OUT"; then

[mtklein, 2014/04/02 20:05:32]

export SKIA_OUT=${SKIA_OUT-"${SKIA_SRC_DIR}/out/barelinux"}

[hal.canary, 2014/04/02 20:07:20]

Done.

+    export SKIA_OUT="${SKIA_SRC_DIR}/out/barelinux"
+fi
 
 # Assume ninja is in your path

[mtklein, 2014/04/02 20:05:32]

Assume -> check?

Or given that everything going to fail anyway when you try to run it, just skip
the existence checks for ninja, gyp_skia, and out/${BUILD_TYPE}?

[hal.canary, 2014/04/02 20:07:20]

It doesn't cost much to test this early.  I'm going to keep it.

-try command -v ninja > /dev/null || exit
+command -v ninja > /dev/null
+
+test -x "${SKIA_SRC_DIR}/gyp_skia"
 
-try test -x "${SKIA_SRC_DIR}/gyp_skia" || exit
-try mkdir -p "$SKIA_OUT" || exit
+mkdir -p "$SKIA_OUT"
 
 export GYP_GENERATORS="ninja"
 export GYP_GENERATOR_FLAGS=""
@@ -87,9 +84,9 @@ export GYP_DEFINES="${GYP_DEFINES} \
     skia_skip_gui=1 \
     "
 
-try "${SKIA_SRC_DIR}/gyp_skia" || exit
+"${SKIA_SRC_DIR}/gyp_skia"
 
-try test -d "${SKIA_OUT}/${BUILD_TYPE}" || exit
+test -d "${SKIA_OUT}/${BUILD_TYPE}"
 
-try ninja -C "${SKIA_OUT}/${BUILD_TYPE}" || exit
+ninja -C "${SKIA_OUT}/${BUILD_TYPE}"