[X2Go-Commits] [x2goserver] 19/50: xsettings: add loop through base file extracting key-value pairs.

[git-admin at x2go.org]

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 0f16fd2325b8afa8eecf9c322d3b5af12b5d54cb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 01:04:06 2014 +0100

    xsettings: add loop through base file extracting key-value pairs.
---
 .../post-start.d/900_xsettings-xsettingsd-startup  |   11 +++++++++++
 1 file changed, 11 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 9fad786..5649a31 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
@@ -89,6 +89,17 @@ merge() {
     echo "${key}" >> "${TMP_KEY}"
     echo "${key} ${value}" >> "${TMP_KEYVALUE}"
   done < "${OVERRIDES_FILE}"
+
+  # Code duplication, but this part is actually specialized.
+  while read line; do
+    parsed_line="$(sanitize_line "${line}")"
+    [ -z "${parsed_line}" ] && continue
+
+    key="$(extract_key "${parsed_line}")"
+    value="$(extract_value "${parsed_line}")"
+    [ -z "${key}" ] && continue
+    [ -z "${value}" ] && continue
+  done < "${BASE_FILE}"
 }
 
 export X2GO_SESSION="${1}"

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git