Fix up

Author: SeanTAllen

make.ps1

@@ -13,7 +13,7 @@ Param(
 
   [Parameter(HelpMessage="Architecture (native, x64).")]
   [string]
-  $ZipArch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture,
+  $Arch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture,
 
   [Parameter(HelpMessage="Directory to install to.")]
   [string]
@@ -22,13 +22,13 @@ Param(
 
 $ErrorActionPreference = "Stop"
 
-if ($ZipArch -ieq 'x64')
+if ($Arch -ieq 'x64')
 {
-  $ZipArch = 'x86-64'
+  $Arch = 'x86-64'
 }
-elseif ($ZipArch -ieq 'arm64')
+elseif ($Arch -ieq 'arm64')
 {
-  $ZipArch = 'arm64'
+  $Arch = 'arm64'
 }
 
 $target = "ponyup" # The name of the target executable.
@@ -104,8 +104,8 @@ function BuildTarget
   {
     if ($binaryTimestamp -lt $file.LastWriteTimeUtc)
     {
-      Write-Host "corral run -- ponyc $configFlag $ponyArgs --output `"$buildDir`" --bin-name `"$target`" `"$srcDir`""
-      $output = (corral run -- ponyc $configFlag $ponyArgs --output "$buildDir" --bin-name "$target" "$srcDir")
+      Write-Host "corral run -- ponyc $configFlag $ponyArgs --cpu `"$Arch`" --output `"$buildDir`" --bin-name `"$target`" `"$srcDir`""
+      $output = (corral run -- ponyc $configFlag $ponyArgs --cpu `"$Arch`"--output "$buildDir" --bin-name "$target" "$srcDir")
       $output | ForEach-Object { Write-Host $_ }
       if ($LastExitCode -ne 0) { throw "Error" }
       break buildFiles
@@ -216,7 +216,7 @@ switch ($Command.ToLower())
     if (-not $isLibrary)
     {
       $binDir = Join-Path -Path $Destdir -ChildPath "bin"
-      $package = "$target-$ZipArch-pc-windows-msvc.zip"
+      $package = "$target-$Arch-pc-windows-msvc.zip"
       Write-Host "Creating $package..."
 
       Compress-Archive -Path $binDir -DestinationPath "$buildDir\..\$package" -Force

ponyup-init.ps1

@@ -4,13 +4,13 @@ $ErrorActionPreference = 'Stop'
 $Arch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture
 if ($Arch -ieq 'x64')
 {
-  $Arch = 'x86_64'
-  $ZipArch = 'x86-64'
+  $Arch = 'x86-64'
+  $PlatformStringArch = 'x86_64'
 }
 elseif ($Arch -ieq 'arm64')
 {
   $Arch = 'arm64'
-  $ZipArch = 'arm64'
+  $PlatformStringArch = 'arm64'
 }
 
 $tempParent = [System.IO.Path]::GetTempPath()
@@ -20,7 +20,7 @@ New-Item -ItemType Directory -Path $tempPath
 
 $downloadUrl = 'https://dl.cloudsmith.io/public/ponylang/releases/raw/versions/latest'
 
-$zipName = "ponyup-$ZipArch-pc-windows-msvc.zip"
+$zipName = "ponyup-$Arch-pc-windows-msvc.zip"
 $zipUrl = "$downloadUrl/$zipName"
 $zipPath = "$tempPath\$zipName"
 
@@ -35,13 +35,13 @@ if (-not (Test-Path $ponyupPath)) {
 Write-Host "Unzipping to $ponyupPath..."
 Expand-Archive -Force -Path $zipPath -DestinationPath $ponyupPath
 
-$platform = "$Arch-pc-windows-msvc"
+$platform = "$PlatformStringArch-pc-windows-msvc"
 Write-Host "Setting platform to $platform..."
 Set-Content -Path "$ponyupPath\.platform" -Value $platform
 
 $version = & "$ponyupPath\bin\ponyup" version
 if ($version -match 'ponyup (\d+\.\d+\.\d+)') {
-  $lockStr = "ponyup-release-$($Matches[1])-$Arch-windows"
+  $lockStr = "ponyup-release-$($Matches[1])-$PlatformStringArch-windows"
   Write-Host "Locking ponyup version to $lockStr..."
   $lockPath = "$ponyupPath\.lock"