merge in changes from 2.0 ongoing. Includes the build type in the package name and other fixes from 2.0

git-svn-id: svn://localhost/ardour2/branches/3.0@8962 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 14 insertions, 5 deletions

diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh
index 43e86b2fb2..33863ee646 100755
--- a/tools/linux_packaging/install.sh
+++ b/tools/linux_packaging/install.sh
@@ -3,14 +3,23 @@
 # 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.
+
+SAVED_PWD=$PWD
+PKG_PATH=$(dirname $(readlink -f $0))
+cd ${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
+
+cd ${SAVED_PWD}