Made resetting the theme optional via TTRSS_THEME_RESET env var. Default is resetting the theme to the default one though. Untested.
This commit is contained in:
parent
472b083f7d
commit
8565deba18
@ -108,6 +108,11 @@ setup_ttrss()
|
|||||||
|
|
||||||
echo "Setup: URL is: $TTRSS_SELF_URL"
|
echo "Setup: URL is: $TTRSS_SELF_URL"
|
||||||
|
|
||||||
|
# By default we want to reset the theme to the default one.
|
||||||
|
if [ -z ${TTRSS_THEME_RESET} ]; then
|
||||||
|
TTRSS_THEME_RESET=1
|
||||||
|
fi
|
||||||
|
|
||||||
# Patch URL path.
|
# Patch URL path.
|
||||||
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
|
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
|
||||||
|
|
||||||
@ -131,6 +136,11 @@ setup_ttrss()
|
|||||||
echo "Setup: Additional plugins: $TTRSS_PLUGINS"
|
echo "Setup: Additional plugins: $TTRSS_PLUGINS"
|
||||||
|
|
||||||
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', '$TTRSS_PLUGINS, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
|
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', '$TTRSS_PLUGINS, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
|
||||||
|
|
||||||
|
# Export variables for sub shells.
|
||||||
|
export TTRSS_PATH
|
||||||
|
export TTRSS_PATH_PLUGINS
|
||||||
|
export TTRSS_THEME_RESET
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_db()
|
setup_db()
|
||||||
|
|||||||
@ -65,10 +65,12 @@ try {
|
|||||||
echo 'Connection to database successful' . PHP_EOL;
|
echo 'Connection to database successful' . PHP_EOL;
|
||||||
// Reached this point => table found, assume db is complete
|
// Reached this point => table found, assume db is complete
|
||||||
|
|
||||||
// Make sure to set the default theme provided by TT-RSS.
|
if (env('TTRSS_THEME_RESET', '1')) {
|
||||||
// Other themes might break everything after an update, so play safe here.
|
// Make sure to set the default theme provided by TT-RSS.
|
||||||
echo 'Resetting theme to default ...' . PHP_EOL;
|
// Other themes might break everything after an update, so play safe here.
|
||||||
$pdo->query("UPDATE ttrss_user_prefs SET value = '' WHERE pref_name = 'USER_CSS_THEME'");
|
echo 'Resetting theme to default ...' . PHP_EOL;
|
||||||
|
$pdo->query("UPDATE ttrss_user_prefs SET value = '' WHERE pref_name = 'USER_CSS_THEME'");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (PDOException $e) {
|
catch (PDOException $e) {
|
||||||
echo 'Database table not found, applying schema... ' . PHP_EOL;
|
echo 'Database table not found, applying schema... ' . PHP_EOL;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user