diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 4cf3057..184c5c8 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -493,15 +493,22 @@ jobs: for group_list in "$group1_icons" "$group2_icons" "$group3_icons"; do montage_files=() for icon in $group_list; do + file="" if [ -f "${ICON_FOLDER}/selection-mod-${icon}@2x.png" ]; then - montage_files+=("${ICON_FOLDER}/selection-mod-${icon}@2x.png") + file="${ICON_FOLDER}/selection-mod-${icon}@2x.png" + elif [ -f "${ICON_FOLDER}/selection-mod-${icon}.png" ]; then + file="${ICON_FOLDER}/selection-mod-${icon}.png" elif [ -f "${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png" ]; then - montage_files+=("${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png") + file="${DEFAULT_SKIN_DIR}/selection-mod-${icon}@2x.png" fi + + [ -n "$file" ] && montage_files+=("$file") done + while [ "${#montage_files[@]}" -lt 7 ]; do montage_files+=("$BLANK_IMAGE") done + magick montage "${montage_files[@]}" \ -tile "7x1" -geometry "160x160+10+10" -background none \ "row_${row_index}.png"