This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 139a6e4f0b8f4f8623fa813a482f5d1e1bb07efa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Aug 23 00:29:32 2014 +0200 Avoid x2gothinclient_init failures, use if..then..fi instead of the test command. --- debian/changelog | 2 ++ .../share/etc/x2gothinclient_init | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2764c23..48ce978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Run x2gothinclient_shell and x2gothinclient_upgrade with LANG=C. - Don't run x2gothinclient_init inside TCE chroot operations (x2gothinclient_shell or x2gothinclient_upgrade). + - Avoid x2gothinclient_init failures, use if..then..fi instead of + the test command. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index 318ddd5..c898f12 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -23,9 +23,17 @@ if [ -z "$X2GO_HANDLE_DAEMON" ]; then mkdir -p ~x2gothinclient mkdir -p ~x2gothinclient/.x2goclient - test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions - test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts - test -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop && mkdir -p ~x2gothinclient/Desktop && cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + if [ -e /etc/x2go/x2gothinclient_sessions ]; then + cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions + fi + if [ -e /etc/x2go/freerdp/known_hosts ]; then + mkdir -p ~x2gothinclient/.freerdp + cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts + fi + if [ -e /etc/xdg/autostart/x2gothinclient-minidesktop.desktop ]; then + mkdir -p ~x2gothinclient/Desktop + cp /etc/xdg/x2gothinclient-minidesktop.desktop ~x2gothinclient/Desktop/ + fi mkdir -p ~x2gothinclient/.kde mkdir -p ~x2gothinclient/.kde/socket-`hostname` mkdir -p ~x2gothinclient/mounts -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git