[X2Go-Commits] [live-build-x2go] 03/108: fixed session file location for dual-mode media

[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 9f6ea6b730c240db9f3f1c7db1f2fbf13392881b
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Feb 3 15:12:46 2018 +0100

    fixed session file location for dual-mode media
---
 .../lib/live/config/2500-x2go-getportableappsessions         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2500-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2500-x2go-getportableappsessions
index 4e417db..9d14f3f 100755
--- a/config/includes.chroot/lib/live/config/2500-x2go-getportableappsessions
+++ b/config/includes.chroot/lib/live/config/2500-x2go-getportableappsessions
@@ -13,11 +13,15 @@ echo -n " x2go-getportableappsessions"
 
 if [ -L /dev/disk/by-label/PORTABLEAPP ]; then 
 	mkdir -p /media/PORTABLEAPP && \
-	mount -o sync /dev/disk/by-label/PORTABLEAPP /media/PORTABLEAPP && \
-	ln -sf /media/PORTABLEAPP/x2goclient/sessions /etc/x2go/x2gothinclient_sessions
+	mount -o sync /dev/disk/by-label/PORTABLEAPP /media/PORTABLEAPP
+	if [ -s /media/PORTABLEAPP/x2goclient/sessions ] ; then
+		ln -sf /media/PORTABLEAPP/x2goclient/sessions /etc/x2go/x2gothinclient_sessions
+	elif [ -s /media/PORTABLEAPP/x2goclient/.x2goclient/sessions ] ; then
+		ln -sf /media/PORTABLEAPP/x2goclient/.x2goclient/sessions /etc/x2go/x2gothinclient_sessions
+	else
+		true
+	fi
 else
 	true
 fi
-}
-
 X2GoGetPortableAppSessions

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