Skip to content

Commit 929011c

Browse files
author
Marek Fiala
committed
update: extended git reset and update submodules for all installer versions
Fixes espressif/esp-idf#15754
1 parent daa4b43 commit 929011c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/InnoSetup/Environment.iss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ begin
198198
end;
199199
200200
{
201-
Initialize submodules - required to call when switching branches in existing repo.
201+
Initialize submodules
202202
E.g. created by offline installer
203203
}
204204
procedure GitUpdateSubmodules(Path: String);
@@ -287,6 +287,9 @@ begin
287287
DoCmdlineInstall(CustomMessage('UpdatingSubmodules'), CustomMessage('UpdatingSubmodules'), Command);
288288
end;
289289
290+
{
291+
Note: This procedure is not invoked for offline installer
292+
}
290293
procedure IDFDownloadInstall();
291294
var
292295
CmdLine: String;
@@ -400,9 +403,6 @@ begin
400403
CmdLine := ExpandConstant('cmd.exe /c ""xcopy.exe" /s /e /i /h /q "' + IDFTempPath + '" "' + IDFPath + '""');
401404
DoCmdlineInstall(CustomMessage('ExtractingEspIdf'), CustomMessage('CopyingEspIdf'), CmdLine);
402405
403-
GitRepoFixFileMode(IDFPath);
404-
GitResetHard(IDFPath);
405-
406406
DelTree(IDFTempPath, True, True, True);
407407
end;
408408
end;

src/InnoSetup/PostInstall.iss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ begin
238238
end;
239239
end;
240240
241+
GitRepoFixFileMode(IDFDownloadPath);
242+
GitResetHard(IDFDownloadPath);
243+
GitUpdateSubmodules(IDFDownloadPath);
241244
IDFToolsSetup();
242245
SaveIdfConfiguration(ExpandConstant('{app}\esp_idf.json'));
243246
end;

0 commit comments

Comments
 (0)