This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/x2goserver-xsettings in repository x2goserver. commit 2ee1acdc7331da808851f87145b8c7c7bd8c967e Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 00:59:58 2014 +0100 xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. --- .../post-start.d/900_xsettings-xsettingsd-startup | 10 ++++++++++ 1 file changed, 10 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 02d030c..3d159b5 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 @@ -41,6 +41,16 @@ extract_key() { echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/' } +# Returns the value. +# Is supposed to be used on sanitized input lines only. +extract_value() { + INPUT="${1}" + + [ -z "${INPUT}" ] && echo "" + + echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/' +} + merge() { BASE_FILE="${1}" OVERRIDES_FILE="${2}" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git