images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-10-31 09:22:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #429 from Jackbennett/mend-build

Browse Source 
Fix build script removing a trailing comma. Download into a temp folder.
This commit is contained in:
Martin Kemp
2015-03-18 14:54:55 +00:00
parent 58a89e779b 2c184f8721
commit 8b8f98c078
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build.ps1
View File

@@ -47,7 +47,7 @@ Param(
[string]$launcher = "..\launcher", [string]$launcher = "..\launcher",
# Include git with the package build # Include git with the package build
[switch]$Full, [switch]$Full
) )
. "$PSScriptRoot\utils.ps1" . "$PSScriptRoot\utils.ps1"
@@ -59,6 +59,7 @@ $sources = Get-Content $sourcesPath | Out-String | Convertfrom-Json
# Check for requirements # Check for requirements
Ensure-Exists $sourcesPath Ensure-Exists $sourcesPath
Ensure-Executable "7z" Ensure-Executable "7z"
New-Item -Type Directory -Path (Join-Path $saveTo "/tmp/") -ErrorAction SilentlyContinue >$null
foreach ($s in $sources) { foreach ($s in $sources) {
if($Full -eq $false -and $s.name -eq "msysgit"){ if($Full -eq $false -and $s.name -eq "msysgit"){
@@ -68,7 +69,7 @@ foreach ($s in $sources) {
Write-Verbose "Getting $($s.name) from URL $($s.url)" Write-Verbose "Getting $($s.name) from URL $($s.url)"
# We do not care about the extensions/type of archive # We do not care about the extensions/type of archive
$tempArchive = "$($s.name).tmp" $tempArchive = "tmp/$($s.name).tmp"
Delete-Existing $tempArchive Delete-Existing $tempArchive
Delete-Existing $s.name Delete-Existing $s.name

2
scripts/utils.ps1
View File

@@ -28,7 +28,7 @@ function Delete-Existing ($path) {
} }
function Extract-Archive ($source, $target) { function Extract-Archive ($source, $target) {
Invoke-Expression "7z x -y -o$($target) $source > `$null" Invoke-Expression "7z x -y -o$($target) '$source' > `$null"
if ($lastexitcode -ne 0) { if ($lastexitcode -ne 0) {
Write-Error "Extracting of $source failied" Write-Error "Extracting of $source failied"
} }