Setup scripts updated

LordKBX · Apr 18, 2022 · 3cc21bf · 3cc21bf
1 parent b8d0df4
commit 3cc21bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/installer/Installer-compiled.iss b/installer/Installer-compiled.iss
@@ -45,7 +45,8 @@ MinVersion=0,6.1
 [Languages]
 Name: "english"; MessagesFile: ".\Default.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-#include ReadReg(HKEY_LOCAL_MACHINE,'Software\Sherlock Software\InnoTools\Downloader','ScriptPath','');
+
+#include "C:\Program Files (x86)\Inno Download Plugin\idp.iss"
 
 [Files]
 ;Source: "D:\CODES\Python\EbookCollection\*.pyw"; DestDir: "{app}"; Flags: ignoreversion
@@ -122,18 +123,13 @@ procedure InitializeWizard();
 begin
   WizardForm.WelcomeLabel1.Visible := True;   
   WizardForm.WelcomeLabel2.Visible := True;
-  
-  itd_init;
 
   if not RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\\7-Zip') then
   begin
-    itd_addfile('http://sd-36502.dedibox.fr/eBookCollection/7zip.zip',expandconstant('{tmp}\eBookCollection-7zip.zip'));
+    idpAddFileSize('http://sd-36502.dedibox.fr/eBookCollection/7zip.zip',expandconstant('{tmp}\eBookCollection-7zip.zip'), 964490)
   end;
-  
-  
   //Start the download after the "Ready to install" screen is shown
-  itd_downloadafter(wpReady);
-
+  idpDownloadAfter(wpReady);
 end;   
      
 procedure CurStepChanged(CurStep: TSetupStep);

diff --git a/installer/Installer-light.iss b/installer/Installer-light.iss
@@ -31,7 +31,7 @@ SetupIconFile=D:\CODES\Python\EbookCollection\ressources\icons\app_icon.ico
 Compression=lzma
 SolidCompression=yes    
 ;lowest or admin
-PrivilegesRequired=lowest
+PrivilegesRequired=admin
 OutputBaseFilename=setup_{#FileAppVersion}.{#FileAppBuild}_light
 
 [Languages]
@@ -49,7 +49,12 @@ Source: "D:\CODES\Python\EbookCollection\editor\*.bat"; DestDir: "{app}\editor";
 
 Source: "D:\CODES\Python\EbookCollection\reader\*.py"; DestDir: "{app}\reader"; Flags: ignoreversion
 Source: "D:\CODES\Python\EbookCollection\reader\*.ui"; DestDir: "{app}\reader"; Flags: ignoreversion
-Source: "D:\CODES\Python\EbookCollection\reader\*.bat"; DestDir: "{app}\reader"; Flags: ignoreversion
+Source: "D:\CODES\Python\EbookCollection\reader\*.bat"; DestDir: "{app}\reader"; Flags: ignoreversion   
+
+Source: "D:\CODES\Python\EbookCollection\Sync\*.py"; DestDir: "{app}\Sync"; Flags: ignoreversion    
+;Source: "D:\CODES\Python\EbookCollection\Sync\*.crt"; DestDir: "{app}\Sync"; Flags: ignoreversion
+Source: "D:\CODES\Python\EbookCollection\Sync\*.pem"; DestDir: "{app}\Sync"; Flags: ignoreversion
+Source: "D:\CODES\Python\EbookCollection\Sync\*.key"; DestDir: "{app}\Sync"; Flags: ignoreversion
 
 Source: "D:\CODES\Python\EbookCollection\common\*.py"; DestDir: "{app}\common"; Flags: ignoreversion
 

diff --git a/test/VERSION_BUILD.txt b/test/VERSION_BUILD.txt
@@ -1 +1 @@
-18
+22