[X2Go-Commits] [x2goserver] 38/50: xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 14 05:14:06 CET 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.

commit e75484a92921c46d0de813ba579c7cade9d5fff7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 05:49:07 2014 +0100

    xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD.
---
 .../post-resume.d/900_xsettings-xsettingsd-refresh |   50 ++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh b/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh
new file mode 100644
index 0000000..9748f23
--- /dev/null
+++ b/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Copyright (C) 2014 X2Go Project - http://wiki.x2go.org
+#
+# This program 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.
+#
+# This program 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.
+#
+# Copyright (C) 2014 Mihai Moldovan <ionic at ionic.de>
+
+. SOMEPLACE/x2goserver-xsettings-common.sh
+
+export X2GO_SESSION="${1}"
+
+X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")"
+X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/"
+X2GO_CONF_DIR="$(x2gopath etc)"
+XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid"
+XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote"
+XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings"
+XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go"
+XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings"
+
+export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")"
+
+XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}"
+[ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}"
+
+# Create a missing XSETTINGSD_OVERRIDES_CONF, if necessary.
+if [ ! -f "${XSETTINGSD_OVERRIDES_CONF}" ]; then
+  (echo "# xsettings overrides file for X2Go."
+   echo "# Created on $(date "+%Y-%m-%d %T")."
+   echo "# You may edit this file to fit your needs."
+   echo "# All settings in here will override remote machine or global settings.") > "${XSETTINGSD_OVERRIDES_CONF}"
+fi
+
+merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}"
+
+kill -s HUP "${XSETTINGSD_PID}"

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list