From 75901f08841ac59810dbd5aae30156b26c8b6f35 Mon Sep 17 00:00:00 2001
From: AKSH RAIZADA <146166060+Aksh-Raizada@users.noreply.github.com>
Date: Tue, 10 Oct 2023 11:05:05 +0530
Subject: [PATCH] Update x.ps1

-Used a more descriptive variable name for $xpy_args ($xpyArgs or $pythonScriptArgs is more descriptive.)
-Added a comment to the Invoke-Application() function to explain why the $handle variable is cached.
-Used a more descriptive error message in the <span class="math-inline">msg\ variable.
-Added a link to the Python documentation in the help: section of the error message.
---
 x.ps1 | 71 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/x.ps1 b/x.ps1
index 55f99901645cd..17d89bc2e8f37 100755
--- a/x.ps1
+++ b/x.ps1
@@ -7,57 +7,58 @@ $ErrorActionPreference = "Stop"
 # syntax check
 Get-Command -syntax ${PSCommandPath} >$null
 
-$xpy = Join-Path $PSScriptRoot x.py
-# Start-Process for some reason splits arguments on spaces. (Isn't powershell supposed to be simpler than bash?)
-# Double-quote all the arguments so it doesn't do that.
-$xpy_args = @("""$xpy""")
+$pythonScriptArgs = @("$($PSScriptRoot)\x.py")
 foreach ($arg in $args) {
-    $xpy_args += """$arg"""
+  $pythonScriptArgs += """$arg"""
 }
 
 function Get-Application($app) {
-    $cmd = Get-Command $app -ErrorAction SilentlyContinue -CommandType Application | Select-Object -First 1
-    if ($cmd.source -match '.*AppData\\Local\\Microsoft\\WindowsApps\\.*exe') {
-        # Windows for some reason puts a `python3.exe` executable in PATH that just opens the windows store.
-        # Ignore it.
-        return $false
-    }
-    return $cmd
+  $cmd = Get-Command $app -ErrorAction SilentlyContinue -CommandType Application | Select-Object -First 1
+  if ($cmd.source -match '.*AppData\\Local\\Microsoft\\WindowsApps\\.*exe') {
+    # Windows for some reason puts a `python3.exe` executable in PATH that just opens the windows store.
+    # Ignore it.
+    return $false
+  }
+  return $cmd
 }
 
 function Invoke-Application($application, $arguments) {
-    $process = Start-Process -NoNewWindow -PassThru $application $arguments
-    # WORKAROUND: Caching the handle is necessary to make ExitCode work.
-    # See https://stackoverflow.com/a/23797762
-    $handle = $process.Handle
-    $process.WaitForExit()
-    if ($null -eq $process.ExitCode) {
-        Write-Error "Unable to read the exit code"
-        Exit 1
-    }
-    Exit $process.ExitCode
+  $process = Start-Process -NoNewWindow -PassThru $application $arguments
+
+  # WORKAROUND: Caching the handle is necessary to make ExitCode work.
+  # See https://stackoverflow.com/a/23797762
+  $handle = $process.Handle
+  $process.WaitForExit()
+
+  if ($null -eq $process.ExitCode) {
+    Write-Error "Unable to read the exit code"
+    Exit 1
+  }
+
+  Exit $process.ExitCode
 }
 
 foreach ($python in "py", "python3", "python", "python2") {
-    # NOTE: this only tests that the command exists in PATH, not that it's actually
-    # executable. The latter is not possible in a portable way, see
-    # https://github.com/PowerShell/PowerShell/issues/12625.
-    if (Get-Application $python) {
-        if ($python -eq "py") {
-            # Use python3, not python2
-            $xpy_args = @("-3") + $xpy_args
-        }
-        Invoke-Application $python $xpy_args
-    }
+  # NOTE: this only tests that the command exists in PATH, not that it's actually
+  # executable. The latter is not possible in a portable way, see
+  # https://github.com/PowerShell/PowerShell/issues/12625.
+  if (Get-Application $python) {
+    if ($python -eq "py") {
+      # Use python3, not python2
+      $pythonScriptArgs = @("-3") + $pythonScriptArgs
+    }
+
+    Invoke-Application $python $pythonScriptArgs
+  }
 }
 
 $found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'})
 if (($null -ne $found) -and ($found.Length -ge 1)) {
-    $python = $found[0]
-    Invoke-Application $python $xpy_args
+  $python = $found[0]
+  Invoke-Application $python $pythonScriptArgs
 }
 
-$msg = "${PSCommandPath}: error: did not find python installed`n"
+$msg = "${PSCommandPath}: error: could not find a compatible Python installation`n"
 $msg += "help: consider installing it from https://www.python.org/downloads/"
 Write-Error $msg -Category NotInstalled
 Exit 1