Make installer shortcut check better

During an upgrade, only create shortcuts if the existing install was not a service install. Otherwise, do not create them.
This commit is contained in:
Anthony Lavado 2019-10-22 04:33:06 -04:00
parent a278b380b6
commit 94932ea216

View File

@ -402,6 +402,8 @@ Function .onInit
StrCpy $_EXISTINGSERVICE_ "Yes" StrCpy $_EXISTINGSERVICE_ "Yes"
StrCpy $_INSTALLSERVICE_ "Yes" StrCpy $_INSTALLSERVICE_ "Yes"
StrCpy $_SERVICESTART_ "Yes" StrCpy $_SERVICESTART_ "Yes"
StrCpy $_MAKESHORTCUTS_ "No"
SectionSetText ${CreateWinShortcuts} ""
NoService: ; existing install was present but no service was detected NoService: ; existing install was present but no service was detected
@ -511,6 +513,7 @@ ${If} $BasicInstall == 1
${Else} ${Else}
StrCpy $_SETUPTYPE_ "Advanced" StrCpy $_SETUPTYPE_ "Advanced"
StrCpy $_INSTALLSERVICE_ "Yes" StrCpy $_INSTALLSERVICE_ "Yes"
StrCpy $_MAKESHORTCUTS_ "No"
${If} $_FOLDEREXISTS_ == "Yes" ${If} $_FOLDEREXISTS_ == "Yes"
MessageBox MB_OKCANCEL|MB_ICONINFORMATION "An existing data folder was detected.\ MessageBox MB_OKCANCEL|MB_ICONINFORMATION "An existing data folder was detected.\
$\r$\nBasic Setup is highly recommended.\ $\r$\nBasic Setup is highly recommended.\
@ -520,6 +523,7 @@ ${Else}
${EndIf} ${EndIf}
GoAhead: GoAhead:
StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server" StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server"
SectionSetText ${CreateWinShortcuts} ""
${EndIf} ${EndIf}
FunctionEnd FunctionEnd