This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from e3a4550 xsettings: also delete pre-processed man pages in clean_man2html target. new 875b89e xsettings: add incomplete merge function to startup script. The 1 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: .../post-start.d/900_xsettings-xsettingsd-startup | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 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 875b89ed9a8fe41aff7846debcfc72e24275eaa6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 23 18:59:55 2014 +0100 xsettings: add incomplete merge function to startup script. --- .../post-start.d/900_xsettings-xsettingsd-startup | 21 ++++++++++++++++++++ 1 file changed, 21 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 3a8cfff..09b48a0 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,6 +19,27 @@ # # Copyright (C) 2014 Mihai Moldovan <ionic@ionic.de> +merge() { + BASE_FILE="${1}" + OVERRIDES_FILE="${2}" + OUT_FILE="${3}" + + # 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 + + # All checks passed. We have readable input files and a writeable output file. + # Go for launch. + : real implementation goes here... +} + export X2GO_SESSION="${1}" X2GO_SESSIONINFO="$(x2golistsessions | grep "${X2GO_SESSION}")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org