diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 22:27:26 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 22:27:26 +0200 |
| commit | f801d405dcdf4d80e8b6b4bfcad9a0013e57be9b (patch) | |
| tree | 7db3f463a9c680317b9510583bf83adf7a0a89ad /debian/patches/021_add-nxauth-wrapper.full.patch | |
| parent | d39771037bea6109cc7ce2e41c9f0d3271f536a3 (diff) | |
| download | nx-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/021_add-nxauth-wrapper.full.patch')
| -rw-r--r-- | debian/patches/021_add-nxauth-wrapper.full.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/patches/021_add-nxauth-wrapper.full.patch b/debian/patches/021_add-nxauth-wrapper.full.patch index 54df5d62a..caa1a71c8 100644 --- a/debian/patches/021_add-nxauth-wrapper.full.patch +++ b/debian/patches/021_add-nxauth-wrapper.full.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/bin/nxauth -@@ -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=nxauth +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/nxauth "$@" ++exec $NX_LIBS/bin/$NXAPP "$@" +\ No newline at end of file |