LOOT now requires 64-bit Windows 10 or 11.

JourneyOver · Jun 13, 2023 · b001018 · b001018
1 parent f3001cc
commit b001018
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/automatic/loot/legal/VERIFICATION.txt b/automatic/loot/legal/VERIFICATION.txt
@@ -10,15 +10,13 @@ and can be verified by doing the following:
 1. Download the following:
 
   url: <https://github.com/loot/loot/releases/download/0.19.1/loot_0.19.1-win32.exe>
-  url64: <https://github.com/loot/loot/releases/download/0.19.1/loot_0.19.1-win64.exe>
 
 2. You can obtain the checksum using one of the following methods:
   - Use powershell function 'Get-FileHash'
   - Use Chocolatey utility 'checksum.exe'
 
   checksum type: sha256
   checksum: 6DFD6323C52DC1E1325920FA655847D8A4FB8FE153720491D875971859BFD741
-  checksum64: F06569A8A11D47EF0E9C7006FC712300FD2A0E716BBAE79A70DDD1CFC66FD9E9
 
 Using AU:
 

diff --git a/automatic/loot/loot.nuspec b/automatic/loot/loot.nuspec
@@ -40,7 +40,7 @@ LOOT is intended to make using mods easier, and mod users should still possess a
 * Automatically built and uploaded by [JourneyOver](https://chocolatey.org/profiles/JourneyOver)
 * If you have any requests or issues with this package please make an issue [here](https://github.com/JourneyOver/chocolatey-packages) instead of "Contact Maintainers"</releaseNotes>
     <dependencies>
-      <dependency id="vcredist2017" version="14.15.26706" />
+      <dependency id="vcredist140" version="14.36.32532" />
     </dependencies>
   </metadata>
   <files>

diff --git a/automatic/loot/tools/chocolateyInstall.ps1 b/automatic/loot/tools/chocolateyInstall.ps1
@@ -3,14 +3,16 @@
 $packageName = 'loot'
 
 $toolsDir = Split-Path $MyInvocation.MyCommand.Definition
-$fileLocation32bit = Get-Item "$toolsDir\*win32.exe"
-$fileLocation64bit = Get-Item "$toolsDir\*win64.exe"
+$fileLocation = Get-Item "$toolsDir\*.exe"
+
+if ((Get-OSArchitectureWidth 32) -or $env:ChocolateyForceX86) {
+  throw ("This application currently only supports 64-bit Windows.")
+}
 
 $packageArgs = @{
   packageName    = $packageName
   fileType       = 'exe'
   file           = $fileLocation
-  file64         = $fileLocation64bit
   silentArgs     = "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /LOG=`"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).InnoInstall.log`""
   validExitCodes = @(0)
 }

diff --git a/automatic/loot/update.ps1 b/automatic/loot/update.ps1
@@ -9,9 +9,7 @@ function global:au_SearchReplace {
     ".\legal\VERIFICATION.txt" = @{
       "(?i)(^\s*location on\:?\s*)\<.*\>" = "`${1}<$($Latest.ReleaseUri)>"
       "(?i)(^\s*url(32)?\:\s*).*"         = "`${1}<$($Latest.URL32)>"
-      "(?i)(^\s*url64?\:\s*).*"           = "`${1}<$($Latest.URL64)>"
       "(?i)(^\s*checksum(32)?\:\s*).*"    = "`${1}$($Latest.Checksum32)"
-      "(?i)(^\s*checksum64?\:\s*).*"      = "`${1}$($Latest.Checksum64)"
       "(?i)(^\s*checksum\s*type\:\s*).*"  = "`${1}$($Latest.ChecksumType32)"
     }
 
@@ -40,12 +38,11 @@ function global:au_AfterUpdate($Package) {
 function global:au_GetLatest {
   $release = Get-LatestGithubReleases $repoUser $repoName $false
 
-  $url32 = $release.latest.Assets | Where-Object { $_ -match 'win32\.exe$' } | Select-Object -First 1
-  $url64 = $release.latest.Assets | Where-Object { $_ -match 'win64\.exe$' } | Select-Object -First 1
+  $url32 = $release.latest.Assets | Where-Object { $_ -match 'win64\.exe$' } | Select-Object -First 1
   $cversionlog = $release.latest.Version
   $changelog = "https://loot.readthedocs.io/en/0.0.0/app/changelog.html" -replace ("en\/(\d+)\.(\d+)\.(\d+)\/app", "en/$cversionlog/app")
 
-  $Latest = @{ URL32 = $url32; URL64 = $url64; Version = $release.latest.Version; ReleaseUri = $release.latest.ReleaseUrl; Changelog = $changelog }
+  $Latest = @{ URL32 = $url32; Version = $release.latest.Version; ReleaseUri = $release.latest.ReleaseUrl; Changelog = $changelog }
   return $Latest
 }