[X2Go-Commits] [x2gobroker] 03/03: Make x2gobroker-daemon a symlink and recognize HTTP mode by the executable's name.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 542c8c5ff977aaefab456296549564d584a9b3aa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 29 16:20:10 2014 +0100

    Make x2gobroker-daemon a symlink and recognize HTTP mode by the executable's name.
---
 Makefile              |    5 +++--
 bin/x2gobroker        |    4 ++--
 bin/x2gobroker-daemon |   30 ------------------------------
 debian/changelog      |    2 ++
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index 7c3b6a6..fa41cf3 100755
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ SHELL=/bin/bash
 INSTALL_DIR=install -dm 755
 INSTALL_FILE=install -m 644
 INSTALL_PROGRAM=install -m 755
+INSTALL_SYMLINK=ln -sf
 
 CC      ?= gcc
 CFLAGS  += -fPIE
@@ -121,8 +122,8 @@ install:
 	        "${DESTDIR}${MANDIR}/man1"
 	${INSTALL_FILE} man/man8/x2gobroker-daemon-debug.8* \
 	        "${DESTDIR}${MANDIR}/man8"
-	${INSTALL_PROGRAM} bin/x2gobroker-daemon \
-	        "${DESTDIR}${BINDIR}/"
+	${INSTALL_SYMLINK} x2gobroker \
+	        "${DESTDIR}${BINDIR}/x2gobroker-daemon"
 	${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \
 	        "${DESTDIR}${SBINDIR}/"
 	
diff --git a/bin/x2gobroker b/bin/x2gobroker
index 6131e5f..143d27a 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -196,7 +196,7 @@ if __name__ == "__main__":
             sys.exit(-2)
 
     ### HTTP broker
-    elif cmdline_args.mode.upper() == 'HTTP':
+    elif cmdline_args.mode.upper() == 'HTTP' or PROG_NAME == 'x2gobroker-daemon':
         if interactive_mode_warning:
             logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER))
             logger_broker.warn('  better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
@@ -256,7 +256,7 @@ if __name__ == "__main__":
 
     logfile_prelude(mode=cmdline_args.mode.upper())
 
-    if cmdline_args.mode.upper() == 'HTTP':
+    if cmdline_args.mode.upper() == 'HTTP' or PROG_NAME == 'x2gobroker-daemon':
 
         ### launch as standalone HTTP daemon ###
 
diff --git a/bin/x2gobroker-daemon b/bin/x2gobroker-daemon
deleted file mode 100755
index 2ea3ce3..0000000
--- a/bin/x2gobroker-daemon
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# -*- coding: utf-8 -*-
-
-# This file is part of the  X2Go Project - http://www.x2go.org
-# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-#
-# X2Go Session Broker is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# X2Go Session Broker is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-cleanup() {
-        local pids=$(jobs -pr)
-        [ -n "$pids" ] && kill $pids
-}
-trap "cleanup" INT QUIT TERM EXIT
-x2gobroker -M http $@ &
-PID=$!
-
-wait $PID
diff --git a/debian/changelog b/debian/changelog
index 3bb637d..71b9b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -185,6 +185,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     + Fix position of XS-Python-Version: field.
     + Rework LONG_DESCRIPTION of bin:package x2gobroker-agent. Imporve line
       breaks, so that we now have lines that are close to 80 chars long.
+    + Make x2gobroker-daemon a symlink and recognize HTTP mode by the
+      executable's name.
   * debian/x2gobroker-agent.dirs:
     + Provide empty log file directory.
   * x2gobroker-wsgi postinst/postrm:

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git