[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-152-g2359295

[X2Go dev team]

The branch, build-main has been updated
       via  2359295f4a9b91e4be3a464b35f031549e3ddb78 (commit)
      from  c980c18e47d1a60c6776a1c5c259bc3fad789398 (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:
 debian/changelog                                   |    1 +
 .../{lib/x2gogetservers => bin/x2gobasepath}       |   11 ++++++-----
 x2goserver/lib/x2godbwrapper.pm                    |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 copy x2goserver/{lib/x2gogetservers => bin/x2gobasepath} (76%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a4f409d..673b4c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Tab'ified (forgotten) scripts in x2goserver-extensions package.
   * Install internal x2goserver scripts to /usr/lib/x2go, make sure scripts
     in /usr/bin find these scripts.
+  * Add x2gobasepath script to reliably detect x2goserver install path.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/bin/x2gobasepath
similarity index 76%
copy from x2goserver/lib/x2gogetservers
copy to x2goserver/bin/x2gobasepath
index 38aa496..4f9198b 100755
--- a/x2goserver/lib/x2gogetservers
+++ b/x2goserver/bin/x2gobasepath
@@ -17,12 +17,13 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
-# Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2007-2011  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 use strict;
+use Cwd;
+use Cwd 'abs_path';
 
-use lib "/usr/lib/x2go";
-use x2godbwrapper; 
+my $dir = getcwd;
+my $base_path = abs_path("$0/../.."); 
 
-print join("\n", db_getservers);
+print "$base_path";
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index 69ccf46..3935548 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -26,7 +26,7 @@ use DBI;
 
 use POSIX;
 
-my $x2go_lib_path=`echo -n \$(dirname $0)`;
+my $x2go_lib_path=`echo -n $(x2gobasepath)/lib/x2go`;
 
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid());
 


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