From 44f7a219acf170f044fcdbb7ec2e97c44cddb95e Mon Sep 17 00:00:00 2001
From: Darkatse <39111369+Darkatse@users.noreply.github.com>
Date: Thu, 30 Apr 2026 15:04:05 -0400
Subject: [PATCH] fix(scripts): handle interrupts during migration export

---
 scripts/export-sillytavern-migration.sh | 27 +++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/scripts/export-sillytavern-migration.sh b/scripts/export-sillytavern-migration.sh
index dbc1e151..97974fe5 100755
--- a/scripts/export-sillytavern-migration.sh
+++ b/scripts/export-sillytavern-migration.sh
@@ -10,14 +10,31 @@ FINAL_ZIP_PATH=""
 INCLUDE_BACKUPS=0
 IS_TERMUX=0
 READ_INPUT=""
+ACTIVE_CHILD_PID=""
 
 cleanup() {
+    if [ -n "${ACTIVE_CHILD_PID:-}" ]; then
+        kill "$ACTIVE_CHILD_PID" >/dev/null 2>&1 || true
+        wait "$ACTIVE_CHILD_PID" 2>/dev/null || true
+        ACTIVE_CHILD_PID=""
+    fi
+
     if [ -n "${WORK_DIR:-}" ] && [ -d "$WORK_DIR" ]; then
-        rm -rf "$WORK_DIR"
+        rm -rf "$WORK_DIR" || true
     fi
 }
 
-trap cleanup EXIT INT TERM
+handle_signal() {
+    exit_status=$1
+    trap - EXIT INT TERM
+    printf '\n' >&2
+    cleanup
+    exit "$exit_status"
+}
+
+trap cleanup EXIT
+trap 'handle_signal 130' INT
+trap 'handle_signal 143' TERM
 
 msg() {
     case "${LANG_CODE}:$1" in
@@ -342,6 +359,7 @@ create_staging_zip() {
         zip -r "$ZIP_PATH" data >"$progress_fifo" 2>&1
     ) &
     zip_pid=$!
+    ACTIVE_CHILD_PID=$zip_pid
 
     processed=0
     while IFS= read -r line; do
@@ -356,8 +374,9 @@ create_staging_zip() {
         esac
     done <"$progress_fifo"
 
-    wait "$zip_pid"
-    zip_status=$?
+    zip_status=0
+    wait "$zip_pid" || zip_status=$?
+    ACTIVE_CHILD_PID=""
     rm -f "$progress_fifo"
 
     if [ "$processed" -lt "$entry_count" ]; then