fix(bundler/nsis): use uninstallstring to find wix installation#7326
Merged
amrbashir merged 3 commits intotauri-apps:1.xfrom Jul 8, 2023
Merged
fix(bundler/nsis): use uninstallstring to find wix installation#7326amrbashir merged 3 commits intotauri-apps:1.xfrom
amrbashir merged 3 commits intotauri-apps:1.xfrom
Conversation
amrbashir
requested changes
Jul 3, 2023
Member
|
could you please rebase your PR and target |
Contributor
Author
done |
amrbashir
requested changes
Jul 5, 2023
Member
amrbashir
left a comment
amrbashir
left a comment
There was a problem hiding this comment.
You will also need to sign your commits, otherwise I won't be able to merge the PR
Comment on lines
+138
to
+146
| ClearErrors | ||
| ReadRegStr $2 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1" "UninstallString" | ||
| Push $2 | ||
| Call GetFirstStrPart | ||
| Pop "$R0" | ||
| StrCmp $R0 "MsiExec.exe" 0 wix_done | ||
| StrCpy $R7 "wix" |
Member
There was a problem hiding this comment.
Instead of a custom function, there is built-in functions https://nsis.sourceforge.io/StrFunc to manipulate strings
So add at the top
!include "StrFunc.nsh"
${StrCase}
${StrLoc}and then
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1" "UninstallString"
${StrCase} $R1 $R0 "L"
${StrLoc} $R0 $R1 "msiexec" ">"
StrCmp $R0 0 0 wix_done
StrCpy $5 "wix"
Contributor
Author
There was a problem hiding this comment.
Unicode true
SetCompressor /SOLID lzma
I need to move these two lines to the head of the file.
Signed-off-by: luofei <luoffei@outlook.com>
Signed-off-by: luofei <luoffei@outlook.com>
amrbashir
previously approved these changes
Jul 8, 2023
amrbashir
reviewed
Jul 8, 2023
amrbashir
approved these changes
Jul 8, 2023
amrbashir
changed the title
Member
|
Thank you |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What kind of change does this PR introduce?
Does this PR introduce a breaking change?
Checklist
fix: remove a typo, closes #___, #___)Other information