feat: use official keys from steamcmd

team-gsri · Dec 6, 2023 · 0123e84 · 0123e84
1 parent c3006e1
commit 0123e84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/src/ArmaServer-InstallBohemiaKeys.ps1 b/src/ArmaServer-InstallBohemiaKeys.ps1
@@ -15,19 +15,9 @@ param (
 
   [Parameter()]
   [string]
-  $WorkshopPattern = '^[0-9]+$',
-
-  [Parameter()]
-  [uri]
-  $OfficialKeysUri = 'https://arma.gsri.team/legacy/keys.zip'
+  $WorkshopPattern = '^[0-9]+$'
 )
 
-Begin {
-  Write-Verbose "Removing old keys from $DestinationPath"
-  New-Item $DestinationPath -ItemType Directory -Force | Out-Null
-  Get-ChildItem -Recurse -Filter *.bikey $DestinationPath | Remove-Item -Force
-}
-
 Process {
   $AddonPath = switch ($true) {
     ($AddonName -match $WorkshopPattern) {
@@ -43,11 +33,3 @@ Process {
   Write-Verbose "Copy addon keys from $AddonPath"
   Get-ChildItem $AddonPath -Recurse -Filter '*.bikey' | Copy-Item -Destination $DestinationPath
 }
-
-End {
-  $KeysZip = New-TemporaryFile
-  Write-Verbose "Download official BI keys from $OfficialKeysUri"
-  Invoke-WebRequest -Uri $OfficialKeysUri -OutFile $KeysZip
-  Expand-Archive -Path $KeysZip -DestinationPath $DestinationPath
-  Remove-Item -Force $KeysZip
-}
diff --git a/src/Install-ArmaServer.ps1 b/src/Install-ArmaServer.ps1
@@ -17,6 +17,8 @@ End {
   Stop-ArmaServer -ConfigFilename $ConfigFilename
   New-Item $Config.MasterPath -ItemType Directory -Force | Out-Null
   New-Item $Config.WorkshopPath -ItemType Directory -Force | Out-Null
+  New-Item $KeysPath -ItemType Directory -Force | Out-Null
+  Get-ChildItem -Recurse -Filter *.bikey $KeysPath | Remove-Item -Force
   $Addons | ArmaServer-InvokeDownload -MasterPath $Config.MasterPath -WorkshopPath $Config.WorkshopPath -Beta $Config.Beta -Quit
   $Addons | ArmaServer-InstallBohemiaKeys -DestinationPath $KeysPath -WorkshopPath $Config.WorkshopPath
   $Config.Missions | ArmaServer-InstallMission -DestinationPath $MissionsPath