summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Naugle <toddn@glw.com>2011-02-08 22:50:27 +0000
committerTodd Naugle <toddn@glw.com>2011-02-08 22:50:27 +0000
commit12ac0049aaa7087f449ae94f0378a6dfe9b915aa (patch)
treea5c23b40b1ee0a23779c0866e37a33a72c9569e6
parentb7a26970d43a18b16b824836bb9467bed0faa99e (diff)
Set the PWD here also. Some systems lose this when install calls stage2. Adds better qjackctl text.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8781 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rwxr-xr-xtools/linux_packaging/stage2.run11
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run
index e62d150251..8b8324d9c5 100755
--- a/tools/linux_packaging/stage2.run
+++ b/tools/linux_packaging/stage2.run
@@ -99,6 +99,11 @@ SystemInstall ()
# Main
########################################################################
+# If you double click a script, some systems don't get the PWD correct.
+# Force it to be correct
+PKG_PATH=$(dirname $(readlink -f $0))
+cd ${PKG_PATH}
+
echo ""
echo "Welcome to the ${PGM_NAME} installer"
echo ""
@@ -356,7 +361,9 @@ fi
if ! which qjackctl > /dev/null;
then
echo ""
- echo "The program QjackCtl is missing from this system. QjackCtl is an OPTIONAL component of $PGM_NAME."
+ echo "The program QjackCtl is missing from this system."
+ echo "QjackCtl is an extremely useful tool for any system that runs JACK applications like $PGM_NAME.
+ echo "We recommend that you install it."
echo ""
ANSWER=$(VaildateYesNoQuestion "Install QjackCtl using system software repository?")
@@ -513,6 +520,6 @@ then
fi
echo ""
-read -p "Press ENTER to close this window:" BLAH
+read -p "Press ENTER to exit installer:" BLAH