Always re-enable print (if exit before slib download)

virtualmin · Sep 9, 2022 · 81e439e · 81e439e
1 parent 03bfdf5
commit 81e439e
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/virtualmin-install.sh b/virtualmin-install.sh
@@ -29,6 +29,15 @@ else
   INTERACTIVE_MODE="on"
 fi
 
+# Set a trap to catch any exit, whether
+# normal or forced (e.g. Ctrl-C)
+enable_stty () {
+  if [ "${INTERACTIVE_MODE}" != "off" ];then
+    stty echo
+  fi
+}
+trap enable_stty INT QUIT TERM EXIT
+
 # Print usage info, if --help, set mode, etc.
 # Temporary colors
 if [ "${INTERACTIVE_MODE}" != "off" ];then
@@ -1233,8 +1242,4 @@ else
   printf "${errorlist}"
 fi
 
-if [ "${INTERACTIVE_MODE}" != "off" ];then
-  stty echo
-fi
-
 exit 0