[X2Go-Commits] [live-build-x2go] 90/108: added log output

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit dc6423c8f15c515b1b616e662fcaa824cd8eec75
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Jan 19 17:46:49 2019 +0000

    added log output
---
 .../includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
index 6897f12..f1978bc 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground
@@ -19,24 +19,30 @@ if [ -n "$XROOT" ] ; then
 
 	if echo "$XROOT" | grep -q "://" ; then
 		# this could be an URI
+		echo -n "\n$(date +'%F | %T | ')'$0' URL detected." | tee -a /dev/tty8
 		if [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then
+			echo -n "\n$(date +'%F | %T | ')'$0' MiniDesktop mode detected." | tee -a /dev/tty8
 			# We're running in X2Go-TCE-MATE-MiniDesktop
 			# only 1 image supported (so far)
 			# no background colors supported (so far)
 			# but, in TCE-MMD, we can use SVG images in addition to PNG, JPG, etc.
 			while ! [ $(ls -1 $IMAGEDIR/background/* 2>/dev/null | wc -l) -gt 0 ] ; do
+				echo -n "\n$(date +'%F | %T | ')'$0' Waiting for image directory to populate ..." | tee -a /dev/tty8
 				sleep 1
 			done
 			cat $(ls -1 $IMAGEDIR/background/*| head -1) >/etc/x2go/x2gothinclient-minidesktop_background.svg # nasty hack, but seems to work, even for non-svg images
 			# update-alternatives --remove desktop-background /usr/share/backgrounds/x2go/x2gothinclient-minidesktop_background.svg
 			# update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background $(ls -1 $IMAGEDIR/background/*| head -1) 10
+			echo -n "\n$(date +'%F | %T | ')'$0' New MiniDesktop background has been set." | tee -a /dev/tty8
 		else
 			(
 				while ! [ $(ls -1 $IMAGEDIR/background/* 2>/dev/null | wc -l) -gt 0 ] ; do
+					echo -n "\n$(date +'%F | %T | ')'$0' Waiting for image directory to populate ..." | tee -a /dev/tty8
 					xsetroot -grey # show that something's amiss
 					sleep 1
 				done
 				feh --no-fehbg --bg-$POSITION $IMAGEDIR/background/*
+				echo -n "\n$(date +'%F | %T | ')'$0' New X background image(s) has/have been set." | tee -a /dev/tty8
 			) &
 		fi
 
@@ -45,8 +51,10 @@ if [ -n "$XROOT" ] ; then
 		HEXCOLOR=${XROOTSHORT#0x}
 		if [ 6 = ${#HEXCOLOR} ] ; then
 			xsetroot -solid "#$HEXCOLOR" # set requested color
+			echo -n "\n$(date +'%F | %T | ')'$0' New X background color has been set." | tee -a /dev/tty8
 		else
 			xsetroot -grey # show that something's amiss
+			echo -n "\n$(date +'%F | %T | ')'$0' Error: X background color has been set to grey grid." | tee -a /dev/tty8
 		fi
 	else 
 		: # NOP
@@ -55,5 +63,7 @@ if [ -n "$XROOT" ] ; then
 else
 	# set our default color
 	xsetroot -solid "#246ed8"
+	echo -n "\n$(date +'%F | %T | ')'$0' Default X background color has been set." | tee -a /dev/tty8
 fi
 
+echo -n "\n$(date +'%F | %T | ')'$0' Done." | tee -a /dev/tty8

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git