Commit 189bfbe1 authored by Mike Gabriel's avatar Mike Gabriel

Make sure the NX_TEMP envvar gets set in all wrapper script for all nx* executables

parent 8d2827b2
...@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low ...@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.15-0) UNRELEASED; urgency=low
* Add VERSION.x2goagent to package x2goagent package so x2goversion command * Add VERSION.x2goagent to package x2goagent package so x2goversion command
lists up x2goagent in the list of X2Go server-side packages. lists up x2goagent in the list of X2Go server-side packages.
* Refresh patch: 200_nxagent_check-binary-x2go-flavour.full.patch. * Refresh patch: 200_nxagent_check-binary-x2go-flavour.full.patch.
* Make sure the NX_TEMP envvar gets set in all wrapper script for all nx*
execubles.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Jun 2012 14:54:51 +0200
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
+ +
+# make sure nxagent starts properly with pam_tmpdir.so being in use +# make sure nxagent starts properly with pam_tmpdir.so being in use
+NX_TEMP=${NX_TEMP:-/tmp} +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 +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 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+ +
+export LD_LIBRARY_PATH +export LD_LIBRARY_PATH
+export NX_TEMP
+ +
+exec $NX_LIBS/nxagent "$@" +exec $NX_LIBS/nxagent "$@"
--- /dev/null --- /dev/null
+++ b/bin/nxauth +++ b/bin/nxauth
@@ -0,0 +1,25 @@ @@ -0,0 +1,29 @@
+#!/bin/bash +#!/bin/bash
+ +
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
+NX_LOCAL_LIBS=/usr/local/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 +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 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+export LD_LIBRARY_PATH +export LD_LIBRARY_PATH
+ +
......
--- /dev/null --- /dev/null
+++ b/bin/nxproxy +++ b/bin/nxproxy
@@ -0,0 +1,25 @@ @@ -0,0 +1,29 @@
+#!/bin/bash +#!/bin/bash
+ +
+# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
+NX_LOCAL_LIBS=/usr/local/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 +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 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+export LD_LIBRARY_PATH +export LD_LIBRARY_PATH
+ +
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
+ +
+# make sure nxagent starts properly with pam_tmpdir.so being in use +# make sure nxagent starts properly with pam_tmpdir.so being in use
+NX_TEMP=${NX_TEMP:-/tmp} +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 +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 +test -d $NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS
+ +
+export LD_LIBRARY_PATH +export LD_LIBRARY_PATH
+export NX_TEMP
+ +
+exec $NX_LIBS/../x2go/x2goagent "$@" +exec $NX_LIBS/../x2go/x2goagent "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment