added suppression of progress by default
This commit is contained in:
parent
d0e940f00b
commit
6d13594e80
|
|
@ -309,6 +309,8 @@ if(!$install_step) { $install_step = 'select_language'; }
|
||||||
$switch = new install_switch($global_settings);
|
$switch = new install_switch($global_settings);
|
||||||
//$switch->debug = true;
|
//$switch->debug = true;
|
||||||
//$system->debug = true;
|
//$system->debug = true;
|
||||||
|
$switch->echo_progress = true;
|
||||||
|
$system->echo_progress = true;
|
||||||
$system->install_phase_1();
|
$system->install_phase_1();
|
||||||
$switch->install_phase_1();
|
$switch->install_phase_1();
|
||||||
$system->install_phase_2();
|
$system->install_phase_2();
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ include "root.php";
|
||||||
protected $dbh;
|
protected $dbh;
|
||||||
|
|
||||||
public $debug = false;
|
public $debug = false;
|
||||||
|
public $echo_progress = false;
|
||||||
|
|
||||||
public $install_language = 'en-us';
|
public $install_language = 'en-us';
|
||||||
public $admin_username;
|
public $admin_username;
|
||||||
|
|
@ -71,7 +72,9 @@ include "root.php";
|
||||||
}
|
}
|
||||||
|
|
||||||
function write_progress($message) {
|
function write_progress($message) {
|
||||||
echo "$message\n";
|
if($this->echo_progress){
|
||||||
|
echo "$message\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_phase_1() {
|
function install_phase_1() {
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ include "root.php";
|
||||||
protected $dbh;
|
protected $dbh;
|
||||||
|
|
||||||
public $debug = false;
|
public $debug = false;
|
||||||
|
public $echo_progress = false;
|
||||||
|
|
||||||
function __construct($global_settings) {
|
function __construct($global_settings) {
|
||||||
if(is_null($global_settings)){
|
if(is_null($global_settings)){
|
||||||
|
|
@ -63,7 +64,9 @@ include "root.php";
|
||||||
}
|
}
|
||||||
|
|
||||||
function write_progress($message) {
|
function write_progress($message) {
|
||||||
echo "$message\n";
|
if($this->echo_progress){
|
||||||
|
echo "$message\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//$options '-n' --no-clobber
|
//$options '-n' --no-clobber
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue