Skip to content
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

Show welcome and finish page duing uninstall for boring uninstall #1173

Merged
merged 1 commit into from
Jan 26, 2017
Merged

Show welcome and finish page duing uninstall for boring uninstall #1173

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion packages/electron-builder/templates/nsis/boringInstaller.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
!else
!insertmacro MUI_UNPAGE_WELCOME
!ifndef INSTALL_MODE_PER_ALL_USERS
!insertmacro PAGE_INSTALL_MODE
!endif
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_FINISH
!endif

!macro initMultiUser
Expand Down Expand Up @@ -129,4 +131,4 @@
!endif
!macroend

!include "langs.nsh"
!include "langs.nsh"
12 changes: 7 additions & 5 deletions packages/electron-builder/templates/nsis/uninstaller.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ Function un.onInit
!insertmacro check64BitAndSetRegView

${IfNot} ${Silent}
MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
Quit

!ifdef ONE_CLICK
MessageBox MB_OKCANCEL "Are you sure you want to uninstall ${PRODUCT_NAME}?" IDOK +2
Quit

# one-click installer executes uninstall section in the silent mode, but we must show message dialog if silent mode was not explicitly set by user (using /S flag)
!insertmacro CHECK_APP_RUNNING "uninstall"
SetSilent silent
Expand Down Expand Up @@ -62,5 +62,7 @@ Section "un.install"
!insertmacro customUnInstall
!endif

!insertmacro quitSuccess
SectionEnd
!ifdef ONE_CLICK
!insertmacro quitSuccess
!endif
SectionEnd