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

[rails.git] / bin / setup

diff --git a/bin/setup b/bin/setup
index ec47b79b3b3a002be18adafe9a5fcd070bcd808d..ff6a47532311f69c591687838c96795d49608cde 100755 (executable)
--- a/bin/setup
+++ b/bin/setup
@@ -1,11 +1,11 @@
 #!/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


@@ -30,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