mirror of
https://github.com/cmderdev/cmder.git
synced 2024-11-10 09:49:12 +08:00
merging in new additions to the pull request
This commit is contained in:
commit
cf74dba780
@ -48,8 +48,8 @@ function Ensure-Exists ($item) {
|
||||
}
|
||||
|
||||
function Ensure-Executable ($command) {
|
||||
try { Get-Command $command -ErrorAction Stop > $null}
|
||||
catch{
|
||||
try { Get-Command $command -ErrorAction Stop > $null }
|
||||
catch {
|
||||
Write-Error "Missing $command! Ensure it is installed and on in the PATH"
|
||||
exit 1
|
||||
}
|
||||
@ -74,6 +74,14 @@ function Flatten-Directory ($name) {
|
||||
Remove-Item -Recurse "$($name)_moving"
|
||||
}
|
||||
|
||||
function Extract-Archive ($source, $target) {
|
||||
Invoke-Expression "7z x -y -o$($target) $source"
|
||||
if ($lastexitcode -ne 0) {
|
||||
Write-Error "Extracting of $source failied"
|
||||
}
|
||||
Remove-Item $source
|
||||
}
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# Check for requirements
|
||||
@ -92,8 +100,7 @@ foreach ($s in $sources) {
|
||||
Delete-Existing $s.name
|
||||
|
||||
Invoke-WebRequest -Uri $s.url -OutFile $tempArchive -ErrorAction Stop
|
||||
Invoke-Expression "7z x -y -o$($s.name) $tempArchive > `$null"
|
||||
Remove-Item $tempArchive
|
||||
Extract-Archive $tempArchive $s.name
|
||||
|
||||
if ((Get-Childitem $s.name).Count -eq 1) {
|
||||
Flatten-Directory($s.name)
|
||||
|
Loading…
Reference in New Issue
Block a user