Merge pull request #235 from barkingfoodog/move-chown-recursive-option

Move the -R option for chown to precede the user:group
saltstack · May 15, 2018 · a7f0a64 · a7f0a64
2 parents 2ae2485 + ae0c732
commit a7f0a64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/kitchen/provisioner/dependencies.erb b/lib/kitchen/provisioner/dependencies.erb
@@ -92,7 +92,7 @@ def install_dependencies
   end
   script += <<-INSTALL
     linkFormulas "$SALT_ROOT"
-    chown "${SUDO_USER:-$USER}" -R "${SALT_SHARE_DIR}" "${SALT_ROOT}";
+    chown -R "${SUDO_USER:-$USER}" "${SALT_SHARE_DIR}" "${SALT_ROOT}";
     echo "Content of $SALT_ROOT :";
     ls -la "$SALT_ROOT";
   INSTALL

diff --git a/lib/kitchen/provisioner/salt_solo.rb b/lib/kitchen/provisioner/salt_solo.rb
@@ -111,7 +111,7 @@ def prepare_command
         cmd = ''
         unless windows_os?
           cmd += <<-CHOWN
-            #{sudo('chown')} "${SUDO_USER:-$USER}" -R "#{config[:root_path]}/#{config[:salt_file_root]}"
+            #{sudo('chown')} -R "${SUDO_USER:-$USER}" "#{config[:root_path]}/#{config[:salt_file_root]}"
           CHOWN
         end
         if config[:prepare_salt_environment]