From 1d6442f28355d02968ee7d8e899fac06bfdd6253 Mon Sep 17 00:00:00 2001 From: x86dev Date: Thu, 13 Jul 2017 18:24:17 +0200 Subject: [PATCH] Integrated DB setup in setup-ttrss.sh, don't do an update in setup-ttrss.sh. --- root/srv/setup-ttrss.sh | 12 ++++++++---- root/srv/update-ttrss.sh | 6 ------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/root/srv/setup-ttrss.sh b/root/srv/setup-ttrss.sh index 434334f..e8aec85 100755 --- a/root/srv/setup-ttrss.sh +++ b/root/srv/setup-ttrss.sh @@ -112,11 +112,15 @@ setup_ttrss() sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', 'api_newsplus, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php } -echo "Setup: Installing Tiny Tiny RSS ..." +setup_db() +{ + echo "Setup: Database" + php -f /srv/ttrss-configure-db.php + php -f /srv/ttrss-configure-plugin-mobilize.php +} + setup_nginx setup_ttrss - -echo "Setup: Applying updates ..." -/srv/update-ttrss.sh --no-start +setup_db echo "Setup: Done" diff --git a/root/srv/update-ttrss.sh b/root/srv/update-ttrss.sh index e4b9b48..b11617e 100755 --- a/root/srv/update-ttrss.sh +++ b/root/srv/update-ttrss.sh @@ -12,12 +12,6 @@ update_ttrss() echo "Updating: Tiny Tiny RSS" ( cd ${TTRSS_PATH} && git pull origin HEAD ) - - if [ -n "$DB_PORT" ]; then - echo "Updating: Database" - php -f /srv/ttrss-configure-db.php - php -f /srv/ttrss-configure-plugin-mobilize.php - fi } update_plugin_mobilize()