From 53f0e6c0eee68b4c971a01e15cf1277d252edd64 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 5 Sep 2018 17:43:22 +0200
Subject: [PATCH] macOS: Replace openTerminal.command by python script

This script will become even less trivial in the future, so use an
actually usable programming language for it.

Change-Id: I4fa1c8d327f97585bf8dde0ffaefc5fac7c1ca18
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 share/qtcreator/scripts/openTerminal.command | 36 ----------
 share/qtcreator/scripts/openTerminal.py      | 75 ++++++++++++++++++++
 src/libs/utils/consoleprocess_unix.cpp       |  2 +-
 3 files changed, 76 insertions(+), 37 deletions(-)
 delete mode 100755 share/qtcreator/scripts/openTerminal.command
 create mode 100755 share/qtcreator/scripts/openTerminal.py

diff --git a/share/qtcreator/scripts/openTerminal.command b/share/qtcreator/scripts/openTerminal.command
deleted file mode 100755
index 1f81a59050b..00000000000
--- a/share/qtcreator/scripts/openTerminal.command
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/bash
-
-# ugly escaping: for apple script \ and " need to be escaped, whereas %q takes care of all bash escaping
-declare -a args
-mydir=`pwd`
-mydir=$(printf '%q' "$mydir")
-mydir="${mydir//\\/\\\\}"
-args[0]="cd ${mydir//\"/\\\"};"
-for a in "$@" ; do
-    x=$(printf '%q ' "$a")
-    x="${x//\\/\\\\}"
-    args[${#args[@]}]="${x//\"/\\\"}"
-done
-mArgs=${args[@]:0}
-
-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 "$mArgs"
-    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/scripts/openTerminal.py b/share/qtcreator/scripts/openTerminal.py
new file mode 100755
index 00000000000..5aabf74cf53
--- /dev/null
+++ b/share/qtcreator/scripts/openTerminal.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+############################################################################
+#
+# Copyright (C) 2018 The Qt Company Ltd.
+# Contact: https://www.qt.io/licensing/
+#
+# This file is part of Qt Creator.
+#
+# Commercial License Usage
+# Licensees holding valid commercial Qt licenses may use this file in
+# accordance with the commercial license agreement provided with the
+# Software or, alternatively, in accordance with the terms contained in
+# a written agreement between you and The Qt Company. For licensing terms
+# and conditions see https://www.qt.io/terms-conditions. For further
+# information use the contact form at https://www.qt.io/contact-us.
+#
+# GNU General Public License Usage
+# Alternatively, this file may be used under the terms of the GNU
+# General Public License version 3 as published by the Free Software
+# Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+# included in the packaging of this file. Please review the following
+# information to ensure the GNU General Public License requirements will
+# be met: https://www.gnu.org/licenses/gpl-3.0.html.
+#
+############################################################################
+
+import os
+import pipes
+import subprocess
+import sys
+
+def quote_for_applescript(arg):
+    return arg.replace('\\', '\\\\').replace('"', '\\"')
+
+def quote(arg):
+    return quote_for_applescript(pipes.quote(arg))
+
+def quote_args(args):
+    return [quote(arg) for arg in args]
+
+def cd_cwd_arguments():
+    return ['cd', os.getcwd()]
+
+def apple_script(shell_script):
+    return '''
+--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 "{}"
+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
+'''.format(shell_script)
+
+def main():
+    args = quote_args(cd_cwd_arguments()) + [';'] + quote_args(sys.argv[1:])
+    shell_script = ' '.join(args)
+    osascript_process = subprocess.Popen(['/usr/bin/osascript'], stdin=subprocess.PIPE)
+    osascript_process.communicate(apple_script(shell_script))
+
+if __name__ == "__main__":
+    main()
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index df017a571ca..92b69952f6d 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -351,7 +351,7 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
         defaultTerm = []() -> TerminalCommand {
             if (HostOsInfo::isMacHost()) {
                 const QString termCmd = QCoreApplication::applicationDirPath()
-                                        + "/../Resources/scripts/openTerminal.command";
+                                        + "/../Resources/scripts/openTerminal.py";
                 if (QFileInfo::exists(termCmd))
                     return {termCmd, "", ""};
                 return {"/usr/X11/bin/xterm", "", "-e"};