Last active
March 8, 2020 19:24
-
-
Save jharley/5ac589354e41fadad0eb to your computer and use it in GitHub Desktop.
vagrant-berkshelf 2.0.1 provisioning patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- /Users/jharley/.vagrant.d/gems/gems/vagrant-berkshelf-2.0.1/lib/berkshelf/vagrant/action/install.rb.orig 2014-05-02 11:02:44.000000000 -0400 | |
| +++ /Users/jharley/.vagrant.d/gems/gems/vagrant-berkshelf-2.0.1/lib/berkshelf/vagrant/action/install.rb 2014-05-03 10:36:35.000000000 -0400 | |
| @@ -42,9 +42,14 @@ | |
| def install(env) | |
| check_vagrant_version(env) | |
| env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'" | |
| - FileUtils.rm_rf(env[:berkshelf].shelf) | |
| + real_shelf = env[:berkshelf].shelf | |
| + tmp_shelf = "#{real_shelf}-tmp" | |
| + | |
| + FileUtils.rm_rf(tmp_shelf) | |
| + env[:berkshelf].berksfile.vendor(tmp_shelf) | |
| + | |
| + system("rsync -aW --delete #{tmp_shelf}/. #{real_shelf}/.") | |
| - env[:berkshelf].berksfile.vendor(env[:berkshelf].shelf) | |
| end | |
| def warn_disabled_but_berksfile_exists(env) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I've added a new patch for vagrant-berkshelf 3.0.1 here.