merge latest

This commit is contained in:
2018-05-14 20:17:30 +02:00
21 changed files with 652 additions and 110 deletions

View File

@@ -1,7 +1,7 @@
#! /bin/bash
ruby_command="ruby"
rake_command="rake"
bundler_command="bundler"
bundler_command="bundle"
# Are the necessary programs installed?
command -v $ruby_command >/dev/null 2>&1 || { echo >&2 "The given ruby command does not exist. Please change the command or install ruby"; exit 1; }
@@ -17,11 +17,12 @@ cp -u config/omniauth_secrets.yml.example config/omniauth_secrets.yml
touch config/crawl_config.yml
echo "Bundle install..."
# Run Bundler
$bundler_command install #|| {echo "Bundler failed. Please run \"$bundle\_command install\" seperately and debug the errors, before running this script again"; exit 1;}
$bundler_command install || { echo "Bundler failed. Please run \"$bundle\_command install\" seperately and debug the errors, before running this script again";exit 1; }
echo "Migrate the database..."
# Run the migration
$rake_command db:migrate #||{echo "Migration failed. Please run \"$rake\_command db:migrate\" seperately and debug the errors, before running this script again"; exit 1}
$rake_command db:migrate || { echo "Migration failed. Please run \"$rake\_command db:migrate\" seperately and debug the errors, before running this script again"; exit 1; }
echo "Start the sunspot server"
# Run Sunspot
@@ -35,7 +36,7 @@ if [ ! -f config/start_topic.yml ]; then
echo "1" > config/start_topic.yml
fi
# Generate fetadmin user "admin@fet.at", password: 12345678
touch config/crawl_config.yml