This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 29b2599 xsettings: rename faulty "base" to "data". new 369cc71 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. new c1a809d xsettings: fix speling errors in POSIX BRE character classes. The 2 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: .../extensions/data/x2goserver-xsettings-common.sh | 24 ++++++++++---------- .../post-resume.d/900_xsettings-xsettingsd-refresh | 2 +- .../post-start.d/900_xsettings-xsettingsd-startup | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) -- 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 369cc717e0760bc2f337518f44331520e8f33360 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/_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 c1a809d30f382b50da45b05056bd2a4a1a978b60 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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org