Merge branch 'task/43099_improve_timeout_logout_scripts' into 'master'

improve timeout logout scripts: Move to new repo

See merge request os2borgerpc/os2borgerpc-scripts!3

Author: Marcus Funch Mogensen

system/always_logout_after_time.sh

@@ -5,7 +5,7 @@
 if [ $# -ne 1 ]
 then
     echo "This job takes exactly one parameter."
-    exit -1
+    exit 1
 fi
 
 
@@ -15,6 +15,7 @@ HAS_AT=$?
 
 if [[ $HAS_AT == 1 ]]
 then
+    export DEBIAN_FRONTEND=noninteractive
     apt-get update
     apt-get install -y at
 fi
@@ -76,5 +77,3 @@ EOF
 chmod +x /home/.skjult/.config/autostart/auto_logout.sh.desktop
 
 exit 0
-
-

system/setup_inactive_logout.sh

@@ -1,51 +1,52 @@
-#!/bin/bash 
-
+#! /usr/bin/env sh
 
 # Time before dialog appears, defined in minutes
 DIALOG_TIME=$1
-if [ -z $DIALOG_TIME ]
+if [ -z "$DIALOG_TIME" ]
 then
 	echo 'Please insert the time the user has to be inactive before dialog is shown.'
-	exit -1
+	exit 1
 fi
 
 # Time before user is logged out, defined in minutes
 LOGOUT_TIME=$2
-if [ -z $LOGOUT_TIME ]
+if [ -z "$LOGOUT_TIME" ]
 then
 	echo 'Please insert the time the user has to be inactive before being logged out.'
-	exit -1
+	exit 1
 fi
 
 if [ "$DIALOG_TIME" -gt "$LOGOUT_TIME" ]
 then
 	echo 'Dialog time is greater than logout time and dialog will therefore not be shown. Edit dialog time!'
-	exit -1
+	exit 1
 fi	
 
 # Text to be shown in the dialog
 DIALOG_TEXT=$3
-if [ -z $DIALOG_TEXT ]
+if [ -z "$DIALOG_TEXT" ]
 then
 	echo 'Please insert the text to be displayed in the dialog.'
-	exit -1
+	exit 1
 fi
 
-# Text to be shown in the dialog button
+# Text to be shown on the dialog button
 BUTTON_TEXT=$4
-if [ -z $BUTTON_TEXT ]
+if [ -z "$BUTTON_TEXT" ]
 then
-	echo 'Please insert the text to be displayed in the dialog button.'
-	exit -1
+	echo 'Please insert the text to be displayed on the dialog button.'
+	exit 1
 fi
 
 # Install xprintidle
+# Stop Debconf from doing anything
+export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -y xprintidle
 
 # if line already added to crontab skip
 TEMP=$(crontab -l | grep "inactive_logout.sh")
-if [[ -z "$TEMP" ]]
+if [ -z "$TEMP" ]
 then
 	line="* * * * * /usr/share/os2borgerpc/bin/inactive_logout.sh"
 	(crontab -l -u root; echo "$line") | crontab -u root -
@@ -54,47 +55,39 @@ fi
 
 # New auto_logout file
 cat << EOF > /usr/share/os2borgerpc/bin/inactive_logout.sh
-#!/usr/bin/env bash
+#! /usr/bin/env sh
 
 # If the user is inactive for too long, a dialog will appear, warning the user that the session will end.
 # If the user do not touch the mouse or press any keyboard key the session will end.
 
-# who | sed -rn 's/.*(:[0-9]*).*/\1/p'
 USER_DISPLAY=\$(who | grep -w 'user' | sed -rn 's/.*(:[0-9]*).*/\1/p')
 
 export XAUTHORITY=/home/user/.Xauthority
 export DISPLAY=\$USER_DISPLAY
 
 su - user -s /bin/bash -c 'xhost +localhost'
 
-FILE=/usr/share/os2borgerpc/bin/dialogshown.txt
-
 # LOG_DIR=/usr/share/os2borgerpc/bin/inactive_logout.log
-NEW_LOGOUT_TIME=$( expr $LOGOUT_TIME "*" 60 "*" 1000)
+NEW_LOGOUT_TIME=$(( LOGOUT_TIME * 60 * 1000 ))
 # echo \$NEW_LOGOUT_TIME \$(xprintidle) >> \$LOG_DIR
 
 if [ \$(xprintidle) -ge \$NEW_LOGOUT_TIME ]
 then 
 	# echo 'Logging user out' >> \$LOG_DIR
 	pkill -KILL -u user
-	rm \$FILE
 	exit 0	
 fi
-
-NEW_DIALOG_TIME=$( expr $DIALOG_TIME "*" 60 "*" 1000)
-# hvis idle time er større end dialog tid, vis da dialog.
+NEW_DIALOG_TIME=$(( DIALOG_TIME * 60 * 1000 ))
+# if idle time is past the dialog time: show the dialog
 if [ \$(xprintidle) -ge \$NEW_DIALOG_TIME ]
 then 
-	# hvis dialog ikke allerede er vist
-	if [ ! -f "\$FILE" ]
-	then
-		# echo 'Running zenity...' >> \$LOG_DIR
-		zenity --warning --text="$DIALOG_TEXT" --ok-label="$BUTTON_TEXT" --no-wrap --display=\$USER_DISPLAY
-		echo 'Dialog shown' >> \$FILE
-		if [ $? = 0 ] ; then
-			rm \$FILE
-		fi
-	fi
+  # ...but only create a dialog if one doesn't already exist
+  if ! pgrep --full 'Inaktivitet' > /dev/null
+  then
+    # echo 'Running zenity...' >> \$LOG_DIR
+    # We use the --title to match against above
+    zenity --warning --text="$DIALOG_TEXT" --ok-label="$BUTTON_TEXT" --no-wrap --display=\$USER_DISPLAY --title "Inaktivitet"
+  fi
 fi
 
 exit 0