[X2Go-Commits] [x2goserver] 03/04: x2goserver/bin/x2gostartagent: replace inline perl with calls to x2goistrue and x2goqueryconfig.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 10 05:38:39 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit a44d4ebea7530b3e6d76311fe216cdf1abef4383
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 10 03:50:28 2018 +0100

    x2goserver/bin/x2gostartagent: replace inline perl with calls to x2goistrue and x2goqueryconfig.
---
 debian/changelog              | 2 ++
 x2goserver/bin/x2gostartagent | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7db3ecf..eae1765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -203,6 +203,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
       more quotes, curly braces et. al.
     - x2goserver/lib: add new perl wrapper script for X2Go::Utils::is_true
       called x2goistrue.
+    - x2goserver/bin/x2gostartagent: replace inline perl with calls to
+      x2goistrue and x2goqueryconfig.
   * x2goserver.spec:
     - Only create session DB in x2goserver's post install script. Do use
       proper Requires(post) statements to make sure perl-X2Go-Server-DB and
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 9e659a1..1ddf82f 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -80,7 +80,7 @@ if ! current_host_name="$(hostname)"; then
 	exit '6'
 fi
 
-X2GO_TELEKINESIS_ENABLED="$(perl -e 'use X2Go::Config qw( get_config ); use X2Go::Utils qw( is_true ); my $Config = get_config(); print is_true($Config->param("telekinesis.enable"));')"
+X2GO_TELEKINESIS_ENABLED="$("${X2GO_LIB_PATH}/x2goistrue" "$("${X2GO_LIB_PATH}/x2goqueryconfig" "telekinesis" "enable")")"
 
 X2GO_ROOT="${HOME}/.x2go"
 export NX_ROOT="${X2GO_ROOT}"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list