summaryrefslogtreecommitdiff
path: root/tools/linux_packaging/install.sh
diff options
context:
space:
mode:
authorTodd Naugle <toddn@glw.com>2011-11-08 18:07:29 +0000
committerTodd Naugle <toddn@glw.com>2011-11-08 18:07:29 +0000
commit07ff18db2a0c8454f9d2535cad4efbf940d16aa9 (patch)
tree0a5d7e5db18c4f499856f0f2a79e54b11dc4ad9b /tools/linux_packaging/install.sh
parentc8921ea277ad6321ed4c699e5106fc53fbcdad71 (diff)
Installer now handles i18n of the Desktop folder. Running the installer or uninstaller as root work correctly and does not invalidate the sanity checks. Corrected method used to detect if the installer is already running in a visable terminal.
git-svn-id: svn://localhost/ardour2/branches/3.0@10502 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/linux_packaging/install.sh')
-rwxr-xr-xtools/linux_packaging/install.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh
index bedabf9fc4..b66b6d9dbe 100755
--- a/tools/linux_packaging/install.sh
+++ b/tools/linux_packaging/install.sh
@@ -10,7 +10,10 @@ SAVED_PWD=$PWD
PKG_PATH=$(dirname "$(readlink -f "$0")")
cd "${PKG_PATH}"
-if [ -z "$TERM" ] || [ "$TERM" = "dumb" ] || [ -z "$PS1" ]; then
+# check for an interactive terminal
+# -t fd - Returns true if file descriptor fd is open and refers to a terminal.
+# fd 1 is stdout
+if [ ! -t 1 ]; then
if which xterm > /dev/null; then
exec xterm -e "${PKG_PATH}/.stage2.run"
elif which gnome-terminal > /dev/null; then