Update Installer.

ShokoAnime · Aug 20, 2018 · 8aee296 · 8aee296
1 parent bc88a1c
commit 8aee296
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -205,14 +205,8 @@ JMMServer.VC.opendb
 JMMServer.VC.db
 JMMServer.VC.VC.opendb
 JMMServer/Images/Unused/
-/Installers/Output/
+/Installer/Output/
 
 # Jetbrains
 /.idea/
 /Shoko.Server.VC.db
-
-Installers/Advanced Installer/Shoko Server-cache/
-
-Installers/Advanced Installer/Shoko Server/Setup Files/
-
-Installers/Inno Script/Output/
diff --git a/Installers/FixPermissions.bat → Installer/FixPermissions.bat b/Installers/FixPermissions.bat → Installer/FixPermissions.bat
@@ -1,22 +1,22 @@
-@echo off
-title Setting Shoko Server Permissions
-
-if exist "%ProgramData%\ShokoServer" (
-  echo Shoko Server folder found, no need to set permissions.
-  exit 0
-) else (
-  netsh advfirewall firewall add rule name="Shoko Server Port" dir=in action=allow protocol=TCP localport=8111
-  netsh http add urlacl url=http://+:8111/JMMServerPlex sddl=D:(A;;GA;;;S-1-1-0)
-  netsh http add urlacl url=http://+:8111/JMMServerStreaming sddl=D:(A;;GA;;;S-1-1-0)
-  netsh http add urlacl url=http://+:8111/JMMServerImage sddl=D:(A;;GA;;;S-1-1-0)
-  netsh http add urlacl url=http://+:8111/ sddl=D:(A;;GA;;;S-1-1-0)
-  mkdir  "%ProgramData%\ShokoServer"
-  icacls "%ProgramData%\ShokoServer" /inheritance:r
-  icacls "%ProgramData%\ShokoServer" /grant *S-1-1-0:(OI)(CI)F /T /inheritance:e
-  exit 0
-)
-
-echo.
-echo.
-echo Shoko Server permissions correctly applied.
-exit 0
+@echo off
+title Setting Shoko Server Permissions
+
+if exist "%ProgramData%\ShokoServer" (
+  echo Shoko Server folder found, no need to set permissions.
+  exit 0
+) else (
+  netsh advfirewall firewall add rule name="Shoko Server Port" dir=in action=allow protocol=TCP localport=8111
+  netsh http add urlacl url=http://+:8111/JMMServerPlex sddl=D:(A;;GA;;;S-1-1-0)
+  netsh http add urlacl url=http://+:8111/JMMServerStreaming sddl=D:(A;;GA;;;S-1-1-0)
+  netsh http add urlacl url=http://+:8111/JMMServerImage sddl=D:(A;;GA;;;S-1-1-0)
+  netsh http add urlacl url=http://+:8111/ sddl=D:(A;;GA;;;S-1-1-0)
+  mkdir  "%ProgramData%\ShokoServer"
+  icacls "%ProgramData%\ShokoServer" /inheritance:r
+  icacls "%ProgramData%\ShokoServer" /grant *S-1-1-0:(OI)(CI)F /T /inheritance:e
+  exit 0
+)
+
+echo.
+echo.
+echo Shoko Server permissions correctly applied.
+exit 0
diff --git a/Installers/ShokoServer.iss → Installer/ShokoServer.iss b/Installers/ShokoServer.iss → Installer/ShokoServer.iss
@@ -13,7 +13,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{0BA2D22B-A0B7-48F8-8AA1-BAAEFC2034CB}
 AppName=Shoko Server
-AppVersion=3.9.2.0
+AppVersion=3.9.3.0
 AppVerName=Shoko Server
 AppPublisher=Shoko Team
 AppPublisherURL=https://shokoanime.com/
@@ -35,8 +35,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
 
 [Files]
-Source: "..\Shoko.Server\bin\Release\FluentNHibernate.xml"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Shoko.Server\bin\Release\ICSharpCode.SharpZipLib.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\Iesi.Collections.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\Iesi.Collections.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\Infralution.Localization.Wpf.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -150,6 +148,8 @@ Source: "..\Shoko.Server\bin\Release\DeepCloner.dll"; DestDir: "{app}"; Flags: i
 Source: "..\Shoko.Server\bin\Release\DeepCloner.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\FluentNHibernate.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\FluentNHibernate.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Shoko.Server\bin\Release\FluentNHibernate.xml"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Shoko.Server\bin\Release\ICSharpCode.SharpZipLib.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Shoko.Server\bin\Release\de\*"; DestDir: "{app}\de"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "..\Shoko.Server\bin\Release\en-gb\*"; DestDir: "{app}\en-gb"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "..\Shoko.Server\bin\Release\es\*"; DestDir: "{app}\es"; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -180,7 +180,8 @@ Filename: "{sys}\netsh.exe"; Parameters: "http add urlacl url=http://+:8111/JMMS
 Filename: "{sys}\netsh.exe"; Parameters: "http add urlacl url=http://+:8111/ sddl=D:(A;;GA;;;S-1-1-0)"; Flags: runhidden;
 Filename: "{app}\FixPermissions.bat";
 Filename: "{app}\ShokoServer.exe"; Flags: nowait postinstall skipifsilent shellexec; Description: "{cm:LaunchProgram,Shoko Server}"
-Filename: "https://shokoanime.com/shoko-version-3-9-2-released/"; Flags: shellexec runasoriginaluser postinstall; Description: "View 3.9.2 Release Notes"
+Filename: "https://docs.shokoanime.com/server/install_windows.html"; Flags: shellexec runasoriginaluser postinstall; Description: "Shoko Server Install Guide"
+Filename: "https://shokoanime.com/shoko-version-3-9-3-released/"; Flags: shellexec runasoriginaluser postinstall; Description: "View 3.9.3 Release Notes"
 
 [UninstallRun]
 Filename: "{sys}\netsh.exe"; Parameters: "advfirewall firewall delete rule name=""Shoko Server - Client Port"" protocol=TCP localport=8111"; Flags: runhidden; StatusMsg: "Closing exception on firewall..."; Tasks: Firewall

diff --git a/Installers/idp.iss → Installer/idp.iss b/Installers/idp.iss → Installer/idp.iss