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

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index 9944e82a33e1e1b5e4739905632d745da75b3ab1..d0b0fbd57ea1321a55db21a46fad765497108248 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -9,8 +9,8 @@ def system!(*args)
 end
 
 FileUtils.chdir APP_ROOT do
 end
 
 FileUtils.chdir APP_ROOT do

-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.

   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="


@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
   system("bundle check") || system!("bundle install")
 
   # Install JavaScript dependencies
   system("bundle check") || system!("bundle install")
 
   # Install JavaScript dependencies

-  # system('bin/yarn')
+  system! "bin/yarn"

 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')