Avoid using the zero key for pluralisation in English

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index ebdfd0277c784e92604855de13adda30c32203f5..ec47b79b3b3a002be18adafe9a5fcd070bcd808d 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require "fileutils"
 #!/usr/bin/env ruby
 require "fileutils"

-include FileUtils

 
 # path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)
 
 # path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)


@@ -9,24 +8,22 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 

-chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+FileUtils.chdir APP_ROOT do
+  # 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 if using Yarn
-  # system('bin/yarn')
-

   # puts "\n== Copying sample files =="
   # puts "\n== Copying sample files =="

-  # unless File.exist?('config/database.yml')
-  #   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 =="

-  system! "bin/rails db:setup"
+  system! "bin/rails db:prepare"

 
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"