Merge branch 'dev' of feistymeow.org:feisty_meow into dev

[feisty_meow.git] / scripts / core / functions.sh

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 7068cc9c0a12292a4b413f6613eac2d62f097270..007f47462cc251ebb7211ce2f1f4caf1e1a8c7ce 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -165,12 +165,17 @@ if [ -z "$skip_all" ]; then
   function ssh()
   {
     local args=($*)
-    save_terminal_title
     # we remember the old terminal title, then force the TERM variable to a more generic
     # version for the other side (just 'linux'); we don't want the remote side still
     # thinking it's running xterm.
+    save_terminal_title
+    # we save the value of TERM; we don't want to leave the user's terminal
+    # brain dead once we come back from this function.
+    local oldterm="$TERM"
     export TERM=linux
     /usr/bin/ssh -X -C "${args[@]}"
+    # restore the terminal variable also.
+    TERM="$oldterm"
     restore_terminal_title
   }
 
@@ -307,12 +312,18 @@ if [ -z "$skip_all" ]; then
     done
   }
   
+#hmmm: not really doing anything yet; ubuntu seems to have changed from pulseaudio in 17.04?
   # restarts the sound driver.
   function fix_sound_driver() {
-#if something
+    # stop bash complaining about blank function body.
+    local nothing=
+#if alsa something
 #    sudo service alsasound restart
+#elif pulse something
+#    sudo pulseaudio -k
+#    sudo pulseaudio -D
 #else
-    sudo service pulseaudio restart
+#    something else...?
 #fi
 
   }