From 713c9311b3ce05a2a2849489fcca4f7198f3f501 Mon Sep 17 00:00:00 2001 From: Viking Studios Date: Thu, 13 Jun 2024 18:42:09 +0100 Subject: [PATCH] fix make.ps1 --- .github/workflows/codacy.yml | 61 ++++ tools/make.ps1 | 682 ++++++++++++++++++----------------- 2 files changed, 413 insertions(+), 330 deletions(-) create mode 100644 .github/workflows/codacy.yml diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml new file mode 100644 index 0000000..53355df --- /dev/null +++ b/.github/workflows/codacy.yml @@ -0,0 +1,61 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow checks out code, performs a Codacy security scan +# and integrates the results with the +# GitHub Advanced Security code scanning feature. For more information on +# the Codacy security scan action usage and parameters, see +# https://github.com/codacy/codacy-analysis-cli-action. +# For more information on Codacy Analysis CLI in general, see +# https://github.com/codacy/codacy-analysis-cli. + +name: Codacy Security Scan + +on: + push: + branches: [ "main" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "main" ] + schedule: + - cron: '35 0 * * 3' + +permissions: + contents: read + +jobs: + codacy-security-scan: + permissions: + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/upload-sarif to upload SARIF results + actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status + name: Codacy Security Scan + runs-on: ubuntu-latest + steps: + # Checkout the repository to the GitHub Actions runner + - name: Checkout code + uses: actions/checkout@v4 + + # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis + - name: Run Codacy Analysis CLI + uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b + with: + # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository + # You can also omit the token and run the tools that support default configurations + project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} + verbose: true + output: results.sarif + format: sarif + # Adjust severity of non-security issues + gh-code-scanning-compat: true + # Force 0 exit code to allow SARIF file generation + # This will handover control about PR rejection to the GitHub side + max-allowed-issues: 2147483647 + + # Upload the SARIF file generated in the previous step + - name: Upload SARIF results file + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: results.sarif diff --git a/tools/make.ps1 b/tools/make.ps1 index 493a8eb..8c87c3e 100644 --- a/tools/make.ps1 +++ b/tools/make.ps1 @@ -11,404 +11,426 @@ $releasePage = "https://github.com/KoffeinFlummi/armake/releases" $downloadPage = "https://github.com/KoffeinFlummi/armake/releases/download/v*.*.*/armake_v*.*.*.zip" $armake2 = "$projectRoot\tools\armake2.exe" $armake = "$projectRoot\tools\armake.exe" -$tag = git describe --tag | %{$_ -replace "-.*-", "-"} +$tag = git describe --tag | ForEach-Object {$_ -replace "-.*-", "-"} $privateKeyFile = "$cachePath\keys\$modPrefix$tag.biprivatekey" $publicKeyFile = "$buildPath\keys\$modPrefix$tag.bikey" $timestamp = Get-Date -UFormat "%T" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - function Get-FullFileHash { - param ( - [String] $Algo = "MD5" - ) + param ( + [String] $Algo = "MD5" + ) - $hashes = @() + $hashes = @() - foreach ($file in $input) { - $string = $file.FullName + foreach ($file in $input) { + $string = $file.FullName - # http://jongurgul.com/blog/get-stringhash-get-filehash/ - $StringBuilder = New-Object System.Text.StringBuilder - [System.Security.Cryptography.HashAlgorithm]::Create($Algo).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($string))|%{ - [Void]$StringBuilder.Append($_.ToString("x2")) - } + # http://jongurgul.com/blog/get-stringhash-get-filehash/ + $StringBuilder = New-Object System.Text.StringBuilder + [System.Security.Cryptography.HashAlgorithm]::Create($Algo).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($string)) | ForEach-Object { + [Void]$StringBuilder.Append($_.ToString("x2")) + } - $hash = Get-FileHash $file.FullName -Algorithm $Algo - $hash.Hash = $hash.Hash + $StringBuilder.ToString() + $hash = Get-FileHash -Path $file.FullName -Algorithm $Algo + $hash.Hash = $hash.Hash + $StringBuilder.ToString() - $hashes += $hash - } + $hashes += $hash + } - return $hashes + return $hashes } - function Get-Hash { - [Cmdletbinding()] - param( - [Parameter(Mandatory=$True)] - [ValidateScript({ - if(Test-Path -Path $_ -ErrorAction SilentlyContinue) - { - return $true - } - else - { - throw "$($_) is not a valid path." - } - })] - [string]$Path, - [string]$Algo = "MD5" - ) - $temp = [System.IO.Path]::GetTempFileName() - - if (Test-Path -Path $Path -PathType Container) { - # Get child-file hashes - gci -File -Recurse $Path | Get-FullFileHash $Algo | select -ExpandProperty Hash | Out-File $temp -Append -NoNewline - # Hash directory in case that has changed - Get-Item $Path | Get-FileHash -Algorithm $Algo | Out-File $temp -Append -NoNewline - - $hash = Get-FileHash $temp -Algorithm $Algo - Remove-Item $temp - - } elseif (Test-Path -Path $Path -PathType Leaf) { - $hash = Get-FileHash $Path -Algorithm $Algo - - } else { - Write-Output " [$timestamp] Get-Hash unknown PathType: $Path" - } - - $hash.Path = $Path - return $hash + [CmdletBinding()] + param( + [Parameter(Mandatory=$True)] + [ValidateScript({ + if(Test-Path -Path $_ -ErrorAction SilentlyContinue) + { + return $true + } + else + { + throw "$($_) is not a valid path." + } + })] + [string]$Path, + [string]$Algo = "MD5" + ) + $temp = [System.IO.Path]::GetTempFileName() + + if (Test-Path -Path $Path -PathType Container) { + # Get child-file hashes + Get-ChildItem -File -Recurse -Path $Path | Get-FullFileHash -Algo $Algo | Select-Object -ExpandProperty Hash | Out-File -FilePath $temp -Append -NoNewline + # Hash directory in case that has changed + Get-Item -Path $Path | Get-FileHash -Algorithm $Algo | Out-File -FilePath $temp -Append -NoNewline + + $hash = Get-FileHash -Path $temp -Algorithm $Algo + Remove-Item -Path $temp + + } elseif (Test-Path -Path $Path -PathType Leaf) { + $hash = Get-FileHash -Path $Path -Algorithm $Algo + + } else { + Write-Output -InputObject " [$timestamp] Get-Hash unknown PathType: $Path" + } + + $hash.Path = $Path + return $hash } +function Get-SupportFiles { + param ( + [string] $type = $False + ) -function Get-Extras { - param ( - [string] $type = $False - ) + if (Test-Path -Path "$toolsPath\support-files.txt") { + $supportFilesRegex = Get-Content -Path "$toolsPath\support-files.txt" + } else { + $supportFilesRegex = "mod.cpp" + } - if (Test-Path -Path "$toolsPath\support-files.txt") { - $supportFilesRegex = Get-Content "$toolsPath\support-files.txt" - } else { - $supportFilesRegex = "mod.cpp" - } + $supportFiles = @() - $supportFiles = @() + if (Test-Path -Path "$projectRoot\extras") { + $supportFiles += Get-ChildItem -Path "$projectRoot\extras\*" + } - if (Test-Path -Path "$projectRoot\extras") { - $supportFiles += Get-ChildItem -Path "$projectRoot\extras\*" - } + $supportFiles += Get-ChildItem -Path "$projectRoot\*" | Where-Object -FilterScript {$_.Name -match $supportFilesRegex} - $supportFiles += Get-ChildItem -Path "$projectRoot\*" | Where-Object -FilterScript {$_.Name -match $supportFilesRegex} + if ($type -ne $False) { + $supportFilesArray = @() + foreach ($file in $supportFiles) { + $supportFilesArray += $file.$($type) + } - if ($type -ne $False) { - $supportFilesArray = @() - foreach ($file in $supportFiles) { - $supportFilesArray += $file.$($type) - } - - $supportFilesArray - } else { - $supportFiles - } + $supportFilesArray + } else { + $supportFiles + } } - -function Remove { - $origLocation = Get-Location - Set-Location "$projectRoot\.build" - - Switch ($remove) { - "all" { Remove-Item "$buildPath" -Recurse -ErrorAction SilentlyContinue } - "extras" { - $items = $(Get-Extras "Name") -join "," - iex "Remove-Item -Path '$buildPath\*' -include $items" - } - "addons" { Remove-Item "$buildPath\addons\*" } - "cache" { Remove-Item "$cachePath" -Recurse -ErrorAction SilentlyContinue } - } - - Set-Location $origLocation +function Remove-Items { + [CmdletBinding(SupportsShouldProcess=$true)] + param() + + $origLocation = Get-Location + Set-Location -Path "$projectRoot\.build" + + Switch ($remove) { + "all" { + if ($PSCmdlet.ShouldProcess("$buildPath", "Remove all items")) { + Remove-Item -Path "$buildPath" -Recurse -ErrorAction SilentlyContinue + } + } + "extras" { + $items = Get-SupportFiles -type "Name" + foreach ($item in $items) { + if ($PSCmdlet.ShouldProcess("$buildPath\*", "Remove extras")) { + Remove-Item -Path "$buildPath\*" -Include $item -Force + } + } + } + "addons" { + if ($PSCmdlet.ShouldProcess("$buildPath\addons\*", "Remove addons")) { + Remove-Item -Path "$buildPath\addons\*" -Force + } + } + "cache" { + if ($PSCmdlet.ShouldProcess("$cachePath", "Remove cache")) { + Remove-Item -Path "$cachePath" -Recurse -ErrorAction SilentlyContinue + } + } + } + + Set-Location -Path $origLocation } +function Compare-Version { + param( + [Parameter(Mandatory=$True)] + $version1, -function Compare-VersionNewerThan { - param( - [Parameter(Mandatory=$True)] - $version1, - - [Parameter(Mandatory=$True)] - $version2 - ) + [Parameter(Mandatory=$True)] + $version2 + ) - $version1 = $version1.Split(".") | % {[int] $_} - $version2 = $version2.Split(".") | % {[int] $_} + $version1 = $version1.Split(".") | ForEach-Object {[int] $_} + $version2 = $version2.Split(".") | ForEach-Object {[int] $_} - $newer = $False - for ($i = 0; $i -lt $version1.Length; $i++) { - if ($version1[$i] -gt $version2[$i]) { - $newer = $True - break - } - } + $newer = $False + for ($i = 0; $i -lt $version1.Length; $i++) { + if ($version1[$i] -gt $version2[$i]) { + $newer = $True + break + } + } - $newer + $newer } - function Get-InstalledArmakeVersion { - if (Test-Path -Path $armake) { - $version = & $armake --version - $version = $version.Substring(1) - } else { - $version = "0.0.0" - } - - $version + if (Test-Path -Path $armake) { + $version = & $armake --version + $version = $version.Substring(1) + } else { + $version = "0.0.0" + } + + $version } - function Get-LatestArmakeVersion { - $client = New-Object Net.WebClient - $content = $client.DownloadString($releasePage) - $client.dispose() - - $match = $content -match "" - if (!$match) { - Write-Error "[$timestamp] Failed to find valid armake download link." - $version = "0.0.0" - } else { - $version = $matches[1] - } - - $version -} - - -function Update-Armake { - param( - [Parameter(Mandatory=$True)] - $url - ) - - New-Item "$PSScriptRoot\temp" -ItemType "directory" -Force | Out-Null - - Write-Output "Downloading armake..." - $client = New-Object Net.WebClient - $client.DownloadFile($url, "$PSScriptRoot\temp\armake.zip") - $client.dispose() - - Write-Output "Download complete, unpacking..." - Expand-Archive "$PSScriptRoot\temp\armake.zip" "$PSScriptRoot\temp\armake" - Remove-Item "$PSScriptRoot\temp\armake.zip" - - if ([Environment]::Is64BitProcess) { - $binary = Get-ChildItem -Path "$PSScriptRoot\temp\armake" -Include "*.exe" -Recurse | Where-Object {$_.Name -match ".*w64.exe"} - } else { - $binary = Get-ChildItem -Path "$PSScriptRoot\temp\armake" -Include "*.exe" -Recurse | Where-Object {$_.Name -match ".*w64.exe"} - } - Move-Item $binary.FullName $armake -Force - - Remove-Item "$PSScriptRoot\temp" -Recurse -Force -} - - -function Create-Private-Key { - $cachedKeysPath = Split-Path -Parent $privateKeyFile - $binKeysPath = Split-Path -Parent $publicKeyFile - - # Do we need to clean up first? - if (Test-Path -Path "$binKeysPath\*" -Exclude "$modPrefix$tag.*") { - Remove-Item "$cachedKeysPath\*" -Exclude "$modPrefix$tag.*" - Remove-Item "$binKeysPath\*" -Exclude "$modPrefix$tag.*" - Remove-Item "$buildPath\addons\*.bisign" -Exclude "*$tag.bisign" + $client = New-Object Net.WebClient + $content = $client.DownloadString($releasePage) + $client.dispose() - Write-Output " [$timestamp] Cleaning up old keys. Current tag: $tag" - } + # Updated regex to match the latest version from the releases page + $versionMatches = [regex]::Matches($content, 'href="/KoffeinFlummi/armake/releases/download/v([\d\.]+)/armake_v[\d\.]+\.zip"') + if ($versionMatches.Count -eq 0) { + Write-Error -Message "[$timestamp] Failed to find valid armake download link." + return "0.0.0" + } - if (!((Test-Path -Path $privateKeyFile) -And (Test-Path -Path $publicKeyFile))) { - Write-Output " [$timestamp] Creating key pairs for $tag" - & $armake2 keygen "$buildPath\keys\$modPrefix$tag" + # Get the highest version number from the matches + $versions = $versionMatches | ForEach-Object { $_.Groups[1].Value } + $latestVersion = $versions | Sort-Object -Descending | Select-Object -First 1 - New-Item "$cachePath\keys" -ItemType "directory" -ErrorAction SilentlyContinue | Out-Null - Move-Item -Path "$buildPath\keys\$modPrefix$tag.biprivatekey" -Destination $privateKeyFile -Force - } - - # Re-check the work done above to verify they exist - if (!((Test-Path -Path $privateKeyFile) -And (Test-Path -Path $publicKeyFile))) { - Write-Error "[$timestamp] Failed to generate key pairs $privateKeyFile" - } + return $latestVersion } - -function Check-Obsolete { - param( - [Parameter(Mandatory=$True)] - $addonPbo - ) - - $pboName = $addonPbo.Name - $addon = $pboName.Replace($modPrefix, '').Replace('.pbo', '') - $sourcePath = "$projectRoot\addons\$addon" - - if (Select-String -Pattern "optional_" -InputObject $pboName -SimpleMatch -Quiet) { - $addon = $pboName.Replace($modPrefix + "optional_", '') - $sourcePath = "$projectRoot\optionals\$addon" - } - - if (!(Test-Path -Path $sourcePath)) { - Remove-Item "$buildPath\addons\$pboName" - Remove-Item "$buildPath\addons\$($pboName).$modPrefix$tag.bisign" -ErrorAction SilentlyContinue - Write-Output " [$timestamp] Deleting obsolete PBO $pboName" - } +function Update-Armake { + [CmdletBinding(SupportsShouldProcess=$True)] + param( + [Parameter(Mandatory=$True)] + [string]$url + ) + + if ($PSCmdlet.ShouldProcess("Update armake")) { + New-Item -Path "$PSScriptRoot\temp" -ItemType "directory" -Force | Out-Null + + Write-Output -InputObject "Downloading armake..." + $client = New-Object Net.WebClient + $client.DownloadFile($url, "$PSScriptRoot\temp\armake.zip") + $client.dispose() + + Write-Output -InputObject "Download complete, unpacking..." + Expand-Archive -Path "$PSScriptRoot\temp\armake.zip" -DestinationPath "$PSScriptRoot\temp\armake" + Remove-Item -Path "$PSScriptRoot\temp\armake.zip" + + if ([Environment]::Is64BitProcess) { + $binary = Get-ChildItem -Path "$PSScriptRoot\temp\armake" -Include "*.exe" -Recurse | Where-Object {$_.Name -match ".*w64.exe"} + } else { + $binary = Get-ChildItem -Path "$PSScriptRoot\temp\armake" -Include "*.exe" -Recurse | Where-Object {$_.Name -match ".*w64.exe"} + } + Move-Item -Path $binary.FullName -Destination $armake -Force + + Remove-Item -Path "$PSScriptRoot\temp" -Recurse -Force + } } +function New-PrivateKey { + [CmdletBinding(SupportsShouldProcess=$true)] + param() + + $cachedKeysPath = Split-Path -Parent $privateKeyFile + $binKeysPath = Split-Path -Parent $publicKeyFile + + # Do we need to clean up first? + if ($PSCmdlet.ShouldProcess("Cleaning up old keys")) { + if (Test-Path -Path "$binKeysPath\*" -Exclude "$modPrefix$tag.*") { + Remove-Item -Path "$cachedKeysPath\*" -Exclude "$modPrefix$tag.*" + Remove-Item -Path "$binKeysPath\*" -Exclude "$modPrefix$tag.*" + Remove-Item -Path "$buildPath\addons\*.bisign" -Exclude "*$tag.bisign" + + Write-Output -InputObject " [$timestamp] Cleaning up old keys. Current tag: $tag" + } + } + + if ($PSCmdlet.ShouldProcess("Creating key pairs for $tag")) { + if (!((Test-Path -Path $privateKeyFile) -And (Test-Path -Path $publicKeyFile))) { + Write-Output -InputObject " [$timestamp] Creating key pairs for $tag" + & $armake2 keygen "$buildPath\keys\$modPrefix$tag" + + New-Item -Path "$cachePath\keys" -ItemType "directory" -ErrorAction SilentlyContinue | Out-Null + Move-Item -Path "$buildPath\keys\$modPrefix$tag.biprivatekey" -Destination $privateKeyFile -Force + } + + # Re-check the work done above to verify they exist + if (!((Test-Path -Path $privateKeyFile) -And (Test-Path -Path $publicKeyFile))) { + Write-Error -Message "[$timestamp] Failed to generate key pairs $privateKeyFile" + } + } +} -function Build-PBO { - param( - [Parameter(Mandatory=$True)] - $Source, - $Parent = "addons", - $Prebuilt = $False - ) - - $otherPrefix = "" - if ($prebuilt) { - $otherPrefix = "optional_" - } - - $component = $source.Name - $fullPath = $source.FullName - $hash = Get-Hash $fullPath | select -ExpandProperty Hash - $binPath = "$buildPath\$Parent\$modPrefix$otherPrefix$component" - - # If it's a directory, then it doesn't have it's own extension, so add it - if (!($prebuilt)) { - $binPath = $binPath + ".pbo" - } - - if (Test-Path -Path "$cachePath\addons\$component") { - $cachedHash = Get-Content "$cachePath\addons\$component" - - if ($hash -eq $cachedHash -And @(Test-Path -Path $binPath)) { - if (!(Test-Path -Path "$binPath.$modPrefix$tag.bisign")) { - Write-Output " [$timestamp] Updating bisign for $component" - & $armake2 sign $privateKeyFile $binPath - return - } else { - return " [$timestamp] Skipping $component" - } - } - } else { - if (!(Test-Path -Path "$cachePath\addons")) { - New-Item "$cachePath\addons" -ItemType "directory" | Out-Null - } - } - - if (Test-Path -Path $binPath) { - Remove-Item $binPath - - if ($prebuilt) { - Write-Output " [$timestamp] Updating pre-built PBO $component" - Copy-Item -Path $fullPath -Destination $binPath -Force - & $armake2 sign $privateKeyFile $binPath - } else { - Write-Output " [$timestamp] Updating PBO $component" - & $armake build -f -w unquoted-string $fullPath $binPath - & $armake2 sign $privateKeyFile $binPath - } - } else { - - if ($prebuilt) { - Write-Output " [$timestamp] Copying pre-built PBO $component" - Copy-Item -Path $fullPath -Destination $binPath -Force - & $armake2 sign $privateKeyFile $binPath - } else { - Write-Output " [$timestamp] Creating PBO $component" - & $armake build -f -w unquoted-string $fullPath $binPath - & $armake2 sign $privateKeyFile $binPath - } - } - - if ($LastExitCode -ne 0) { - Write-Error "[$timestamp] Failed to build $component." - } - - # Store this for later comparisons - $hash | Out-File "$cachePath\addons\$component" -NoNewline +function Remove-ObsoleteFiles { + [CmdletBinding(SupportsShouldProcess=$true)] + param( + [Parameter(Mandatory=$True)] + $addonPbo + ) + + $pboName = $addonPbo.Name + $addon = $pboName.Replace($modPrefix, '').Replace('.pbo', '') + $sourcePath = "$projectRoot\addons\$addon" + + if (Select-String -Pattern "optional_" -InputObject $pboName -SimpleMatch -Quiet) { + $addon = $pboName.Replace($modPrefix + "optional_", '') + $sourcePath = "$projectRoot\optionals\$addon" + } + + if (!(Test-Path -Path $sourcePath)) { + if ($PSCmdlet.ShouldProcess("$buildPath\addons\$pboName", "Remove obsolete PBO")) { + Remove-Item -Path "$buildPath\addons\$pboName" + Remove-Item -Path "$buildPath\addons\$($pboName).$modPrefix$tag.bisign" -ErrorAction SilentlyContinue + Write-Output -InputObject " [$timestamp] Deleting obsolete PBO $pboName" + } + } } +function New-PBO { + param( + [Parameter(Mandatory=$True)] + $Source, + $Parent = "addons", + $Prebuilt = $False + ) + + $otherPrefix = "" + if ($prebuilt) { + $otherPrefix = "optional_" + } + + $component = $source.Name + $fullPath = $source.FullName + $hash = Get-Hash -Path $fullPath | Select-Object -ExpandProperty Hash + $binPath = "$buildPath\$Parent\$modPrefix$otherPrefix$component" + + # If it's a directory, then it doesn't have it's own extension, so add it + if (!($prebuilt)) { + $binPath = $binPath + ".pbo" + } + + if (Test-Path -Path "$cachePath\addons\$component") { + $cachedHash = Get-Content -Path "$cachePath\addons\$component" + + if ($hash -eq $cachedHash -And @(Test-Path -Path $binPath)) { + if (!(Test-Path -Path "$binPath.$modPrefix$tag.bisign")) { + Write-Output -InputObject " [$timestamp] Updating bisign for $component" + & $armake2 sign $privateKeyFile $binPath + return + } else { + return " [$timestamp] Skipping $component" + } + } + } else { + if (!(Test-Path -Path "$cachePath\addons")) { + New-Item -Path "$cachePath\addons" -ItemType "directory" | Out-Null + } + } + + if (Test-Path -Path $binPath) { + Remove-Item -Path $binPath + + if ($prebuilt) { + Write-Output -InputObject " [$timestamp] Updating pre-built PBO $component" + Copy-Item -Path $fullPath -Destination $binPath -Force + & $armake2 sign $privateKeyFile $binPath + } else { + Write-Output -InputObject " [$timestamp] Updating PBO $component" + & $armake build -f -w unquoted-string $fullPath $binPath + & $armake2 sign $privateKeyFile $binPath + } + } else { + + if ($prebuilt) { + Write-Output -InputObject " [$timestamp] Copying pre-built PBO $component" + Copy-Item -Path $fullPath -Destination $binPath -Force + & $armake2 sign $privateKeyFile $binPath + } else { + Write-Output -InputObject " [$timestamp] Creating PBO $component" + & $armake build -f -w unquoted-string $fullPath $binPath + & $armake2 sign $privateKeyFile $binPath + } + } + + if ($LastExitCode -ne 0) { + Write-Error -Message "[$timestamp] Failed to create PBO $component." + } + + # Store this for later comparisons + $hash | Out-File -FilePath "$cachePath\addons\$component" -NoNewline +} -function Copy-Extras { - $supportFiles = Get-Extras +function Copy-SupportFiles { + $supportFiles = Get-SupportFiles - # Switch from tools dir to projectRoot dir - $origLocation = Get-Location - Set-Location -Path $projectRoot + # Switch from tools dir to projectRoot dir + $origLocation = Get-Location + Set-Location -Path $projectRoot - foreach ($file in $supportFiles) { - $fileName = $(Get-ChildItem $file).Name + foreach ($file in $supportFiles) { + $fileName = Get-ChildItem -Path $file | Select-Object -ExpandProperty Name - Write-Output " [$timestamp] Copying $fileName" - & Copy-Item -Path $file -Destination $buildPath -Force -Recurse + Write-Output -InputObject " [$timestamp] Copying $fileName" + Copy-Item -Path $file -Destination $buildPath -Force -Recurse - if ($LastExitCode -ne 0) { - Write-Error "[$timestamp] Failed to copy $fileName." - } - } + if ($LastExitCode -ne 0) { + Write-Error -Message "[$timestamp] Failed to copy $fileName." + } + } - Set-Location $origLocation + Set-Location -Path $origLocation } - function Main { - if ($remove -ne $False) { - Remove - return - } + if ($remove -ne $False) { + Remove-Items + return + } - $installed = Get-InstalledArmakeVersion - $latest = Get-LatestArmakeVersion + $installed = Get-InstalledArmakeVersion + $latest = Get-LatestArmakeVersion - if (Compare-VersionNewerThan $latest $installed) { - Write-Output "Found newer version of armake:" " Installed: $installed" " Latest: $latest" - Update-Armake ($downloadPage -f $latest) - Write-Output "Update complete, armake up-to-date." - } + if (Compare-Version -version1 $latest -version2 $installed) { + Write-Output -InputObject "Found newer version of armake:" " Installed: $installed" " Latest: $latest" + Update-Armake -url ($downloadPage -f $latest) + Write-Output -InputObject "Update complete, armake up-to-date." + } - New-Item "$buildPath" -ItemType "directory" -Force | Out-Null - New-Item "$buildPath\keys" -ItemType "directory" -Force | Out-Null + New-Item -Path "$buildPath" -ItemType "directory" -Force | Out-Null + New-Item -Path "$buildPath\keys" -ItemType "directory" -Force | Out-Null - # Switch from tools dir to buildPath dir - $origLocation = Get-Location - Set-Location -Path $buildPath + # Switch from tools dir to buildPath dir + $origLocation = Get-Location + Set-Location -Path $buildPath - Create-Private-Key + New-PrivateKey - if (Test-Path -Path $privateKeyFile) { - New-Item "$buildPath\addons" -ItemType "directory" -Force | Out-Null - New-Item "$projectRoot\optionals" -ItemType "directory" -Force | Out-Null + if (Test-Path -Path $privateKeyFile) { + New-Item -Path "$buildPath\addons" -ItemType "directory" -Force | Out-Null + New-Item -Path "$projectRoot\optionals" -ItemType "directory" -Force | Out-Null - foreach ($component in Get-ChildItem -File "$projectRoot\optionals") { - Build-PBO $component -Prebuilt $True - } + foreach ($component in Get-ChildItem -File -Path "$projectRoot\optionals") { + New-PBO -Source $component -Prebuilt $True + } - foreach ($component in Get-ChildItem -Directory "$projectRoot\addons") { - Build-PBO $component - } + foreach ($component in Get-ChildItem -Directory -Path "$projectRoot\addons") { + New-PBO -Source $component + } - foreach ($component in @(Get-ChildItem "$buildPath\addons\*.pbo")) { - Check-Obsolete $component - } + foreach ($component in Get-ChildItem -Path "$buildPath\addons\*.pbo") { + Remove-ObsoleteFiles -addonPbo $component + } - Remove-Item "$buildPath\*.tmp" - } + Remove-Item -Path "$buildPath\*.tmp" + } - Set-Location $origLocation + Set-Location -Path $origLocation - Copy-Extras + Copy-SupportFiles } Main