Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds icons to shortcuts, fixes nsis warning

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/windows/dialogs/setuptype.nsdinc
View File

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

11
deployment/windows/jellyfin.nsi
View File

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