installer: refactor the retrieval of previously chosen options

This change is a companion to the previous refactoring, where recording
users' choices was made much more robust. Same here.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

installer/install.iss.in

@@ -512,6 +512,18 @@ begin
     end;
 end;
 
+function ReplayChoice(Key:String,Default:String):String;
+begin
+    // Restore the settings chosen during a previous install.
+    Result:=GetPreviousData(Key,Default);
+
+    // Use settings from the user provided INF.
+    if ShouldLoadInf then begin
+        Result:=LoadInfString('Setup',StringChangeEx(Key,' ','',True),Default);
+    end;
+
+end;
+
 procedure InitializeWizard;
 var
     PrevPageID:Integer;
@@ -624,12 +636,7 @@ begin
     end;
 
     // Restore the setting chosen during a previous install.
-    Data:=GetPreviousData('Path Option','BashOnly');
-
-    // Use settings from the user provided INF.
-    if ShouldLoadInf then begin
-        Data:=LoadInfString('Setup','PathOption','BashOnly');
-    end;
+    Data:=ReplayChoice('Path Option','BashOnly');
 
     if Data='BashOnly' then begin
         RdbPath[GP_BashOnly].Checked:=True;
@@ -737,12 +744,7 @@ begin
         end;
 
         // Restore the setting chosen during a previous install.
-        Data:=GetPreviousData('SSH Option','OpenSSH');
-
-        // Use settings from the user provided INF.
-        if ShouldLoadInf then begin
-            Data:=LoadInfString('Setup','SSHOption','OpenSSH');
-        end;
+        Data:=ReplayChoice('SSH Option','OpenSSH');
 
         if Data='OpenSSH' then begin
             RdbSSH[GS_OpenSSH].Checked:=True;
@@ -843,12 +845,7 @@ begin
     end;
 
     // Restore the setting chosen during a previous install.
-    Data:=GetPreviousData('CRLF Option','CRLFAlways');
-
-    // Use settings from the user provided INF.
-    if ShouldLoadInf then begin
-        Data:=LoadInfString('Setup','CRLFOption','CRLFAlways');
-    end;
+    Data:=ReplayChoice('CRLF Option','CRLFAlways');
 
     if Data='LFOnly' then begin
         RdbCRLF[GC_LFOnly].Checked:=True;
@@ -924,12 +921,7 @@ begin
     end;
 
     // Restore the setting chosen during a previous install.
-    Data:=GetPreviousData('Bash Terminal Option','MinTTY');
-
-    // Use settings from the user provided INF.
-    if ShouldLoadInf then begin
-        Data:=LoadInfString('Setup','BashTerminalOption','MinTTY');
-    end;
+    Data:=ReplayChoice('Bash Terminal Option','MinTTY');
 
     if Data='MinTTY' then begin
         RdbBashTerminal[GB_MinTTY].Checked:=True;
@@ -975,12 +967,7 @@ begin
     end;
 
     // Restore the settings chosen during a previous install.
-    Data:=GetPreviousData('Performance Tweaks FSCache','Disabled');
-
-    // Use settings from the user provided INF.
-    if ShouldLoadInf then begin
-        Data:=LoadInfString('Setup','PerformanceTweaksFSCache','Disabled');
-    end;
+    Data:=ReplayChoice('Performance Tweaks FSCache','Disabled');
 
     if Data='Enabled' then begin
         RdbPerfTweaks[GP_FSCache].Checked:=True;