This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 9fc1e56 x2goserver: add x2gopath etc addition to debian/changelog. new bbf8952 x2goserver: add generic typo and whitespace fixes comment to debian/changelog. new 2f134cc extensions: add data directory in hooks directory used for shared data/programs/scripts. new 7645635 extensions: add "data" directory to man page. The 3 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 | 3 +++ x2goserver-extensions/Makefile | 6 +++++- .../{fail-resume.d => data}/.placeholder | 0 .../man/man8/x2goserver-run-extensions.8 | 11 +++++++++-- 4 files changed, 17 insertions(+), 3 deletions(-) copy x2goserver-extensions/lib/extensions/{fail-resume.d => data}/.placeholder (100%) -- Alioth's /srv/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 x2goserver-xsettings in repository x2goserver. commit bbf8952ac55c2839983b2a8554b29e67b191479b 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 f711523..c3d5acc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -148,6 +148,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/_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 x2goserver-xsettings in repository x2goserver. commit 2f134cc459e18c44417fda8d378bd881c54ab048 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 c3d5acc..8b7d80a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -149,6 +149,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 e84f0ea..2516381 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 @@ -68,6 +69,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/ @@ -99,7 +101,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 @@ -112,6 +114,7 @@ uninstall_scripts: $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.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/ @@ -124,6 +127,7 @@ uninstall_scripts: $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.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/_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 x2goserver-xsettings in repository x2goserver. commit 7645635341d8c634a5cf29e0ce1e44e1c735b4e6 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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org