Skip to content

Commit

Permalink
Merge pull request #7938 from habitat-sh/no_alias
Browse files Browse the repository at this point in the history
eliminate usages of `hab install` alias in plan-build-ps1
  • Loading branch information
christophermaier committed Oct 14, 2020
2 parents 16ef0a3 + 1ee27eb commit e5e3cc4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/plan-build-ps1/bin/hab-plan-build.ps1
Expand Up @@ -319,12 +319,12 @@ function Set-HabBin {

function Install-Dependency($dependency, $install_args = $null) {
if (!$env:NO_INSTALL_DEPS) {
$cmd = "$HAB_BIN install -u $env:HAB_BLDR_URL --channel $env:HAB_BLDR_CHANNEL $dependency $install_args"
$cmd = "$HAB_BIN pkg install -u $env:HAB_BLDR_URL --channel $env:HAB_BLDR_CHANNEL $dependency $install_args"
if($env:HAB_FEAT_IGNORE_LOCAL -eq "true") { $cmd += " --ignore-local" }
Invoke-Expression $cmd
if ($LASTEXITCODE -ne 0 -and ($env:HAB_BLDR_URL -ne $FALLBACK_CHANNEL)) {
Write-BuildLine "Trying to install '$dependency' from '$FALLBACK_CHANNEL'"
$cmd = "$HAB_BIN install -u $env:HAB_BLDR_URL --channel $FALLBACK_CHANNEL $dependency $install_args"
$cmd = "$HAB_BIN pkg install -u $env:HAB_BLDR_URL --channel $FALLBACK_CHANNEL $dependency $install_args"
if($env:HAB_FEAT_IGNORE_LOCAL -eq "true") { $cmd += " --ignore-local" }
Invoke-Expression $cmd
}
Expand Down

0 comments on commit e5e3cc4

Please sign in to comment.