From 560abc3ef2ff1c210c67233feb80d5d8138b9bd5 Mon Sep 17 00:00:00 2001
From: Nikita Skryabin <nekit2271@gmail.com>
Date: Fri, 19 Sep 2025 16:42:23 +0300
Subject: [PATCH] fix(ipregion): enhance trap handling for spinner

---
 ipregion.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ipregion.sh b/ipregion.sh
index a8d97b9..89bbf80 100755
--- a/ipregion.sh
+++ b/ipregion.sh
@@ -927,6 +927,11 @@ spinner_update() {
   fi
 }
 
+spinner_cleanup() {
+  spinner_stop
+  exit 130
+}
+
 make_request() {
   local method="$1"
   local url="$2"
@@ -1828,6 +1833,8 @@ main() {
 
   setup_debug
 
+  trap spinner_cleanup EXIT INT TERM
+
   detect_distro
   install_dependencies
 
@@ -1840,8 +1847,7 @@ main() {
   discover_external_ips
   get_asn
 
-  if [[ "$JSON_OUTPUT" != true && "$VERBOSE" != true ]]; then
-    trap spinner_stop EXIT INT TERM
+  if [[ "$JSON_OUTPUT" != "true" && "$VERBOSE" != "true" ]]; then
     spinner_start
   fi
 
@@ -1862,14 +1868,15 @@ main() {
       ;;
   esac
 
-  if [[ "$JSON_OUTPUT" != true && "$VERBOSE" != true ]]; then
+  if [[ "$JSON_OUTPUT" != "true" && "$VERBOSE" != "true" ]]; then
     spinner_stop
-    trap - EXIT INT TERM
   fi
 
   print_results
 
   cleanup_debug
+
+  trap - EXIT INT TERM
 }
 
 main "$@"