Merge pull request #239 from espressif/fix/online_installer_crash

Fix/online installer crash

Author: jakub-kocka

Build-Installer.ps1

@@ -11,7 +11,7 @@ param (
     [String]
     $IdfPythonShortVersion = '3.11',
     [String]
-    $GitVersion = '2.43.0',
+    $GitVersion = '2.44.0',
     [String]
     [ValidateSet('online', 'offline', 'espressif-ide')]
     $InstallerType = 'online',

src/InnoSetup/Environment.iss

@@ -270,9 +270,9 @@ begin
   Log('Setting core.fileMode on repository: ' + CmdLine);
   DoCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingFileMode'), CmdLine);
 
-  Log('Setting core.fileMode on repository for submodules: ' + CmdLine);
   CmdLine := GitExecutablePath + ' -C ' + Path + ' submodule foreach --recursive git config --local core.fileMode false';
-  DoCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingFileModeInSubmodules'), CmdLine);
+  Log('Setting core.fileMode on repository for submodules: ' + CmdLine);
+  PerformCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingFileModeInSubmodules'), CmdLine);
 end;
 
 { Run git reset --hard in the repo and in the submodules, to fix the newlines. }
@@ -289,9 +289,9 @@ begin
   Log('Resetting the repository: ' + CmdLine);
   DoCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingNewLines'), CmdLine);
 
-  Log('Resetting the submodules: ' + CmdLine);
   CmdLine := GitExecutablePath + ' -C ' + Path + ' submodule foreach git reset --hard';
-  DoCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingNewLinesInSubmodules'), CmdLine);
+  Log('Resetting the submodules: ' + CmdLine);
+  PerformCmdlineInstall(CustomMessage('FinishingEspIdfInstallation'), CustomMessage('UpdatingNewLinesInSubmodules'), CmdLine);
 end;
 
 { Run git clean - clean leftovers after switching between tags }

src/InnoSetup/IdfToolsSetup.iss

@@ -14,7 +14,7 @@
 #ifdef VERSION
 #define MyAppVersion VERSION
 #else
-#define MyAppVersion "2.24"
+#define MyAppVersion "2.25"
 #endif
 
 #define MyAppPublisher "Espressif Systems (Shanghai) Co. Ltd."
@@ -37,7 +37,7 @@
 ;#define PythonInstallerDownloadURL "https://github.com/espressif/idf-python/releases/download/v" + PYTHONVERSION + "/idf-python-" + PYTHONVERSION + "-embed-win64.zip"
 
 #ifndef GITVERSION
-  #define GITVERSION "2.43.0"
+  #define GITVERSION "2.44.0"
 #endif
 #define GitInstallerName "idf-git-" + GITVERSION + "-win64.zip"
 #define GitInstallerDownloadURL "https://dl.espressif.com/dl/idf-git/" + GitInstallerName

src/InnoSetup/Languages/IdfToolsSetup_cs-CZ.isl

@@ -88,7 +88,7 @@ RunEclipse=Spustit Espressif-IDE
 RunPowerShell=Spustit ESP-IDF PowerShell Environment
 RunCmd=Spustit ESP-IDF Command Prompt Environment
 InstallationCancelled=Instalace byla zrušena.
-InstallationFailed=Instalace selhala s návratovým kódem
+InstallationFailed=Během instalace se vyskytla chyba (nemusí být kritická). Návratový kód:
 InstallationFailedAtStep=Instalace selhala v kroku:
 DirectoryAlreadyExists=Složka již existuje nebo není prázdná:
 ChooseDifferentDirectory=Vyberte jinou složku.

src/InnoSetup/Languages/IdfToolsSetup_en-US.isl

@@ -88,7 +88,7 @@ RunEclipse=Run Espressif-IDE
 RunPowerShell=Run ESP-IDF PowerShell Environment
 RunCmd=Run ESP-IDF Command Prompt Environment
 InstallationCancelled=Installation has been cancelled.
-InstallationFailed=Installation has failed with exit code
+InstallationFailed=The installation process has encountered an error (which may not be critical). Exit code:
 InstallationFailedAtStep=Installation has failed at step:
 DirectoryAlreadyExists=Directory already exists and is not empty:
 ChooseDifferentDirectory=Please choose a different directory.

src/InnoSetup/Languages/IdfToolsSetup_es-ES.isl

@@ -89,7 +89,7 @@ RunEclipse=Ejecutar ambiente Espressif-IDE
 RunPowerShell=Ejecutar ambiente ESP-IDF PowerShell
 RunCmd=Ejecutar ambiente ESP-IDF Command Prompt
 InstallationCancelled=La instalación ha sido cancelada.
-InstallationFailed=La instalación ha fallado con el código:
+InstallationFailed=El proceso de instalación ha encontrado un error (que puede no ser crítico). Código de salida:
 InstallationFailedAtStep=La instalación ha fallado en el paso:
 DirectoryAlreadyExists=El directorio ya existe y no está vacío:
 ChooseDifferentDirectory=Por favor elija un directorio diferente.

src/InnoSetup/Languages/IdfToolsSetup_pt-BR.isl

@@ -89,7 +89,7 @@ RunEclipse=Executar ambiente Espressif-IDE
 RunPowerShell=Executar o ambiente ESP-IDF PowerShell
 RunCmd=Executar ambiente ESP-IDF Prompt de Comando
 InstallationCancelled=A instalação foi cancelada.
-InstallationFailed=A instalação falhou com o seguinte código
+InstallationFailed=O processo de instalação encontrou um erro (que pode não ser crítico). Código de saída:
 InstallationFailedAtStep=A instalação falhou no seguinte passo:
 DirectoryAlreadyExists=Diretório já existe e não está vazio:
 ChooseDifferentDirectory=Por favor escolha um outro diretório.

src/InnoSetup/Languages/IdfToolsSetup_pt-PT.isl

@@ -89,7 +89,7 @@ RunEclipse=Executar ambiente Espressif-IDE
 RunPowerShell=Executar o ambiente ESP-IDF PowerShell
 RunCmd=Executar ambiente ESP-IDF Prompt de Comando
 InstallationCancelled=A instalação foi cancelada.
-InstallationFailed=A instalação falhou com o seguinte código
+InstallationFailed=O processo de instalação encontrou um erro (que pode não ser crítico). Código de saída:
 InstallationFailedAtStep=A instalação falhou no seguinte passo:
 DirectoryAlreadyExists=Diretório já existe e não está vazio:
 ChooseDifferentDirectory=Por favor escolha um outro diretório.

src/InnoSetup/Languages/IdfToolsSetup_sk-SK.isl

@@ -88,7 +88,7 @@ RunEclipse=Spustiť Espressif-IDE
 RunPowerShell=Spustiť ESP-IDF PowerShell Environment
 RunCmd=Spustiť ESP-IDF Command Prompt Environment
 InstallationCancelled=Inštalácia bola zrušená.
-InstallationFailed=Inštalácia zlyhala s návratovým kódom
+InstallationFailed=Počas inštalácie sa vyskytla chyba (nemusí byť kritická). Návratový kód:
 InstallationFailedAtStep=Inštalácia zlyhala v kroku:
 DirectoryAlreadyExists=Zložka už existuje alebo nie je prázdna:
 ChooseDifferentDirectory=Vyberte inú zložku.

src/InnoSetup/Languages/IdfToolsSetup_zh-CN.isl

@@ -88,7 +88,7 @@ RunEclipse=运行 Espressif-IDE 环境
 RunPowerShell=运行 ESP-IDF PowerShell 环境
 RunCmd=运行 ESP-IDF 命令提示符环境
 InstallationCancelled=安装已取消。
-InstallationFailed=安装失败，退出代码为
+InstallationFailed=安装过程遇到错误（可能并不严重）。 退出代码：
 InstallationFailedAtStep=安装失败，失败步骤为：
 DirectoryAlreadyExists=目录已经存在且并不为空：
 ChooseDifferentDirectory=请另外选择目录。