[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-151-gc980c18

[X2go dev team]

The branch, master has been updated
       via  c980c18e47d1a60c6776a1c5c259bc3fad789398 (commit)
      from  3ea43d31cb312ccfc83463e41cd05822231f296e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c980c18e47d1a60c6776a1c5c259bc3fad789398
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 28 14:39:22 2011 +0200

    x2gocleansessions fix for $X2GO_LIB_PATH changes

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/bin/x2gocmdexitmessage |    2 +-
 x2goserver/bin/x2goruncommand     |    2 +-
 x2goserver/sbin/x2gocleansessions |    8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index 3f8e1e7..43dbf0f 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -24,4 +24,4 @@ X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
 
 # return command output of the command that was issued by x2goruncommand
-cat $MESSAGE_FILE
\ No newline at end of file
+cat $MESSAGE_FILE
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 419bf66..989f4b5 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -109,7 +109,7 @@ if [ "$EXEC" != "" ] && [ -x `which $cmd` ]; then
 	fi
 else
 	echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE
-fi 
+fi
 
 kill -TERM  $X2GO_AGENT_PID
 $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION  > /dev/null
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 1b99474..4eeca93 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -23,6 +23,8 @@
 use Sys::Hostname;
 use strict;
 
+my $x2go_lib_path=`echo -n \$(dirname $0)/../lib/x2go`;
+
 sub check_pid
 {
 	my $pid=shift;
@@ -86,7 +88,7 @@ elsif ($pid == 0 )
 	while(sleep 5)
 	{
 		$serv=`hostname`;
-		my $outp=`x2golistsessions_sql $serv 2>/dev/null`;
+		my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`;
 		my @outp=split("\n","$outp");
 		for (my $i=0;$i<@outp;$i++)
 		{
@@ -99,7 +101,7 @@ elsif ($pid == 0 )
 			}
 			elsif (! check_pid (@sinfo[0], at sinfo[1], at sinfo[12]))
 			{
-				system("su @sinfo[11] -c \"x2gochangestatus 'F' @sinfo[1] \" > /dev/null");
+				system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" > /dev/null");
 				#print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n";
 				#print "(@sinfo[1])Unmounting all shares\n";	 
 				system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null");
@@ -110,7 +112,7 @@ elsif ($pid == 0 )
 				{
 					if (!check_stat(@sinfo[1], at sinfo[11]))
 					{
-						system("su @sinfo[11] -c  \"x2gochangestatus 'S' @sinfo[1] \" > /dev/null");
+						system("su @sinfo[11] -c  \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null");
 						#print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n";
 						#print "(@sinfo[1])Unmounting all shares\n";	        
 						system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null");


hooks/post-receive
-- 
x2goserver.git (X2go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2go Server).