#59 better to check if script is provisioned already in not_if

file does not exist at all on first chef run so bash did not execute
gocd · Dec 21, 2015 · 8cb482f · 8cb482f
1 parent 9e6d608
commit 8cb482f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/providers/agent.rb b/providers/agent.rb
@@ -23,8 +23,8 @@
     cp /etc/init.d/go-agent /etc/init.d/#{agent_name}
     sed -i 's/# Provides: go-agent$/# Provides: #{agent_name}/g' /etc/init.d/#{agent_name}
     EOH
-    only_if "grep -q '# Provides: go-agent$' /etc/init.d/#{agent_name}"
-    not_if { agent_name == 'go-agent' }
+    not_if "grep -q '# Provides: #{agent_name}$' /etc/init.d/#{agent_name}"
+    only_if { agent_name != 'go-agent' }
   end
   link "/usr/share/#{agent_name}" do
     to "/usr/share/go-agent"

diff --git a/spec/go_agent_lwrp_spec.rb b/spec/go_agent_lwrp_spec.rb
@@ -12,7 +12,7 @@
   end
   before do
     stub_command("grep -q '# Provides: go-agent$' /etc/init.d/go-agent").and_return(false)
-    stub_command("grep -q '# Provides: go-agent$' /etc/init.d/my-go-agent").and_return(false)
+    stub_command("grep -q '# Provides: my-go-agent$' /etc/init.d/my-go-agent").and_return(false)
   end
 
   it_behaves_like :agent_linux_install

diff --git a/spec/go_agent_spec.rb b/spec/go_agent_spec.rb
@@ -98,7 +98,7 @@
     end
     before do
       stub_command("grep -q '# Provides: go-agent$' /etc/init.d/go-agent").and_return(false)
-      stub_command("grep -q '# Provides: go-agent$' /etc/init.d/go-agent-1").and_return(true)
+      stub_command("grep -q '# Provides: go-agent-1$' /etc/init.d/go-agent-1").and_return(false)
     end
     it_behaves_like :agent_recipe
     it_behaves_like :apt_repository_recipe