[X2Go-Commits] [live-build-x2go] 39/108: added code to accomodate minidesktop versions in local-sessions-config code

[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 cfcf0c5d243a62bb631d1f6d60a7518ed8e0e03b
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 11 21:40:50 2018 +0100

    added code to accomodate minidesktop versions in local-sessions-config code
---
 .../lib/live/config/2280-x2go-getportableappsessions    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
index 48a7ca2..b609141 100755
--- a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
+++ b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
@@ -28,6 +28,13 @@ X2GoGetPortableAppSessions ()
 
 		}
 
+		check_for_minidesktop {
+			if [ -L /etc/x2go/x2gothinclient_sessions ] && [ -d ~x2gothinclient ] ; then
+				mkdir -p ~x2gothinclient/.x2gothinclient
+				ln -sf /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2gothinclient/sessions
+			fi
+		}
+
 		while ! [ -c /dev/tty8 ] ; do
 			echo -n "\n$(date +'%F | %T | ')'$0' is waiting for tty8 to become available."
 			sleep 2
@@ -76,7 +83,10 @@ X2GoGetPortableAppSessions ()
 					echo -n "\n$(date +'%F | %T | ')'$0' Device '$NEXTDEVICE' is mounted at: '$MNTPT'" | tee -a /dev/tty8
 					# so let's check if we have a config directory at that mountpoint.
 					if check_for_config $MNTPT ; then
-						# if we managed to pull a config off of it (or save one on it), we make a note of this ...
+						# if we managed to pull a config off of it (or save one on it), we 
+						# check if we need to make any changes due to us being a minidesktop-TCE ...
+						check_for_minidesktop
+						# then we make a note that we're done ...
 						touch /var/lib/live/config/x2goportableappsessions
 						# and quit right here.
 						exit 0
@@ -93,7 +103,10 @@ X2GoGetPortableAppSessions ()
 						# and now we can try to mount it.  Needs to be in rw mode, as in minidesktop mode, people might want to try to save back changes.
 						mount /dev/$NEXTDEVICE /media/fixeddisks/$NEXTDEVICE
 						if check_for_config /media/fixeddisks/$NEXTDEVICE ; then
-							# if we managed to pull a config off of it (or save one on it), we make a note of this ...
+							# if we managed to pull a config off of it (or save one on it), we 
+							# check if we need to make any changes due to us being a minidesktop-TCE ...
+							check_for_minidesktop
+							# then we make a note that we're done ...
 							touch /var/lib/live/config/x2goportableappsessions
 							# and quit right here.
 							exit 0

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