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

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index 9944e82a33e1e1b5e4739905632d745da75b3ab1..ec47b79b3b3a002be18adafe9a5fcd070bcd808d 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -9,20 +9,17 @@ 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 =="
   system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
   system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 

-  # Install JavaScript dependencies
-  # system('bin/yarn')
-

   # puts "\n== Copying sample files =="
   # 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 =="
   # end
 
   puts "\n== Preparing database =="