[X2Go-Commits] [x2goserver] 02/07: xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line.
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 24 01:06:11 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch x2goserver-xsettings
in repository x2goserver.
commit dcb17fa470361732f06202277beda13562b00445
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 24 00:58:58 2014 +0100
xsettings: add extract_key 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 b48a8eb..02d030c 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
@@ -31,6 +31,16 @@ sanitize_line() {
echo "${INPUT}" | sed -e 's/^[[:blank:]]*//' -e 's/#.*//'
}
+# Returns the key.
+# Is supposed to be used on sanitized input lines only.
+extract_key() {
+ INPUT="${1}"
+
+ [ -z "${INPUT}" ] && echo ""
+
+ echo "${INPUT}" | sed -e 's/^\([^[:blank]]*\)[[:blank:]].*$/\1/'
+}
+
merge() {
BASE_FILE="${1}"
OVERRIDES_FILE="${2}"
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list