Package: x2goserver Tag: patch Before I forget to commit this patch, here it is in X2Go BTS... Mike ----- Weitergeleitete Nachricht von jengelh@inai.de ----- Datum: Wed, 9 Jan 2013 14:51:11 +0100 Von: Jan Engelhardt <jengelh@inai.de> Betreff: [PATCH] x2gopath: make use of this helper An: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Cc: x2go-dev@lists.berlios.de Note that .pm Perl modules must be placed in an arch-specific directory (e.g. /usr/lib64/... rather than /usr/libexec/...) since they could possibly entail XS modules. --- x2goserver-printing/bin/x2goprint | 2 +- x2goserver/bin/x2gogetapps | 2 +- x2goserver/bin/x2gogetservers | 2 +- x2goserver/bin/x2golistdesktops | 2 +- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2gomountdirs | 2 +- x2goserver/bin/x2gosessionlimit | 2 +- x2goserver/bin/x2goshowblocks | 2 +- x2goserver/bin/x2goumount-session | 2 +- x2goserver/lib/x2gochangestatus | 2 +- x2goserver/lib/x2gocreatesession | 2 +- x2goserver/lib/x2godbwrapper.pm | 4 ++-- x2goserver/lib/x2gogetagent | 2 +- x2goserver/lib/x2gogetdisplays | 2 +- x2goserver/lib/x2gogetports | 2 +- x2goserver/lib/x2gogetstatus | 2 +- x2goserver/lib/x2goinsertport | 2 +- x2goserver/lib/x2goinsertsession | 2 +- x2goserver/lib/x2golistsessions_sql | 2 +- x2goserver/lib/x2gologlevel | 2 +- x2goserver/lib/x2goresume | 2 +- x2goserver/lib/x2gormport | 2 +- x2goserver/lib/x2gosuspend-agent | 2 +- x2goserver/lib/x2gosyslog | 2 +- x2goserver/sbin/x2godbadmin | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index e3f3f8f..b5739c8 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -26,7 +26,7 @@ use File::Copy; use File::Path; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index dbcd8c1..48bf865 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -24,7 +24,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use MIME::Base64 qw(encode_base64); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; my @iconext=("png","svg","jpeg","jpg","xpm","bmp"); diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers index d34cc98..cafc2fe 100755 --- a/x2goserver/bin/x2gogetservers +++ b/x2goserver/bin/x2gogetservers @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index acdd7c4..71a15b0 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index ade0c67..879ca61 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index e4421b3..eb24196 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index ef7f139..d151255 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -24,7 +24,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use File::BaseDir qw( xdg_config_home ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit index 91f747b..bae41f7 100755 --- a/x2goserver/bin/x2gosessionlimit +++ b/x2goserver/bin/x2gosessionlimit @@ -24,7 +24,7 @@ use strict; use Config::Simple; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks index f253a73..46dd6d0 100755 --- a/x2goserver/bin/x2goshowblocks +++ b/x2goserver/bin/x2goshowblocks @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 33ffc01..2d10c26 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -25,7 +25,7 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use File::BaseDir qw( xdg_config_home ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus index ce33520..5cd1981 100755 --- a/x2goserver/lib/x2gochangestatus +++ b/x2goserver/lib/x2gochangestatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession index ceb62a9..6f81e5f 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gocreatesession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index f290b71..e6bcb48 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -26,8 +26,8 @@ use DBI; use POSIX; use Sys::Syslog qw( :standard :macros ); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path = `x2gopath libexec`; +use lib `x2gopath lib`; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent index 897d75e..d7f5e92 100755 --- a/x2goserver/lib/x2gogetagent +++ b/x2goserver/lib/x2gogetagent @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays index db29b5c..28474db 100755 --- a/x2goserver/lib/x2gogetdisplays +++ b/x2goserver/lib/x2gogetdisplays @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports index b269800..02d6639 100755 --- a/x2goserver/lib/x2gogetports +++ b/x2goserver/lib/x2gogetports @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gogetstatus b/x2goserver/lib/x2gogetstatus index d2271a4..0fe5a63 100755 --- a/x2goserver/lib/x2gogetstatus +++ b/x2goserver/lib/x2gogetstatus @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport index bc18d96..9eea344 100755 --- a/x2goserver/lib/x2goinsertport +++ b/x2goserver/lib/x2goinsertport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession index 372208b..2cf3086 100755 --- a/x2goserver/lib/x2goinsertsession +++ b/x2goserver/lib/x2goinsertsession @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 6563705..2957437 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel index 9269097..5914448 100755 --- a/x2goserver/lib/x2gologlevel +++ b/x2goserver/lib/x2gologlevel @@ -22,7 +22,7 @@ use strict; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; print x2gologlevel(); diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume index 7391cd3..a5da249 100755 --- a/x2goserver/lib/x2goresume +++ b/x2goserver/lib/x2goresume @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gormport b/x2goserver/lib/x2gormport index 4ba632d..0ea101d 100755 --- a/x2goserver/lib/x2gormport +++ b/x2goserver/lib/x2gormport @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent index 7000281..052ace6 100755 --- a/x2goserver/lib/x2gosuspend-agent +++ b/x2goserver/lib/x2gosuspend-agent @@ -23,7 +23,7 @@ strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog index c7650f7..704b9f1 100755 --- a/x2goserver/lib/x2gosyslog +++ b/x2goserver/lib/x2gosyslog @@ -23,7 +23,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; setlogmask( LOG_UPTO(x2gologlevel()) ); diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index fc86ca8..b39c8cb 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -26,7 +26,7 @@ use Getopt::Long; use Config::Simple; use DBI; -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index dda2b31..a3b7ea6 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -23,7 +23,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); -- 1.7.10.4 ----- Ende der weitergeleiteten Nachricht ----- -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...