fix sanity_config script, regenerate check file

diff --git a/sanity_config.php b/sanity_config.php
index 5dc2178a24644649f79c50ed07a78f31d472374e..67e373a64877dc629c02b341d7ecf68e0dc95eb0 100644 (file)
--- a/sanity_config.php
+++ b/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Mon Jan 24 12:17:33 MSK 2011
+<?php # This file has been generated at:  Sun Jan 30 19:01:07 MSK 2011
 define('GENERATED_CONFIG_CHECK', 21);
-$requred_defines = array( ); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'MAGPIE_CACHE_AGE', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'ENABLE_UPDATE_DAEMON', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'USE_CURL', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'ENABLE_TRANSLATIONS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'CONFIG_VERSION'); ?>

diff --git a/utils/regen_config_checks.sh b/utils/regen_config_checks.sh
index 9e7737858b4cfc4dd2017691abeb9b2e72235034..8f753c8238b065c9aa70b40a8f1cda7126f899b1 100755 (executable)
--- a/utils/regen_config_checks.sh
+++ b/utils/regen_config_checks.sh
@@ -10,7 +10,7 @@ echo ");" >> $DESTINATION
 
 echo -n "\$requred_defines = array( " >> $DESTINATION
 
-grep define\( config.php-dist | awk -F\' '{ print "*" $2 "*," }' | xargs echo -n | grep -v DB_PORT | sed -e s/,$// -e s/*/\'/g >> $DESTINATION
+grep define\( config.php-dist | awk -F\' '{ print "*" $2 "*," }' | grep -v DB_PORT | xargs echo -n | sed -e s/,$// -e s/*/\'/g >> $DESTINATION
 
 echo "); ?>" >> $DESTINATION