From 8e73f1be15bda67ecfad565195d0772cbf32cda4 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 12 May 2025 15:15:14 +0700 Subject: [PATCH] maint(common): Handle exclude filenames --- resources/build/zip.inc.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/build/zip.inc.sh b/resources/build/zip.inc.sh index 3a38aac444..287a23cd3b 100644 --- a/resources/build/zip.inc.sh +++ b/resources/build/zip.inc.sh @@ -71,7 +71,7 @@ function zip_files() { done COMPRESS_CMD=zip - IGNORE= + IGNORE=() if ! command -v zip 2>&1 > /dev/null; then # Fallback to 7z if [[ -z "${SEVENZ+x}" ]]; then @@ -89,20 +89,20 @@ function zip_files() { for ignoreFile in "${EXCLUDE[@]}" do - IGNORE+= ' -xr!${ignoreFile}' + IGNORE+=" -xr!${ignoreFile}" done # 7z command, excluding build.sh files - "${SEVENZ}" ${FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]} ${IGNORE} + "${SEVENZ}" ${FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]} ${IGNORE[@]} fi else for ignoreFile in "${EXCLUDE[@]}" do - IGNORE+= ' -x ${ignoreFile}' + IGNORE+=" -x \\*\\*/${ignoreFile}" done # zip command, excluding build.sh files - echo ${COMPRESS_CMD} ${FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]} ${IGNORE} - exit + echo ${COMPRESS_CMD} ${FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]} ${IGNORE[@]} + ${COMPRESS_CMD} ${FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]} ${IGNORE[@]} fi }