From 8bc8feed2dac2d0e10d8e82badb6efbe9c852c52 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 27 Apr 2011 15:27:44 +0200
Subject: [PATCH] "Open Terminal Here" should open Terminal.app on Mac.

It was starting X11 and a xterm...

Task-number: QTCREATORBUG-4683
---
 share/qtcreator/scripts/openTerminal.command  | 29 +++++++++++++++++++
 share/qtcreator/static.pro                    |  1 +
 .../foldernavigationwidget.cpp                |  4 +++
 3 files changed, 34 insertions(+)
 create mode 100755 share/qtcreator/scripts/openTerminal.command

diff --git a/share/qtcreator/scripts/openTerminal.command b/share/qtcreator/scripts/openTerminal.command
new file mode 100755
index 00000000000..2d5791da8c2
--- /dev/null
+++ b/share/qtcreator/scripts/openTerminal.command
@@ -0,0 +1,29 @@
+#! /bin/bash
+
+i=`pwd`
+i=${i//\\/\\\\\\\\}
+i=${i//\"/\\\\\\\"}
+i=${i//\$/\\\\\\\$}
+i=${i//\`/\\\\\\\`}
+i=\\\"$i\\\"
+osascript <<EOF
+    --Terminal opens a window by default when it is not running, so check
+    on applicationIsRunning(applicationName)
+            tell application "System Events" to count (every process whose name is applicationName)
+            return result is greater than 0
+    end applicationIsRunning
+    set terminalWasRunning to applicationIsRunning("Terminal")
+
+    set cdScript to "cd $i"
+    tell application "Terminal"
+        --do script will open a new window if none given, but terminal already opens one if not running
+        if terminalWasRunning then
+            do script cdScript
+        else
+            do script cdScript in first window
+        end if
+        set currentTab to the result
+        set currentWindow to first window whose tabs contains currentTab
+        activate
+    end tell
+EOF
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 73105e5c196..2c416cd57d9 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -38,6 +38,7 @@ DATA_DIRS = \
     qml-type-descriptions \
     generic-highlighter \
     glsl
+macx: DATA_DIRS += scripts
 
 # conditionally deployed data
 !isEmpty(copydata) {
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 0710b1daf21..739abe8490d 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -441,6 +441,10 @@ void FolderNavigationWidget::openTerminal(const QString &path)
 #ifdef Q_OS_WIN
     const QString terminalEmulator = QString::fromLocal8Bit(qgetenv("COMSPEC"));
     const QStringList args; // none
+#elif defined(Q_WS_MAC)
+    const QString terminalEmulator = Core::ICore::instance()->resourcePath()
+            + QLatin1String("/scripts/openTerminal.command");
+    QStringList args;
 #else
     QStringList args = Utils::QtcProcess::splitArgs(
         Utils::ConsoleProcess::terminalEmulator(Core::ICore::instance()->settings()));