From 38296b0a63a18c4ed1a1c4c50c438200ad1baf69 Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Sat, 5 Mar 2016 15:13:10 +0100 Subject: [PATCH 1/2] Rename options.yml to config.yml in bootstrap.sh options.yml does not exists in context of OSEM. Probably a c&p error. --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 1c64d21e..48c6a054 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -16,7 +16,7 @@ echo -e "\ninstalling your bundle...\n" su - vagrant -c "cd /vagrant/; bundle install --quiet" # Configure the app if it isn't -if [ ! -f /vagrant/config/options.yml ] && [ -f /vagrant/config/options.yml.example ]; then +if [ ! -f /vagrant/config/config.yml ] && [ -f /vagrant/config/config.yml.example ]; then echo "Configuring your app in config/options.yml..." cp config/config.yml.example config/config.yml else From 50d946e4a7e9d256f5535a7a48e7d5c59c66a8dd Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Sat, 5 Mar 2016 15:15:22 +0100 Subject: [PATCH 2/2] Fixes setup db if statement in bootstrap.sh to setup the database if there is no developement and no test database already. --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 48c6a054..7ef62f4a 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -37,7 +37,7 @@ fi if [ ! -f /vagrant/config/database.yml ] && [ -f /vagrant/config/database.yml.example ]; then echo -e "\nSetting up your database from config/database.yml...\n" cp config/database.yml.example config/database.yml - if [ ! -f db/development.sqlite3 ] && [ -f db/test.sqlite3 ]; then + if [ ! -f db/development.sqlite3 ] && [ ! -f db/test.sqlite3 ]; then bundle exec rake db:setup else echo -e "\n\nWARNING: You have already have a development/test database."