summaryrefslogtreecommitdiff
path: root/chef-config/lib
diff options
context:
space:
mode:
Diffstat (limited to 'chef-config/lib')
-rw-r--r--chef-config/lib/chef-config/path_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/chef-config/lib/chef-config/path_helper.rb b/chef-config/lib/chef-config/path_helper.rb
index 0c00e116ea..0304694516 100644
--- a/chef-config/lib/chef-config/path_helper.rb
+++ b/chef-config/lib/chef-config/path_helper.rb
@@ -66,7 +66,7 @@ module ChefConfig
args.flatten.inject() do |joined_path, component|
joined_path = joined_path.sub(trailing_slashes, "")
component = component.sub(leading_slashes, "")
- joined_path += "#{path_separator}#{component}"
+ joined_path + "#{path_separator}#{component}"
end
end
@@ -250,7 +250,7 @@ module ChefConfig
# Determine if the given path is protected by OS X System Integrity Protection.
def self.is_sip_path?(path, node)
- if node["platform"] == "mac_os_x" and Gem::Version.new(node["platform_version"]) >= Gem::Version.new("10.11")
+ if node["platform"] == "mac_os_x" && Gem::Version.new(node["platform_version"]) >= Gem::Version.new("10.11")
# todo: parse rootless.conf for this?
sip_paths = [
"/System", "/bin", "/sbin", "/usr"