Merge branch 'upstream'

RiotGames-Archive · Jul 16, 2013 · 7a1406e · 7a1406e
2 parents f63834b + fe843dd
commit 7a1406e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -5,7 +5,8 @@
 case node['platform_family']
 when "windows"
   if ENV['ProgramFiles'] == ENV['ProgramFiles(x86)']
-    default['zabbix']['etc_dir']    = ::File.join(ENV['homedrive'], "Program Files", "Zabbix Agent")
+    #if user has never logged into an interactive session then ENV['homedrive'] will be nil
+    default['zabbix']['etc_dir']    = ::File.join((ENV['homedrive'] || "C:"), "Program Files", "Zabbix Agent")
   else
     default['zabbix']['etc_dir']    = ::File.join(ENV['ProgramFiles'], "Zabbix Agent")
   end