Fix wrapper scripts: make sure all NX executables can be launched if NX gets installed via the tarball installation method.

5 files changed, 39 insertions, 17 deletions

diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 5c13e630b..4910982c4 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -45,7 +45,7 @@ Last-Update: 2011-12-31
 +	fi
 --- /dev/null
 +++ b/bin/Makefile
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,24 @@
 +#!/usr/bin/make -f
 +
 +INSTALL_DIR=install -d -o root -g root -m 755
@@ -55,9 +55,18 @@ Last-Update: 2011-12-31
 +DESTDIR=
 +PREFIX ?= /usr/local
 +BINDIR=$(PREFIX)/bin
++NXLIBDIR=$(PREFIX)/lib/nx
++X2GOLIBDIR=$(PREFIX)/lib/x2go
 +
 +%:
++	echo "Nothing to do for $@..."
 +
 +install:
++	$(INSTALL_DIR) $(X2GOLIBDIR)/bin/
++	ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent
 +	find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
 +	find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done
++
++uninstall:
++	find nx* | while read file; do rm -f $(BINDIR)/$$file; done
++	find x2go* | while read file; do rm -f $(BINDIR)/$$file; done
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 <mike.gabriel@das-netzwerkteam.de>
@@ -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 "$@"
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
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
diff --git a/debian/patches/023_add-x2goagent-wrapper.full.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
index 05b9134b7..b3be89434 100644
--- a/debian/patches/023_add-x2goagent-wrapper.full.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.full.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/bin/x2goagent
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,32 @@
 +#!/bin/bash
 +
 +# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
@@ -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=x2goagent
 +NX_LIBS=/usr/lib/nx
 +NX_LOCAL_LIBS=/usr/local/lib/nx
 +
@@ -25,9 +26,11 @@
 +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/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
++test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
 +
 +export LD_LIBRARY_PATH
 +
-+exec $NX_LIBS/../x2go/bin/x2goagent "$@"
++exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
+\ No newline at end of file