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

Minor changes for installer

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-03 22:25:22 +00:00
parent 87f5250c9d
commit 691ab71ecf
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ SourceDir=E:\Mes Developpements\dolibarr
; ----- End of change ; ----- End of change
AppId=doliwamp AppId=doliwamp
AppPublisher=Laurent Destailleur - NLTechno AppPublisher=Laurent Destailleur - NLTechno
AppPublisherURL=http://www.dolibarr.org AppPublisherURL=http://www.nltechno.com
AppSupportURL=http://www.dolibarr.org AppSupportURL=http://www.dolibarr.org
AppUpdatesURL=http://www.dolibarr.org AppUpdatesURL=http://www.dolibarr.org
AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares. AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
@ -44,6 +44,7 @@ Name: "desktopicon"; Description: "Create a &Desktop icon"; GroupDescription: "A
Name: "{app}\logs" Name: "{app}\logs"
Name: "{app}\tmp" Name: "{app}\tmp"
Name: "{app}\dolibarr_documents" Name: "{app}\dolibarr_documents"
Name: "{app}\bin\apache\apache2.2.6\logs"
[Files] [Files]
; Stop/start ; Stop/start
@ -549,27 +550,22 @@ DeleteFile(SrcFile);
// Install services // Install services
//Filename: "{app}\uninstall_services.bat"; Flags: runhidden waituntilterminated
batFile := path+'\uninstall_services.bat'; batFile := path+'\uninstall_services.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
//Filename: "{app}\install_services.bat"; Flags: runhidden waituntilterminated
batFile := path+'\install_services.bat'; batFile := path+'\install_services.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
// Stard services // Stard services
//Filename: "{app}\startdoliwamp.bat"; Flags: runhidden waituntilterminated
batFile := path+'\startdoliwamp.bat'; batFile := path+'\startdoliwamp.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
// Change mysql password // Change mysql password
//Filename: "{app}\mysqlinitpassword.bat"; Flags: runhidden waituntilterminated
batFile := path+'\mysqlinitpassword.bat'; batFile := path+'\mysqlinitpassword.bat';
Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
// Remove bat file // Remove dangerous files
//Filename: "{app}\removefiles.bat"; Flags: runhidden waituntilterminated batFile := path+'\removefiles.bat';
// batFile := path+'\removefiles.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
// Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
end end
@ -678,6 +674,9 @@ Filename: "{app}\rundoliwamp.bat"; Description: "Launch Dolibarr now"; Flags: sh
[UninstallDelete] [UninstallDelete]
Type: files; Name: "{app}\*.*" Type: files; Name: "{app}\*.*"
Type: files; Name: "{app}\www\dolibarr\htdocs\conf\conf.php"
Type: files; Name: "{app}\www\dolibarr\htdocs\install\install.forced.php"
Type: filesandordirs; Name: "{app}\alias"
Type: filesandordirs; Name: "{app}\apps" Type: filesandordirs; Name: "{app}\apps"
Type: filesandordirs; Name: "{app}\bin\apache" Type: filesandordirs; Name: "{app}\bin\apache"
Type: filesandordirs; Name: "{app}\bin\php" Type: filesandordirs; Name: "{app}\bin\php"

2
build/exe/doliwamp/removefiles.bat
View File

@ -1 +1,3 @@
@echo off
del /F .\mysqlinitpassword.bat del /F .\mysqlinitpassword.bat
rename .\www\dolibarr\htdocs\install install.norun

9
htdocs/install/etape5.php
View File

@ -39,8 +39,6 @@ $success=0;
dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO); dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
{
// If install, check pass and pass_verif used to create admin account // If install, check pass and pass_verif used to create admin account
if ($_POST["action"] == "set") if ($_POST["action"] == "set")
{ {
@ -64,8 +62,15 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
} }
/*
* View
*/
pHeader($langs->trans("SetupEnd"),"etape5"); pHeader($langs->trans("SetupEnd"),"etape5");
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
{
print '<table cellspacing="0" cellpadding="2" width="100%">'; print '<table cellspacing="0" cellpadding="2" width="100%">';
$error=0; $error=0;