The branch, build-main has been updated via 256e0dde5c8b5a5af9ab950ad69c7b788c6672ce (commit) from 31f8deabd2a8f1730a11b4093e1efb144cd02041 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2goserver/{sbin => lib}/x2golistsessions_root | 8 ++++---- x2goserver/{bin => lib}/x2gosessionlimit | 0 2 files changed, 4 insertions(+), 4 deletions(-) copy x2goserver/{sbin => lib}/x2golistsessions_root (87%) copy x2goserver/{bin => lib}/x2gosessionlimit (100%) The diff of changes is: diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/lib/x2golistsessions_root similarity index 87% copy from x2goserver/sbin/x2golistsessions_root copy to x2goserver/lib/x2golistsessions_root index df92ff5..1e60493 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/lib/x2golistsessions_root @@ -1,4 +1,5 @@ #!/usr/bin/perl + # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify @@ -35,8 +36,6 @@ sub check_stat return 1; } -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; - my $uname; my $serv=shift; @@ -45,7 +44,8 @@ if ( ! $serv) $serv=hostname; } -my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; +my $outp=`x2golistsessions_sql $serv 2>/dev/null`; + my @outp=split("\n","$outp"); @@ -62,7 +62,7 @@ for (my $i=0;$i<@outp;$i++) { if (!check_stat(@sinfo[1],@sinfo[11])) { - system("su - @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); + system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); @outp[$i] =~ s/\|R\|/\|S\|/; } } diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/lib/x2gosessionlimit similarity index 100% copy from x2goserver/bin/x2gosessionlimit copy to x2goserver/lib/x2gosessionlimit 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).