[X2Go-Commits] [x2gobroker] 02/02: x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib).

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 7daedb7fbca65b868facdf6721b84c8320e6a900
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 7 18:45:35 2015 +0200

    x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib).
---
 debian/changelog        |    1 +
 lib/x2gobroker-agent.pl |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fdac86..61bc3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -318,6 +318,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - When the x2gobroker-agent command call is shipped via
       $SSH_ORIGINAL_COMMAND environment var, make sure to strip-off
       "sh -c" from the command's beginning.
+    - x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib).
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 5c90282..708ceca 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -354,7 +354,8 @@ if( $mode eq 'suspendsession' && which('x2gosuspend-session') )
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "S",  "$sid");
+	my $x2go_lib_path=`x2gopath lib`;
+	exec ("sudo", "-u", "$uid", "--", "$x2go_lib_path/x2gochangestatus", "S",  "$sid");
 }
 
 # use x2goterminate-session to test if we can really do this...
@@ -363,5 +364,6 @@ if( $mode eq 'terminatesession' && which('x2goterminate-session') )
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
 	my $sid=shift;
-	exec ("sudo", "-u", "$uid", "--", "$(x2gopath lib)/x2gochangestatus", "T",  "$sid");
+	my $x2go_lib_path=`x2gopath lib`;
+	exec ("sudo", "-u", "$uid", "--", "$x2go_lib_path/x2gochangestatus", "T",  "$sid");
 }

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