installer: use double quotes when configuring editors

The single quotes are fine when a *shell script* launches the editor,
but not when `git.exe` does.

This led to the funny issue where switching to the built-in as default
editor triggered this bug, because the built-in simply is not a shell
script and therefore cannot handle single quotes when spawning an
editor.

This fixes git-for-windows/git#2011

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

Author: dscho

installer/install.iss

@@ -2612,29 +2612,29 @@ begin
     if (CbbEditor.ItemIndex=GE_Nano) then
         GitSystemConfigSet('core.editor','nano.exe')
     else if ((CbbEditor.ItemIndex=GE_NotepadPlusPlus)) and (NotepadPlusPlusPath<>'') then
-        GitSystemConfigSet('core.editor','"'+#39+NotepadPlusPlusPath+#39+' -multiInst -notabbar -nosession -noPlugin"')
+        GitSystemConfigSet('core.editor','"'+NotepadPlusPlusPath+'" -multiInst -notabbar -nosession -noPlugin')
     else if ((CbbEditor.ItemIndex=GE_VisualStudioCode)) and (VisualStudioCodePath<>'') then begin
         if (VisualStudioCodeUserInstallation=False) then
-            GitSystemConfigSet('core.editor','"'+#39+VisualStudioCodePath+#39+' --wait"')
+            GitSystemConfigSet('core.editor','"'+VisualStudioCodePath+'" --wait')
         else begin
-            if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "'+#39+VisualStudioCodePath+#39+' --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
+            if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "\"'+VisualStudioCodePath+'\" --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
                 LogError('Could not set Visual Studio Code as core.editor in the gitconfig.')
         end
     end else if ((CbbEditor.ItemIndex=GE_VisualStudioCodeInsiders)) and (VisualStudioCodeInsidersPath<>'') then begin
         if (VisualStudioCodeInsidersUserInstallation=False) then
-            GitSystemConfigSet('core.editor','"'+#39+VisualStudioCodeInsidersPath+#39+' --wait"')
+            GitSystemConfigSet('core.editor','"'+VisualStudioCodeInsidersPath+'" --wait')
         else begin
-            if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "'+#39+VisualStudioCodeInsidersPath+#39+' --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
+            if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "\"'+VisualStudioCodeInsidersPath+'\" --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
                 LogError('Could not set Visual Studio Code Insiders as core.editor in the gitconfig.')
         end
     end else if ((CbbEditor.ItemIndex=GE_SublimeText)) and (SublimeTextPath<>'') then begin
-        if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "'+#39+SublimeTextPath+#39+' -w"','',SW_HIDE,ewWaitUntilTerminated, i) then
+        if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "\"'+SublimeTextPath+'\" -w"','',SW_HIDE,ewWaitUntilTerminated, i) then
             LogError('Could not set Sublime Text as core.editor in the gitconfig.');
     end else if ((CbbEditor.ItemIndex=GE_Atom)) and (AtomPath<>'') then begin
-        if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "'+#39+AtomPath+#39+' --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
+        if not ExecAsOriginalUser(AppDir + '\{#MINGW_BITNESS}\bin\git.exe','config --global core.editor "\"'+AtomPath+'\" --wait"','',SW_HIDE,ewWaitUntilTerminated, i) then
             LogError('Could not set Atom as core.editor in the gitconfig.');
     end else if ((CbbEditor.ItemIndex=GE_CustomEditor)) and (PathIsValidExecutable(CustomEditorPath)) then
-        GitSystemConfigSet('core.editor','"'+#39+CustomEditorPath+#39+' '+CustomEditorOptions+'"');
+        GitSystemConfigSet('core.editor','"'+CustomEditorPath+'" '+CustomEditorOptions);
 
     {
         Install a scheduled task to try to auto-update Git for Windows