summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Preston <stuart@chef.io>2019-02-25 12:32:39 +0000
committerStuart Preston <stuart@chef.io>2019-02-25 12:33:38 +0000
commitca595fdd3660d7721a4a0462d1601e4d6f4cc89b (patch)
treec2e5f0cf940c7189d2bcec72ee8574aa3500a36e
parent03bb341a07e007d78c13703225c6d1360e8d16c8 (diff)
downloadchef-sp/habitat-win.tar.gz
Updating plan with libsodium dependencysp/habitat-win
Signed-off-by: Stuart Preston <stuart@chef.io>
-rw-r--r--habitat-win/plan.ps15
1 files changed, 4 insertions, 1 deletions
diff --git a/habitat-win/plan.ps1 b/habitat-win/plan.ps1
index d083139273..9392622b5a 100644
--- a/habitat-win/plan.ps1
+++ b/habitat-win/plan.ps1
@@ -78,9 +78,12 @@ function Invoke-Install {
# Now install our built gems into the new Ruby folder structure that is under assembly.
$gem_in_pkg_prefix = Resolve-Path "$pkg_prefix/bin/gem.cmd"
Invoke-Expression -Command ("$gem_in_pkg_prefix install {0} --force --no-update-sources --local --no-document --conservative --no-env-shebang" -f "$HAB_CACHE_SRC_PATH/$pkg_dirname/*.gem")
+
+ # Copy libsodium-23.dll to the Ruby bin folder
+ $ruby_path_version = (ruby -e "puts RbConfig::CONFIG['ruby_version']")
+ Get-ChildItem $pkg_prefix/lib/ruby/gems/$ruby_path_version/gems/rbnacl-libsodium-* -Filter "libsodium-*.dll" -Recurse | Select-Object -First 1 | Copy-Item -Destination $pkg_prefix/bin/sodium.dll -Force
# Cleanup some files that are no longer necessary before packaging
- $ruby_path_version = (ruby -e "puts RbConfig::CONFIG['ruby_version']")
Get-ChildItem $pkg_prefix/lib/ruby/gems/$ruby_path_version/gems -Filter "spec" -Recurse | Remove-Item -Recurse -Force
Get-ChildItem $pkg_prefix/lib/ruby/gems/$ruby_path_version/cache -Recurse | Remove-Item -Recurse -Force
Get-ChildItem $pkg_prefix -Filter "unins000.*" | Remove-Item -Recurse -Force