mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 20:08:59 +02:00
Fix syntax errors, move order of upgrade checks, enhance folder check, fix shortcuts
Fixes a syntax error with the NoServiceUninstall section. Moves the detection of an existing Service and datadir further up, so it happens before we decide how the installation will happen. Removed a newline from a comment, and enhanced the existing directory check. Adds an existing folder check, as well as a prompt if the user wants to continue with it or not. Also adds the datadir property to shortcuts.
This commit is contained in:
parent
330395e8b6
commit
a278b380b6
1 changed files with 41 additions and 21 deletions
|
@ -23,6 +23,7 @@ ShowUninstDetails show
|
||||||
Var _EXISTINGINSTALLATION_
|
Var _EXISTINGINSTALLATION_
|
||||||
Var _EXISTINGSERVICE_
|
Var _EXISTINGSERVICE_
|
||||||
Var _MAKESHORTCUTS_
|
Var _MAKESHORTCUTS_
|
||||||
|
Var _FOLDEREXISTS_
|
||||||
;
|
;
|
||||||
!ifdef x64
|
!ifdef x64
|
||||||
!define ARCH "x64"
|
!define ARCH "x64"
|
||||||
|
@ -269,10 +270,10 @@ 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" "" "$INSTDIR\icon.ico" 0
|
CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMAXIMIZED
|
||||||
;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
|
;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0
|
||||||
CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "" "$INSTDIR\icon.ico" 0
|
CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0 SW_SHOWMINIMIZED
|
||||||
;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
|
;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe" "--datadir $\"$_JELLYFINDATADIR_$\"" "$INSTDIR\icon.ico" 0
|
||||||
${EndIf}
|
${EndIf}
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
@ -330,10 +331,11 @@ Section "Uninstall"
|
||||||
Sleep 3000 ; Give time for Windows to catchup
|
Sleep 3000 ; Give time for Windows to catchup
|
||||||
|
|
||||||
NoServiceUninstall: ; existing install was present but no service was detected. Remove shortcuts if account is set to none
|
NoServiceUninstall: ; existing install was present but no service was detected. Remove shortcuts if account is set to none
|
||||||
{$If} $_SERVICEACCOUNTTYPE_ == "None"
|
${If} $_SERVICEACCOUNTTYPE_ == "None"
|
||||||
RMDir /r "$SMPROGRAMS\Jellyfin Server"
|
RMDir /r "$SMPROGRAMS\Jellyfin Server"
|
||||||
Delete "$DESKTOP\Jellyfin Server.lnk"
|
Delete "$DESKTOP\Jellyfin Server.lnk"
|
||||||
{$EndIf}
|
DetailPrint "Removed old shortcuts..."
|
||||||
|
${EndIf}
|
||||||
|
|
||||||
Delete "$INSTDIR\*.*"
|
Delete "$INSTDIR\*.*"
|
||||||
RMDir /r /REBOOTOK "$INSTDIR\jellyfin-web"
|
RMDir /r /REBOOTOK "$INSTDIR\jellyfin-web"
|
||||||
|
@ -380,6 +382,16 @@ Function .onInit
|
||||||
StrCpy $_EXISTINGINSTALLATION_ "Yes" ; Set our flag to be used later
|
StrCpy $_EXISTINGINSTALLATION_ "Yes" ; Set our flag to be used later
|
||||||
SectionSetText ${InstallJellyfinServer} "Upgrade Jellyfin Server (required)" ; Change install text to "Upgrade"
|
SectionSetText ${InstallJellyfinServer} "Upgrade Jellyfin Server (required)" ; Change install text to "Upgrade"
|
||||||
|
|
||||||
|
; check if service was run using Network Service account
|
||||||
|
ClearErrors
|
||||||
|
ReadRegStr $_SERVICEACCOUNTTYPE_ HKLM "${REG_CONFIG_KEY}" "ServiceAccountType" ; in case of error _SERVICEACCOUNTTYPE_ will be NetworkService as default
|
||||||
|
|
||||||
|
ClearErrors
|
||||||
|
ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder" ; in case of error, the default holds
|
||||||
|
|
||||||
|
; Hide sections which will not be needed in case of previous install
|
||||||
|
; SectionSetText ${InstallService} ""
|
||||||
|
|
||||||
; check if there is a service called Jellyfin, there should be
|
; check if there is a service called Jellyfin, there should be
|
||||||
; hack : nssm statuscode Jellyfin will return non zero return code in case it exists
|
; hack : nssm statuscode Jellyfin will return non zero return code in case it exists
|
||||||
ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
|
ExecWait '"$INSTDIR\nssm.exe" statuscode JellyfinServer' $0
|
||||||
|
@ -391,15 +403,6 @@ Function .onInit
|
||||||
StrCpy $_INSTALLSERVICE_ "Yes"
|
StrCpy $_INSTALLSERVICE_ "Yes"
|
||||||
StrCpy $_SERVICESTART_ "Yes"
|
StrCpy $_SERVICESTART_ "Yes"
|
||||||
|
|
||||||
; check if service was run using Network Service account
|
|
||||||
ClearErrors
|
|
||||||
ReadRegStr $_SERVICEACCOUNTTYPE_ HKLM "${REG_CONFIG_KEY}" "ServiceAccountType" ; in case of error _SERVICEACCOUNTTYPE_ will be NetworkService as default
|
|
||||||
|
|
||||||
ClearErrors
|
|
||||||
ReadRegStr $_JELLYFINDATADIR_ HKLM "${REG_CONFIG_KEY}" "DataFolder" ; in case of error, the default holds
|
|
||||||
|
|
||||||
; Hide sections which will not be needed in case of previous install
|
|
||||||
; SectionSetText ${InstallService} ""
|
|
||||||
|
|
||||||
NoService: ; existing install was present but no service was detected
|
NoService: ; existing install was present but no service was detected
|
||||||
${If} $_SERVICEACCOUNTTYPE_ == "None"
|
${If} $_SERVICEACCOUNTTYPE_ == "None"
|
||||||
|
@ -416,8 +419,7 @@ Function .onInit
|
||||||
|
|
||||||
ProceedWithUpgrade:
|
ProceedWithUpgrade:
|
||||||
|
|
||||||
NoExisitingInstall:
|
NoExisitingInstall: ; by this time, the variables have been correctly set to reflect previous install details
|
||||||
; by this time, the variables have been correctly set to reflect previous install details
|
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
@ -488,18 +490,36 @@ Var BasicInstall
|
||||||
|
|
||||||
Function SetupTypePage_Config
|
Function SetupTypePage_Config
|
||||||
${NSD_GetState} $hCtl_setuptype_BasicInstall $BasicInstall
|
${NSD_GetState} $hCtl_setuptype_BasicInstall $BasicInstall
|
||||||
|
IfFileExists "$LOCALAPPDATA\Jellyfin" folderfound foldernotfound ; if the folder exists, use this, otherwise, go with new default
|
||||||
|
folderfound:
|
||||||
|
StrCpy $_FOLDEREXISTS_ "Yes"
|
||||||
|
Goto InstallCheck
|
||||||
|
foldernotfound:
|
||||||
|
StrCpy $_FOLDEREXISTS_ "No"
|
||||||
|
Goto InstallCheck
|
||||||
|
|
||||||
|
InstallCheck:
|
||||||
${If} $BasicInstall == 1
|
${If} $BasicInstall == 1
|
||||||
StrCpy $_SETUPTYPE_ "Basic"
|
StrCpy $_SETUPTYPE_ "Basic"
|
||||||
StrCpy $_INSTALLSERVICE_ "No"
|
StrCpy $_INSTALLSERVICE_ "No"
|
||||||
StrCpy $_SERVICESTART_ "No"
|
StrCpy $_SERVICESTART_ "No"
|
||||||
StrCpy $_SERVICEACCOUNTTYPE_ "None"
|
StrCpy $_SERVICEACCOUNTTYPE_ "None"
|
||||||
StrCpy $_MAKESHORTCUTS_ "Yes"
|
StrCpy $_MAKESHORTCUTS_ "Yes"
|
||||||
IfFileExists "$LOCALAPPDATA\Jellyfin\Server\*.*" 0 ; if the folder exists, use this, otherwise, go with new default
|
${If} $_FOLDEREXISTS_ == "Yes"
|
||||||
StrCpy $_JELLYFINDATADIR_ "$LOCALAPPDATA\Jellyfin\Server"
|
StrCpy $_JELLYFINDATADIR_ "$LOCALAPPDATA\Jellyfin\"
|
||||||
|
${EndIf}
|
||||||
${Else}
|
${Else}
|
||||||
StrCpy $_SETUPTYPE_ "Advanced"
|
StrCpy $_SETUPTYPE_ "Advanced"
|
||||||
StrCpy $_INSTALLSERVICE_ "Yes"
|
StrCpy $_INSTALLSERVICE_ "Yes"
|
||||||
|
${If} $_FOLDEREXISTS_ == "Yes"
|
||||||
|
MessageBox MB_OKCANCEL|MB_ICONINFORMATION "An existing data folder was detected.\
|
||||||
|
$\r$\nBasic Setup is highly recommended.\
|
||||||
|
$\r$\nIf you proceed, you will need to set up Jellyfin again." IDOK GoAhead IDCANCEL GoBack
|
||||||
|
GoBack:
|
||||||
|
Abort
|
||||||
|
${EndIf}
|
||||||
|
GoAhead:
|
||||||
|
StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
Loading…
Reference in a new issue