From c0acfe0f1ca8006f708c4099e0471b7b99fc8ef7 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Tue, 22 Oct 2019 16:46:40 +0200
Subject: [PATCH] handle ctrl-c in upgrade scripts

---
 scripts/elastic-upgrade.sh | 10 ++++++++--
 scripts/postgre-upgrade.sh | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/elastic-upgrade.sh b/scripts/elastic-upgrade.sh
index 9d856c6c2..9a06fc4e4 100755
--- a/scripts/elastic-upgrade.sh
+++ b/scripts/elastic-upgrade.sh
@@ -629,13 +629,19 @@ start_upgrade()
   esac
 }
 
+function trap_ctrlc()
+{
+  echo "Ctrl^C, exiting..."
+  exit 2
+}
+
 upgrade_elastic()
 {
   config
   detect_installation
   read -rp "Continue with upgrading? (y/n) " confirm </dev/tty
-  if [[ "$confirm" = "y" ]]
-  then
+  if [[ "$confirm" = "y" ]]; then
+    trap "trap_ctrlc" 2 # SIGINT
     ensure_initial_status_green
     start_upgrade '1.7' '2.4'
     reindex_indices '24'
diff --git a/scripts/postgre-upgrade.sh b/scripts/postgre-upgrade.sh
index 52a652104..59c18a564 100755
--- a/scripts/postgre-upgrade.sh
+++ b/scripts/postgre-upgrade.sh
@@ -166,12 +166,18 @@ clean()
   fi
 }
 
+function trap_ctrlc()
+{
+  echo "Ctrl^C, exiting..."
+  exit 2
+}
+
 upgrade_postgres()
 {
   config
   read -rp "Continue with upgrading? (y/N) " confirm </dev/tty
-  if [[ "$confirm" = "y" ]]
-  then
+  if [[ "$confirm" = "y" ]]; then
+    trap "trap_ctrlc" 2 # SIGINT
     OLD='9.4'
     NEW='9.6'
     read_path