maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removing incorrect warning about supportability and using precheck

Browse source
This commit is contained in:
Karol Kaczmarek 2016-07-21 15:53:36 -07:00
parent 38fc724a0b
commit 1c480ded72
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.psm1
View file

@ -548,8 +548,6 @@ function Start-PSBootstrap {
brew install $Deps
# OpenSSL libraries must be updated
brew link --force openssl
} else {
Write-Warning "This script only supports Ubuntu 14.04, CentOS 7, and OS X, you must install dependencies manually!"
}
# Install [fpm](https://github.com/jordansissel/fpm)
@ -595,7 +593,8 @@ function Start-PSBootstrap {
# Install chocolatey
$chocolateyPath = "$env:AllUsersProfile\chocolatey\bin"
if(Get-Command "choco" -ErrorAction SilentlyContinue)
if(precheck 'choco' $null)
{
log "Chocolatey is already installed. Skipping installation."
}
@ -618,7 +617,7 @@ function Start-PSBootstrap {
# Install cmake
$cmakePath = "${env:ProgramFiles(x86)}\CMake\bin"
if(Get-Command "cmake" -ErrorAction SilentlyContinue)
if(precheck 'cmake' $null)
{
log "Cmake is already installed. Skipping installation."
}
@ -1370,7 +1369,10 @@ function script:log([string]$message) {
function script:precheck([string]$command, [string]$missedMessage) {
$c = Get-Command $command -ErrorAction SilentlyContinue
if (-not $c) {
Write-Warning $missedMessage
if ($missedMessage -ne $null)
{
Write-Warning $missedMessage
}
return $false
} else {
return $true