[SPARK-5664][BUILD] Restore stty settings when exiting from SBT's spa…

…rk-shell For launching spark-shell from SBT. Author: Liang-Chi Hsieh <[email protected]> Closes #4451 from viirya/restore_stty and squashes the following commits: fdfc480 [Liang-Chi Hsieh] Restore stty settings when exit (for launching spark-shell from SBT).
apache · Feb 9, 2015 · dae2161 · dae2161
1 parent afb1316
commit dae2161
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/build/sbt b/build/sbt
@@ -125,4 +125,32 @@ loadConfigFile() {
 [[ -f "$etc_sbt_opts_file" ]] && set -- $(loadConfigFile "$etc_sbt_opts_file") "$@"
 [[ -f "$sbt_opts_file" ]] && set -- $(loadConfigFile "$sbt_opts_file") "$@"
 
+exit_status=127
+saved_stty=""
+
+restoreSttySettings() {
+  stty $saved_stty
+  saved_stty=""
+}
+
+onExit() {
+  if [[ "$saved_stty" != "" ]]; then
+    restoreSttySettings
+  fi
+  exit $exit_status
+}
+
+saveSttySettings() {
+  saved_stty=$(stty -g 2>/dev/null)
+  if [[ ! $? ]]; then
+    saved_stty=""
+  fi
+}
+
+saveSttySettings
+trap onExit INT
+
 run "$@"
+
+exit_status=$?
+onExit
diff --git a/build/sbt-launch-lib.bash b/build/sbt-launch-lib.bash
@@ -81,7 +81,7 @@ execRunner () {
     echo ""
   }
 
-  exec "$@"
+  "$@"
 }
 
 addJava () {
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ execRunner () { @@
         echo ""
       }
-      exec "$@"
+      "$@"
     }
     addJava () {
@@ Expand Down @@