This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/x2goserver-xsettings in repository x2goserver. discards 34ff953 xsettings: remove temporary file in x2goserver_xsettings_merge. discards 503f822 xsettings: fix speling errors in POSIX BRE character classes. discards 95d2c58 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. discards 85df6b5 xsettings: rename faulty "base" to "data". discards 23c719c xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. discards 9b2e1c8 xsettings: add missing post-resume.d targets to Makefile. discards 0c36f1c extensions: add data/common.sh, providing commonly used variables. discards 6721346 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. discards bc4da32 extensions: add "data" directory to man page. discards 71f0235 extensions: add data directory in hooks directory used for shared data/programs/scripts. discards a82312e x2goserver: add generic typo and whitespace fixes comment to debian/changelog. discards 45da265 x2goserver: add x2gopath etc addition to debian/changelog. discards 1ef1966 xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. discards 57ddf48 xsettings: add debian/x2goserver-xsettings.manpages. discards 9a0a61e xsettings: add debian/x2goserver-xsettings.install. discards 76d03e2 xsettings: add debian/x2goserver-xsettings.dirs. discards 9e3ff0a xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. discards 2d89175 xsettings: add x2goserver-xsettings package to debian/control. discards 78c89ce xsettings: spell XSETTINGS in uppercase in RPM spec file. discards 29bbf68 xsettings: change RPM spec file to include the new x2goserver-xsettings package. discards e63f30a xsettings: documentation update, describe the newly implemented features. discards 629ad37 xsettings: rename xsettings.conf previously missed. discards 50c83a0 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. discards cd7d78b xsettings: add comment explaining the merge shell function and its requirements. discards e2ac69d xsettings: remove .conf suffix from xsettingsd config files. discards c629157 xsettings: use merge shell function to merge the determined base config with the overrides config. discards 3b64611 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. discards 9860fe0 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. discards f9b2743 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. discards d356d1c xsettings: use out file directly, no need for a second temp file. discards 8e5ba30 xsettings: filter out overriden keys. Add the rest to the second temporary file. discards 05b7270 xsettings: add loop through base file extracting key-value pairs. discards e4798c5 xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. discards dcde05b xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. discards b5359fe xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. discards 0db30a0 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. discards 5c03855 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. discards 345f9f1 xsettings: add incomplete merge function to startup script. discards 58cbdaf xsettings: also delete pre-processed man pages in clean_man2html target. discards 90b10cd xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. discards b7e4f22 xsettings: fix default config file. discards 1cb7165 xsettings: add manual page. discards 5f70a94 xsettings: add X2GO_XSETTINGS feature. discards 7e04967 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. discards cbf9e1c xsettings: add pre-terminate hook. discards 29fefd7 xsettings: add post-start hook. discards 933529e xsettings: add VERSION file. discards 1146f9f x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. discards 0072d8a xsettings: add README.md. discards 10b847e xsettings: add new stub. adds 3c1cd29 debian/changelog: sync with release/4.0.1.x branch. adds 21ce952 x2goserver.spec: add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. adds fe9f1ad x2goserver.spec: typo fix in comment: Recommands -> Recommends. adds 097c241 x2goserver.spec: fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S,D} 12. adds d716e91 x2goserver.spec: add workaround documentation for sudoers on *SUSE 11. adds dd70d3e x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package. adds 6eebfb8 x2goserver.spec: move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) adds a875eb9 x2goserver-extensions: add runcommand.d hooks to x2goserver-extensions Makefile. Fix changelog. adds 4d93df5 Make X2Go Server aware of Rick Astley (RICKROLL) adds 81b8d3d Revert "Make X2Go Server aware of Rick Astley (RICKROLL)" adds 9ec47ce TRINITY: Add support for Q4OS adds 4eb608e {debian/control,x2goserver.spec}: add new dependency on bash. adds dd39de9 x2goserver/bin/x2gosessionlimit: don't iterate over the whole groups file. adds 4ad590e x2goserver/sbin/x2godbadmin: remove trailing whitespace. adds 126b18d x2goserver/sbin/x2godbadmin: revoke all PRIVILEGES before trying to delete a user on postgres. adds 2108538 x2goserver/sbin/x2gocleansessions: re-fetch the current sessions' status before handling it. adds 1767104 x2goserver/sbin/x2gocleansessions: rename %remembered_sessions_since to %remembered_sessions_status_since. adds f13c44b x2goserver/sbin/x2gocleansessions: rename %remembered_sessions_status_since to %remembered_sessions_status_since_time. adds a35aa9c x2goserver/sbin/x2gocleansessions: give suspended-but-running sessions a grace period of one iteration. adds a1ab739 x2goserver/sbin/x2gocleansessions: fix ugly missing whitespace. adds 8393882 x2goserver/sbin/x2gocleansessions: move up session status sync a bit, don't update session state when session has been removed from the database. adds 939a345 x2goserver/sbin/x2gocleansessions: unify log messages. Move dangling line around. adds 30de2ca x2goserver/sbin/x2gocleansessions: whitespace only. adds 45a92c7 x2goserver/sbin/x2gocleansessions: also delete entries in the other, overlooked hashes. adds b44bc57 x2goserver/sbin/x2gocleansessions: move socket and lock file cleanup into time-based block for finished/failed sessions. adds 77ce2d2 x2goserver/sbin/x2gocleansessions: add @remembered_finished_sessions array. adds d894b1a x2goserver/sbin/x2gocleansessions: don't add failed/finished sessions to remembered list if that list already includes them. adds 87b97fb x2goserver/sbin/x2gocleansessions: don't use gmtime (time ()) but merely time (). adds 4bd8d24 x2goserver/sbin/x2gocleansessions: add debugging output to show the state change when updating the cached state result. adds 81fb801 x2goserver/sbin/x2gocleansessions: add timestamp to debug output. adds 91c41f1 x2goserver/sbin/x2gocleansessions: only output status refreshing debug message if the old and new states actually differ. adds 47de61e x2goserver/sbin/x2gocleansessions: also (correctly) log to syslog if started with --debug parameter. adds 4a6bf69 debian/control: add new dependency on xkb-data to x2goserver. adds d62cb63 x2goserver.spec: add new dependency on xkeyboard-config to x2goserver. Fixes: #903. adds 2a10512 debian/x2goserver.preinst: Use proper comment header explaining about preinst script argument calls (not postinst). adds bfe3ba7 x2goserver/bin/x2gostartagent: changes to Robert Nowotny's SSH_PORT patch. Fixes: #922. adds c37ea34 libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl: don't use deprecated defined (@array) construct which never really did what one would expect (defined () can only be used on scalar values.) new 439a223 xsettings: add new stub. new b303054 xsettings: add README.md. new 21c697c x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. new 3f00614 xsettings: add VERSION file. new 885c2b9 xsettings: add post-start hook. new 08531bf xsettings: add pre-terminate hook. new 0df7946 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. new d277e4f xsettings: add X2GO_XSETTINGS feature. new 3db8134 xsettings: add manual page. new 423b43d xsettings: fix default config file. new d446d25 xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. new c2aa395 xsettings: also delete pre-processed man pages in clean_man2html target. new 60c86fc xsettings: add incomplete merge function to startup script. new acd5210 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. new d9a28b6 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. new 2ee1acd xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. new 84c73e8 xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. new 639a45c xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. new ecbaadf xsettings: add loop through base file extracting key-value pairs. new 6498f61 xsettings: filter out overriden keys. Add the rest to the second temporary file. new 2fb4986 xsettings: use out file directly, no need for a second temp file. new 134d82a xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. new 9244684 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. new e44bfdc xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. new e5f3662 xsettings: use merge shell function to merge the determined base config with the overrides config. new 3a6f39b xsettings: remove .conf suffix from xsettingsd config files. new 856bb66 xsettings: add comment explaining the merge shell function and its requirements. new d3d4ab0 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. new 542d063 xsettings: rename xsettings.conf previously missed. new 8e38700 xsettings: documentation update, describe the newly implemented features. new 2c54082 xsettings: change RPM spec file to include the new x2goserver-xsettings package. new adad8d7 xsettings: spell XSETTINGS in uppercase in RPM spec file. new 72e3340 xsettings: add x2goserver-xsettings package to debian/control. new 7107de6 xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. new 48269e8 xsettings: add debian/x2goserver-xsettings.dirs. new fec2361 xsettings: add debian/x2goserver-xsettings.install. new 0def351 xsettings: add debian/x2goserver-xsettings.manpages. new e75484a xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. new b0516e8 x2goserver: add x2gopath etc addition to debian/changelog. new d2db0ea x2goserver: add generic typo and whitespace fixes comment to debian/changelog. new 16ff808 extensions: add data directory in hooks directory used for shared data/programs/scripts. new 8cfbf8e extensions: add "data" directory to man page. new d777c25 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. new 2f07be5 extensions: add data/common.sh, providing commonly used variables. new a59510a xsettings: add missing post-resume.d targets to Makefile. new b9b1e43 xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. new 36cf705 xsettings: rename faulty "base" to "data". new 2ee5126 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. new 567cc6b xsettings: fix speling errors in POSIX BRE character classes. new d837d54 xsettings: remove temporary file in x2goserver_xsettings_merge. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (34ff953) \ N -- N -- N refs/heads/feature/x2goserver-xsettings (d837d54) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 50 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 130 ++++++++++++++++++- debian/control | 2 + debian/x2goserver.preinst | 14 +- .../lib/libx2go-server-db-sqlite3-wrapper.pl | 2 +- x2goserver-extensions/Makefile | 12 ++ x2goserver.spec | 79 ++++++++++-- x2goserver/bin/x2goruncommand | 8 +- x2goserver/bin/x2gosessionlimit | 21 +-- x2goserver/bin/x2gostartagent | 71 +++++++++- x2goserver/doc/README.sudoers | 22 ++++ x2goserver/sbin/x2gocleansessions | 136 +++++++++++++------- x2goserver/sbin/x2godbadmin | 70 ++++++---- 12 files changed, 454 insertions(+), 113 deletions(-) create mode 100644 x2goserver/doc/README.sudoers -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 439a223bbed972dc84f4d82a29c81640b3302ee1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 01:50:20 2014 +0100 xsettings: add new stub. --- Makefile | 7 ++++ x2goserver-xsettings/Makefile | 89 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/Makefile b/Makefile index 03b0484..3c78e94 100755 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ build_man2html: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ clean: -$(MAKE) -f Makefile.perl clean @@ -35,6 +36,7 @@ clean: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ distclean: -$(MAKE) -f Makefile.perl realclean @@ -45,6 +47,7 @@ distclean: $(MAKE) -C x2goserver-extensions clean $(MAKE) -C x2goserver-xsession clean $(MAKE) -C x2goserver-fmbindings clean + $(MAKE) -C x2goserver-xsettings clean build-arch: $(MAKE) -C x2goserver-common $@ @@ -54,6 +57,7 @@ build-arch: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ build-indep: $(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS) @@ -65,6 +69,7 @@ build-indep: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ install: $(MAKE) -f Makefile.perl pure_install @@ -75,11 +80,13 @@ install: $(MAKE) -C x2goserver-extensions $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ uninstall: $(MAKE) -C x2goserver-printing $@ $(MAKE) -C x2goserver-xsession $@ $(MAKE) -C x2goserver-fmbindings $@ + $(MAKE) -C x2goserver-xsettings $@ $(MAKE) -C x2goserver-extensions $@ $(MAKE) -f Makefile.perl uninstall $(MAKE) -C libx2go-server-db-perl $@ diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile new file mode 100755 index 0000000..6229b2c --- /dev/null +++ b/x2goserver-xsettings/Makefile @@ -0,0 +1,89 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR ?= +PREFIX ?= /usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +SHAREDIR=$(PREFIX)/share/x2go + +ETC_FILES=$(shell cd etc && echo *) +LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) + +man_pages = `cd man && find * -type f` + +MAN2HTML_BIN = $(shell which man2html) +MAN2HTML_SRC = man +MAN2HTML_DEST = .build_man2html/html + +all: clean build + +build: build-arch build-indep + +build-arch: + +build-indep: build_man2html + +build_man2html: + if [ -n "$(MAN2HTML_BIN)" ]; then \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + fi + +clean: clean_man2html + +clean_man2html: + rm -rf `dirname $(MAN2HTML_DEST)` + +install: install_scripts install_config install_man install_version + +install_scripts: + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d + $(INSTALL_PROGRAM) lib/x2go/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + +install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_FILE) etc/xsettings.conf $(DESTDIR)$(ETCDIR)/ + +install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + +install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions + $(INSTALL_FILE) VERSION.x2goserver-xsettings $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings + +uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version + +uninstall_scripts: + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettingsd* + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done + +uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings.conf + +uninstall_man: + for file in man/man8/*.8; do $(RM_FILE) $(DESTDIR)$(MANDIR)/$${file#man}.gz; done + $(RM_DIR) $(DESTDIR)$(MANDIR) || true + +uninstall_version: + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 885c2b9182a049d5ef4fc094a3722114ef0b8ae2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 03:47:33 2014 +0100 xsettings: add post-start hook. --- .../post-start.d/900_xsettings-xsettingsd-startup | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup new file mode 100644 index 0000000..3a8cfff --- /dev/null +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -0,0 +1,36 @@ +#!/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@ionic.de> + +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_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" +XSETTINGSD_USER_CONF="${X2GO_SESSION_DIR}/xsettings.conf" +XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" + +export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" + +[ -r "${XSETTINGSD_USER_CONF}" ] && XSETTINGSD_CONF="${XSETTINGSD_USER_CONF}" || XSETTINGSD_CONF="${XSETTINGSD_DEFAULT_CONF}" + +nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 3f006149317bf9e9b72930987cb4a049277c0c67 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 03:00:47 2014 +0100 xsettings: add VERSION file. --- x2goserver-xsettings/VERSION.x2goserver-xsettings | 1 + 1 file changed, 1 insertion(+) diff --git a/x2goserver-xsettings/VERSION.x2goserver-xsettings b/x2goserver-xsettings/VERSION.x2goserver-xsettings new file mode 100644 index 0000000..8a1136f --- /dev/null +++ b/x2goserver-xsettings/VERSION.x2goserver-xsettings @@ -0,0 +1 @@ +4.1.0.0-preview -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 21c697cb711b2677176358940da574aecf104e52 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 02:55:37 2014 +0100 x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. Don't use '/' as sed replace command separator for... paths. Bad idea, who would have guessed. --- x2goserver/Makefile | 1 + x2goserver/bin/{x2gopath => x2gopath.in} | 1 + 2 files changed, 2 insertions(+) diff --git a/x2goserver/Makefile b/x2goserver/Makefile index ee1891c..3deb452 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,6 +37,7 @@ build: build-arch build-indep build-arch: build-indep: build_man2html + sed -e 's,@@SYSCONFDIR@@,$(ETCDIR),' bin/x2gopath.in > bin/x2gopath build_man2html: if [ -n "$(MAN2HTML_BIN)" ]; then \ diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath.in similarity index 97% rename from x2goserver/bin/x2gopath rename to x2goserver/bin/x2gopath.in index 43903c4..497c284 100755 --- a/x2goserver/bin/x2gopath +++ b/x2goserver/bin/x2gopath.in @@ -32,6 +32,7 @@ base=$(readlink -f "$base/.."); # The following section is subject to substitution by distro packaging tools. case "$1" in "base") printf '%s' "$base";; + "etc") printf '%s' "@@SYSCONFDIR@@";; "lib") printf '%s' "$base/lib/x2go";; "libexec") printf '%s' "$base/lib/x2go";; "share") printf '%s' "$base/share/x2go";; -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 b303054c8233c5966587fb015dede91ddae38fe0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 02:18:55 2014 +0100 xsettings: add README.md. --- x2goserver-xsettings/README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/x2goserver-xsettings/README.md b/x2goserver-xsettings/README.md new file mode 100644 index 0000000..90d009d --- /dev/null +++ b/x2goserver-xsettings/README.md @@ -0,0 +1,18 @@ +# x2goserver-xsettings +This folder contains scripts and default settings to enable the use of the XSETTINGS desktop settings protocol. + + * etc + + contains the default xsettings.conf file + + * lib + + contains scripts to start xsettingsd + + * man + + documentation directory + + * share + + contains the feature itself -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 0df794609b3a1ef81246d6d76c28f1e5f6e162f0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 04:32:10 2014 +0100 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. --- x2goserver-xsettings/etc/xsettings.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/etc/xsettings.conf b/x2goserver-xsettings/etc/xsettings.conf new file mode 100644 index 0000000..7920616 --- /dev/null +++ b/x2goserver-xsettings/etc/xsettings.conf @@ -0,0 +1,2 @@ +/Gtk/MenuImages 1 +/Gtk/ButtonImages 1 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 08531bf1d3b34efcab48e578e78f2c3e8253cd79 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 04:18:08 2014 +0100 xsettings: add pre-terminate hook. --- x2goserver-xsettings/Makefile | 5 +++- .../000_xsettings-xsettingsd-shutdown | 28 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 6229b2c..5c710f3 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -52,7 +52,9 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d $(INSTALL_PROGRAM) lib/x2go/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(INSTALL_PROGRAM) lib/x2go/extensions/pre-terminate.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ @@ -74,7 +76,8 @@ install_version: uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: - $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettingsd* + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettings-* + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/000_xsettings-* for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown new file mode 100644 index 0000000..fde8fe6 --- /dev/null +++ b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown @@ -0,0 +1,28 @@ +#!/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@ionic.de> + +export X2GO_SESSION="${1}" + +X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" +X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" +XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" + +kill "$(cat "${XSETTINGSD_PID}")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 423b43d85621eb976f51151385aa44e6b856ff59 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 17:51:20 2014 +0100 xsettings: fix default config file. --- x2goserver-xsettings/etc/xsettings.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2goserver-xsettings/etc/xsettings.conf b/x2goserver-xsettings/etc/xsettings.conf index 7920616..0ed952f 100644 --- a/x2goserver-xsettings/etc/xsettings.conf +++ b/x2goserver-xsettings/etc/xsettings.conf @@ -1,2 +1,2 @@ -/Gtk/MenuImages 1 -/Gtk/ButtonImages 1 +Gtk/MenuImages 1 +Gtk/ButtonImages 1 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 3db81349b43245d0aae33e123b790a54ebcd0a05 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 07:36:59 2014 +0100 xsettings: add manual page. --- .../man/man8/x2goserver-xsettings.8 | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 new file mode 100644 index 0000000..5181181 --- /dev/null +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 @@ -0,0 +1,39 @@ +.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0-preview" "X2Go Server Component" +.SH "DESCRIPTION" +\fBx2goserver-xsettings\fP is an \fBx2goserver\fP component providing support +for the \fIXSETTINGS\fP protocol\&. + +The \fIXSETTINGS\fP protocol as specified on +\fBhttp://standards\&.freedesktop\&.org/xsettings-spec/latest/\fP is a means for +desktop environments to store and apply settings globally for all applications +running in a specific context\&. + +It is designed to be lightweight and reactive with changes being propagated +instantly\&. + +This makes it a perfect fit for X2Go\&. + +Unfortunately, currently every desktop environment implements and provides its +own settings daemon\&. Settings are not being shared and changes are contained to +the very desktop environment they have been undertaken in\&. + +Thus, diverging settings for different desktop environments even on the same +system are very common\&. + +\fBx2goserver-xsettings\fP aims to provide generic solutions whenever possible\&. + +For this reason \fBxsettingsd\fP has been adopted as the tool of choice to +provide \fBXSETTINGS\fP support\&. It has no run time dependencies other than the +C++ run time it has been built against\&. Settings are read from a plain text +file\&. + +This package provides hooks for starting \fBxsettingsd\fP\&. +.SH "CONFIGURATION" +\fBxsettingsd\fP uses plain text files as configuration storage\&. A default +configuration handling issues with GTK-based applications is shipped as +\fI@@SYSCONFDIR@@/xsettings\&.conf\fP\&. Edit the file to suit your needs\&. + +More sophisticated configuration handling is scheduled to be implemented at a +later date and this documentation updated accordingly\&. +.SH "SEE ALSO" +\fIxsettingsd\fP(1) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d277e4f0d2616603d44ea1516f071b502453f15f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 04:36:30 2014 +0100 xsettings: add X2GO_XSETTINGS feature. --- .../x2gofeature.d/x2goserver-xsettings.features | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/x2goserver-xsettings/share/x2gofeature.d/x2goserver-xsettings.features b/x2goserver-xsettings/share/x2gofeature.d/x2goserver-xsettings.features new file mode 100755 index 0000000..74a4000 --- /dev/null +++ b/x2goserver-xsettings/share/x2gofeature.d/x2goserver-xsettings.features @@ -0,0 +1,33 @@ +#!/bin/bash + +# Copyright (C) 2007-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) 2011-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +# Copyright (C) 2011-2014 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + +X2GO_LIB_PATH="$(x2gopath libexec)"; + +${X2GO_LIB_PATH}/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +X2GO_FEATURE="${1}" + +# check for X2Go server core features +case "$X2GO_FEATURE" in + "X2GO_XSETTINGS") echo "ok"; exit 0;; + *) exit -1;; +esac -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d446d25359c6edd8de1f17b940ba6f53c2f6bf7d Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 18:19:05 2014 +0100 xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. --- x2goserver-xsettings/Makefile | 4 +++- ...erver-xsettings.8 => x2goserver-xsettings.8.in} | 0 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 5c710f3..741c79e 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -22,7 +22,8 @@ ETC_FILES=$(shell cd etc && echo *) LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) -man_pages = `cd man && find * -type f` +man_pages_pregen=$(shell cd man && find . -type "f" -name "*.in") +man_pages=$(shell cd man && find . -type "f" ! -name "*.in") MAN2HTML_BIN = $(shell which man2html) MAN2HTML_SRC = man @@ -40,6 +41,7 @@ build_man2html: if [ -n "$(MAN2HTML_BIN)" ]; then \ mkdir -p $(MAN2HTML_DEST); \ for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ + for man_page in $(man_pages_pregren); do sed -e 's,@@SYSCONFDIR@@,$(ETCDIR),' $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_SRC)/$${man_page%.in}; done; \ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ fi diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8 b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in similarity index 100% rename from x2goserver-xsettings/man/man8/x2goserver-xsettings.8 rename to x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 c2aa395f9d54f29f9eb3b4348c08ae3f6761f979 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 18:26:42 2014 +0100 xsettings: also delete pre-processed man pages in clean_man2html target. --- x2goserver-xsettings/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 741c79e..90ea411 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -48,7 +48,8 @@ build_man2html: clean: clean_man2html clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` + rm -rf $$(dirname $(MAN2HTML_DEST)) + for man_page in $(man_pages_pregen); do $(RM_FILE) $(MAN2HTML_SRC)/$${man_page%.in}; done install: install_scripts install_config install_man install_version -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 60c86fccbada49ab826a34666d19bb425ebc4c88 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 18:59:55 2014 +0100 xsettings: add incomplete merge function to startup script. --- .../post-start.d/900_xsettings-xsettingsd-startup | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 3a8cfff..09b48a0 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -19,6 +19,27 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> +merge() { + BASE_FILE="${1}" + OVERRIDES_FILE="${2}" + OUT_FILE="${3}" + + # Sanitizing input parameters. + # Yes, you CAN specify /dev/null for OVERRIDES_FILE or BASE_FILE. + [ -z "${OVERRIDES_FILE}" -o ! -r "${OVERRIDES_FILE}" ] && return 1 + [ -z "${BASE_FILE}" -o ! -r "${BASE_FILE}" ] && return 1 + [ -z "${OUT_FILE}" ] && return 1 + if [ ! -f "${OUT_FILE}" ]; then + touch "${OUT_FILE}" || return 1 + elif [ ! -w "${OUT_FILE}" ]; then + return 1 + fi + + # All checks passed. We have readable input files and a writeable output file. + # Go for launch. + : real implementation goes here... +} + export X2GO_SESSION="${1}" X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d9a28b6f49905374d809fca6783a1287e2513815 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 00:58:58 2014 +0100 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. --- .../post-start.d/900_xsettings-xsettingsd-startup | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index b48a8eb..02d030c 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -31,6 +31,16 @@ sanitize_line() { echo "${INPUT}" | sed -e 's/^[[:blank:]]*//' -e 's/#.*//' } +# Returns the key. +# Is supposed to be used on sanitized input lines only. +extract_key() { + INPUT="${1}" + + [ -z "${INPUT}" ] && echo "" + + echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/' +} + merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 acd5210328fbe401b844c79119120d3b06d871a0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 00:57:36 2014 +0100 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. --- .../post-start.d/900_xsettings-xsettingsd-startup | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 09b48a0..b48a8eb 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -19,6 +19,18 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> +# Removes redundant white space and comments. +# Note that in-line comments are supported. +# Comments start with a hash and everything succeeding, as well as the hash character +# itself will be removed. +sanitize_line() { + INPUT="${1}" + + [ -z "${INPUT}" ] && echo "" + + echo "${INPUT}" | sed -e 's/^[[:blank:]]*//' -e 's/#.*//' +} + merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 639a45c12b3ff695ced63d11a4ac9195f3169cf7 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:02:14 2014 +0100 xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. --- .../post-start.d/900_xsettings-xsettingsd-startup | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 031aae8..9fad786 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -77,7 +77,18 @@ merge() { # All checks passed. We have readable input files and a writeable output file. # Go for launch. - : real implementation goes here... + while read line; do + parsed_line="$(sanitize_line "${line}")" + [ -z "${parsed_line}" ] && continue + + key="$(extract_key "${parsed_line}")" + value="$(extract_value "${parsed_line}")" + [ -z "${key}" ] && continue + [ -z "${value}" ] && continue + + echo "${key}" >> "${TMP_KEY}" + echo "${key} ${value}" >> "${TMP_KEYVALUE}" + done < "${OVERRIDES_FILE}" } export X2GO_SESSION="${1}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 84c73e88e11f49fbc71b9473fb4fa838f8282e72 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:00:44 2014 +0100 xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. --- .../post-start.d/900_xsettings-xsettingsd-startup | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 3d159b5..031aae8 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -55,6 +55,7 @@ merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" OUT_FILE="${3}" + SESSION_DIR="${4}" # Sanitizing input parameters. # Yes, you CAN specify /dev/null for OVERRIDES_FILE or BASE_FILE. @@ -66,6 +67,13 @@ merge() { elif [ ! -w "${OUT_FILE}" ]; then return 1 fi + [ -z "${SESSION_DIR}" ] && return 1 + + TMP_KEY="${SESSION_DIR}/xsettings-merge.k" + TMP_KEYVALUE="${SESSION_DIR}/xsettings-merge.kv" + + touch "${TMP_KEY}" || return 1 + touch "${TMP_KEYVALUE}" || return 1 # All checks passed. We have readable input files and a writeable output file. # Go for launch. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 2ee1acdc7331da808851f87145b8c7c7bd8c967e Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 00:59:58 2014 +0100 xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. --- .../post-start.d/900_xsettings-xsettingsd-startup | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 02d030c..3d159b5 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -41,6 +41,16 @@ extract_key() { echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/' } +# Returns the value. +# Is supposed to be used on sanitized input lines only. +extract_value() { + INPUT="${1}" + + [ -z "${INPUT}" ] && echo "" + + echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/' +} + merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 6498f61c3339348075f853f06d559477df3335e7 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:05:55 2014 +0100 xsettings: filter out overriden keys. Add the rest to the second temporary file. --- .../post-start.d/900_xsettings-xsettingsd-startup | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 5649a31..366d112 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -99,6 +99,13 @@ merge() { value="$(extract_value "${parsed_line}")" [ -z "${key}" ] && continue [ -z "${value}" ] && continue + + # Filter out keys already defined in the parsed overrides file. + while read overrides_key; do + [ -n "${overrides_key}" ] && [ "${key}" = "${overrides_key}" ] && continue 2 + done < "${TMP_KEY}" + + echo "${key} ${value}" >> "${TMP_KEYVALUE}" done < "${BASE_FILE}" } -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 ecbaadf42fcbab279d267b17a7834c78c3444088 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:04:06 2014 +0100 xsettings: add loop through base file extracting key-value pairs. --- .../post-start.d/900_xsettings-xsettingsd-startup | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 9fad786..5649a31 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -89,6 +89,17 @@ merge() { echo "${key}" >> "${TMP_KEY}" echo "${key} ${value}" >> "${TMP_KEYVALUE}" done < "${OVERRIDES_FILE}" + + # Code duplication, but this part is actually specialized. + while read line; do + parsed_line="$(sanitize_line "${line}")" + [ -z "${parsed_line}" ] && continue + + key="$(extract_key "${parsed_line}")" + value="$(extract_value "${parsed_line}")" + [ -z "${key}" ] && continue + [ -z "${value}" ] && continue + done < "${BASE_FILE}" } export X2GO_SESSION="${1}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 2fb498623377dc62d78b956a9e1ef2ee555a3451 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:12:00 2014 +0100 xsettings: use out file directly, no need for a second temp file. --- .../post-start.d/900_xsettings-xsettingsd-startup | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 366d112..ee5f52f 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -73,7 +73,6 @@ merge() { TMP_KEYVALUE="${SESSION_DIR}/xsettings-merge.kv" touch "${TMP_KEY}" || return 1 - touch "${TMP_KEYVALUE}" || return 1 # All checks passed. We have readable input files and a writeable output file. # Go for launch. @@ -87,7 +86,7 @@ merge() { [ -z "${value}" ] && continue echo "${key}" >> "${TMP_KEY}" - echo "${key} ${value}" >> "${TMP_KEYVALUE}" + echo "${key} ${value}" >> "${OUT_FILE}" done < "${OVERRIDES_FILE}" # Code duplication, but this part is actually specialized. @@ -105,7 +104,7 @@ merge() { [ -n "${overrides_key}" ] && [ "${key}" = "${overrides_key}" ] && continue 2 done < "${TMP_KEY}" - echo "${key} ${value}" >> "${TMP_KEYVALUE}" + echo "${key} ${value}" >> "${OUT_FILE}" done < "${BASE_FILE}" } -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 9244684a2c7f4460731deaaa340a3e5d13ba0320 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:21:38 2014 +0100 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index b3e79ac..a802e26 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -117,6 +117,8 @@ XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" +XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go.conf" +XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 134d82afb5d05386e0445e0591ad046cb9b9436e Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:20:47 2014 +0100 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index ee5f52f..b3e79ac 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -115,7 +115,7 @@ X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" X2GO_CONF_DIR="$(x2gopath etc)" XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" -XSETTINGSD_USER_CONF="${X2GO_SESSION_DIR}/xsettings.conf" +XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 e5f3662107737b58ec450594a574d062fbbbc83f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:25:49 2014 +0100 xsettings: use merge shell function to merge the determined base config with the overrides config. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index ff93fb7..9468359 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -125,4 +125,6 @@ export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9 XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}" [ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}" +merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" + nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 e44bfdc4306c44d03f330df115607a13c8468762 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:23:40 2014 +0100 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. --- .../post-start.d/900_xsettings-xsettingsd-startup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index a802e26..ff93fb7 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -122,6 +122,7 @@ XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -[ -r "${XSETTINGSD_USER_CONF}" ] && XSETTINGSD_CONF="${XSETTINGSD_USER_CONF}" || XSETTINGSD_CONF="${XSETTINGSD_DEFAULT_CONF}" +XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}" +[ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 3a6f39bef061718bf0d2bda0f383c5765a7c66ac Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:29:18 2014 +0100 xsettings: remove .conf suffix from xsettingsd config files. --- x2goserver-xsettings/Makefile | 4 ++-- x2goserver-xsettings/README.md | 2 +- .../post-start.d/900_xsettings-xsettingsd-startup | 8 ++++---- .../man/man8/x2goserver-xsettings.8.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index 90ea411..b3facbc 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -63,7 +63,7 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/xsettings.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_FILE) etc/xsettings $(DESTDIR)$(ETCDIR)/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -84,7 +84,7 @@ uninstall_scripts: for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings.conf + $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings uninstall_man: for file in man/man8/*.8; do $(RM_FILE) $(DESTDIR)$(MANDIR)/$${file#man}.gz; done diff --git a/x2goserver-xsettings/README.md b/x2goserver-xsettings/README.md index 90d009d..375aa55 100644 --- a/x2goserver-xsettings/README.md +++ b/x2goserver-xsettings/README.md @@ -3,7 +3,7 @@ This folder contains scripts and default settings to enable the use of the XSETT * etc - contains the default xsettings.conf file + contains the default xsettings file * lib diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 9468359..492834f 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -115,10 +115,10 @@ X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" X2GO_CONF_DIR="$(x2gopath etc)" XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" -XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" -XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" -XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go.conf" -XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" +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")" diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in index 5181181..4632f44 100644 --- a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in @@ -31,7 +31,7 @@ This package provides hooks for starting \fBxsettingsd\fP\&. .SH "CONFIGURATION" \fBxsettingsd\fP uses plain text files as configuration storage\&. A default configuration handling issues with GTK-based applications is shipped as -\fI@@SYSCONFDIR@@/xsettings\&.conf\fP\&. Edit the file to suit your needs\&. +\fI@@SYSCONFDIR@@/xsettings\fP\&. Edit the file to suit your needs\&. More sophisticated configuration handling is scheduled to be implemented at a later date and this documentation updated accordingly\&. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 856bb66df64ab208c95c557c7fef84c9f1082f24 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:39:48 2014 +0100 xsettings: add comment explaining the merge shell function and its requirements. --- .../post-start.d/900_xsettings-xsettingsd-startup | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 492834f..0baeadb 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -51,6 +51,13 @@ extract_value() { echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/' } +# Merge a base file with a overrides file and write the result to an out file. +# For keys which are both in the base and overrides file, the overrides file +# takes precedence. +# Keys only specified in one of the files will be copied to the out file. +# Both the base and overrides files MUST exist and be readable. +# The out file MAY exist. The base directory of this file MUST be writeable. +# If the out file does not exist, it will be created. merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 542d063597c5c621c8336a8cc721ebce3210fbec Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:57:15 2014 +0100 xsettings: rename xsettings.conf previously missed. --- .../etc/{xsettings.conf => xsettings} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/x2goserver-xsettings/etc/xsettings.conf b/x2goserver-xsettings/etc/xsettings similarity index 100% rename from x2goserver-xsettings/etc/xsettings.conf rename to x2goserver-xsettings/etc/xsettings -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d3d4ab08a980d43fcb965e7f8a3673b865dfba0c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:53:11 2014 +0100 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. --- .../post-start.d/900_xsettings-xsettingsd-startup | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 0baeadb..eb8885a 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -132,6 +132,14 @@ export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9 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}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 8e38700fe9ec4ae6cc4656092ce893d6147d35a2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 03:33:53 2014 +0100 xsettings: documentation update, describe the newly implemented features. --- .../man/man8/x2goserver-xsettings.8.in | 38 +++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in index 4632f44..c9b08d0 100644 --- a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in @@ -1,4 +1,4 @@ -.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0-preview" "X2Go Server Component" +.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0\&-preview" "X2Go Server Component" .SH "DESCRIPTION" \fBx2goserver-xsettings\fP is an \fBx2goserver\fP component providing support for the \fIXSETTINGS\fP protocol\&. @@ -24,16 +24,38 @@ system are very common\&. For this reason \fBxsettingsd\fP has been adopted as the tool of choice to provide \fBXSETTINGS\fP support\&. It has no run time dependencies other than the -C++ run time it has been built against\&. Settings are read from a plain text +C++ runtime it has been built against\&. Settings are read from a plain text file\&. This package provides hooks for starting \fBxsettingsd\fP\&. .SH "CONFIGURATION" -\fBxsettingsd\fP uses plain text files as configuration storage\&. A default -configuration handling issues with GTK-based applications is shipped as -\fI@@SYSCONFDIR@@/xsettings\fP\&. Edit the file to suit your needs\&. - -More sophisticated configuration handling is scheduled to be implemented at a -later date and this documentation updated accordingly\&. +\fBxsettingsd\fP uses plain text files as configuration storage\&. + +The files taken into consideration depend upon the client system. +.IP \[bu] 2 +UNIX-like systems +.RS +On UNIX-like systems already using the X server as their main display server, +the user's current \fIXSETTINGS\fP will be transfered to the X2Go server by the +client application and used as the base configuration\&. This assumes that a +working xsettings configuration daemon is already running. If this not the +case, the behavior will be similar to Windows and OS X systems\&. +.RE +.IP \[bu] +Windows and OS X systems +.RS +As those systems do not use the X server as their main display server, no user +configuration will be transfered to the server. The base configuration will be +determined by the default configuration file shipped by X2Go as +\fI@@SYSCONFDIR@@/xsettings\fP\&. The shipped default configuration handles +issues with GTK\&-based applications by providing sane defaults\&. It may be +modified by a system administrator\&. +.RE + +All settings can be overridden per-user via a custom file +\fI$HOME/\&.xsettings\&-x2go\fP\&. If it does not exist, this file will be +created automatically the first time a session is started\&. The generated file +will only contain comments describing what it is used for and when it was +created\&. .SH "SEE ALSO" \fIxsettingsd\fP(1) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 72e33405e45486204bfa55ebc070a10ad5cfa2a9 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 04:47:21 2014 +0100 xsettings: add x2goserver-xsettings package to debian/control. --- debian/control | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/debian/control b/debian/control index a578777..194b7a3 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,7 @@ Recommends: xinit, x2goserver-extensions (>= ${source:Version}), x2goserver-extensions (<< ${source:Version}.1~), x2goserver-xsession (>= ${source:Version}), x2goserver-xsession (<< ${source:Version}.1~), + x2goserver-xsettings (>= ${source:Version}), x2goserver-xsettings (<< ${source:Version}.1~), x2goserver-fmbindings (>= ${source:Version}), x2goserver-fmbindings (<< ${source:Version}.1~), x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~), Suggests: @@ -244,6 +245,25 @@ Description: X2Go Server (Xsession runner) startups and many more Xsession related features on X2Go session login automagically. +Package: x2goserver-xsettings +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), + xsettingsd, +Description: X2Go Server (XSETTINGS support) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This X2Go Server add-on enables support for the XSETTINGS protocol + via the xsettingsd configuration daemon. For Linux clients, it provides + seamless support for the user's current settings. + Package: x2goserver-fmbindings Architecture: all Depends: -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 adad8d714a39e4931cb5a294c5e9764b5dc51954 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 04:46:44 2014 +0100 xsettings: spell XSETTINGS in uppercase in RPM spec file. --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index efd52c2..0ee7f23 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -453,7 +453,7 @@ corresponding desktop shell: - under MATE by x2gomatebindings %package xsettings -Summary: X2Go Server (Xsettings support) +Summary: X2Go Server (XSETTINGS support) Requires: %{name} = %{version}-%{release} Requires: xsettingsd %if 0%{?fedora} || 0%{?rhel} -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 2c5408280f2390a0f3e42c2bca1ecff36af08ffe Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 03:54:16 2014 +0100 xsettings: change RPM spec file to include the new x2goserver-xsettings package. --- x2goserver.spec | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index 8278916..efd52c2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -131,7 +131,8 @@ Requires(post): perl-X2Go-Server-DB Requires(post): x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession -#Recommends: x2goserver-fmbindings +Requires: x2goserver-xsettings +#Recommands: x2goserver-fmbindings #Recommends: x2goserver-printing %{?perl_default_filter} @@ -451,6 +452,28 @@ corresponding desktop shell: - under KDE4 by plasma-widget-x2go - under MATE by x2gomatebindings +%package xsettings +Summary: X2Go Server (Xsettings support) +Requires: %{name} = %{version}-%{release} +Requires: xsettingsd +%if 0%{?fedora} || 0%{?rhel} +Group: Applications/Communications +%else +Group: Productivity/Networking/Remote Desktop +%endif +%description xsettings +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This X2Go Server add-on enables support for the XSETTINGS protocol +via the xsettingsd configuration daemon. For Linux clients, it provides +seamless support for the user's current settings. + %prep %setup -q @@ -800,5 +823,10 @@ fi %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features %{_datadir}/x2go/versions/VERSION.x2goserver-xsession +#files xsettings +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/x2go/xsettings +%{_datadir}/x2go/x2gofeature.d/x2goserver-xsettings.features +%{_datadir}/x2go/versions/VERSION.x2goserver-xsettings %changelog -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 48269e880c9e1ad81df3963abb49b696c7cb3041 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 05:00:13 2014 +0100 xsettings: add debian/x2goserver-xsettings.dirs. --- debian/x2goserver-xsettings.dirs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/x2goserver-xsettings.dirs b/debian/x2goserver-xsettings.dirs new file mode 100644 index 0000000..70259d4 --- /dev/null +++ b/debian/x2goserver-xsettings.dirs @@ -0,0 +1,4 @@ +etc/x2go +usr/lib/x2go +usr/share/x2go +usr/share/x2go/versions -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 7107de612270b8a098a8e72092f7fb16cab9e623 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 04:48:01 2014 +0100 xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2441b6e..c81b64b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -170,6 +170,17 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Change deprecated and removed PreReq to Requires(pre) header. - Move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) + - Add new x2goserver-xsettings package. + * Add new x2goserver-xsettings package: + - Add Makefile. + - Add new x2goserver-xsettings feature. + - Add new manpage for x2goserver-xsettings. + - Add default config file. + - Add hooks for starting and stopping xsettingsd. + * x2goserver.spec: + - Add x2goserver-settings package. + * debian/control: + - Add x2goserver-xsettings package. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 May 2014 13:06:24 +0200 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 fec236135e1b1e668c0a195a9375c1fa5c57356a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 05:00:43 2014 +0100 xsettings: add debian/x2goserver-xsettings.install. --- debian/x2goserver-xsettings.install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/x2goserver-xsettings.install b/debian/x2goserver-xsettings.install new file mode 100644 index 0000000..8497989 --- /dev/null +++ b/debian/x2goserver-xsettings.install @@ -0,0 +1,4 @@ +x2goserver-xsettings/etc/* /etc/x2go/ +x2goserver-xsettings/VERSION.x2goserver-extensions /usr/share/x2go/versions/ +x2goserver-xsettings/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ +x2goserver-xsettings/lib/* /usr/lib/x2go/ -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 0def3510b7929555beb0b1e333f7432a059f0786 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 05:00:55 2014 +0100 xsettings: add debian/x2goserver-xsettings.manpages. --- debian/x2goserver-xsettings.manpages | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/x2goserver-xsettings.manpages b/debian/x2goserver-xsettings.manpages new file mode 100644 index 0000000..43bdbdb --- /dev/null +++ b/debian/x2goserver-xsettings.manpages @@ -0,0 +1 @@ +x2goserver-xsettings/man/man8/* \ No newline at end of file -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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@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@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
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 d2db0ea9815e7fbfa2e2676e3351c7629029b135 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 18:53:12 2014 +0100 x2goserver: add generic typo and whitespace fixes comment to debian/changelog. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 30ee01c..e7d9f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -179,6 +179,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Add hooks for starting and stopping xsettingsd. - x2gopath now knows the 'etc' component -- generated at build time out of the ETCDIR Makefile directive. + - Various typo and whitespace fixes across components. * x2goserver.spec: - Add x2goserver-settings package. * debian/control: -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 b0516e840f9717cce3eaf82d5d0dcd351bb55b2d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 17:17:37 2014 +0100 x2goserver: add x2gopath etc addition to debian/changelog. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index c81b64b..30ee01c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -177,6 +177,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Add new manpage for x2goserver-xsettings. - Add default config file. - Add hooks for starting and stopping xsettingsd. + - x2gopath now knows the 'etc' component -- generated at build time out of + the ETCDIR Makefile directive. * x2goserver.spec: - Add x2goserver-settings package. * debian/control: -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 16ff8080593d306711464af27046a002f3b2be17 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 19:30:13 2014 +0100 extensions: add data directory in hooks directory used for shared data/programs/scripts. --- debian/changelog | 2 ++ x2goserver-extensions/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e7d9f30..6607ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -180,6 +180,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - x2gopath now knows the 'etc' component -- generated at build time out of the ETCDIR Makefile directive. - Various typo and whitespace fixes across components. + - Add data directory in x2goserver-extensions. Shared data (e.g., shell + scripts) can be put there. * x2goserver.spec: - Add x2goserver-settings package. * debian/control: diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 3648a92..7386522 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -53,6 +53,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/data $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d @@ -71,6 +72,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_FILE) lib/extensions/data/.placeholder $(DESTDIR)$(LIBDIR)/extensions/data/ $(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ $(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ $(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ @@ -105,7 +107,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/data/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/.placeholder @@ -121,6 +123,7 @@ uninstall_scripts: $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d/.placeholder + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/data/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ @@ -136,6 +139,7 @@ uninstall_scripts: $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d/ + $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: diff --git a/x2goserver-extensions/lib/extensions/data/.placeholder b/x2goserver-extensions/lib/extensions/data/.placeholder new file mode 100644 index 0000000..e69de29 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 8cfbf8e75ba0cdf3f011ba2596f02f02f8e421fe Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 19:56:17 2014 +0100 extensions: add "data" directory to man page. --- .../man/man8/x2goserver-run-extensions.8 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index d61731f..51f0302 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Jan 2013" "Version 4.1.0.0-preview" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Nov 2014" "Version 4.1.0.0-preview" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS @@ -68,12 +68,19 @@ The following table shows the available modalities, the calling scripts and the post-terminate extensions/post-terminate.d/ fail-terminate extensions/fail-terminate.d/ +.PP +An exception to this forms the \fIdata\fR directory. This is not a modality, +but a place for storing shared data, like scripts used by multiple modality +scripts. .TP \fIIMPORTANT:\fR When providing X2Go Server extensions by this mechanism, please pretty well make sure that extension scripts you place in either of the above folders do under no circumstance fail during execution. Return codes are ignored and failures are therefore not (yet) propagated. .SH EXECUTION OF EXTENSIONS -Scripts (or binaries) that have been placed into one of the pre/post/fail modality folders (see above) are executed in alpha-numerical sorting order. +Scripts (or binaries) that have been placed into one of the pre/post/fail +modality folders (see above) are executed in alpha-numerical sorting order. +Scripts may call or otherwise utilize shared components in the \fIdata\fR +directory. .PP Extensions will only get executed if their file names start with three digits followed by an underscore character. This restriction is in place to make sure that X2Go Server extensions get executed in the correct/wanted order: -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d777c252361dc417078b8dd7fd9f158a2d4db0db Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 23:12:07 2014 +0100 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. --- .../x2goserver-xsettings-common.sh} | 13 +-- .../post-resume.d/900_xsettings-xsettingsd-refresh | 19 +--- .../post-start.d/900_xsettings-xsettingsd-startup | 114 +------------------- .../000_xsettings-xsettingsd-shutdown | 4 +- 4 files changed, 8 insertions(+), 142 deletions(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh similarity index 89% copy from x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup copy to x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh index eb8885a..a65102d 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh @@ -115,20 +115,13 @@ merge() { done < "${BASE_FILE}" } -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" +SETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" 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}" @@ -139,7 +132,3 @@ if [ ! -f "${XSETTINGSD_OVERRIDES_CONF}" ]; then 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}" - -nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" 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 index 9748f23..e94997e 100644 --- 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 @@ -19,32 +19,17 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -. SOMEPLACE/x2goserver-xsettings-common.sh +X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" +. ${X2GO_EXTENSIONS_BASE}/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}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index eb8885a..b62d26b 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -19,127 +19,17 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -# Removes redundant white space and comments. -# Note that in-line comments are supported. -# Comments start with a hash and everything succeeding, as well as the hash character -# itself will be removed. -sanitize_line() { - INPUT="${1}" - - [ -z "${INPUT}" ] && echo "" - - echo "${INPUT}" | sed -e 's/^[[:blank:]]*//' -e 's/#.*//' -} - -# Returns the key. -# Is supposed to be used on sanitized input lines only. -extract_key() { - INPUT="${1}" - - [ -z "${INPUT}" ] && echo "" - - echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/' -} - -# Returns the value. -# Is supposed to be used on sanitized input lines only. -extract_value() { - INPUT="${1}" - - [ -z "${INPUT}" ] && echo "" - - echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/' -} - -# Merge a base file with a overrides file and write the result to an out file. -# For keys which are both in the base and overrides file, the overrides file -# takes precedence. -# Keys only specified in one of the files will be copied to the out file. -# Both the base and overrides files MUST exist and be readable. -# The out file MAY exist. The base directory of this file MUST be writeable. -# If the out file does not exist, it will be created. -merge() { - BASE_FILE="${1}" - OVERRIDES_FILE="${2}" - OUT_FILE="${3}" - SESSION_DIR="${4}" - - # Sanitizing input parameters. - # Yes, you CAN specify /dev/null for OVERRIDES_FILE or BASE_FILE. - [ -z "${OVERRIDES_FILE}" -o ! -r "${OVERRIDES_FILE}" ] && return 1 - [ -z "${BASE_FILE}" -o ! -r "${BASE_FILE}" ] && return 1 - [ -z "${OUT_FILE}" ] && return 1 - if [ ! -f "${OUT_FILE}" ]; then - touch "${OUT_FILE}" || return 1 - elif [ ! -w "${OUT_FILE}" ]; then - return 1 - fi - [ -z "${SESSION_DIR}" ] && return 1 - - TMP_KEY="${SESSION_DIR}/xsettings-merge.k" - TMP_KEYVALUE="${SESSION_DIR}/xsettings-merge.kv" - - touch "${TMP_KEY}" || return 1 - - # All checks passed. We have readable input files and a writeable output file. - # Go for launch. - while read line; do - parsed_line="$(sanitize_line "${line}")" - [ -z "${parsed_line}" ] && continue - - key="$(extract_key "${parsed_line}")" - value="$(extract_value "${parsed_line}")" - [ -z "${key}" ] && continue - [ -z "${value}" ] && continue - - echo "${key}" >> "${TMP_KEY}" - echo "${key} ${value}" >> "${OUT_FILE}" - done < "${OVERRIDES_FILE}" - - # Code duplication, but this part is actually specialized. - while read line; do - parsed_line="$(sanitize_line "${line}")" - [ -z "${parsed_line}" ] && continue - - key="$(extract_key "${parsed_line}")" - value="$(extract_value "${parsed_line}")" - [ -z "${key}" ] && continue - [ -z "${value}" ] && continue - - # Filter out keys already defined in the parsed overrides file. - while read overrides_key; do - [ -n "${overrides_key}" ] && [ "${key}" = "${overrides_key}" ] && continue 2 - done < "${TMP_KEY}" - - echo "${key} ${value}" >> "${OUT_FILE}" - done < "${BASE_FILE}" -} +X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" +. ${X2GO_EXTENSIONS_BASE}/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_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" -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}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown index fde8fe6..8789ae1 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown +++ b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown @@ -19,10 +19,12 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> +X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" +. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh + export X2GO_SESSION="${1}" X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" -XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" kill "$(cat "${XSETTINGSD_PID}")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 2f07be528e16a1f219ee2e93423a2daec5bc3226 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 23:38:17 2014 +0100 extensions: add data/common.sh, providing commonly used variables. --- debian/changelog | 2 ++ x2goserver-extensions/Makefile | 2 ++ .../lib/extensions/data/common.sh | 6 ++---- .../extensions/base/x2goserver-xsettings-common.sh | 3 +++ .../post-resume.d/900_xsettings-xsettingsd-refresh | 8 -------- .../post-start.d/900_xsettings-xsettingsd-startup | 8 -------- .../000_xsettings-xsettingsd-shutdown | 5 ----- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6607ef9..6ae4837 100644 --- a/debian/changelog +++ b/debian/changelog @@ -182,6 +182,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low - Various typo and whitespace fixes across components. - Add data directory in x2goserver-extensions. Shared data (e.g., shell scripts) can be put there. + - Add data/common.sh in x2goserver-extensions. Provides commonly used + variables. * x2goserver.spec: - Add x2goserver-settings package. * debian/control: diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 7386522..7ccdd76 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -72,6 +72,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_FILE) lib/extensions/data/common.sh $(DESTDIR)$(LIBDIR)/extensions/data/ $(INSTALL_FILE) lib/extensions/data/.placeholder $(DESTDIR)$(LIBDIR)/extensions/data/ $(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ $(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ @@ -107,6 +108,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/data/common.sh $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/data/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-extensions/lib/extensions/data/common.sh similarity index 86% copy from x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown copy to x2goserver-extensions/lib/extensions/data/common.sh index 8789ae1..1e08511 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown +++ b/x2goserver-extensions/lib/extensions/data/common.sh @@ -19,12 +19,10 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" -. ${X2GO_EXTENSIONS_BASE}/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)" -kill "$(cat "${XSETTINGSD_PID}")" +export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" diff --git a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh index a65102d..241c0c6 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh +++ b/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh @@ -19,6 +19,9 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> +X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" +. ${X2GO_EXTENSIONS_BASE}/common.sh + # Removes redundant white space and comments. # Note that in-line comments are supported. # Comments start with a hash and everything succeeding, as well as the hash character 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 index e94997e..db8fccd 100644 --- 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 @@ -22,14 +22,6 @@ X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" . ${X2GO_EXTENSIONS_BASE}/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)" - -export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" - merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" kill -s HUP "${XSETTINGSD_PID}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index b62d26b..5fb50df 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -22,14 +22,6 @@ X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" . ${X2GO_EXTENSIONS_BASE}/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)" - -export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" - merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown index 8789ae1..762ff64 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown +++ b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown @@ -22,9 +22,4 @@ X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" . ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh -export X2GO_SESSION="${1}" - -X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" -X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" - kill "$(cat "${XSETTINGSD_PID}")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 a59510a2e8f0a0510a4e7d362deb344e79430f0d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 23:42:40 2014 +0100 xsettings: add missing post-resume.d targets to Makefile. --- x2goserver-xsettings/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile index b3facbc..b0f7be4 100755 --- a/x2goserver-xsettings/Makefile +++ b/x2goserver-xsettings/Makefile @@ -55,8 +55,10 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d $(INSTALL_PROGRAM) lib/x2go/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ + $(INSTALL_PROGRAM) lib/x2go/extensions/post-resume.d/* $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/ $(INSTALL_PROGRAM) lib/x2go/extensions/pre-terminate.d/* $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ @@ -80,6 +82,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettings-* + $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/900_xsettings-* $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/000_xsettings-* for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 b9b1e4384fc1b574f042b3d6ff67899cd366e3d1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 23:55:53 2014 +0100 xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. --- debian/x2goserver-xsettings.install | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/x2goserver-xsettings.install b/debian/x2goserver-xsettings.install index 8497989..34e4468 100644 --- a/debian/x2goserver-xsettings.install +++ b/debian/x2goserver-xsettings.install @@ -1,4 +1,3 @@ x2goserver-xsettings/etc/* /etc/x2go/ x2goserver-xsettings/VERSION.x2goserver-extensions /usr/share/x2go/versions/ x2goserver-xsettings/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ -x2goserver-xsettings/lib/* /usr/lib/x2go/ -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 36cf705d5ccfb9446747e75019b931bf72ba235a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 23:58:14 2014 +0100 xsettings: rename faulty "base" to "data". --- .../{base => data}/x2goserver-xsettings-common.sh | 4 ++-- .../post-resume.d/900_xsettings-xsettingsd-refresh | 4 ++-- .../post-start.d/900_xsettings-xsettingsd-startup | 4 ++-- .../000_xsettings-xsettingsd-shutdown | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh similarity index 97% rename from x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh rename to x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh index 241c0c6..def71b9 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh +++ b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh @@ -19,8 +19,8 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" -. ${X2GO_EXTENSIONS_BASE}/common.sh +X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" +. ${X2GO_EXTENSIONS_DATA}/common.sh # Removes redundant white space and comments. # Note that in-line comments are supported. 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 index db8fccd..be3728c 100644 --- 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 @@ -19,8 +19,8 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" -. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh +X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" +. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 5fb50df..3e42ea6 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -19,8 +19,8 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" -. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh +X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" +. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown index 762ff64..f54ab3c 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown +++ b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown @@ -19,7 +19,7 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> -X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/" -. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh +X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" +. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh kill "$(cat "${XSETTINGSD_PID}")" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 567cc6b709bc5f5740482ca2c6753171f75fc6a7 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 25 01:02:51 2014 +0100 xsettings: fix speling errors in POSIX BRE character classes. --- .../extensions/data/x2goserver-xsettings-common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh index 3f4de3b..9d53864 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh +++ b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh @@ -41,7 +41,7 @@ x2goserver_xsettings_extract_key() { [ -z "${INPUT}" ] && echo "" - echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/' + echo "${INPUT}" | sed -e 's/^\([^[:blank:]]*\)[[:blank:]].*$/\1/' } # Returns the value. @@ -51,7 +51,7 @@ x2goserver_xsettings_extract_value() { [ -z "${INPUT}" ] && echo "" - echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/' + echo "${INPUT}" | sed -e 's/^[^[:blank:]]*[[:blank:]][[:blank:]]*\([^[:blank:]]*\).*$/\1/' } # Merge a base file with a overrides file and write the result to an out file. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 2ee5126e2855e5ba3051d918ee527c8115d439bc Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 25 01:01:42 2014 +0100 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. --- .../extensions/data/x2goserver-xsettings-common.sh | 20 ++++++++++---------- .../post-resume.d/900_xsettings-xsettingsd-refresh | 2 +- .../post-start.d/900_xsettings-xsettingsd-startup | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh index def71b9..3f4de3b 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh +++ b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh @@ -26,7 +26,7 @@ X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" # Note that in-line comments are supported. # Comments start with a hash and everything succeeding, as well as the hash character # itself will be removed. -sanitize_line() { +x2goserver_xsettings_sanitize_line() { INPUT="${1}" [ -z "${INPUT}" ] && echo "" @@ -36,7 +36,7 @@ sanitize_line() { # Returns the key. # Is supposed to be used on sanitized input lines only. -extract_key() { +x2goserver_xsettings_extract_key() { INPUT="${1}" [ -z "${INPUT}" ] && echo "" @@ -46,7 +46,7 @@ extract_key() { # Returns the value. # Is supposed to be used on sanitized input lines only. -extract_value() { +x2goserver_xsettings_extract_value() { INPUT="${1}" [ -z "${INPUT}" ] && echo "" @@ -61,7 +61,7 @@ extract_value() { # Both the base and overrides files MUST exist and be readable. # The out file MAY exist. The base directory of this file MUST be writeable. # If the out file does not exist, it will be created. -merge() { +x2goserver_xsettings_merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" OUT_FILE="${3}" @@ -87,11 +87,11 @@ merge() { # All checks passed. We have readable input files and a writeable output file. # Go for launch. while read line; do - parsed_line="$(sanitize_line "${line}")" + parsed_line="$(x2goserver_xsettings_sanitize_line "${line}")" [ -z "${parsed_line}" ] && continue - key="$(extract_key "${parsed_line}")" - value="$(extract_value "${parsed_line}")" + key="$(x2goserver_xsettings_extract_key "${parsed_line}")" + value="$(x2goserver_xsettings_extract_value "${parsed_line}")" [ -z "${key}" ] && continue [ -z "${value}" ] && continue @@ -101,11 +101,11 @@ merge() { # Code duplication, but this part is actually specialized. while read line; do - parsed_line="$(sanitize_line "${line}")" + parsed_line="$(x2goserver_xsettings_sanitize_line "${line}")" [ -z "${parsed_line}" ] && continue - key="$(extract_key "${parsed_line}")" - value="$(extract_value "${parsed_line}")" + key="$(x2goserver_xsettings_extract_key "${parsed_line}")" + value="$(x2goserver_xsettings_extract_value "${parsed_line}")" [ -z "${key}" ] && continue [ -z "${value}" ] && continue 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 index be3728c..1ad5797 100644 --- 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 @@ -22,6 +22,6 @@ X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" . ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh -merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" +x2goserver_xsettings_merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" kill -s HUP "${XSETTINGSD_PID}" diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup index 3e42ea6..b0e2201 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup +++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup @@ -22,6 +22,6 @@ X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/" . ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh -merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" +x2goserver_xsettings_merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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 d837d540c17afc475be3d5b358eac6f71a3dc937 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 25 01:13:37 2014 +0100 xsettings: remove temporary file in x2goserver_xsettings_merge. --- .../extensions/data/x2goserver-xsettings-common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh index 9d53864..92369d5 100644 --- a/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh +++ b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh @@ -116,6 +116,8 @@ x2goserver_xsettings_merge() { echo "${key} ${value}" >> "${OUT_FILE}" done < "${BASE_FILE}" + + rm "${TMP_KEY}" } SETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org