[x2goserver] branch x2goserver-xsettings updated (7c1101f -> d7f158f)

List overview All Threads
Download

newer

older

[x2goserver] branch...

git-admin＠x2go.org

24 Nov 2014 24 Nov '14

12:26 a.m.

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 7c1101f xsettings: filter out overriden keys. Add the rest to the second temporary file. new 3f9cc52 xsettings: use out file directly, no need for a second temp file. new c0ee653 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. new 5ff6462 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. new 6f40c24 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. new d7f158f xsettings: use merge shell function to merge the determined base config with the overrides config. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../post-start.d/900_xsettings-xsettingsd-startup | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

Show replies by date

git-admin＠x2go.org

24 Nov 24 Nov

12:26 a.m.

New subject: [x2goserver] 01/05: xsettings: use out file directly, no need for a second temp file.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 3f9cc528a8e2d090972aa673e9611361a452d459 Author: Mihai Moldovan <ionic@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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

12:26 a.m.

New subject: [x2goserver] 02/05: xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit c0ee6535eb0653dc4733bd3f961d318eeba753ca Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:20:47 2014 +0100 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ee5f52f..b3e79ac 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 @@ -115,7 +115,7 @@ X2GO_SESSION_DIR="${HOME}/.x2go/C-${X2GO_SESSION}/" X2GO_CONF_DIR="$(x2gopath etc)" XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" -XSETTINGSD_USER_CONF="${X2GO_SESSION_DIR}/xsettings.conf" +XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

12:26 a.m.

New subject: [x2goserver] 03/05: xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 5ff6462ae317ecd6c2af25142c5bc5b2015a405d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:21:38 2014 +0100 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 ++ 1 file changed, 2 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 b3e79ac..a802e26 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 @@ -117,6 +117,8 @@ XSETTINGSD_PID="${X2GO_SESSION_DIR}/xsettingsd.pid" XSETTINGSD_LOG="${X2GO_SESSION_DIR}/xsettingsd.log" XSETTINGSD_REMOTE_CONF="${X2GO_SESSION_DIR}/xsettings-remote.conf" XSETTINGSD_DEFAULT_CONF="${X2GO_CONF_DIR}/xsettings.conf" +XSETTINGSD_OVERRIDES_CONF="${HOME}/.xsettings-x2go.conf" +XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

12:26 a.m.

New subject: [x2goserver] 04/05: xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 6f40c2440aa5bc4acb9b66ad364aaa35f4150c76 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:23:40 2014 +0100 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. --- .../post-start.d/900_xsettings-xsettingsd-startup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a802e26..ff93fb7 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 @@ -122,6 +122,7 @@ XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf" export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")" -[ -r "${XSETTINGSD_USER_CONF}" ] && XSETTINGSD_CONF="${XSETTINGSD_USER_CONF}" || XSETTINGSD_CONF="${XSETTINGSD_DEFAULT_CONF}" +XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}" +[ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}" nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

12:26 a.m.

New subject: [x2goserver] 05/05: xsettings: use merge shell function to merge the determined base config with the overrides config.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit d7f158f96ca021ca43f8fd58168488aaba858661 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 01:25:49 2014 +0100 xsettings: use merge shell function to merge the determined base config with the overrides config. --- .../post-start.d/900_xsettings-xsettingsd-startup | 2 ++ 1 file changed, 2 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 ff93fb7..9468359 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 @@ -125,4 +125,6 @@ export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9 XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}" [ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}" +merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}" + nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

3866

Age (days ago)

3866

Last active (days ago)

x2go-commits@lists.x2go.org

5 comments

1 participants

tags (0)

participants (1)

git-admin＠x2go.org