Rename FileUtil to Which since its too close to FileUtils
This commit is contained in:
parent
bb59c551da
commit
f837d32ae4
|
@ -1,9 +1,9 @@
|
|||
require "log4r"
|
||||
|
||||
require "vagrant/util/file_util"
|
||||
require "vagrant/util/file_mode"
|
||||
require "vagrant/util/platform"
|
||||
require "vagrant/util/safe_exec"
|
||||
require "vagrant/util/which"
|
||||
|
||||
module Vagrant
|
||||
module Util
|
||||
|
@ -55,7 +55,7 @@ module Vagrant
|
|||
def self.exec(ssh_info, opts={})
|
||||
# Ensure the platform supports ssh. On Windows there are several programs which
|
||||
# include ssh, notably git, mingw and cygwin, but make sure ssh is in the path!
|
||||
if !FileUtil.which("ssh")
|
||||
if !Which.which("ssh")
|
||||
if Platform.windows?
|
||||
raise Errors::SSHUnavailableWindows,
|
||||
:host => ssh_info[:host],
|
||||
|
|
|
@ -2,7 +2,7 @@ require "vagrant/util/platform"
|
|||
|
||||
module Vagrant
|
||||
module Util
|
||||
class FileUtil
|
||||
class Which
|
||||
# Cross-platform way of finding an executable in the PATH.
|
||||
#
|
||||
# which('ruby') #=> /usr/bin/ruby
|
Loading…
Reference in New Issue