1 files changed, 5 insertions, 4 deletions
diff --git a/bin/setup b/bin/setup
index 016b7e2..5e6d2fe 100755
--- a/bin/setup
+++ b/bin/setup
@@ -3,7 +3,6 @@
 
 require 'fileutils'
 
-# path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*)
@@ -16,7 +15,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
   # puts "\n== Copying sample files =="
@@ -30,6 +28,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
 
-  puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  unless ARGV.include?('--skip-server')
+    puts "\n== Starting development server =="
+    $stdout.flush # flush the output before exec(2) so that it displays
+    exec 'bin/dev'
+  end
 end