lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DoliWamp installer

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-20 12:35:28 +00:00
parent dead11d96e
commit 89835ae802
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/exe/doliwamp/doliwamp2.4.iss
View File

@ -532,8 +532,12 @@ begin
batFile := path+'\mysqlinitpassword.bat'; batFile := path+'\mysqlinitpassword.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
// Save result in a file
// destFile := pathWithSlashes+'/mysqlinitpassword.log';
// SaveStringToFile(destFile,myResult, False);
// Remove dangerous files // Remove dangerous files
batFile := path+'\removefiles.bat'; // batFile := path+'\removefiles.bat';
// Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); // Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
end end

3
build/exe/doliwamp/mysqlinitpassword.bat.install
View File

@ -1 +1,2 @@
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD sleep 1
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >>doliwamp.log 2>>&1

5
htdocs/install/check.php
View File

@ -39,6 +39,11 @@ $langs->load("install");
dolibarr_install_syslog("check: Dolibarr install/upgrade process started"); dolibarr_install_syslog("check: Dolibarr install/upgrade process started");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license