diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-10-30 10:05:22 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-10-30 10:05:22 +0600 |
| commit | eaec32d0f1231e7ae608be90caffaf30ec8c68c8 (patch) | |
| tree | c629c41f4fd94305ee4497d5eaec90460ae1034a | |
| parent | 2d00df3c506129b9617764f61c927bac23a94dc9 (diff) | |
| download | chef-eaec32d0f1231e7ae608be90caffaf30ec8c68c8.tar.gz | |
Choco git install is failing, reverting to installed version
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | habitat/plan.ps1 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index fd38166dad..76c76a4ccf 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -43,14 +43,14 @@ function Invoke-Download() { # appropriate path within the repo and place the generated tarball in the # location expected by do_unpack $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") - $git_path = "c:\\Program Files\\Git\\cmd" + $git_path = "c:\\Program Files\\Git\\bin" $env:Path = $git_path + ";" + [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") try { Push-Location (Resolve-Path "$PLAN_CONTEXT/../").Path - Write-Output "`n *** Installing Choco *** `n" - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - choco install gh -y - choco install git -y + # Write-Output "`n *** Installing Choco *** `n" + # Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) + # choco install gh -y + # choco install git -y $env:Path = $git_path + ";" + [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") $full_git_path = $($git_path + "\git.exe") Write-Ouput "Is Git REALLY Installed? " @@ -58,7 +58,7 @@ function Invoke-Download() { # Get-Command "Git" Write-Output "Hab source path is : ${HAB_CACHE_SRC_PATH}`n" Write-Output "Package Filename is : ${pkg_filename}" - # [System.Diagnostics.Process]::Start("git archive --format=zip --output=${HAB_CACHE_SRC_PATH}\\${pkg_filename} HEAD") + # [System.Diagnostics.Process]::Start("c:\\Program Files\\Git\\cmd\\git.exe archive --format=zip --output=${HAB_CACHE_SRC_PATH}\\${pkg_filename} HEAD") Write-Output "Now archiving the repo" [System.Diagnostics.Process]::Start("$full_git_path archive --format=zip --output=${HAB_CACHE_SRC_PATH}\\${pkg_filename} HEAD --verbose") # Invoke-Expression -Command "$full_git_path archive --format=zip --output=${HAB_CACHE_SRC_PATH}\\${pkg_filename} HEAD --verbose" |