Merge pull request #3486 from tomhughes/vips

[rails.git] / bin / yarn

diff --git a/bin/yarn b/bin/yarn
index 38f278aa087e2bbab837f887c2ff66b90b40d8be..72c7b5d97601a8e6695d318f0a3ab7011e423580 100755 (executable)
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path("..", __dir__)
 Dir.chdir(APP_ROOT) do
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path("..", __dir__)
 Dir.chdir(APP_ROOT) do

-  begin
-    exec "yarnpkg", *ARGV
-  rescue Errno::ENOENT
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR)
+                    .reject { |dir| File.expand_path(dir) == __dir__ }
+                    .product(["yarnpkg", "yarn", "yarn.cmd", "yarn.ps1"])
+                    .map { |dir, file| File.expand_path(file, dir) }
+                    .find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, "--ignore-engines", *ARGV
+  else

     warn "Yarn executable was not detected in the system."
     warn "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1
     warn "Yarn executable was not detected in the system."
     warn "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1