summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2020-06-17 03:18:55 -0400
committerNed Deily <nad@python.org>2020-06-17 03:18:55 -0400
commit966036af0e5e1dff8fedd423d90a246067537345 (patch)
treee1edd4b5e1208854a512b9c1af0f74a3d92b02be
parentUpdate the macOS installer build scripts (diff)
downloadcpython-966036af0e5e1dff8fedd423d90a246067537345.tar.gz
cpython-966036af0e5e1dff8fedd423d90a246067537345.tar.bz2
cpython-966036af0e5e1dff8fedd423d90a246067537345.zip
bpo-39580: add check for CLI installation on macOS
Adds a simple check for whether or not the package is being installed in the GUI or using installer on the command line. This addresses an issue where CLI-based software management tools (such as Munki) unexpectedly open Finder windows into a GUI session during installation runs.
-rwxr-xr-xMac/BuildScript/scripts/postflight.documentation4
-rw-r--r--Misc/NEWS.d/next/macOS/2020-06-17-03-18-38.bpo-39580.UBX7Bu.rst1
2 files changed, 4 insertions, 1 deletions
diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation
index 3cbbc1bf10c..ec48599cba7 100755
--- a/Mac/BuildScript/scripts/postflight.documentation
+++ b/Mac/BuildScript/scripts/postflight.documentation
@@ -12,7 +12,9 @@ SHARE_DOCDIR_TO_FWK="../../.."
# make link in /Applications/Python m.n/ for Finder users
if [ -d "${APPDIR}" ]; then
ln -fhs "${FWK_DOCDIR}/index.html" "${APPDIR}/Python Documentation.html"
- open "${APPDIR}" || true # open the applications folder
+ if [ "${COMMAND_LINE_INSTALL}" != 1 ]; then
+ open "${APPDIR}" || true # open the applications folder
+ fi
fi
# make share/doc link in framework for command line users
diff --git a/Misc/NEWS.d/next/macOS/2020-06-17-03-18-38.bpo-39580.UBX7Bu.rst b/Misc/NEWS.d/next/macOS/2020-06-17-03-18-38.bpo-39580.UBX7Bu.rst
new file mode 100644
index 00000000000..b6b31f42e46
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2020-06-17-03-18-38.bpo-39580.UBX7Bu.rst
@@ -0,0 +1 @@
+Avoid opening Finder window if running installer from the command line.