This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 972
Prevent loss of default browser on Windows during upgrade/reinstall/etc #8060
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,137 +1,138 @@ | ||
| !include "MUI2.nsh" | ||
| !include "LogicLib.nsh" | ||
| !include "Win8WinVer.nsh" | ||
| !include "GetParameters.nsh" | ||
| !include "GetParent.nsh" | ||
| !include "StrStr.nsh" | ||
|
|
||
| !addplugindir "." | ||
| !include "UAC.nsh" | ||
|
|
||
| !define MUI_ICON "app.ico" | ||
| !insertmacro MUI_LANGUAGE "English" | ||
|
|
||
| SilentInstall silent | ||
|
|
||
| Name "Brave" | ||
| OutFile "../Brave-win32-${ARCH}/resources/BraveDefaults.exe" | ||
| RequestExecutionLevel user | ||
| Var BraveEXEPath | ||
| Var BraveIconPath | ||
| Var IsElevated | ||
| Var IsUninstall | ||
|
|
||
| Function .onInit | ||
| ; The StartMenuInternet key can be set in HKCU on Win8 and above. | ||
| ${IfNot} ${AtLeastWin8} | ||
| SetShellVarContext all | ||
| ${EndIf} | ||
|
|
||
| ; Determine if we're elevated currently | ||
| ClearErrors | ||
| WriteRegStr HKLM "Software\Brave" "InstallerTest" "Write Test" | ||
| DeleteRegValue HKLM "Software\Brave" "InstallerTest" | ||
| ${If} ${Errors} | ||
| StrCpy $IsElevated "0" | ||
| ${Else} | ||
| StrCpy $IsElevated "1" | ||
| ${EndIf} | ||
|
|
||
| Push $EXEDIR | ||
| Call GetParent | ||
| POP $0 | ||
|
|
||
| StrCpy $BraveEXEPath "$0\Brave.exe" | ||
| StrCpy $BraveIconPath "$0\Brave.exe,0" | ||
|
|
||
| Call GetParameters | ||
| Pop $1 | ||
|
|
||
| ; Determine if this is an uninstall or an install | ||
| ${StrStr} $4 $1 "-uninstall" | ||
| ${StrStr} $5 $1 "/uninstall" | ||
|
|
||
| ${If} $4 != "" | ||
| ${OrIf} $5 != "" | ||
| StrCpy $IsUninstall "1" | ||
| ${Else} | ||
| StrCpy $IsUninstall "0" | ||
| ; Document / protocol handler class | ||
| ; These need to always be in HKCU becuase they contain the actual path of the exe which changes | ||
| ; on each update. If on HKLM then the user could not elevate later and cause a problem. | ||
| ; They should also be in this block early because we always want to re-create on each update. | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML" "" "Brave HTML Document" | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML\DefaultIcon" "" "$BraveIconPath" | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML\shell\open\command" "" '"$BraveEXEPath" -- "%1"' | ||
| ${EndIf} | ||
|
|
||
| ; If we already have the defaults key, there's nothing to do so we can abort early without even needing to elevate on Win7. | ||
| ${If} $IsUninstall == "0" | ||
| ClearErrors | ||
| ReadRegStr $2 SHCTX "SOFTWARE\RegisteredApplications" "Brave" | ||
| ${IfNot} ${Errors} | ||
| Quit | ||
| ${EndIf} | ||
| ${EndIf} | ||
|
|
||
| ; Elevate if we're on Win7 and below. Win8 allows keys to be set as HKCU so this is not needed there. | ||
| ${IfNot} ${AtLeastWin8} | ||
| ; Don't even try to elevate if we are already elevated. | ||
| ${AndIf} $IsElevated == "0" | ||
| !insertmacro UAC_RunElevated | ||
| ${Switch} $0 | ||
| ${Case} 0 | ||
| ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done | ||
| ${IfThen} $3 <> 0 ${|} ${Break} ${|} ;we are admin, let the show go on | ||
| ;fall-through and die | ||
| ${Case} 1223 | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate, Brave will not be able to be set as the default browser." | ||
| Quit | ||
| ${Case} 1062 | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Logon service not running, aborting!" | ||
| Quit | ||
| ${Default} | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate , error $0" | ||
| Quit | ||
| ${EndSwitch} | ||
| ${EndIf} | ||
| FunctionEnd | ||
|
|
||
| Section "Defaults Section" SecDummy | ||
| Call GetParameters | ||
| Pop $1 | ||
|
|
||
| ${If} $IsUninstall == "1" | ||
| DeleteRegKey HKCU "SOFTWARE\Classes\BraveHTML" | ||
| DeleteRegKey SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave" | ||
| DeleteRegValue SHCTX "SOFTWARE\RegisteredApplications" "Brave" | ||
|
|
||
| SetShellVarContext current | ||
| Delete "$DESKTOP\Brave.lnk" | ||
| ${Else} | ||
|
|
||
| ; Define capabilities | ||
| WriteRegStr SHCTX "SOFTWARE\RegisteredApplications" "Brave" "Software\Clients\StartMenuInternet\Brave\Capabilities" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\StartMenu" "StartMenuInternet" "Brave" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave" "" "Brave" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities" "ApplicationDescription" "Brave is the new and fast web browser that protects your privacy and security by blocking intrusive ads and trackers." | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities" "ApplicationName" "Brave" | ||
| WriteRegDWORD SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\InstallInfo" "IconsVisible" 1 | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\shell\open\command" "" "" | ||
| ; File associations | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".htm" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".html" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".shtml" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".xht" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".xhtml" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".webp" "BraveHTML" | ||
| ; Protocol associations | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "ftp" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "http" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "https" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "mailto" "BraveHTML" | ||
| ; Uninstall icon | ||
| SetRegView 64 | ||
| WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Brave" "DisplayIcon" "$BraveIconPath" | ||
| ${EndIf} | ||
| SectionEnd | ||
| !include "MUI2.nsh" | ||
| !include "LogicLib.nsh" | ||
| !include "Win8WinVer.nsh" | ||
| !include "GetParameters.nsh" | ||
| !include "GetParent.nsh" | ||
| !include "StrStr.nsh" | ||
|
|
||
| !addplugindir "." | ||
| !include "UAC.nsh" | ||
|
|
||
| !define MUI_ICON "app.ico" | ||
| !insertmacro MUI_LANGUAGE "English" | ||
|
|
||
| SilentInstall silent | ||
|
|
||
| Name "Brave" | ||
| OutFile "../Brave-win32-${ARCH}/resources/BraveDefaults.exe" | ||
| RequestExecutionLevel user | ||
| Var BraveEXEPath | ||
| Var BraveIconPath | ||
| Var IsElevated | ||
| Var IsUninstall | ||
|
|
||
| Function .onInit | ||
| ; The StartMenuInternet key can be set in HKCU on Win8 and above. | ||
| ${IfNot} ${AtLeastWin8} | ||
| SetShellVarContext all | ||
| ${EndIf} | ||
|
|
||
| ; Determine if we're elevated currently | ||
| ClearErrors | ||
| WriteRegStr HKLM "Software\Brave" "InstallerTest" "Write Test" | ||
| DeleteRegValue HKLM "Software\Brave" "InstallerTest" | ||
| ${If} ${Errors} | ||
| StrCpy $IsElevated "0" | ||
| ${Else} | ||
| StrCpy $IsElevated "1" | ||
| ${EndIf} | ||
|
|
||
| Push $EXEDIR | ||
| Call GetParent | ||
| Call GetParent | ||
| POP $0 | ||
|
|
||
| StrCpy $BraveEXEPath "$0\Brave.exe" | ||
| StrCpy $BraveIconPath "$0\Brave.exe,0" | ||
|
|
||
| Call GetParameters | ||
| Pop $1 | ||
|
|
||
| ; Determine if this is an uninstall or an install | ||
| ${StrStr} $4 $1 "-uninstall" | ||
| ${StrStr} $5 $1 "/uninstall" | ||
|
|
||
| ${If} $4 != "" | ||
| ${OrIf} $5 != "" | ||
| StrCpy $IsUninstall "1" | ||
| ${Else} | ||
| StrCpy $IsUninstall "0" | ||
| ; Document / protocol handler class | ||
| ; These need to always be in HKCU becuase they contain the actual path of the exe which changes | ||
| ; on each update. If on HKLM then the user could not elevate later and cause a problem. | ||
| ; They should also be in this block early because we always want to re-create on each update. | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML" "" "Brave HTML Document" | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML\DefaultIcon" "" "$BraveIconPath" | ||
| WriteRegStr HKCU "SOFTWARE\Classes\BraveHTML\shell\open\command" "" '"$BraveEXEPath" -- "%1"' | ||
| ${EndIf} | ||
|
|
||
| ; If we already have the defaults key, there's nothing to do so we can abort early without even needing to elevate on Win7. | ||
| ${If} $IsUninstall == "0" | ||
| ClearErrors | ||
| ReadRegStr $2 SHCTX "SOFTWARE\RegisteredApplications" "Brave" | ||
| ${IfNot} ${Errors} | ||
| Quit | ||
| ${EndIf} | ||
| ${EndIf} | ||
|
|
||
| ; Elevate if we're on Win7 and below. Win8 allows keys to be set as HKCU so this is not needed there. | ||
| ${IfNot} ${AtLeastWin8} | ||
| ; Don't even try to elevate if we are already elevated. | ||
| ${AndIf} $IsElevated == "0" | ||
| !insertmacro UAC_RunElevated | ||
| ${Switch} $0 | ||
| ${Case} 0 | ||
| ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done | ||
| ${IfThen} $3 <> 0 ${|} ${Break} ${|} ;we are admin, let the show go on | ||
| ;fall-through and die | ||
| ${Case} 1223 | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate, Brave will not be able to be set as the default browser." | ||
| Quit | ||
| ${Case} 1062 | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Logon service not running, aborting!" | ||
| Quit | ||
| ${Default} | ||
| MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate , error $0" | ||
| Quit | ||
| ${EndSwitch} | ||
| ${EndIf} | ||
| FunctionEnd | ||
|
|
||
| Section "Defaults Section" SecDummy | ||
| Call GetParameters | ||
| Pop $1 | ||
|
|
||
| ${If} $IsUninstall == "1" | ||
| DeleteRegKey HKCU "SOFTWARE\Classes\BraveHTML" | ||
| DeleteRegKey SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave" | ||
| DeleteRegValue SHCTX "SOFTWARE\RegisteredApplications" "Brave" | ||
|
|
||
| SetShellVarContext current | ||
| Delete "$DESKTOP\Brave.lnk" | ||
| ${Else} | ||
|
|
||
| ; Define capabilities | ||
| WriteRegStr SHCTX "SOFTWARE\RegisteredApplications" "Brave" "Software\Clients\StartMenuInternet\Brave\Capabilities" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\StartMenu" "StartMenuInternet" "Brave" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave" "" "Brave" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities" "ApplicationDescription" "Brave is the new and fast web browser that protects your privacy and security by blocking intrusive ads and trackers." | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities" "ApplicationName" "Brave" | ||
| WriteRegDWORD SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\InstallInfo" "IconsVisible" 1 | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\shell\open\command" "" "" | ||
| ; File associations | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".htm" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".html" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".shtml" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".xht" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".xhtml" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\FileAssociations" ".webp" "BraveHTML" | ||
| ; Protocol associations | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "ftp" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "http" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "https" "BraveHTML" | ||
| WriteRegStr SHCTX "SOFTWARE\Clients\StartMenuInternet\Brave\Capabilities\URLAssociations" "mailto" "BraveHTML" | ||
| ; Uninstall icon | ||
| SetRegView 64 | ||
| WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Brave" "DisplayIcon" "$BraveIconPath" | ||
| ${EndIf} | ||
| SectionEnd | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the confusing diff; This is the fix here (calling
GetParenta second time)I messed around with my .gitconfig for about 20 minutes trying it to only recognize this one line change before giving up and just checking it in like this. I believe this file in particular was checked in with CRLF (and I'm not about to change my config to do that). Good news: future updates won't have this conflict