[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-154-g1d19835
X2go dev team
git-admin at x2go.org
Thu Jul 28 15:15:24 CEST 2011
The branch, master has been updated
via 1d19835ce2d6042a4e1c977b6f259b8f5f8fb37a (commit)
from a7cee3bd41308a76b0944d1d44ba0a11efbe81e1 (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 1d19835ce2d6042a4e1c977b6f259b8f5f8fb37a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jul 28 15:15:26 2011 +0200
using x2gobasepath script whenever we have to find the X2GO_LIB dir
-----------------------------------------------------------------------
Summary of changes:
x2goserver/bin/x2golistsessions | 2 +-
x2goserver/bin/x2gomountdirs | 2 +-
x2goserver/bin/x2goprint | 2 +-
x2goserver/bin/x2goresume-session | 2 +-
x2goserver/bin/x2goruncommand | 2 +-
x2goserver/bin/x2goshowblocks | 2 +-
x2goserver/bin/x2gostartagent | 2 +-
x2goserver/bin/x2gosuspend-session | 2 +-
x2goserver/bin/x2goterminate-session | 2 +-
x2goserver/bin/x2goumount-session | 2 +-
x2goserver/lib/x2gochangestatus | 2 +-
x2goserver/lib/x2gocreatesession | 2 +-
x2goserver/lib/x2gogetagent | 2 +-
x2goserver/lib/x2gogetdisplays | 2 +-
x2goserver/lib/x2gogetports | 2 +-
x2goserver/lib/x2gogetservers | 2 +-
x2goserver/lib/x2goinsertport | 2 +-
x2goserver/lib/x2goinsertsession | 2 +-
x2goserver/lib/x2golistsessions_sql | 2 +-
x2goserver/lib/x2goresume | 2 +-
x2goserver/sbin/x2gocleansessions | 2 +-
x2goserver/sbin/x2golistsessions_root | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 5e8f7f5..a47057c 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -23,7 +23,7 @@
use Sys::Hostname;
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index f20806c..2194da2 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $type=shift;
diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint
index 9360cf9..8b913ea 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver/bin/x2goprint
@@ -25,7 +25,7 @@ use File::Copy;
use File::Path;
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
if (scalar(@ARGV) ==1)
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 5c15d03..cbaab9a 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -34,7 +34,7 @@ X2GO_ROOT=${HOME}/.x2go
X2GO_RESIZE=0
X2GO_FULLSCREEN=0
-X2GO_LIB_PATH="$(dirname $0)/../lib/x2go"
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
if [ "$X2GO_GEOMETRY" == "" ]
then
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 989f4b5..8499d8a 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -35,7 +35,7 @@ X2GO_ROOT=${HOME}/.x2go
MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput
echo "exec $cmd" >> $MESSAGE_FILE
-X2GO_LIB_PATH="$(dirname $0)/../lib/x2go"
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
IMEXIT="false"
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index e5f3d1f..0c15c39 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index f6a2971..91d3e09 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -38,7 +38,7 @@ X2GO_CMD=$9
X2GO_RESIZE=0
X2GO_FULLSCREEN=0
-X2GO_LIB_PATH="$(dirname $0)/../lib/x2go"
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
if [ "$X2GO_STYPE" == "S" ]; then
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index 25f35a8..c9b6656 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -26,7 +26,7 @@ else
SESSION_NAME=$X2GO_SESSION
fi
-X2GO_LIB_PATH="$(dirname $0)/../lib/x2go"
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME`
X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index bf14490..cbe4c38 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -26,7 +26,7 @@ else
SESSION_NAME=$X2GO_SESSION
fi
-X2GO_LIB_PATH="$(dirname $0)/../lib/x2go"
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME`
X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index c673ad0..81103e2 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -23,7 +23,7 @@
use Sys::Hostname;
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus
index 542cab4..89696ba 100755
--- a/x2goserver/lib/x2gochangestatus
+++ b/x2goserver/lib/x2gochangestatus
@@ -23,7 +23,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $status=shift or die;
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession
index 3609a34..425a5d0 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gocreatesession
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent
index 9a66104..5987942 100755
--- a/x2goserver/lib/x2gogetagent
+++ b/x2goserver/lib/x2gogetagent
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $sid=shift or die;
diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
index 75b9f18..e07b8b1 100755
--- a/x2goserver/lib/x2gogetdisplays
+++ b/x2goserver/lib/x2gogetdisplays
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $host=shift or die;
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports
index bf0d345..27dc74c 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gogetports
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;;
use x2godbwrapper;
my $host=shift or die;
diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/lib/x2gogetservers
index 38aa496..fcc57a8 100755
--- a/x2goserver/lib/x2gogetservers
+++ b/x2goserver/lib/x2gogetservers
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
print join("\n", db_getservers);
diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport
index 75ec3c5..1458348 100755
--- a/x2goserver/lib/x2goinsertport
+++ b/x2goserver/lib/x2goinsertport
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $server=shift or die;
diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession
index 300c71f..74b0c25 100755
--- a/x2goserver/lib/x2goinsertsession
+++ b/x2goserver/lib/x2goinsertsession
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $display=shift or die;
diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
index ffaa3c6..7ffd2e2 100755
--- a/x2goserver/lib/x2golistsessions_sql
+++ b/x2goserver/lib/x2golistsessions_sql
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $serv=shift;
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index eb65a5d..e21006c 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -22,7 +22,7 @@
use strict;
-use lib "/usr/lib/x2go";
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
use x2godbwrapper;
my $client=shift or die;
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 4eeca93..b82214d 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -23,7 +23,7 @@
use Sys::Hostname;
use strict;
-my $x2go_lib_path=`echo -n \$(dirname $0)/../lib/x2go`;
+my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
sub check_pid
{
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 675d786..df92ff5 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -35,7 +35,7 @@ sub check_stat
return 1;
}
-my $x2go_lib_path=`echo -n \$(dirname $0)/../lib/x2go`;
+my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`;
my $uname;
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).
More information about the x2go-commits
mailing list