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

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index 9944e82a33e1e1b5e4739905632d745da75b3ab1..ff6a47532311f69c591687838c96795d49608cde 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -1,28 +1,25 @@
 #!/usr/bin/env ruby
 require "fileutils"
 
 #!/usr/bin/env ruby
 require "fileutils"
 

-# path to your application root.

 APP_ROOT = File.expand_path("..", __dir__)
 APP_ROOT = File.expand_path("..", __dir__)

+APP_NAME = "openstreetmap".freeze

 
 def system!(*args)
 
 def system!(*args)

-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, :exception => true)

 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 =="


@@ -33,4 +30,8 @@ FileUtils.chdir APP_ROOT do
 
   puts "\n== Restarting application server =="
   system! "bin/rails restart"
 
   puts "\n== Restarting application server =="
   system! "bin/rails restart"

+
+  # puts "\n== Configuring puma-dev =="
+  # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
+  # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"

 end
 end