FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor simplification of installer

Browse Source
This commit is contained in:
Martin Rotter 2021-03-10 07:57:23 +01:00
parent 93da8822ef
commit 9c95e68f23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/nsis/NSIS.definitions.nsh.in
View File

@ -4,7 +4,6 @@
!define APP_VERSION "@APP_VERSION@" !define APP_VERSION "@APP_VERSION@"
!define APP_NAME "@APP_NAME@" !define APP_NAME "@APP_NAME@"
!define EXE_NAME "@EXE_NAME@" !define EXE_NAME "@EXE_NAME@"
;!define README_FILE "README"
!define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL" !define LICENSE_FILE "@PWD@\..\..\resources\text\COPYING_GNU_GPL"
!define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_ICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"
!define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_UNICON "@PWD@\..\..\resources\graphics\@APP_LOW_NAME@.ico"

6
resources/nsis/NSIS.template.in
View File

@ -23,7 +23,7 @@ SetCompressor /SOLID /FINAL lzma
; Default installation folder. ; Default installation folder.
InstallDir "C:\${APP_NAME}" InstallDir "C:\${APP_NAME}"
InstallDirRegKey HKCU "Software\${APP_NAME}" "Install Directory" InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation"
; Require administrator access. ; Require administrator access.
RequestExecutionLevel admin RequestExecutionLevel admin
@ -131,9 +131,6 @@ NotInstalled:
ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /quiet /norestart' ExecWait '"$INSTDIR\vc_redist.x64.exe" /install /quiet /norestart'
Delete "$INSTDIR\vc_redist.x64.exe" Delete "$INSTDIR\vc_redist.x64.exe"
; Store installation folder.
WriteRegStr HKCU "Software\${APP_NAME}" "Install Directory" $INSTDIR
; Create uninstaller. ; Create uninstaller.
WriteUninstaller "$INSTDIR\Uninstall.exe" WriteUninstaller "$INSTDIR\Uninstall.exe"
@ -141,6 +138,7 @@ NotInstalled:
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayName" "${APP_NAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayName" "${APP_NAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayIcon" "$INSTDIR\${EXE_NAME}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayIcon" "$INSTDIR\${EXE_NAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayVersion" "${APP_VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "DisplayVersion" "${APP_VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "InstallLocation" "$INSTDIR"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
SectionEnd SectionEnd