x2goserver.git - master (branch) updated: 3.0.99-2-134-g9205787 - x2go-commits

28 Jul 2011

The branch, master has been updated
       via  9205787dda7a60495827f57ab8256a0b54c6bcfa (commit)
      from  f575cb3b13a42afc3e797880ac2de30bf7f1fc77 (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 9205787dda7a60495827f57ab8256a0b54c6bcfa
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Jul 28 11:49:12 2011 +0200

    X2GO_LIB_PATH fix for x2golistsessions_root

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

Summary of changes:
 x2goserver/sbin/x2golistsessions_root |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index dc2d0ad..9af6ca6 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 
 # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
 #
@@ -36,7 +35,7 @@ sub check_stat
 	return 1;
 }
 
-my $x2go_lib_path="`dirname $0`/../x2go/lib";
+my $x2go_lib_path=`echo -n \$(dirname $0)/../lib/x2go`;
 
 my $uname;
 
@@ -46,7 +45,7 @@ if ( ! $serv)
 	$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");
@@ -64,7 +63,7 @@ for (my $i=0;$i<@outp;$i++)
 		{
 			if (!check_stat(@sinfo[1],@sinfo[11]))
 			{
-				system("export X2GO_LIB_PATH=$x2go_lib_path; su - @sinfo[11] -c \"\$X2GO_LIB_PATH/x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
+				system("su - @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1]\" > /dev/null");
 				@outp[$i] =~ s/\|R\|/\|S\|/;
 			}
 		}


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).

    