skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Don't fail stopProgress if there is no active logSpinner.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-05 15:24:45 -04:00
parent 66e893fd83
commit 687923da32
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform-darwin/Scripts/bashlib
View File

@ -699,7 +699,7 @@ log() {
;; ;;
stopProgress) stopProgress)
kill -0 "$_logSpinner" 2>/dev/null || return ! kill -0 "$_logSpinner" 2>/dev/null && return
case $exitcode in case $exitcode in
0) printf -v logMsg "done${format:+ ($format)}.\n" "${args[@]}" 0) printf -v logMsg "done${format:+ ($format)}.\n" "${args[@]}"

6
platform-darwin/Scripts/genassets
View File

@ -70,12 +70,12 @@ set -e
done <<< "$niftyNinePatch" done <<< "$niftyNinePatch"
fnip fnip
else else
echo >&2 'pinf'
pinf '%s -> %s' "${src##*/}" "${dst##*/}" pinf '%s -> %s' "${src##*/}" "${dst##*/}"
echo >&2 'cp <$src> <$dst>' echo >&2 "pinf: $?"
cp "$src" "$dst" cp "$src" "$dst"
echo >&2 'fnip' echo >&2 "cp <$src> <$dst>: $?"
fnip fnip
echo >&2 "fnip: $?"
fi fi
} }