Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  (GH-925) Make package title available to $env
  (GH-920) Fix missing $ in Get-FtpFile
  • Loading branch information
ferventcoder committed Sep 12, 2016
2 parents e26c02c + eddf669 commit dc74d61
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ param(
}

Set-PowerShellExitCode 404
if (env:DownloadCacheAvailable -eq 'true') {
if ($env:DownloadCacheAvailable -eq 'true') {
throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message) `nThis package is likely not broken for licensed users - see https://chocolatey.org/docs/features-private-cdn."
} else {
throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ public void prepare_powershell_environment(IPackage package, ChocolateyConfigura

Environment.SetEnvironmentVariable("chocolateyPackageName", package.Id);
Environment.SetEnvironmentVariable("packageName", package.Id);
Environment.SetEnvironmentVariable("chocolateyPackageTitle", package.Title);
Environment.SetEnvironmentVariable("packageTitle", package.Title);
Environment.SetEnvironmentVariable("chocolateyPackageVersion", package.Version.to_string());
Environment.SetEnvironmentVariable("packageVersion", package.Version.to_string());
Environment.SetEnvironmentVariable("chocolateyPackageFolder", packageDirectory);
Expand Down

0 comments on commit dc74d61

Please sign in to comment.