From bc7dc158c4b4d1e958474b7ace1e0079ed2dbe45 Mon Sep 17 00:00:00 2001
From: Todd Naugle <toddn@glw.com>
Date: Wed, 2 Feb 2011 22:01:24 +0000
Subject: [PATCH] Make the installer work on more systems.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8682 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 tools/linux_packaging/install.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh
index 43e86b2fb2..e9cde28b66 100755
--- a/tools/linux_packaging/install.sh
+++ b/tools/linux_packaging/install.sh
@@ -3,14 +3,22 @@
 # Make sure we have a terminal for the user to see and then run
 # the real install script.
 
-if [ -z $WINDOWID ]; then
+# Some systems don't correctly set the PWD when a script is double-clicked,
+# so go ahead and figure out our path and make sure we are in that directory.
+
+PKG_PATH=$(dirname $(readlink -f $0))
+pushd ${PKG_PATH}
+
+if [ -z "$TERM" ] || [ "$TERM" == "dumb" ]; then
 	if which xterm > /dev/null; then
-		exec xterm -e ./stage2.run
+		exec xterm -e ${PKG_PATH}/stage2.run
 	elif which gnome-terminal > /dev/null; then
-		exec gnome-terminal -e ./stage2.run
+		exec gnome-terminal -e ${PKG_PATH}/stage2.run
 	elif which konsole > /dev/null; then
-		exec konsole -e ./stage2.run
+		exec konsole -e ${PKG_PATH}/stage2.run
 	fi
 else
-	./stage2.run
+	${PKG_PATH}/stage2.run
 fi
+
+popd