This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit aedaac3425d5279f42005c25de63ec3d31f0d5a3 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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git