Skip to content

Commit

Permalink
Merge pull request #232 from chef/nikhil/CHEF-1540-chef-undelete-wind…
Browse files Browse the repository at this point in the history
…ows-issue

Updated the undo path(from '\\' to "/") for undelete command for windows OS
  • Loading branch information
nikhil2611 committed Jan 2, 2024
2 parents f430301 + 4722e32 commit 73eed54
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ group :test do
gem "rspec-mocks", "~> 3.8"
gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
gem "chefstyle", "=1.6.2"
gem "test-kitchen", ">= 2.11.1"
gem "test-kitchen", "=3.5.1" # pinning test-kitchen to 3.5.1 which supports ruby < 3.1 . Need to update this to latest once we update the ruby to 3.1 and chef to 18.x in chef-cli

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
gem "chef-zero", "~> 14"
Expand Down
2 changes: 1 addition & 1 deletion chef-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
if RUBY_VERSION.match?(/3.1/)
gem.add_dependency "chef", "~> 18.0"
else
gem.add_dependency "chef", ">= 16.0"
gem.add_dependency "chef", "~> 17.0"
end
gem.add_dependency "solve", "< 5.0", "> 2.0"
gem.add_dependency "addressable", ">= 2.3.5", "< 2.9"
Expand Down
2 changes: 1 addition & 1 deletion lib/chef-cli/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def expected_omnibus_root

def default_package_home
if Chef::Platform.windows?
File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME)
File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME).gsub("\\", "/")
else
File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
end
Expand Down

0 comments on commit 73eed54

Please sign in to comment.