[core][ultimate] IDEA-347489 upgrade to PY was fixed, the correct shell name...

[core][ultimate] IDEA-347489 upgrade to PY was fixed, the correct shell name is used when ide is started

(cherry picked from commit 75dca3ebfa0a172245508dd495c6f2504a144104)

IJ-CR-128122

GitOrigin-RevId: 3be24a8d1bf010f1bb2066b5f4e888b6e0a4638a

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/upgradeToUltimate/installation/install/UltimateInstallationService.kt

@@ -240,10 +240,12 @@ class UltimateInstallationService(
 
 private fun SuggestedIde.canBeAutoInstalled(): Boolean {
   return when {
-    PlatformUtils.isIdeaCommunity() && productCode == "IU" -> true
-    PlatformUtils.isPyCharmCommunity() && productCode == "PY" -> true
+    PlatformUtils.isIdeaCommunity() && isIdeUltimate() -> true
+    PlatformUtils.isPyCharmCommunity() && isPycharmProfessional() -> true
     else -> false
   }
 }
-  
+
+internal fun SuggestedIde.isIdeUltimate() = productCode == "IU"
+internal fun SuggestedIde.isPycharmProfessional() = productCode == "PY"
 

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/upgradeToUltimate/installation/linux/LinuxInstaller.kt

@@ -3,10 +3,7 @@ package com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.DownloadResult
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.InstallationResult
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.UltimateInstaller
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.runCommand
+import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.*
 import com.intellij.openapi.util.io.toNioPathOrNull
 import com.intellij.util.SystemProperties
 import com.intellij.util.io.Decompressor
@@ -37,7 +34,8 @@ internal class LinuxInstaller(scope: CoroutineScope, project: Project) : Ultimat
 
   override fun startUltimate(installationResult: InstallationResult): Boolean {
     val installed = installationResult.appPath
-    val shellPath = installed.resolve("bin").resolve("idea.sh")
+    val shellName = if (installationResult.suggestedIde.isPycharmProfessional()) "pycharm" else "idea"
+    val shellPath = installed.resolve("bin").resolve("$shellName.sh")
 
     val command = GeneralCommandLine("sh", "-c", "${shellPath.pathString} ${project.basePath} $trialParameter &")
     

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/upgradeToUltimate/installation/windows/WindowsInstaller.kt

@@ -3,10 +3,7 @@ package com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.DownloadResult
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.InstallationResult
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.UltimateInstaller
-import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.runCommand
+import com.intellij.openapi.updateSettings.impl.upgradeToUltimate.installation.install.*
 import com.intellij.openapi.util.io.toNioPathOrNull
 import com.intellij.util.SystemProperties
 import com.intellij.util.applyIf
@@ -46,7 +43,7 @@ internal class WindowsInstaller(scope: CoroutineScope, project: Project) : Ultim
 
   override fun startUltimate(installationResult: InstallationResult): Boolean {
     val appPath = installationResult.appPath
-    val exeName = if (installationResult.suggestedIde.productCode == "PY") "pycharm64" else "idea64"
+    val exeName = if (installationResult.suggestedIde.isPycharmProfessional()) "pycharm64" else "idea64"
     val exePath = appPath.resolve("bin").resolve("$exeName.exe").pathString
 
     val basePath = project.basePath