From 239120feaa158bbb530d41c52ecca47415d85aec Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 18 Jul 2018 09:50:28 +0200 Subject: [PATCH] shell/setup.sh: remove unused code for screenrc Unused since 37ae4aa ("screenrc: Disable auto-lock.", 2013-12-27). --- shell/screenrc.in | 2 +- shell/setup.sh | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/shell/screenrc.in b/shell/screenrc.in index d45da63..0ac4b7c 100644 --- 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 ef74ba1..5e6866f 100755 --- 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 -- 2.43.2