diff --git a/.gitignore b/.gitignore index 5ce4390..068994d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ Thumbs.db *.exe *.dll build/ -Version v* +/Version * *.bak .github_changelog_generator launcher/.vs diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 27796a1..03c5804 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -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) } diff --git a/scripts/utils.ps1 b/scripts/utils.ps1 index fae1948..ddfb929 100644 --- a/scripts/utils.ps1 +++ b/scripts/utils.ps1 @@ -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) {