This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit d9923193e21f01a77fa21c04c6e978e26b5fb1e9 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:00:44 2014 +0100 xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. --- .../post-start.d/900_xsettings-xsettingsd-startup | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3d159b5..031aae8 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 @@ -55,6 +55,7 @@ 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. @@ -66,6 +67,13 @@ merge() { 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 + touch "${TMP_KEYVALUE}" || return 1 # All checks passed. We have readable input files and a writeable output file. # Go for launch. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git