[X2Go-Commits] [x2goserver] 44/50: extensions: add data/common.sh, providing commonly used variables.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:14:09 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.
commit 2f07be528e16a1f219ee2e93423a2daec5bc3226
Author: Mihai Moldovan <ionic at 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 at 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 at 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
More information about the x2go-commits
mailing list