From 5640de85e96f306bd971eda0165c38fb650189a5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 20 Mar 2026 19:27:26 +0000 Subject: [PATCH 2/2] Restore netalertx/ folder and fix daily_README workflow rename collision Commit 734a824 was triggered by the daily_README.yaml workflow which temporarily renames addon folders to their .name for README generation. Both netalertx and netalertx_fa share name: NetAlertX, causing mv to move netalertx inside the already-renamed netalertx_fa directory. Fix: add [ ! -e "$NAME" ] guard to prevent rename when target exists. Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com> Agent-Logs-Url: https://github.com/alexbelgium/hassio-addons/sessions/b23b6b99-d4da-4c4e-926f-4067af6f16a0 --- .github/workflows/daily_README.yaml | 2 +- {netalertx_fa/netalertx => netalertx}/CHANGELOG.md | 0 {netalertx_fa/netalertx => netalertx}/Dockerfile | 0 {netalertx_fa/netalertx => netalertx}/README.md | 0 {netalertx_fa/netalertx => netalertx}/apparmor.txt | 0 {netalertx_fa/netalertx => netalertx}/build.json | 0 {netalertx_fa/netalertx => netalertx}/config.yaml | 0 {netalertx_fa/netalertx => netalertx}/icon.png | Bin {netalertx_fa/netalertx => netalertx}/logo.png | Bin .../rootfs/etc/cont-init.d/91-configure.sh | 0 .../rootfs/etc/cont-init.d/99-run.sh | 0 {netalertx_fa/netalertx => netalertx}/stats.png | Bin {netalertx_fa/netalertx => netalertx}/updater.json | 0 netalertx_fa/netalertx/oldname | 1 - 14 files changed, 1 insertion(+), 2 deletions(-) rename {netalertx_fa/netalertx => netalertx}/CHANGELOG.md (100%) rename {netalertx_fa/netalertx => netalertx}/Dockerfile (100%) rename {netalertx_fa/netalertx => netalertx}/README.md (100%) rename {netalertx_fa/netalertx => netalertx}/apparmor.txt (100%) rename {netalertx_fa/netalertx => netalertx}/build.json (100%) rename {netalertx_fa/netalertx => netalertx}/config.yaml (100%) rename {netalertx_fa/netalertx => netalertx}/icon.png (100%) rename {netalertx_fa/netalertx => netalertx}/logo.png (100%) rename {netalertx_fa/netalertx => netalertx}/rootfs/etc/cont-init.d/91-configure.sh (100%) rename {netalertx_fa/netalertx => netalertx}/rootfs/etc/cont-init.d/99-run.sh (100%) rename {netalertx_fa/netalertx => netalertx}/stats.png (100%) rename {netalertx_fa/netalertx => netalertx}/updater.json (100%) delete mode 100644 netalertx_fa/netalertx/oldname diff --git a/.github/workflows/daily_README.yaml b/.github/workflows/daily_README.yaml index b1522cef4..acd8cbfe5 100644 --- a/.github/workflows/daily_README.yaml +++ b/.github/workflows/daily_README.yaml @@ -87,7 +87,7 @@ jobs: IFS='|' read -r CONFIG TYPE <<<"$(get_config "$f")" if [ -n "$CONFIG" ]; then NAME="$(get_raw '.name' "$TYPE" "$CONFIG")" - if [ -n "${NAME:-}" ] && [ "$f" != "$NAME" ]; then + if [ -n "${NAME:-}" ] && [ "$f" != "$NAME" ] && [ ! -e "$NAME" ]; then echo "$f" > "$f/oldname" mv "$f" "$NAME" fi diff --git a/netalertx_fa/netalertx/CHANGELOG.md b/netalertx/CHANGELOG.md similarity index 100% rename from netalertx_fa/netalertx/CHANGELOG.md rename to netalertx/CHANGELOG.md diff --git a/netalertx_fa/netalertx/Dockerfile b/netalertx/Dockerfile similarity index 100% rename from netalertx_fa/netalertx/Dockerfile rename to netalertx/Dockerfile diff --git a/netalertx_fa/netalertx/README.md b/netalertx/README.md similarity index 100% rename from netalertx_fa/netalertx/README.md rename to netalertx/README.md diff --git a/netalertx_fa/netalertx/apparmor.txt b/netalertx/apparmor.txt similarity index 100% rename from netalertx_fa/netalertx/apparmor.txt rename to netalertx/apparmor.txt diff --git a/netalertx_fa/netalertx/build.json b/netalertx/build.json similarity index 100% rename from netalertx_fa/netalertx/build.json rename to netalertx/build.json diff --git a/netalertx_fa/netalertx/config.yaml b/netalertx/config.yaml similarity index 100% rename from netalertx_fa/netalertx/config.yaml rename to netalertx/config.yaml diff --git a/netalertx_fa/netalertx/icon.png b/netalertx/icon.png similarity index 100% rename from netalertx_fa/netalertx/icon.png rename to netalertx/icon.png diff --git a/netalertx_fa/netalertx/logo.png b/netalertx/logo.png similarity index 100% rename from netalertx_fa/netalertx/logo.png rename to netalertx/logo.png diff --git a/netalertx_fa/netalertx/rootfs/etc/cont-init.d/91-configure.sh b/netalertx/rootfs/etc/cont-init.d/91-configure.sh similarity index 100% rename from netalertx_fa/netalertx/rootfs/etc/cont-init.d/91-configure.sh rename to netalertx/rootfs/etc/cont-init.d/91-configure.sh diff --git a/netalertx_fa/netalertx/rootfs/etc/cont-init.d/99-run.sh b/netalertx/rootfs/etc/cont-init.d/99-run.sh similarity index 100% rename from netalertx_fa/netalertx/rootfs/etc/cont-init.d/99-run.sh rename to netalertx/rootfs/etc/cont-init.d/99-run.sh diff --git a/netalertx_fa/netalertx/stats.png b/netalertx/stats.png similarity index 100% rename from netalertx_fa/netalertx/stats.png rename to netalertx/stats.png diff --git a/netalertx_fa/netalertx/updater.json b/netalertx/updater.json similarity index 100% rename from netalertx_fa/netalertx/updater.json rename to netalertx/updater.json diff --git a/netalertx_fa/netalertx/oldname b/netalertx_fa/netalertx/oldname deleted file mode 100644 index 56d427ee1..000000000 --- a/netalertx_fa/netalertx/oldname +++ /dev/null @@ -1 +0,0 @@ -netalertx