Skip to content

Commit 560dcf2

Browse files
committed
installer: fix a couple of CR/LF issues
For some time, the incorrect order LF/CR survived in `GitSystemConfigSet()`. Let's fix it. While at it, also add a missing `+` in `RecordChoice()` (which apparently did not hurt, but let's just fix it anyway). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 9fdc41b commit 560dcf2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

installer/install.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,14 +676,14 @@ begin
676676
// exit code 5 means it was already unset, so that's okay
677677
Result:=True
678678
else begin
679-
LogError('Unable to unset system config "'+Key+'": exit code '+IntToStr(i)+#10+#13+ReadFileAsString(OutPath)+#10+#13+'stderr:'+#10+#13+ReadFileAsString(ErrPath));
679+
LogError('Unable to unset system config "'+Key+'": exit code '+IntToStr(i)+#13+#10+ReadFileAsString(OutPath)+#13+#10+'stderr:'+#13+#10+ReadFileAsString(ErrPath));
680680
Result:=False
681681
end
682682
end else if Exec(ExpandConstant('{cmd}'),'/C .\{#MINGW_BITNESS}\bin\git.exe config --system '+ShellQuote(Key)+' '+ShellQuote(Value)+' >'+#34+OutPath+#34+' 2>'+#34+ErrPath+#34,
683683
AppDir,SW_HIDE,ewWaitUntilTerminated,i) And (i=0) then
684684
Result:=True
685685
else begin
686-
LogError('Unable to set system config "'+Key+'":="'+Value+'": exit code '+IntToStr(i)+#10+#13+ReadFileAsString(OutPath)+#10+#13+'stderr:'+#10+#13+ReadFileAsString(ErrPath));
686+
LogError('Unable to set system config "'+Key+'":="'+Value+'": exit code '+IntToStr(i)+#13+#10+ReadFileAsString(OutPath)+#13+#10+'stderr:'+#13+#10+ReadFileAsString(ErrPath));
687687
Result:=False;
688688
end;
689689
end;
@@ -1013,7 +1013,7 @@ end;
10131013
10141014
procedure RecordChoice(PreviousDataKey:Integer;Key,Data:String);
10151015
begin
1016-
ChosenOptions:=ChosenOptions+Key+': '+Data+#13#10;
1016+
ChosenOptions:=ChosenOptions+Key+': '+Data+#13+#10;
10171017
SetPreviousData(PreviousDataKey,Key,Data);
10181018
if ShouldSaveInf then begin
10191019
// .inf files do not like keys with spaces.

0 commit comments

Comments
 (0)