aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-29 11:21:09 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-29 11:21:09 +0200
commit3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1 (patch)
treed0b4c045bf363ac03054b2c5fe7288fa0cece50b /bin
parentb9fb7a05ae01329ef6579b8a1d83926fe5374a76 (diff)
parentc355dc91d35c74234c24dfbf013dfac98110d352 (diff)
downloadnx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.tar.gz
nx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.tar.bz2
nx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.zip
Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.x
Attributes GH PR #145: https://github.com/ArcticaProject/nx-libs/pull/145 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Wed, 29 Jun 2016 11:22:30 +0200
Diffstat (limited to 'bin')
-rw-r--r--bin/x2goagent29
1 files changed, 0 insertions, 29 deletions
diff --git a/bin/x2goagent b/bin/x2goagent
deleted file mode 100644
index 09011efbe..000000000
--- a/bin/x2goagent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
-
-NXAPP=x2goagent
-NX_LIBS=/usr/lib/nx
-NX_LOCAL_LIBS=/usr/local/lib/nx
-
-# make sure nxagent starts properly with pam_tmpdir.so being in use
-NX_TEMP=${NX_TEMP:-/tmp}
-export NX_TEMP
-
-test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/../x2go/bin/$NXAPP "$@"