Skip to content

Commit

Permalink
Add back python x86, Fix one instance the service would not run on wi…
Browse files Browse the repository at this point in the history
…ndows > 10

Signed-off-by: miigotu <miigotu@gmail.com>
  • Loading branch information
miigotu committed Jul 17, 2021
1 parent d6d6e82 commit bb8d441
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
13 changes: 9 additions & 4 deletions SickChill.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <.\idp\idp.iss>

#define SickChillInstallerVersion "v0.6.0"
#define SickChillInstallerVersion "v0.6.1"

#define AppId "{{B0D7EA3E-CC34-4BE6-95D5-3C3D31E9E1B2}"
#define AppName "SickChill"
Expand All @@ -14,7 +14,7 @@

#define DefaultPort 8081

#define InstallerVersion 10009
#define InstallerVersion 10010
#define InstallerSeedUrl "https://raw.githubusercontent.com/SickChill/windows-sickchill/master/seed.ini"
#define AppRepoUrl "https://github.com/SickChill/SickChill.git"

Expand Down Expand Up @@ -254,7 +254,12 @@ begin
// Make sure we're running the latest version of the installer
CheckInstallerVersion(SeedFile)
ParseDependency(PythonDep, 'Python', SeedFile)
if Is64BitInstallMode then
Arch := 'x64'
else
Arch := 'x86';
ParseDependency(PythonDep, 'Python.' + Arch, SeedFile)
DependencyDownloadPageId := idpCreateDownloadForm(wpPreparing)
DownloadPage := PageFromID(DependencyDownloadPageId)
Expand Down Expand Up @@ -349,7 +354,7 @@ begin
Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppStopMethodSkip 6'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppStopMethodConsole 20000'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
if WindowsVersion.NTPlatform and (WindowsVersion.Major = 10) and (WindowsVersion.Minor = 0) and (WindowsVersion.Build > 14393) then begin
if WindowsVersion.NTPlatform and (WindowsVersion.Major >= 10) and (WindowsVersion.Build > 14393) then begin
Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppNoConsole 1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
end;
Expand Down
10 changes: 8 additions & 2 deletions seed.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[Installer]
Version=10009
Version=10010
DownloadUrl=https://github.com/SickChill/windows-sickchill

[Python]
[Python.x64]
url=https://www.nuget.org/api/v2/package/python/3.8.10
size=14219645
sha1=6b67898b2b22d61c0a6b42aa46b10cb4210446d7
filename="python.3.8.10.zip"

[Python.x86]
url=https://www.nuget.org/api/v2/package/pythonx86/3.8.10
size=13284201
sha1=180eac111b61e0216c19e8e1c1316bf575f5999c
filename="python86.3.8.10.zip"

0 comments on commit bb8d441

Please sign in to comment.