From 5135c8954b7e0fa671483e2a3b4a9c4857264ff2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 25 Apr 2019 14:17:24 +0200
Subject: [xscreensaver] ash doesn't know -v -- scrap it entirely

---
 .../data/etc/X11/Xsession.d/95-xscreensaver        | 23 ++--------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'core/modules')

diff --git a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
index c8eb88ca..8953aa83 100755
--- a/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
+++ b/core/modules/xscreensaver/data/etc/X11/Xsession.d/95-xscreensaver
@@ -38,27 +38,8 @@ if which xscreensaver; then
 	# Create config value for standby timeout
 	[ "$SBY" -gt 0 ] && DPMS=True
 	STANDBY="$( secsToTime "$SBY" )"
-	if [ -v SLX_SCREEN_SAVER_TIMEOUT ]; then
-		# Explicit screen saver timeout set
-		TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )"
-	else
-		# Create config for screensaver activation timeout
-		if [ "$SLX_LOGOUT_TIMEOUT" -gt 0 ] && [ "$SBY" -eq 0 ]; then
-			# Standby is disabled, consider logout timeout
-			TMO=$SLX_LOGOUT_TIMEOUT
-		else
-			# Consider standby timeout
-			TMO=$SBY
-		fi
-		# Start screen saver 3 minutes before forced logout, or screen enters standby
-		TMO=$(( TMO - 180 ))
-		if [ "$TMO" -gt 0 ]; then
-			[ "$TMO" -gt 1200 ] && TMO=$(( TMO - 300 ))
-			TIMEOUT="$( secsToTime "$TMO" )"
-		else
-			TIMEOUT="99:00:00"
-		fi
-	fi
+	# Explicit screen saver timeout set
+	TIMEOUT="$( secsToTime "$SLX_SCREEN_SAVER_TIMEOUT" )"
 	if [ -z "$SLX_SCREEN_SAVER_GRACE_TIME" ]; then
 		GRACE="00:00:15"
 	else
-- 
cgit v1.2.3-55-g7522