[X2Go-Commits] [x2goserver] 21/50: xsettings: use out file directly, no need for a second temp file.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:13:57 CET 2016
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 2fb498623377dc62d78b956a9e1ef2ee555a3451
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 24 01:12:00 2014 +0100
xsettings: use out file directly, no need for a second temp file.
---
.../post-start.d/900_xsettings-xsettingsd-startup | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 366d112..ee5f52f 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
@@ -73,7 +73,6 @@ merge() {
TMP_KEYVALUE="${SESSION_DIR}/xsettings-merge.kv"
touch "${TMP_KEY}" || return 1
- touch "${TMP_KEYVALUE}" || return 1
# All checks passed. We have readable input files and a writeable output file.
# Go for launch.
@@ -87,7 +86,7 @@ merge() {
[ -z "${value}" ] && continue
echo "${key}" >> "${TMP_KEY}"
- echo "${key} ${value}" >> "${TMP_KEYVALUE}"
+ echo "${key} ${value}" >> "${OUT_FILE}"
done < "${OVERRIDES_FILE}"
# Code duplication, but this part is actually specialized.
@@ -105,7 +104,7 @@ merge() {
[ -n "${overrides_key}" ] && [ "${key}" = "${overrides_key}" ] && continue 2
done < "${TMP_KEY}"
- echo "${key} ${value}" >> "${TMP_KEYVALUE}"
+ echo "${key} ${value}" >> "${OUT_FILE}"
done < "${BASE_FILE}"
}
--
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