skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix a syntax error in genassets.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-05 15:36:27 -04:00
parent 687923da32
commit 55bd9382bc
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform-darwin/Scripts/genassets
View File

@ -54,8 +54,6 @@ splashes=(
) )
copyImage() { copyImage() {
trap 'echo >&2 "ERROR: $?: $BASH_COMMAND"' ERR
set -e
local src=$1 dst=$2 local src=$1 dst=$2
if [[ $src = *.9.png || $src = *.9@*.png ]]; then if [[ $src = *.9.png || $src = *.9@*.png ]]; then
@ -71,11 +69,8 @@ set -e
fnip fnip
else else
pinf '%s -> %s' "${src##*/}" "${dst##*/}" pinf '%s -> %s' "${src##*/}" "${dst##*/}"
echo >&2 "pinf: $?"
cp "$src" "$dst" cp "$src" "$dst"
echo >&2 "cp <$src> <$dst>: $?"
fnip fnip
echo >&2 "fnip: $?"
fi fi
} }
@ -135,7 +130,7 @@ if [[ "$(latest "$ios_launch"/*)" -nt "$launchimage/Contents.json" ]]; then
esac esac
filename="Default${os:+-$os}${subtype:+-$subtype}${scale:+@${scale}x}${idiom:+~$idiom}.png" filename="Default${os:+-$os}${subtype:+-$subtype}${scale:+@${scale}x}${idiom:+~$idiom}.png"
imageProps=$(copyImage "$ios_launch/$name${scale:+@${scale}x}.png" "$launchimage/$filename"); then imageProps=$(copyImage "$ios_launch/$name${scale:+@${scale}x}.png" "$launchimage/$filename")
printf '%s{"extent":"full-screen","filename":"%s","orientation":"portrait","scale":"%sx"' \ printf '%s{"extent":"full-screen","filename":"%s","orientation":"portrait","scale":"%sx"' \
"$comma" "$filename" "${scale:-1}" "$comma" "$filename" "${scale:-1}"
[[ $idiom ]] && printf ',"idiom":"%s"' "$idiom" [[ $idiom ]] && printf ',"idiom":"%s"' "$idiom"