screenrc: Lock screen after 10 minutes of inactivity for root.

Also update setup.sh to remove the option for non-root users.

diff --git a/screenrc.in b/screenrc.in
index 37d61da70fcff39640bcab3ee8a84d53a943f173..ae278438876f3cfea8f28ef3761c911de76e5d82 100644 (file)
--- a/screenrc.in
+++ b/screenrc.in
@@ -3,7 +3,13 @@
 # Features which are only available in (very) recent screen releases or in
 # current Git are marked with "(GIT)" so they can be removed by the setup
 # script on machines with older versions.
+#
+# (BATTERY) is only used on laptops, (ROOT) only if running as root.
+
 
+# Automatically lock the screen after 10 minutes of inactivity if running as
+# root.
+idle 600 lockscreen # (ROOT)
 
 # Don't display startup message.
 startup_message off

diff --git a/setup.sh b/setup.sh
index 761e4bc2408a96f274776b72cfdccd478dbaaba0..e9727dc91361e8cf75fca5cf4da60cdec9090ee3 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -19,6 +19,13 @@ if [ $hostname != asp -a $hostname != systemofadown ]; then
          s/screen-256color/screen/' screenrc > screenrc.tmp
     mv screenrc.tmp screenrc
 fi
+# Some options are only necessary when running as root. They are marked as
+# "(ROOT)".
+if [ x`id -u` != x0 ]; then
+    echo screenrc: removing root options
+    grep -v '(ROOT)' screenrc > screenrc.tmp
+    mv screenrc.tmp screenrc
+fi
 # I use some features of screen which are only in Git. Drop them on machines
 # which have older versions. They are marked as "(GIT)".
 if [ $hostname != asp ]; then