Skip to content

Commit

Permalink
Improve wording in Windows installer
Browse files Browse the repository at this point in the history
  • Loading branch information
dhaavi committed Nov 9, 2021
1 parent ca92b7b commit 6362e23
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 16 deletions.
15 changes: 11 additions & 4 deletions windows/install_finish.rtf
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{\rtf1\ansi
\f1\b0\fs18 \
\f0\b Portmaster updates itself automatically. You can always follow the progress on fixes and new features on https://github.com/safing/portmaster/\
\fs18\f0\b0
Thanks for installing the Portmaster!\
\
\f0\b In order to finish the Portmaster installation you must reboot your system.\
}
If you want to contribute to this open source project, you can:\
\~\bullet\~ Give feedback\
\~\bullet\~ Report bugs\
\~\bullet\~ Spread the word\
\
In case you decide to uninstall the Portmaster, we would love to know why.\
\
Please take note that the Portmaster updates itself automatically.\
}
7 changes: 5 additions & 2 deletions windows/install_summary.rtf
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{\rtf1\ansi
\f0\fs30 Details
\f0\b1\fs25 Install Summary
\f1\b0\fs18 \
\
Install location, settings, profiles and other data\
Install size\
~300MB to download, ~500MB on disk\
\
Install location, program data and settings\
C:\\ProgramData\\Safing\\Portmaster\
\
Symlink at\
Expand Down
21 changes: 11 additions & 10 deletions windows/portmaster-installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Function fnc_PageSummary_Show
${If} $0 == error
Abort
${EndIf}
!insertmacro MUI_HEADER_TEXT "Summary" "A summary of all that will be installed"
!insertmacro MUI_HEADER_TEXT "Install Summary" ""

nsDialogs::CreateControl "RichEdit20A" ${ES_READONLY}|${WS_VISIBLE}|${WS_CHILD}|${WS_TABSTOP}|${WS_VSCROLL}|${ES_MULTILINE}|${ES_WANTRETURN} ${WS_EX_STATICEDGE} 0 0 100% 119u ''
Pop $0
Expand All @@ -83,7 +83,7 @@ Function fnc_PageFinish_Show
${If} $0 == error
Abort
${EndIf}
!insertmacro MUI_HEADER_TEXT "Installation successfull" ""
!insertmacro MUI_HEADER_TEXT "Install Successfull" ""

nsDialogs::CreateControl "RichEdit20A" ${ES_READONLY}|${WS_VISIBLE}|${WS_CHILD}|${WS_TABSTOP}|${WS_VSCROLL}|${ES_MULTILINE}|${ES_WANTRETURN} ${WS_EX_STATICEDGE} 0 0 100% 119u ''
Pop $0
Expand Down Expand Up @@ -146,24 +146,24 @@ dontUpdate:
!insertmacro ShortcutSetToastProperties "$SMPROGRAMS\Portmaster\Portmaster.lnk" "{7F00FB48-65D5-4BA8-A35B-F194DA7E1A51}" "io.safing.portmaster"
pop $0
${If} $0 <> 0
MessageBox MB_ICONEXCLAMATION "Shortcut-Attributes to enable Toast Messages couldn't be set"
MessageBox MB_ICONEXCLAMATION "Shortcut-Attributes to enable Toast Messages could not be set"
SetErrors
Abort
${EndIf}
DetailPrint "Returncode when setting Shortcut: $0 (0: S_OK)"
DetailPrint "Sucessfully added Shortcut-Attributes for Toast Messages. Return Code: $0 (0: S_OK)"

WriteRegStr HKLM "SOFTWARE\Classes\CLSID\{7F00FB48-65D5-4BA8-A35B-F194DA7E1A51}\LocalServer32" "" '"$INSTDIR\${ExeName}" notifier-snoretoast'

; prepare directory structure
DetailPrint "Preparing installation directory ..."
nsExec::ExecToStack '$INSTDIR\${ExeName} clean-structure --data=$InstDir'
pop $0
pop $1
; we ignore the error here as a reboot is suggested anyway and that will
; fix the above error as well.
DetailPrint "Prepared the installation directory."

; download
DetailPrint "Downloading Portmaster modules, this may take a while ..."
DetailPrint "Downloading Portmaster (~300MB), depending on download speeds this may take a while ..."
nsExec::ExecToStack '$INSTDIR\${ExeName} update --data=$InstDir'
pop $0
pop $1
Expand All @@ -173,9 +173,9 @@ dontUpdate:
SetErrors
Abort
${EndIf}
DetailPrint "Sucessfully downloaded Portmaster."

; register Service
DetailPrint "Installing Portmaster as a Windows Service ..."
nsExec::ExecToStack '$INSTDIR\${ExeName} install core-service --data=$InstDir'
pop $0
pop $1
Expand All @@ -185,6 +185,7 @@ dontUpdate:
SetErrors
Abort
${EndIf}
DetailPrint "Successfully registered Portmaster as a Windows Service."

;Actually gets placed at HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Portmaster because NSIS is 32 Bit
;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Portmaster" \
Expand Down Expand Up @@ -226,7 +227,7 @@ Section Un.Portmaster SectionPortmaster
pop $1
DetailPrint $1
${If} $0 <> 0
MessageBox MB_ICONEXCLAMATION "Deleting Service was unsuccessfull, see Details"
MessageBox MB_ICONEXCLAMATION "Deleting service was unsuccessfull, see details."
SetErrors
Abort
${EndIf}
Expand All @@ -250,7 +251,7 @@ Section Un.Data SectionData
SectionEnd

!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SectionData} "Settings, profiles, logs and any other data generated, downloaded or governed by Portmaster. Please create backups of any valuable data before uninstalling."
!insertmacro MUI_DESCRIPTION_TEXT ${SectionPortmaster} "All program components, including downloaded updates. Removes system integrations such as shortcuts, registry keys or services."
!insertmacro MUI_DESCRIPTION_TEXT ${SectionData} "Permanently delete all user-configured global settings and application settings, as well as logs and caches."
!insertmacro MUI_DESCRIPTION_TEXT ${SectionPortmaster} "Uninstall Portmaster from Windows and remove system integrations such as shortcuts, registry keys and services."
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
!endif

0 comments on commit 6362e23

Please sign in to comment.