osc/skins-template
Template
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better logs for Cleanup Extra Files

Browse Source
This commit is contained in:
Arlind
2025-06-08 21:28:25 +02:00
parent 1c719c21dd
commit be6d0416f3
1 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
.gitea/workflows/ci.yml
View File

@@ -673,17 +673,12 @@ jobs:
echo "README generation completed successfully." echo "README generation completed successfully."
- name: Cleanup Extraneous Files - name: Cleanup Extra Files
shell: bash shell: bash
run: | run: |
set -euo pipefail set -euo pipefail
echo "[Cleanup Extraneous Files Started]" echo "[Cleanup Extra Files Started]"
echo " DANSER_SKINS_DIR= $DANSER_SKINS_DIR"
echo " REPO_SCREENSHOT_DIR=$REPO_SCREENSHOT_DIR"
echo " REPO_RANKING_PANEL_DIR=$REPO_RANKING_PANEL_DIR"
echo " REPO_MOD_ICONS_DIR=$REPO_MOD_ICONS_DIR"
echo " OSK_PATH= $OSK_PATH"
rm -rf src/docs || true rm -rf src/docs || true
rm -f how-to-use.md || true rm -f how-to-use.md || true
@@ -697,53 +692,45 @@ jobs:
expected_basenames=() expected_basenames=()
for dir in "$DANSER_SKINS_DIR"/*; do for dir in "$DANSER_SKINS_DIR"/*; do
echo " Found skin directory: $dir"
[ -d "$dir" ] || continue [ -d "$dir" ] || continue
raw=$(basename "$dir" | tr -d '\r\n') raw=$(basename "$dir" | tr -d '\r\n')
header=$(sanitize_filename "$raw") header=$(sanitize_filename "$raw")
expected_basenames+=("$header") expected_basenames+=("$header")
ini=$(find "$dir" -maxdepth 1 -iname skin.ini | head -n1 || true) if ini=$(find "$dir" -maxdepth 1 -iname skin.ini | head -n1); then
if [ -f "$ini" ]; then if name_line=$(grep -i '^[[:space:]]*name:' "$ini" | head -n1); then
name_line=$({ grep -i '^[[:space:]]*name:' "$ini" || true; } | head -n1)
if [ -n "$name_line" ]; then
val="${name_line#*:}" val="${name_line#*:}"
val=$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') val=$(echo "$val" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
header=$(sanitize_filename "$val") header=$(sanitize_filename "$val")
expected_basenames+=("$header")
fi fi
fi fi
expected_basenames+=("$header")
done done
echo " Raw expected basenames: ${expected_basenames[*]}" readarray -t expected_basenames < <(
readarray -t expected_basenames < <(printf "%s\n" "${expected_basenames[@]}" | sort -u) printf "%s\n" "${expected_basenames[@]}" | sort -u
)
for b in "${expected_basenames[@]}"; do for b in "${expected_basenames[@]}"; do
expected_basenames+=("${b}-mod-icons") expected_basenames+=("${b}-mod-icons")
done done
readarray -t expected_basenames < <(printf "%s\n" "${expected_basenames[@]}" | sort -u) readarray -t expected_basenames < <(
echo " Final expected basenames: ${expected_basenames[*]}" printf "%s\n" "${expected_basenames[@]}" | sort -u
)
prune_dir() { prune_dir() {
echo " Pruning directory: $1"
for f in "$1"/*; do for f in "$1"/*; do
echo " Checking: $f"
[ -e "$f" ] || continue [ -e "$f" ] || continue
fn=$(basename "$f") base="${f##*/}"
base="${fn%.*}" base="${base%.*}"
keep=false keep=false
for kb in "${expected_basenames[@]}"; do for kb in "${expected_basenames[@]}"; do
[ "$base" = "$kb" ] && { keep=true; break; } if [[ "$base" == "$kb" ]]; then
keep=true
break
fi
done done
if ! $keep; then $keep || rm -rf "$f"
echo " → Removing $f"
rm -rf "$f"
else
echo " → Keeping $f"
fi
done done
} }
@@ -752,7 +739,7 @@ jobs:
prune_dir "$REPO_MOD_ICONS_DIR" prune_dir "$REPO_MOD_ICONS_DIR"
prune_dir "$OSK_PATH" prune_dir "$OSK_PATH"
echo "[Cleanup Extraneous Files Complete]" echo "[Cleanup Extra Files Complete]"
- name: Configure Git - name: Configure Git
shell: bash shell: bash