From: Steve Dower <steve.dower@python.org>
Date: Fri, 30 Sep 2022 09:29:31 +0000 (+0100)
Subject: gh-90989: Install Windows launcher per-user, and clarify some installer text (GH... 
X-Git-Tag: v3.12.0a1~325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff54dd96cbe589635ed95c8b5b26bc768166b07d;p=thirdparty%2FPython%2Fcpython.git

gh-90989: Install Windows launcher per-user, and clarify some installer text (GH-97655)
---

diff --git a/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst b/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst
new file mode 100644
index 000000000000..786b3435042d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-09-29-23-08-49.gh-issue-90989.no89Q2.rst
@@ -0,0 +1,2 @@
+Made :ref:`launcher` install per-user by default (unless an all users
+install already exists), and clarify some text in the installer.
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index 8b2633fe89f7..e83a540a0e67 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -79,15 +79,15 @@ Select Customize to review current options.</String>
   <String Id="Include_launcherRemove">Use Programs and Features to remove the 'py' launcher.</String>
   <String Id="Include_launcherUpgrade">Upgrades the global 'py' launcher from the previous version.</String>
   
-  <String Id="AssociateFilesLabel">Associate &amp;files with Python (requires the py launcher)</String>
+  <String Id="AssociateFilesLabel">Associate &amp;files with Python (requires the 'py' launcher)</String>
   <String Id="ShortcutsLabel">Create shortcuts for installed applications</String>
   <String Id="PrependPathLabel">Add Python to &amp;environment variables</String>
-  <String Id="ShortPrependPathLabel">Add &amp;Python [ShortVersion] to PATH</String>
+  <String Id="ShortPrependPathLabel">Add &amp;python.exe to PATH</String>
   <String Id="AppendPathLabel">Append Python to &amp;environment variables</String>
-  <String Id="ShortAppendPathLabel">Append &amp;Python [ShortVersion] to PATH</String>
-  <String Id="InstallAllUsersLabel">Install for &amp;all users</String>
-  <String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires elevation)</String>
-  <String Id="ShortInstallLauncherAllUsersLabel">Install &amp;launcher for all users (recommended)</String>
+  <String Id="ShortAppendPathLabel">Append &amp;python.exe to PATH</String>
+  <String Id="InstallAllUsersLabel">Install Python [ShortVersion] for &amp;all users</String>
+  <String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires admin privileges)</String>
+  <String Id="ShortInstallLauncherAllUsersLabel">Use admin privi&amp;leges when installing py.exe</String>
   <String Id="PrecompileLabel">&amp;Precompile standard library</String>
   <String Id="Include_symbolsLabel">Download debugging &amp;symbols</String>
   <String Id="Include_debugLabel">Download debu&amp;g binaries (requires VS 2017 or later)</String>
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index d23158c2cae9..8b12baae3110 100644
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -28,7 +28,7 @@
 
     <Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" />
     <?if "$(var.PyTestExt)"="" ?>
-    <Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" />
+    <Variable Name="InstallLauncherAllUsers" Value="0" bal:Overridable="yes" />
     <?else ?>
     <Variable Name="InstallLauncherAllUsers" Value="0" />
     <?endif ?>