From 687923da328a54162be71ac02b1eba2087efc99b Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 5 Jun 2018 15:24:45 -0400 Subject: [PATCH] Don't fail stopProgress if there is no active logSpinner. --- platform-darwin/Scripts/bashlib | 2 +- platform-darwin/Scripts/genassets | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-darwin/Scripts/bashlib b/platform-darwin/Scripts/bashlib index 9116cc46..964b49f2 100644 --- a/platform-darwin/Scripts/bashlib +++ b/platform-darwin/Scripts/bashlib @@ -699,7 +699,7 @@ log() { ;; stopProgress) - kill -0 "$_logSpinner" 2>/dev/null || return + ! kill -0 "$_logSpinner" 2>/dev/null && return case $exitcode in 0) printf -v logMsg "done${format:+ ($format)}.\n" "${args[@]}" diff --git a/platform-darwin/Scripts/genassets b/platform-darwin/Scripts/genassets index 06013252..41fd4744 100755 --- a/platform-darwin/Scripts/genassets +++ b/platform-darwin/Scripts/genassets @@ -70,12 +70,12 @@ set -e done <<< "$niftyNinePatch" fnip else - echo >&2 'pinf' pinf '%s -> %s' "${src##*/}" "${dst##*/}" - echo >&2 'cp <$src> <$dst>' + echo >&2 "pinf: $?" cp "$src" "$dst" - echo >&2 'fnip' + echo >&2 "cp <$src> <$dst>: $?" fnip + echo >&2 "fnip: $?" fi }