fix some merge problems

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/facter/acpi_available.rb b/lib/facter/acpi_available.rb
index e3d8dfa..9a0474f 100644
--- a/lib/facter/acpi_available.rb
+++ b/lib/facter/acpi_available.rb
@@ -1,10 +1,10 @@
 # return whether acpi is available -- used for deciding whether to install the munin plugin
 Facter.add("acpi_available") do
-	setcode do
-		if `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? 
-			"absent"
-		else
-			"present"
-		end
-	end
+    setcode do
+    	if not File.exist? `which acpi 2>/dev/null`.chomp or `acpi -t -B -A 2>/dev/null`.match(/\d/).nil?
+    		"absent"
+    	else
+    		"present"
+    	end
+    end
 end