screenrc: only show hostname in hardstatus on remote systems

diff --git a/shell/screenrc.in b/shell/screenrc.in
index 0ac4b7c7d5bd5a5c6dd2bd2b79134d57ba6f8842..e9f397a7c7036816765a015752a9941ca6d6038c 100644 (file)
--- a/shell/screenrc.in
+++ b/shell/screenrc.in
@@ -74,8 +74,8 @@ unsetenv s
 # Always display the status line with open windows and the hostname.
 setenv s "$s%Lw" # - number and names of windows, L displays window flags
 setenv s "$s%="  # - right align the following text
-setenv s "$s "   # - space
-setenv s "$s%H"  # - hostname
+setenv s "$s "   # - space          (REMOTE)
+setenv s "$s%H"  # - hostname       (REMOTE)
 setenv s "$s "   # - space          (TEMPERATURE)
 setenv s "$s%2`" # - temperature    (TEMPERATURE)
 setenv s "$s "   # - space          (BATTERY)

diff --git a/shell/setup.sh b/shell/setup.sh
index 5e6866fea72bea1905843c02fea7ff095b0e4f58..394c46310d8c0001e53cb686e9e9f0bcd3f30353 100755 (executable)
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -184,6 +184,11 @@ if ! test -d "$temperature"; then
 fi
 apply_optional_replacement screenrc \
     temperature TEMPERATURE "$temperature"
+# Settings for local hosts.
+if test -z "${SSH_CONNECTION:+set}"; then
+    echo 'screenrc: removing remote options'
+    grep_i -v '(REMOTE)' screenrc
+fi
 
 
 if installed tmux; then