shell/setup.sh: remove unused code for screenrc

Unused since 37ae4aa ("screenrc: Disable auto-lock.", 2013-12-27).

diff --git a/shell/screenrc.in b/shell/screenrc.in
index d45da635fe757410e45c0925a3215187eed51798..0ac4b7c7d5bd5a5c6dd2bd2b79134d57ba6f8842 100644 (file)
--- a/shell/screenrc.in
+++ b/shell/screenrc.in
@@ -1,6 +1,6 @@
 # GNU screen configuration file.
 #
-# (BATTERY) is only used on laptops, (ROOT) only if running as root.
+# (NAME) is used to selectively disable features, see setup.sh for details.
 
 # Copyright (C) 2011-2018  Simon Ruderich
 #

diff --git a/shell/setup.sh b/shell/setup.sh
index ef74ba130f083bf7343e0d60251074e583280cdd..5e6866fea72bea1905843c02fea7ff095b0e4f58 100755 (executable)
--- a/shell/setup.sh
+++ b/shell/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for shell configuration files.
 
-# Copyright (C) 2011-2014  Simon Ruderich
+# Copyright (C) 2011-2018  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -161,12 +161,6 @@ if test -z "$use_256colors"; then
     sed_i 's/Enable 256 color/Disable 256 color/;
            s/screen-256color/screen/' screenrc
 fi
-# Some options are only necessary when running as root. They are marked as
-# "(ROOT)".
-if test "`id -u`" -ne 0; then
-    echo 'screenrc: removing root options'
-    grep_i -v '(ROOT)' screenrc
-fi
 # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
 # it's installed.
 if installed rxvt; then