Adds icons to shortcuts, fixes nsis warning

Adds the icon as a resource file in the program folder, and uses it for the shortcuts created.
Removes an extra section from the dialog creator file, so NSIS won't show a warning for unused code.
This commit is contained in:
Anthony Lavado 2019-10-16 02:29:37 -04:00
parent dc46620a81
commit 5232302532
2 changed files with 7 additions and 10 deletions

View File

@ -48,9 +48,3 @@ Function fnc_setuptype_Create
${NSD_Check} $hCtl_setuptype_BasicInstall
FunctionEnd
; dialog show function
Function fnc_setuptype_Show
Call fnc_setuptype_Create
nsDialogs::Show
FunctionEnd

View File

@ -163,7 +163,9 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
SetOutPath "$INSTDIR"
CopyFiles /SILENT /FILESONLY "${UXPATH}\branding\NSIS\modern-install.ico" "$%InstallLocation%\icon.ico"
File /r $%InstallLocation%\*
; Write the InstallFolder, DataFolder, Network Service info into the registry for later use
WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "InstallFolder" "$INSTDIR"
@ -266,11 +268,12 @@ SectionEnd
Section "Create Shortcuts" CreateWinShortcuts
${If} $_MAKESHORTCUTS_ == "Yes"
CreateDirectory "$SMPROGRAMS\Jellyfin Server"
CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe"
;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe"
CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe"
;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe"
CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe" "" "$INSTDIR\icon.ico" 0
;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "" "$INSTDIR\icon.ico" 0
;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
${EndIf}
SectionEnd