Merge branch 'odolbeau-correct-recipe'

jujugrrr · May 31, 2014 · 30b6b8d · 30b6b8d
2 parents 44fa323 + 5f0673f
commit 30b6b8d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Berksfile b/Berksfile
@@ -1,3 +1,3 @@
-site :opscode
+source "https://api.berkshelf.com"
 
-metadata
+metadata
diff --git a/recipes/global_configs.rb b/recipes/global_configs.rb
@@ -16,25 +16,25 @@
       action :create
     end
 
-    unless user_configs.nil?
-      user_configs.each_pair do |option, value|
-        if value.respond_to?(:each_pair)
-          value.each_pair do |value_k, value_v|
-            execute "composer-config-for-#{user}" do
-              command "composer config --global #{option}.#{value_k} #{value_v}"
-              user user
-              group user
-              action :run
-            end
-          end
-        else
+    user_configs.nil? && next
+
+    user_configs.each_pair do |option, value|
+      if value.respond_to?(:each_pair)
+        value.each_pair do |value_k, value_v|
           execute "composer-config-for-#{user}" do
-            command "composer config --global #{option} #{value}"
+            command "composer config --global #{option}.#{value_k} #{value_v}"
             user user
             group user
             action :run
           end
         end
+      else
+        execute "composer-config-for-#{user}" do
+          command "composer config --global #{option} #{value}"
+          user user
+          group user
+          action :run
+        end
       end
     end
   end