diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 23:50:12 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:07:50 +0200 |
| commit | 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c (patch) | |
| tree | e1b687d9c6a658c81801c8fc9dba9a063f22b3da /bin | |
| parent | da7261cfe0244fcf329e0597f9d122293fd4f9eb (diff) | |
| download | nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.tar.gz nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.tar.bz2 nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.zip | |
Rework nxagent and nxproxy wrapper scripts.
o Install nxagent/nxproxy executables into multi-arch path.
o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*.
o Allow injecting different $NXAPP containing the executable name.
o For e.g. x2goagent this requires the following changes:
- Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to
$LIBDIR/nx/bin/x2goagent
- Replace /usr/bin/x2goagent by a two-liner...
```
#!/bin/sh
export NXAPP=x2goagent
nxagent
```
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nxagent.in (renamed from bin/nxproxy) | 10 | ||||
| -rw-r--r-- | bin/nxproxy.in (renamed from bin/nxagent) | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/bin/nxproxy b/bin/nxagent.in index 23e7109e3..86603d549 100644 --- a/bin/nxproxy +++ b/bin/nxagent.in @@ -15,15 +15,11 @@ # 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=nxproxy -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx +NX_LIBS=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP +export LD_LIBRARY_PATH=@@NXLIBDIR@@-X11/ -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file +exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@" diff --git a/bin/nxagent b/bin/nxproxy.in index 6306ed069..d21388d18 100644 --- a/bin/nxagent +++ b/bin/nxproxy.in @@ -15,15 +15,10 @@ # 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=nxagent -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx +NX_LIBS=@@NXLIBDIR@@ # 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/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@" +exec $NX_LIBS/bin/${NXAPP:="nxproxy"} "$@" |