From 8f5709ba71902e5291ccaf142447c1f4dd7221dd Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Sat, 29 Jan 2022 17:13:08 -0300
Subject: [PATCH] Set new trap

---
 install.sh | 6 ++++--
 log.txt    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 log.txt

diff --git a/install.sh b/install.sh
index 8b4a798..906b562 100755
--- a/install.sh
+++ b/install.sh
@@ -520,7 +520,8 @@ checkForSystemdUnit() {
     else
         systemctl is-active --quiet "${2}" && return
     fi
-    trap 'systemctl stop ${2}; forceExit=true' INT
+    trapBackup=$(trap)
+    trap 'systemctl stop ${2}; forceExit=true' INT QUIT TERM
     forceExit=false
     calcAndRun dialog --infobox "\"\nWaiting for the ${1} to finish. Please wait.\"" 5 WIDTH
     if [ "${3}" = "oneshot" ]; then
@@ -536,7 +537,7 @@ checkForSystemdUnit() {
             systemctl is-active --quiet "${2}"
         done
     fi
-    trap - INT
+    eval "$trapBackup"
 }
 
 printStepIfDebug() {
@@ -625,6 +626,7 @@ runScript() {
         clear
     fi
 
+    trap 'printAndExit "You pressed <Ctrl-c/d> or exit calsais script."' INT QUIT TERM
     calcAndRun dialog --title "calsais" --msgbox "\"\n${welcomeMsg}\"" 7 WIDTH
 
     while [ $i -lt "${#steps[@]}" ]; do
diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..34e397c
--- /dev/null
+++ b/log.txt
@@ -0,0 +1 @@
+forceExit=true