diff options
| author | spiderr <spiderr@bitweaver.org> | 2021-06-02 15:26:32 -0400 |
|---|---|---|
| committer | spiderr <spiderr@bitweaver.org> | 2021-06-02 15:26:32 -0400 |
| commit | cf221b48d9476f181f40ffa094755dc04fe76225 (patch) | |
| tree | b7c5a69703423d73243be082cbbd04952bb8d7b8 | |
| parent | fd1712a4270a4349dc4e5d620e7779fcf7ed86cf (diff) | |
| parent | 3f746cbb61dead95799ff3c35909bc5b0f6256e9 (diff) | |
| download | install-cf221b48d9476f181f40ffa094755dc04fe76225.tar.gz install-cf221b48d9476f181f40ffa094755dc04fe76225.tar.bz2 install-cf221b48d9476f181f40ffa094755dc04fe76225.zip | |
resolve conflicts
| -rw-r--r-- | process_sql.php | 34 | ||||
| -rw-r--r-- | templates/install_checks.tpl | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/process_sql.php b/process_sql.php new file mode 100644 index 0000000..c7c5d73 --- /dev/null +++ b/process_sql.php @@ -0,0 +1,34 @@ +<?php +/** + * @version $Header$ + * @package install + * @subpackage functions + */ + +/** + * Global flag to indicate we are installing + * @ignore + */ +define( 'BIT_INSTALL', 'TRUE' ); + global $failedcommands; +// keep some crappy notices from spewing +$_SERVER['HTTP_HOST'] = 'shell'; +$_SERVER['SERVER_SOFTWARE'] = 'command_line'; + +/** + * required setup + */ +require_once( 'install_lib.php' ); +include("../kernel/includes/setup_inc.php"); + +if( count( $argv ) < 2) { + print "Please enter name of SQL file in db/ directory to process\n"; +} else { + // avoid errors in ADONewConnection() (wrong darabase driver etc...) + $gBitDb = &ADONewConnection($gBitDbType); + if( $gBitDb->Connect($gBitDbHost, $gBitDbUser, $gBitDbPassword, $gBitDbName) ) { + process_sql_file( $argv[1], $gBitDbType, BIT_DB_PREFIX ); + } +} + +?> diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl index db06e50..c403147 100644 --- a/templates/install_checks.tpl +++ b/templates/install_checks.tpl @@ -150,7 +150,7 @@ <li>or download a pre-packed set of <a class="external" href="http://www.bitweaver.org/downloads/file/11619">Bitweaver PEAR extensions</a> and extract this to<br /> - <kbd>{$smarty.const.UTIL_PKG_INC}pear/</kbd></li> + <kbd>{$smarty.const.UTIL_PKG_INCLUDE_PATH}pear/</kbd></li> </ul> {else} <p class="alert alert-success"> |