Skip to content

fix(desktop): emit per-pass NSIS RemovePathSegment variant #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lxrzlyr wants to merge 1 commit into from
Closed

fix(desktop): emit per-pass NSIS RemovePathSegment variant #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/desktop/resources/installer.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,15 @@ done:
Push $R8 ; return the cleaned path
FunctionEnd
!macroend
!insertmacro RemovePathSegment ""
!insertmacro RemovePathSegment "un."
; electron-builder compiles this include twice (installer pass + BUILD_UNINSTALLER
; pass) and treats makensis warnings as errors. Each pass references only its own
; function variant, so emit just that one — an unreferenced variant fails the
; build with warning 6010.
!ifdef BUILD_UNINSTALLER
!insertmacro RemovePathSegment "un."
!else
!insertmacro RemovePathSegment ""
!endif

!macro WriteUserPath
; $R0 = new user Path value. REG_EXPAND_SZ keeps %VAR% references expandable
Expand Down
Loading