tidy up

2 files changed, 7 insertions, 8 deletions

diff --git a/generate.sh b/generate.sh
index 68504b0..9541184 100755
--- a/generate.sh
+++ b/generate.sh
@@ -9,9 +9,13 @@ set -xe
 srcdir=$(dirname "$(readlink -f "$0")")
 cd "$srcdir"
 
+export RAILS_ENV=development
+
 git rm -rf -- app test config/routes.rb db/migrate || true
 git checkout clean-start -- app test config/routes.rb
 
+bundle install
+
 bundle exec rails generate simple_captcha
 bundle exec rails generate delayed_job:active_record
 
@@ -60,10 +64,10 @@ bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string
 #for the tournament controller to generate options
 #bundle exec rails generate scaffold
 
-bundle exec rake db:drop RAILS_ENV=development
-bundle exec rake db:migrate RAILS_ENV=development
+bundle exec rake db:drop
+bundle exec rake db:migrate
 bundle exec rake db:seed
 
 find app -type f -name '*.rb' -exec bin/autoindent {} \;
 
-git add app test config/routes.rb db/migrate db/schema.rb
+git add app test config/routes.rb db/migrate db/schema.rb Gemfile.lock
diff --git a/start.sh b/start.sh
deleted file mode 100755
index 6c0d594..0000000
--- a/start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-generate.sh
-nohup bundle exec rails server &
-