From 3012cbae04cef0b55c306ce40fe15c61b87294c9 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Fri, 27 May 2022 10:21:47 +0200 Subject: [PATCH] fixup! build.sh: package up required files for spflashtool when present * forgot to add/commit the needed parenthesis Change-Id: I55f3703ccf52fb19311ee67e0a5fe41d89d6e711 --- src/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build.sh b/src/build.sh index 5ca8e8e..4921818 100755 --- a/src/build.sh +++ b/src/build.sh @@ -275,13 +275,13 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then SKIP_DYNAMIC_IMAGES="odm.img product.img system.img system_ext.img vendor.img" if [ "$BACKUP_IMG" = true ]; then if [ "$BUILD_SUPER_IMAGE" = true ]; then - find . -maxdepth 1 -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' -type f $(printf "! -name %s " $(echo "$SKIP_DYNAMIC_IMAGES")) -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; + find . -maxdepth 1 \( -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' \) -type f $(printf "! -name %s " $(echo "$SKIP_DYNAMIC_IMAGES")) -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; elif [ "$SPARSE_PREBUILT_VENDOR_IMAGE" = true ]; then echo "Sparsing prebuilt vendor image" img2simg vendor.img vendor-sparsed.img || return 1 - find . -maxdepth 1 -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' -type f ! -name vendor.img -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; + find . -maxdepth 1 \( -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' \) -type f ! -name vendor.img -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; else - find . -maxdepth 1 -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' -type f -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; + find . -maxdepth 1 \( -name '*.img' -o -name '*_scatter.txt' -o -name '*.bin' \) -type f -exec zip "$ZIP_DIR/$zipsubdir/IMG-$build" {} \; fi cd "$ZIP_DIR/$zipsubdir" || return 1 sha256sum "IMG-$build" > "IMG-$build.sha256sum" -- GitLab