This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 7645635 extensions: add "data" directory to man page. new d5a5a90 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. new 673538a extensions: add data/common.sh, providing commonly used variables. new 820cefd xsettings: add missing post-resume.d targets to Makefile. new 17588db xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. new 29b2599 xsettings: rename faulty "base" to "data". The 5 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 | 2 + debian/x2goserver-xsettings.install | 1 - x2goserver-extensions/Makefile | 2 + .../lib/extensions/data/common.sh | 4 +- x2goserver-xsettings/Makefile | 3 + .../x2goserver-xsettings-common.sh} | 16 +-- .../post-resume.d/900_xsettings-xsettingsd-refresh | 27 +---- .../post-start.d/900_xsettings-xsettingsd-startup | 122 +------------------- .../000_xsettings-xsettingsd-shutdown | 7 +- 9 files changed, 19 insertions(+), 165 deletions(-) copy x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown => x2goserver-extensions/lib/extensions/data/common.sh (88%) copy x2goserver-xsettings/lib/x2go/extensions/{post-start.d/900_xsettings-xsettingsd-startup => data/x2goserver-xsettings-common.sh} (89%) -- 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 29b259979569b17fa5395ea9546216e3bb9aff1d 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/_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 d5a5a90ee91d34cf556d3fed76a4020e1aa2da2c 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/_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 673538a0db9fa5c10d0b716e0e0a066562108d64 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 8b7d80a..ee831d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -151,6 +151,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 2516381..1c7e25f 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -69,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/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/ @@ -101,6 +102,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/_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 820cefd743b0b71735c90e8b11e4e7dd842e2e20 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/_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 17588dba355cc89d9264484cafb24d1effa777e0 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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org