Merge pull request #210 from pietervogelaar/patch-2

Fixes error "bash: line 114: [: too many arguments"
neillturner · Mar 2, 2020 · f96b346 · f96b346
2 parents 9b42195 + f9e40d5
commit f96b346
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/kitchen/provisioner/puppet_apply.rb b/lib/kitchen/provisioner/puppet_apply.rb
@@ -276,7 +276,7 @@ def install_command
                 if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then
                     #{install_puppet_yum_repo}
                 else
-                  if [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
+                  if [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then
                      #{install_puppet_yum_repo}
                   else
                     #{sudo('apt-get')} -y install wget
@@ -372,7 +372,7 @@ def install_command_collections
             #{custom_pre_install_command}
             if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
               if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ] || \
-                 [ -f /etc/system-release ] || [ grep -q 'Amazon Linux' /etc/system-release ]; then
+                 [ -f /etc/system-release ] || grep -q 'Amazon Linux' /etc/system-release; then
                 echo "-----> #{sudo_env('yum')} -y --nogpgcheck install #{config[:puppet_yum_collections_repo]}"
                 #{sudo_env('yum')} -y --nogpgcheck install #{config[:puppet_yum_collections_repo]}
                 #{sudo_env('yum')} -y --nogpgcheck install puppet-agent#{puppet_redhat_version}