Merge remote-tracking branch 'upstream/pull/4832'

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index d0b0fbd57ea1321a55db21a46fad765497108248..b5accee8aca084a9d9d65a33eb4fd995f714eef4 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -5,7 +5,7 @@ require "fileutils"
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, :exception => true)
 end
 
 FileUtils.chdir APP_ROOT do
@@ -17,12 +17,9 @@ FileUtils.chdir APP_ROOT do
   system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
-  # Install JavaScript dependencies
-  system! "bin/yarn"
-
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="