aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-20 22:27:26 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-10-20 22:27:26 +0200
commitf801d405dcdf4d80e8b6b4bfcad9a0013e57be9b (patch)
tree7db3f463a9c680317b9510583bf83adf7a0a89ad /debian/patches/022_add-nxproxy-wrapper.full+lite.patch
parentd39771037bea6109cc7ce2e41c9f0d3271f536a3 (diff)
downloadnx-libs-f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b.tar.gz
nx-libs-f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b.tar.bz2
nx-libs-f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b.zip
Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method.
Diffstat (limited to 'debian/patches/022_add-nxproxy-wrapper.full+lite.patch')
-rw-r--r--debian/patches/022_add-nxproxy-wrapper.full+lite.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
index d8c49cff5..20a1e6823 100644
--- a/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
+++ b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/bin/nxproxy
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
@@ -18,15 +18,19 @@
+# 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
-+LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+
+# make sure nxagent starts properly with pam_tmpdir.so being in use
+NX_TEMP=${NX_TEMP:-/tmp}
+export NX_TEMP
+
-+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/nxproxy "$@"
++exec $NX_LIBS/bin/$NXAPP "$@"
+\ No newline at end of file