diff -Nru x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home --- x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home 2020-12-08 17:46:49.000000000 +0000 +++ x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home 2024-03-27 16:30:49.000000000 +0000 @@ -20,7 +20,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -if [ -z "$X2GO_HANDLE_DAEMON" ]; then +if [ -z "$X2GO_HANDLE_DAEMONS" ]; then if [ -d ~x2gothinclient ]; then find ~x2gothinclient -mindepth 1 -type f | egrep -v "(\.Xauthority|.dmrc)" | while read file; do rm -vf "$file" diff -Nru x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home --- x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 2020-12-08 17:46:49.000000000 +0000 +++ x2gothinclient-1.5.0.2/common/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 2024-03-27 16:30:49.000000000 +0000 @@ -1,9 +1,10 @@ #!/bin/bash -# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org +# Copyright (C) 2010-2024 by X2Go project, https://wiki.x2go.org # Oleksandr Shneyder # Moritz 'Morty' Struebe # Mike Gabriel +# Stefan Baur # X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,12 +21,36 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -if [ -z "$X2GO_HANDLE_DAEMON" ]; then +if [ -z "$X2GO_HANDLE_DAEMONS" ]; then mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient + + # if the /etc/x2go/x2gothinclient_sessions download is still in progress + # (/etc/x2go/x2gothinclient_sessions_old exists, but no /etc/x2go/x2gothinclient_sessions exists yet), + # print a timestamped "in progress" notification to the debug log console window on /dev/tty8 + # and wait one second, then check again (else we would trigger a race condition as to who gets to write the config file first) + # note that this will not in any way affect TCE-NFS or any TCE where /etc/x2go/x2gothinclient_sessions is a static file (i.e. + # where it has been included in the squashfs filesystem), because no file /etc/x2go/x2gothinclient_sessions_old SHOULD exist there. + # if this is a problem, we could consider moving *_old to /var/tmp/x2go/ instead, but that would make it harder to find. + while [ -e /etc/x2go/x2gothinclient_sessions_old ] && ! [ -e /etc/x2go/x2gothinclient_sessions ] ; do + echo -en "\n\$(date +'%F | %T | ') waiting for session config data download to finish ..." | tee -a /dev/tty8 + sleep 1 + done + + # if/once /etc/x2go/x2gothinclient_sessions exists, copy it over if [ -e /etc/x2go/x2gothinclient_sessions ]; then - cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + + # if there's no sessions file, it does not make sense to add this link to the Desktop, so check that first, + # and only then check if the desktop file exists in autostart + if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then + mkdir -p ~x2gothinclient/Desktop + cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + # newer MATE versions require *.desktop files to be executable, else there will be a warning/confirmation popup + chmod 700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop + fi fi + if [ -e /etc/x2go/freerdp/known_hosts ]; then mkdir -p ~x2gothinclient/.freerdp cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts @@ -34,11 +59,7 @@ mkdir -p ~x2gothinclient/.config/freerdp cp /etc/x2go/freerdp/known_hosts2 ~x2gothinclient/.config/freerdp/known_hosts2 fi - if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then - mkdir -p ~x2gothinclient/Desktop - cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ - chmod 0700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop - fi + mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` mkdir -p ~x2gothinclient/mounts diff -Nru x2gothinclient-1.5.0.2/debian/Jenkinsfile x2gothinclient-1.5.0.2/debian/Jenkinsfile --- x2gothinclient-1.5.0.2/debian/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000 +++ x2gothinclient-1.5.0.2/debian/Jenkinsfile 2024-03-27 16:30:49.000000000 +0000 @@ -0,0 +1,6 @@ +@Library('jenkins-ci-tools') _ +buildDebianPackage( + /* isArchIndependent */ false, + /* ignoredArchs */ [], + /* isHeavyPackage */ false +) diff -Nru x2gothinclient-1.5.0.2/debian/bzr-builder.manifest x2gothinclient-1.5.0.2/debian/bzr-builder.manifest --- x2gothinclient-1.5.0.2/debian/bzr-builder.manifest 2020-12-08 17:46:50.000000000 +0000 +++ x2gothinclient-1.5.0.2/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~721 -lp:~x2go/x2go/x2gothinclient_master revid:git-v1:9abcc4e1d470eca2b3367dbd974e835f28a9e5c7 diff -Nru x2gothinclient-1.5.0.2/debian/changelog x2gothinclient-1.5.0.2/debian/changelog --- x2gothinclient-1.5.0.2/debian/changelog 2020-12-08 17:46:50.000000000 +0000 +++ x2gothinclient-1.5.0.2/debian/changelog 2024-03-27 16:30:49.000000000 +0000 @@ -1,8 +1,8 @@ -x2gothinclient (1.5.0.2-0~721~ubuntu16.04.1) xenial; urgency=low +x2gothinclient (1.5.0.2-0~202401311630~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- X2Go Tue, 08 Dec 2020 17:46:50 +0000 + -- X2Go Wed, 27 Mar 2024 16:30:49 +0000 x2gothinclient (1.5.0.2-0x2go2) UNRELEASED; urgency=medium diff -Nru x2gothinclient-1.5.0.2/debian/git-build-recipe.manifest x2gothinclient-1.5.0.2/debian/git-build-recipe.manifest --- x2gothinclient-1.5.0.2/debian/git-build-recipe.manifest 1970-01-01 00:00:00.000000000 +0000 +++ x2gothinclient-1.5.0.2/debian/git-build-recipe.manifest 2024-03-27 16:30:49.000000000 +0000 @@ -0,0 +1,2 @@ +# git-build-recipe format 0.4 deb-version {debupstream}-0~202401311630 +lp:~x2go/x2go/+git/x2gothinclient git-commit:deadf94379456b6272a9bcb1859989fff003287c diff -Nru x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home --- x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home 2020-12-08 17:46:49.000000000 +0000 +++ x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/005_x2gothinclient-wipe-home 2024-03-27 16:30:49.000000000 +0000 @@ -20,7 +20,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -if [ -z "$X2GO_HANDLE_DAEMON" ]; then +if [ -z "$X2GO_HANDLE_DAEMONS" ]; then if [ -d ~x2gothinclient ]; then find ~x2gothinclient -mindepth 1 -type f | egrep -v "(\.Xauthority|.dmrc)" | while read file; do rm -vf "$file" diff -Nru x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home --- x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 2020-12-08 17:46:49.000000000 +0000 +++ x2gothinclient-1.5.0.2/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home 2024-03-27 16:30:49.000000000 +0000 @@ -1,9 +1,10 @@ #!/bin/bash -# Copyright (C) 2010-2019 by X2Go project, https://wiki.x2go.org +# Copyright (C) 2010-2024 by X2Go project, https://wiki.x2go.org # Oleksandr Shneyder # Moritz 'Morty' Struebe # Mike Gabriel +# Stefan Baur # X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,12 +21,36 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -if [ -z "$X2GO_HANDLE_DAEMON" ]; then +if [ -z "$X2GO_HANDLE_DAEMONS" ]; then mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient + + # if the /etc/x2go/x2gothinclient_sessions download is still in progress + # (/etc/x2go/x2gothinclient_sessions_old exists, but no /etc/x2go/x2gothinclient_sessions exists yet), + # print a timestamped "in progress" notification to the debug log console window on /dev/tty8 + # and wait one second, then check again (else we would trigger a race condition as to who gets to write the config file first) + # note that this will not in any way affect TCE-NFS or any TCE where /etc/x2go/x2gothinclient_sessions is a static file (i.e. + # where it has been included in the squashfs filesystem), because no file /etc/x2go/x2gothinclient_sessions_old SHOULD exist there. + # if this is a problem, we could consider moving *_old to /var/tmp/x2go/ instead, but that would make it harder to find. + while [ -e /etc/x2go/x2gothinclient_sessions_old ] && ! [ -e /etc/x2go/x2gothinclient_sessions ] ; do + echo -en "\n\$(date +'%F | %T | ') waiting for session config data download to finish ..." | tee -a /dev/tty8 + sleep 1 + done + + # if/once /etc/x2go/x2gothinclient_sessions exists, copy it over if [ -e /etc/x2go/x2gothinclient_sessions ]; then - cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + + # if there's no sessions file, it does not make sense to add this link to the Desktop, so check that first, + # and only then check if the desktop file exists in autostart + if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then + mkdir -p ~x2gothinclient/Desktop + cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + # newer MATE versions require *.desktop files to be executable, else there will be a warning/confirmation popup + chmod 700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop + fi fi + if [ -e /etc/x2go/freerdp/known_hosts ]; then mkdir -p ~x2gothinclient/.freerdp cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts @@ -34,11 +59,7 @@ mkdir -p ~x2gothinclient/.config/freerdp cp /etc/x2go/freerdp/known_hosts2 ~x2gothinclient/.config/freerdp/known_hosts2 fi - if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then - mkdir -p ~x2gothinclient/Desktop - cp /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ - chmod 0700 ~x2gothinclient/Desktop/x2gothinclient-minidesktop.desktop - fi + mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` mkdir -p ~x2gothinclient/mounts