From 1ae88b84a6142e945f989c82a6b0ffbeac4a8173 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Fri, 19 Dec 2014 18:18:49 -0500 Subject: Make bin/setup portable --- .../lib/rails/generators/rails/app/templates/bin/setup | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup index 0e22b3fa5c..ac500caffe 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/setup +++ b/railties/lib/rails/generators/rails/app/templates/bin/setup @@ -1,28 +1,30 @@ require 'pathname' +require 'fileutils' +include FileUtils # path to your application root. APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) -Dir.chdir APP_ROOT do +chdir APP_ROOT do # This script is a starting point to setup your application. # Add necessary setup steps to this file: puts "== Installing dependencies ==" system "gem install bundler --conservative" - system "bundle check || bundle install" + system("bundle check") or system("bundle install") # puts "\n== Copying sample files ==" # unless File.exist?("config/database.yml") - # system "cp config/database.yml.sample config/database.yml" + # cp "config/database.yml.sample", "config/database.yml" # end puts "\n== Preparing database ==" - system "bin/rake db:setup" + system "ruby bin/rake db:setup" puts "\n== Removing old logs and tempfiles ==" - system "rm -f log/*" - system "rm -rf tmp/cache" + rm_f Dir.glob("log/*") + rm_rf "tmp/cache" puts "\n== Restarting application server ==" - system "touch tmp/restart.txt" + touch "tmp/restart.txt" end -- cgit v1.2.3