This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop in repository live-build-x2go. commit adac24468105d1b80acac14c9a6f4674cd55bbef Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sun Nov 19 23:37:59 2017 +0100 Revert "deleted two files that are now identical in x2gothinclient-minidesktop" (seems to have been a mistake) This reverts commit f6e19bec2de9df8e338193ed6dc9e850fedd807d. --- .../020_x2gothinclient-confine-to-tray | 29 ++++++++++++++++++++++ .../030_x2gothinclient-inject-tcmode | 25 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray new file mode 100755 index 0000000..b8d3210 --- /dev/null +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org +# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> +# Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +# X2Go is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# X2Go is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +if [ -z "$X2GO_HANDLE_DAEMON" ] ; then + mkdir -p ~x2gothinclient/.x2goclient + echo '[trayicon]' >>~x2gothinclient/.x2goclient/settings + echo 'enabled=true' >>~x2gothinclient/.x2goclient/settings + chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf + chmod go-rwx ~x2gothinclient -Rf +fi diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/030_x2gothinclient-inject-tcmode b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/030_x2gothinclient-inject-tcmode new file mode 100755 index 0000000..b790254 --- /dev/null +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/030_x2gothinclient-inject-tcmode @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright (C) 2010-2015 by X2Go project, http://wiki.x2go.org +# Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> +# Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +# X2Go is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# X2Go is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +if [ -z "$X2GO_HANDLE_DAEMON" ] ; then + sed -i -e "\#^/usr/lib/x2go/x2goclient#a\\\t\\t\\t --thinclient \\\\" /etc/x2go/x2gothinclient-minidesktop_start +fi -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git