This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit f9e8fab8cd9e6c37bcd70131600aa2e022e29a4b Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 00:57:36 2014 +0100 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. --- .../post-start.d/900_xsettings-xsettingsd-startup | 12 ++++++++++++ 1 file changed, 12 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 09b48a0..b48a8eb 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,18 @@ # # 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/#.*//' +} + merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git