gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #832 from ChrisBr/vagrant

Browse source 
More Vagrant fixes
This commit is contained in:
Christian Bruckmayer 2016-03-05 16:23:13 +01:00
commit ac7149fbe5
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.sh
View file

@ -16,7 +16,7 @@ echo -e "\ninstalling your bundle...\n"
su - vagrant -c "cd /vagrant/; bundle install --quiet" su - vagrant -c "cd /vagrant/; bundle install --quiet"
# Configure the app if it isn't # 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..." echo "Configuring your app in config/options.yml..."
cp config/config.yml.example config/config.yml cp config/config.yml.example config/config.yml
else else
@ -37,7 +37,7 @@ fi
if [ ! -f /vagrant/config/database.yml ] && [ -f /vagrant/config/database.yml.example ]; then if [ ! -f /vagrant/config/database.yml ] && [ -f /vagrant/config/database.yml.example ]; then
echo -e "\nSetting up your database from config/database.yml...\n" echo -e "\nSetting up your database from config/database.yml...\n"
cp config/database.yml.example config/database.yml 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 bundle exec rake db:setup
else else
echo -e "\n\nWARNING: You have already have a development/test database." echo -e "\n\nWARNING: You have already have a development/test database."