summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorTimothy Collett2012-09-10 11:54:56 -0400
committerTimothy Collett2012-09-10 11:54:56 -0400
commit96abc903abb93b7bf7418f2da3455ee6da5ad942 (patch)
treea5326ef1dbd492086b319c888854e707c59d2a56 /package
parent274d6038adce5797b58cee78a330eb5d639bf59e (diff)
parent21904fd607d0f2037782e28ff7284300663931ab (diff)
downloaddfhack-96abc903abb93b7bf7418f2da3455ee6da5ad942.tar.gz
dfhack-96abc903abb93b7bf7418f2da3455ee6da5ad942.tar.bz2
dfhack-96abc903abb93b7bf7418f2da3455ee6da5ad942.tar.xz
Merge branch 'master' of http://github.com/peterix/dfhack
Diffstat (limited to 'package')
-rwxr-xr-xpackage/linux/dfhack10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/linux/dfhack b/package/linux/dfhack
index d8790eac..cfb57153 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -14,8 +14,6 @@
# DF_GDB_OPTS: Options to pass to gdb, if it's being run
# DF_VALGRIND_OPTS: Options to pass to valgrind, if it's being run
# DF_HELGRIND_OPTS: Options to pass to helgrind, if it's being run
-# DF_RESET_OPTS: Options to pass the reset command at the end of
-# this script
# DF_POST_CMD: Shell command to be run at very end of script
DF_DIR=$(dirname "$0")
@@ -33,6 +31,9 @@ if [ -r "./$RC" ]; then
. "./$RC"
fi
+# Save current terminal settings
+old_tty_settings=$(stty -g)
+
# Now run
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./stonesense/deplibs":"./hack"
@@ -67,8 +68,9 @@ case "$1" in
;;
esac
-# Reset terminal to sane state in case of a crash
-# reset $DF_RESET_OPTS
+# Restore previous terminal settings
+stty "$old_tty_settings"
+echo -e "\n"
if [ -n "$DF_POST_CMD" ]; then
eval $DF_POST_CMD