From f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 20 Oct 2012 22:27:26 +0200 Subject: Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method. --- debian/patches/020_add-nxagent-wrapper.full.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'debian/patches/020_add-nxagent-wrapper.full.patch') diff --git a/debian/patches/020_add-nxagent-wrapper.full.patch b/debian/patches/020_add-nxagent-wrapper.full.patch index d44e760de..6e98cb8cf 100644 --- a/debian/patches/020_add-nxagent-wrapper.full.patch +++ b/debian/patches/020_add-nxagent-wrapper.full.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/bin/nxagent -@@ -0,0 +1,30 @@ +@@ -0,0 +1,32 @@ +#!/bin/bash + +# Copyright (C) 2012 Mike Gabriel @@ -18,6 +18,7 @@ +# 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 + @@ -25,9 +26,10 @@ +NX_TEMP=${NX_TEMP:-/tmp} +export NX_TEMP + -+LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH -+test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS ++LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH ++test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS ++test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS + +export LD_LIBRARY_PATH + -+exec $NX_LIBS/bin/nxagent "$@" ++exec $NX_LIBS/bin/$NXAPP "$@" -- cgit v1.2.3