[X2Go-Commits] [x2goserver] 07/33: x2goserver/bin/x2gostartagent: drop obsolete X2GO_BIN environment variable usage.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 10 00:19:23 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit a1548a60c6a6c647a38ac92b2a5d7b99e8f171a2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 2 03:21:47 2018 +0100

    x2goserver/bin/x2gostartagent: drop obsolete X2GO_BIN environment variable usage.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog              | 2 ++
 x2goserver/bin/x2gostartagent | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2afc7b9..2051d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -276,6 +276,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/bin/x2gostartagent: update copyright notice.
     - x2goserver/bin/x2gostartagent: fix most shellcheck warnings, whitespace
       errors, use more quotes and curly braces.
+    - x2goserver/bin/x2gostartagent: drop obsolete X2GO_BIN environment
+      variable usage.
   * x2goserver.spec:
     - RPMify x2goserver-xsession description.
     - Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 2bf2dc4..864ecf6 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -481,9 +481,6 @@ grep "PPid" "/proc/${PPID}/status" >"${SESSION_DIR}/sshd.pid"
 
 X2GO_COOKIE="$(mcookie)"
 
-PATH="${PATH}:${X2GO_BIN}/"
-export PATH
-
 
 xauth -f "${XAUTHORITY}" "add" "${current_host_name}/unix:${X2GO_PORT}" "MIT-MAGIC-COOKIE-1" "${X2GO_COOKIE}"
 xauth -f "${XAUTHORITY}" "add" "${current_host_name}:${X2GO_PORT}" "MIT-MAGIC-COOKIE-1" "${X2GO_COOKIE}"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list