Use /usr/bin/env CMD instead of hardcoded paths

This fixes commands that currently rely on hardcoded paths and break on systems like NixOS that don't have all binaries in /usr/bin etc.
fgrehm · Aug 2, 2015 · 4b78c04 · 4b78c04
1 parent 9c67e13
commit 4b78c04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/vagrant-lxc/provider.rb b/lib/vagrant-lxc/provider.rb
@@ -36,7 +36,7 @@ def sudo_wrapper
 
       def ensure_lxc_installed!
         begin
-          sudo_wrapper.run("/usr/bin/which", "lxc-create")
+          sudo_wrapper.run("which", "lxc-create")
         rescue Vagrant::LXC::Errors::ExecuteError
           raise Errors::LxcNotInstalled
         end

diff --git a/lib/vagrant-lxc/sudo_wrapper.rb b/lib/vagrant-lxc/sudo_wrapper.rb
@@ -14,7 +14,7 @@ def initialize(wrapper_path = nil)
       def run(*command)
         options = command.last.is_a?(Hash) ? command.last : {}
         command.unshift @wrapper_path if @wrapper_path && !options[:no_wrapper]
-        execute *(['sudo'] + command)
+        execute *(['sudo', '/usr/bin/env'] + command)
       end
 
       private