Update comments, strip trailing whitespace

Also, use uppercase for the first letters of the default browser string.

4 files changed, 14 insertions, 8 deletions

diff --git a/misc/nsis/install.nsh b/misc/nsis/install.nsh
index fa5b20a72..eb1079ea6 100755
--- a/misc/nsis/install.nsh
+++ b/misc/nsis/install.nsh
@@ -148,7 +148,7 @@ var KeepReg
 !macroend
 
 ; Functions
-Function CheckInstallation 
+Function CheckInstallation
   ; if there's an installed version, uninstall it first (I chose not to start the uninstaller silently, so that user sees what failed)
   ; if both per-user and per-machine versions are installed, unistall the one that matches $MultiUser.InstallMode
   StrCpy $0 ""
@@ -363,7 +363,7 @@ Section "Register with Windows" SectionWindowsRegister
   ${endif}
 SectionEnd
 
-Section /o "Open default browser settings" SectionDefaultBrowser
+Section /o "Open Default Browser Settings" SectionDefaultBrowser
   SectionIn 1
 
   !insertmacro UAC_AsUser_Call Function GetDefaultBrowser ${UAC_SYNCREGISTERS}
@@ -511,7 +511,7 @@ FunctionEnd
 Function PageInstallModeChangeMode
   ; Disable integration for single user install on Win7 and older, as it's not supported
   ${if} ${AtMostWin7}
-    SectionSetText ${SectionDefaultBrowser} "Set as default browser"
+    SectionSetText ${SectionDefaultBrowser} "Set as Default Browser"
     ${if} $MultiUser.InstallMode == "CurrentUser"
       SectionSetText ${SectionGroupIntegration} "System Integration (not supported)"
       IntOP $0 ${SF_RO} & ${SECTION_OFF}
diff --git a/misc/nsis/mkunlist.cmd b/misc/nsis/mkunlist.cmd
index 864b208c9..8ebb6d708 100755
--- a/misc/nsis/mkunlist.cmd
+++ b/misc/nsis/mkunlist.cmd
@@ -25,7 +25,7 @@ if exist "%DLIST%" del "%DLIST%" || exit 3
 rem Add release files deletion commands

 for /r "%DIST%" %%i in (*) do call:AddToNSH f "%%i" "%ULIST%"

 

-rem '*' doesn't catch hidden files and there are a couple files starting with

+rem '*' doesn't catch hidden files and there are a couple of files starting with

 rem a '.', which will appear as hidden if mapped from a linux file system.

 for /f "tokens=*" %%i in ('dir "%DIST%" /a:h-d /b /s') do call:AddToNSH f "%%i" "%ULIST%"

 

diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi
index 1f136704b..d9b8fbf8d 100755
--- a/misc/nsis/qutebrowser.nsi
+++ b/misc/nsis/qutebrowser.nsi
@@ -21,8 +21,9 @@
 # Includes modified graphics from the NSIS distribution.

 

 # Requires:

-# - NsisMultiUser plugin @ 79914db   https://github.com/Drizin/NsisMultiUser

-# - UAC plugin v2.4.5c (20150526)    http://nsis.sourceforge.net/UAC_plug-in

+# - NsisMultiUser plugin        https://github.com/Drizin/NsisMultiUser

+# - UAC plugin                  https://nsis.sourceforge.net/UAC_plug-in

+# - StdUtils plugin             https://nsis.sourceforge.io/StdUtils_plug-in

 

 

 ; Installer Attributes

diff --git a/misc/nsis/uninstall.nsh b/misc/nsis/uninstall.nsh
index 9d10d05d2..caaddd848 100755
--- a/misc/nsis/uninstall.nsh
+++ b/misc/nsis/uninstall.nsh
@@ -127,7 +127,7 @@ Section "-Uninstall" ; hidden section, must always be the last one!
   ; Remove the uninstaller from registry as the very last step
   ; if something goes wrong, let the user run it again
   !insertmacro MULTIUSER_RegistryRemoveInstallInfo ; Remove registry keys
-  
+
   ${RefreshShellIcons}
 
   ; If the uninstaller still exists, use cmd.exe on exit to remove it (along with $INSTDIR if it's empty)
@@ -169,7 +169,7 @@ Function un.onInit
   ${else}
     StrCpy $RunningFromInstaller 0
   ${endif}
-  
+
   ${GetOptions} $R0 "/upgrade" $R1
   ${ifnot} ${errors}
     StrCpy $KeepReg 1
@@ -188,6 +188,11 @@ Function un.onInit
     StrCpy $SemiSilentMode 0
   ${endif}
 
+  ; Windows stars the uninstallers elevated when called from 'Cotrol Panel' or
+  ; from 'Apps & features' (where it elevates even for per user installations).
+  ; This causes the uninstaller to run for the account used for elevation, which
+  ; may be different than the user doing the uninstall. As a workaround, the
+  ; uninstaller is restarted using the non-elevated user.
   ${ifnot} ${UAC_IsInnerInstance}
   ${andif} $RunningFromInstaller = 0
     ${if} ${UAC_IsAdmin}