make sure each edition contains the correct vendored files

This commit is contained in:
David Refoua 2022-10-15 03:55:44 +03:30
parent 2dc5463c31
commit adcef21034
3 changed files with 4 additions and 4 deletions

2
.gitignore vendored
View File

@ -23,7 +23,7 @@ Thumbs.db
*.exe
*.dll
build/
Version v*
/Version *
*.bak
.github_changelog_generator
launcher/.vs

View File

@ -44,7 +44,7 @@ Ensure-Executable "7z"
$targets = @{
"cmder.zip" = $null;
"cmder.7z" = $null;
"cmder_mini.zip" = "-x!`"$cmderRoot\vendor\git-for-windows`"";
"cmder_mini.zip" = "-xr!`"vendor\git-for-windows`"";
}
Push-Location -Path $cmderRoot
@ -68,7 +68,7 @@ if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
}
foreach ($t in $targets.GetEnumerator()) {
Create-Archive "$cmderRoot\*" "$saveTo\$($t.Name)" $t.Value
Create-Archive "$cmderRoot" "$saveTo\$($t.Name)" $t.Value
$hash = (Digest-Hash "$saveTo\$($t.Name)")
Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
}

View File

@ -37,7 +37,7 @@ function Extract-Archive($source, $target) {
}
function Create-Archive($source, $target, $params) {
$command = "7z a -xr@`"$source\packignore`" $params $target $source > `$null"
$command = "7z a -xr@`"$source\packignore`" $params `"$target`" `"$source\*`" > `$null"
Write-Verbose "Creating Archive from '$source' in '$target' with parameters '$params'"
Invoke-Expression $command
if ($lastexitcode -ne 0) {