[X2Go-Commits] [x2goserver] 27/50: xsettings: add comment explaining the merge shell function and its requirements.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 3 16:07:21 CET 2015
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 7a4a5b577d192c208c8def5853fa3994f16377d6
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 24 01:39:48 2014 +0100
xsettings: add comment explaining the merge shell function and its requirements.
---
.../post-start.d/900_xsettings-xsettingsd-startup | 7 +++++++
1 file changed, 7 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 492834f..0baeadb 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
@@ -51,6 +51,13 @@ extract_value() {
echo "${INPUT}" | sed -e 's/^[^[:blank]]*[[:blank:]][[:blank]]*\([^[:blank:]]*\).*$/\1/'
}
+# Merge a base file with a overrides file and write the result to an out file.
+# For keys which are both in the base and overrides file, the overrides file
+# takes precedence.
+# Keys only specified in one of the files will be copied to the out file.
+# Both the base and overrides files MUST exist and be readable.
+# The out file MAY exist. The base directory of this file MUST be writeable.
+# If the out file does not exist, it will be created.
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
More information about the x2go-commits
mailing list