[X2Go-Commits] [x2goserver] 47/50: xsettings: rename faulty "base" to "data".

[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 36cf705d5ccfb9446747e75019b931bf72ba235a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 23:58:14 2014 +0100

    xsettings: rename faulty "base" to "data".
---
 .../{base => data}/x2goserver-xsettings-common.sh  |    4 ++--
 .../post-resume.d/900_xsettings-xsettingsd-refresh |    4 ++--
 .../post-start.d/900_xsettings-xsettingsd-startup  |    4 ++--
 .../000_xsettings-xsettingsd-shutdown              |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh
similarity index 97%
rename from x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh
rename to x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh
index 241c0c6..def71b9 100644
--- a/x2goserver-xsettings/lib/x2go/extensions/base/x2goserver-xsettings-common.sh
+++ b/x2goserver-xsettings/lib/x2go/extensions/data/x2goserver-xsettings-common.sh
@@ -19,8 +19,8 @@
 #
 # Copyright (C) 2014 Mihai Moldovan <ionic at ionic.de>
 
-X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/"
-. ${X2GO_EXTENSIONS_BASE}/common.sh
+X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/"
+. ${X2GO_EXTENSIONS_DATA}/common.sh
 
 # Removes redundant white space and comments.
 # Note that in-line comments are supported.
diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh b/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh
index db8fccd..be3728c 100644
--- a/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh
+++ b/x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh
@@ -19,8 +19,8 @@
 #
 # Copyright (C) 2014 Mihai Moldovan <ionic at ionic.de>
 
-X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/"
-. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh
+X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/"
+. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh
 
 merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}"
 
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 5fb50df..3e42ea6 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
@@ -19,8 +19,8 @@
 #
 # Copyright (C) 2014 Mihai Moldovan <ionic at ionic.de>
 
-X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/"
-. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh
+X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/"
+. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh
 
 merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}"
 
diff --git a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown
index 762ff64..f54ab3c 100644
--- a/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown
+++ b/x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown
@@ -19,7 +19,7 @@
 #
 # Copyright (C) 2014 Mihai Moldovan <ionic at ionic.de>
 
-X2GO_EXTENSIONS_BASE="$(x2gopath libexec)/extensions/base/"
-. ${X2GO_EXTENSIONS_BASE}/x2goserver-xsettings-common.sh
+X2GO_EXTENSIONS_DATA="$(x2gopath libexec)/extensions/data/"
+. ${X2GO_EXTENSIONS_DATA}/x2goserver-xsettings-common.sh
 
 kill "$(cat "${XSETTINGSD_PID}")"

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