Merge pull request #1 from sharkykh/updates

Updates

Medusa.iss

@@ -1,6 +1,6 @@
 #include <.\idp\idp.iss>
 
-#define MedusaInstallerVersion "v0.2"
+#define MedusaInstallerVersion "v0.3"
 
 #define AppId "{{991BED37-186A-5451-9E77-C3DCE91D56C7}"
 #define AppName "Medusa"
@@ -14,9 +14,9 @@
 
 #define DefaultPort 8081
 
-#define InstallerVersion 10002
+#define InstallerVersion 10003
 #define InstallerSeedUrl "https://raw.githubusercontent.com/pymedusa/MedusaInstaller/master/seed.ini"
-#define AppRepoUrl "https://github.com/pymedusa/SickRage.git"
+#define AppRepoUrl "https://github.com/pymedusa/Medusa.git"
 
 [Setup]
 AppId={#AppId}
@@ -30,6 +30,9 @@ AppUpdatesURL={#AppURL}
 DefaultDirName={sd}\{#AppName}
 DefaultGroupName={#AppName}
 AllowNoIcons=yes
+DisableWelcomePage=no
+DisableDirPage=no
+DisableProgramGroupPage=no
 ArchitecturesInstallIn64BitMode=x64
 OutputBaseFilename={#AppName}Installer
 SolidCompression=yes
@@ -44,7 +47,6 @@ WizardSmallImageFile=assets\WizardSmall.bmp
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "utils\unzip.exe"; Flags: dontcopy
 Source: "assets\medusa.ico"; DestDir: "{app}\Installer"
 Source: "assets\github.ico"; DestDir: "{app}\Installer"
 Source: "utils\nssm32.exe"; DestDir: "{app}\Installer"; DestName: "nssm.exe"; Check: not Is64BitInstallMode
@@ -64,14 +66,15 @@ Name: "{group}\Edit {#AppName} Service"; Filename: "{app}\Installer\nssm.exe"; P
 
 [Run]
 ;Medusa
-Filename: "{app}\Git\cmd\git.exe"; Parameters: "clone {#AppRepoUrl} {app}\{#AppName}"; StatusMsg: "Installing {#AppName}..."
+Filename: "{app}\Git\cmd\git.exe"; Parameters: "clone {#AppRepoUrl} ""{app}\{#AppName}"""; StatusMsg: "Installing {#AppName}..."
 ;Filename: "xcopy.exe"; Parameters: """C:\MedusaInstaller\Medusa"" ""{app}\{#AppName}"" /E /I /H /Y"; Flags: runminimized; StatusMsg: "Installing {#AppName}..."
 ;Service
 Filename: "{app}\Installer\nssm.exe"; Parameters: "start ""{#AppServiceName}"""; Flags: runhidden; BeforeInstall: CreateService; StatusMsg: "Starting {#AppName} service..."
 ;Open
 Filename: "http://localhost:{code:GetWebPort}/"; Flags: postinstall shellexec; Description: "Open {#AppName} in browser"
 
 [UninstallRun]
+;Service
 Filename: "{app}\Installer\nssm.exe"; Parameters: "remove ""{#AppServiceName}"" confirm"; Flags: runhidden
 
 [UninstallDelete]
@@ -295,7 +298,7 @@ begin
     SeedDownloadPageId := idpCreateDownloadForm(wpWelcome)
     DownloadPage := PageFromID(SeedDownloadPageId)
     DownloadPage.Caption := 'Downloading Installer Configuration'
-    DownloadPage.Description := 'Setup is downloading it''s configuration file...'
+    DownloadPage.Description := 'Setup is downloading its configuration file...'
 
     idpConnectControls()
   end;
@@ -329,8 +332,10 @@ var
   Nssm: String;
   ResultCode: Integer;
   OldProgressString: String;
+  WindowsVersion: TWindowsVersion;
 begin
   Nssm := ExpandConstant('{app}\Installer\nssm.exe')
+  GetWindowsVersionEx(WindowsVersion);
 
   OldProgressString := WizardForm.StatusLabel.Caption;
   WizardForm.StatusLabel.Caption := ExpandConstant('Installing {#AppName} service...')
@@ -342,6 +347,10 @@ begin
   Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppStopMethodConsole 20000'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
   Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppEnvironmentExtra "PATH={app}\Git\cmd;%PATH%"'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
 
+  if WindowsVersion.NTPlatform and (WindowsVersion.Major = 10) and (WindowsVersion.Minor = 0) and (WindowsVersion.Build > 14393) then begin
+    Exec(Nssm, ExpandConstant('set "{#AppServiceName}" AppNoConsole 1'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode)
+  end;
+
   WizardForm.StatusLabel.Caption := OldProgressString;
 end;
 

idp/unicode/idplang/ChineseSimplified.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+zh.IDP_FormCaption           =下载文件
+zh.IDP_FormDescription       =请等待安装程序下载文件...
+zh.IDP_TotalProgress         =总进度
+zh.IDP_CurrentFile           =当前文件
+zh.IDP_File                  =文件:
+zh.IDP_Speed                 =速度:
+zh.IDP_Status                =状态:
+zh.IDP_ElapsedTime           =已用时间:
+zh.IDP_RemainingTime         =剩余时间:
+zh.IDP_DetailsButton         =详情
+zh.IDP_HideButton            =隐藏
+zh.IDP_RetryButton           =重试
+zh.IDP_IgnoreButton          =忽略
+zh.IDP_KBs                   =KB/s
+zh.IDP_MBs                   =MB/s
+zh.IDP_X_of_X                =%.2f of %.2f
+zh.IDP_KB                    =KB
+zh.IDP_MB                    =MB
+zh.IDP_GB                    =GB
+zh.IDP_Initializing          =正在初始化...
+zh.IDP_GettingFileInformation=正在获取文件信息...
+zh.IDP_StartingDownload      =开始下载...
+zh.IDP_Connecting            =正在连接...
+zh.IDP_Downloading           =正在下载...
+zh.IDP_DownloadComplete      =下载完成
+zh.IDP_DownloadFailed        =下载失败
+zh.IDP_CannotConnect         =不能连接
+zh.IDP_CancellingDownload    =正在取消下载...
+zh.IDP_Unknown               =未知
+zh.IDP_DownloadCancelled     =下载被取消
+zh.IDP_RetryNext             =检查你的网络连接，点击“重试”重新下载，或点击“下一步”继续安装。
+zh.IDP_RetryCancel           =检查你的网络连接，点击“重试”重新下载，或点击“取消”中止安装。
+zh.IDP_FilesNotDownloaded    =下面文件不能下载:
+zh.IDP_HTTPError_X           =HTTP 错误 %d
+zh.IDP_400                   =错误的请求 (400)
+zh.IDP_401                   =访问被拒绝 (401)
+zh.IDP_404                   =未找到文件 (404)
+zh.IDP_407                   =需要验证代理 (407)
+zh.IDP_500                   =服务器内部错误 (500)
+zh.IDP_502                   =错误的网关 (502)
+zh.IDP_503                   =服务暂时不可用 (503)

idp/unicode/idplang/belarusian.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+be.IDP_FormCaption           =Спампоўванне дадатковых файлаў
+be.IDP_FormDescription       =Калі ласка, пачакайце, пакуль усталёўнік пампуе дадатковыя файлы...
+be.IDP_TotalProgress         =Агульны прагрэс
+be.IDP_CurrentFile           =Бягучы файл
+be.IDP_File                  =Файл:
+be.IDP_Speed                 =Хуткасць:
+be.IDP_Status                =Стан:
+be.IDP_ElapsedTime           =Мінула часу:
+be.IDP_RemainingTime         =Засталося часу:
+be.IDP_DetailsButton         =Падрабязней
+be.IDP_HideButton            =Схаваць
+be.IDP_RetryButton           =Паўтарыць
+be.IDP_IgnoreButton          =
+be.IDP_KBs                   =КБ/с
+be.IDP_MBs                   =МБ/с
+be.IDP_X_of_X                =%.2f з %.2f
+be.IDP_KB                    =КБ
+be.IDP_MB                    =МБ
+be.IDP_GB                    =ГБ
+be.IDP_Initializing          =Ініцыялізацыя...
+be.IDP_GettingFileInformation=Атрыманне звестак пра файл...
+be.IDP_StartingDownload      =Спампоўванне пачынаецца...
+be.IDP_Connecting            =Злучэнне...
+be.IDP_Downloading           =Спампоўванне...
+be.IDP_DownloadComplete      =Спампоўванне скончылася
+be.IDP_DownloadFailed        =Не ўдалося спампаваць
+be.IDP_CannotConnect         =Нельга злучыцца
+be.IDP_CancellingDownload    =Скасаванне спампоўвання...
+be.IDP_Unknown               =Невядома
+be.IDP_DownloadCancelled     =Загрузка отменена
+be.IDP_RetryNext             =Праверце сваё злучэнне з Сецівам і націсніце 'Паўтарыць' каб пачаць спампоўванне нанова, або націсніце 'Далей' каб працягнуць усталяванне.
+be.IDP_RetryCancel           =Праверце сваё злучэнне з Сецівам і націсніце 'Паўтарыць' каб пачаць спампоўванне нанова, або націсніце 'Скасаваць' каб скасаваць усталяванне.
+be.IDP_FilesNotDownloaded    =
+be.IDP_HTTPError_X           =Памылка HTTP %d
+be.IDP_400                   =Памылковы запыт (400)
+be.IDP_401                   =Доступ забаронены (401)
+be.IDP_404                   =Файл не знойдзены (404)
+be.IDP_407                   =Неабходна аўтарызацыя прокси (407)
+be.IDP_500                   =Унутраная памылка сервера (500)
+be.IDP_502                   =Памылковы шлюз (502)
+be.IDP_503                   =Сервер часовы недаступны (503)

idp/unicode/idplang/brazilianPortuguese.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+pt_br.IDP_FormCaption           =Baixando arquivos
+pt_br.IDP_FormDescription       =Por favor aguarde, enquanto recebe arquivos adicionais...
+pt_br.IDP_TotalProgress         =Progresso total
+pt_br.IDP_CurrentFile           =Arquivo atual
+pt_br.IDP_File                  =Arquivo:
+pt_br.IDP_Speed                 =Velocidade:
+pt_br.IDP_Status                =Estado:
+pt_br.IDP_ElapsedTime           =Tempo decorrido:
+pt_br.IDP_RemainingTime         =Tempo remanescente:
+pt_br.IDP_DetailsButton         =Detalhes
+pt_br.IDP_HideButton            =Ocultar
+pt_br.IDP_RetryButton           =Repetir
+pt_br.IDP_IgnoreButton          =
+pt_br.IDP_KBs                   =KB/s
+pt_br.IDP_MBs                   =MB/s
+pt_br.IDP_X_of_X                =%.2f de %.2f
+pt_br.IDP_KB                    =KB
+pt_br.IDP_MB                    =MB
+pt_br.IDP_GB                    =GB
+pt_br.IDP_Initializing          =Inicializando...
+pt_br.IDP_GettingFileInformation=Recebendo informações do arquivo...
+pt_br.IDP_StartingDownload      =Iniciando o download...
+pt_br.IDP_Connecting            =Conectando...
+pt_br.IDP_Downloading           =Baixando...
+pt_br.IDP_DownloadComplete      =Download finalizado
+pt_br.IDP_DownloadFailed        =Falha no download
+pt_br.IDP_CannotConnect         =Não pode conectar
+pt_br.IDP_CancellingDownload    =Cancelando o download...
+pt_br.IDP_Unknown               =Desconhecido
+pt_br.IDP_DownloadCancelled     =Download cancelado
+pt_br.IDP_RetryNext             =Verifique sua conexão e clique em 'Repetir' para tentar novamente o download dos arquivos, ou clique em 'Próximo' para continuar a instalação mesmo assim.
+pt_br.IDP_RetryCancel           =Verifique sua conexão e clique em 'Repetir' para tentar novamente o download dos arquivos, ou clique em 'Cancel' para finalizar a Instalação.
+pt_br.IDP_FilesNotDownloaded    =
+pt_br.IDP_HTTPError_X           =erro HTTP %d
+pt_br.IDP_400                   =Requisição inválida (400)
+pt_br.IDP_401                   =Acesso negado (401)
+pt_br.IDP_404                   =Arquivo não encontrado (404)
+pt_br.IDP_407                   =Autenticação de proxy necessária (407)
+pt_br.IDP_500                   =Erro interno do servidor (500)
+pt_br.IDP_502                   =Bad Gateway (502)
+pt_br.IDP_503                   =Serviço temporariamente indisponível (503)

idp/unicode/idplang/bulgarian.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+bg.IDP_FormCaption           =Изтегляне на допълнителни файлове
+bg.IDP_FormDescription       =Моля, изчакайте, докато съветникът изтегля допълнителните файлове...
+bg.IDP_TotalProgress         =Общ ход
+bg.IDP_CurrentFile           =Текущ файл
+bg.IDP_File                  =Файл:
+bg.IDP_Speed                 =Скорост:
+bg.IDP_Status                =Състояние:
+bg.IDP_ElapsedTime           =Изминало време:
+bg.IDP_RemainingTime         =Оставащо време:
+bg.IDP_DetailsButton         =Повече информация
+bg.IDP_HideButton            =Скрий
+bg.IDP_RetryButton           =Опитай отново
+bg.IDP_IgnoreButton          =Пренебрегни
+bg.IDP_KBs                   =КБ/с
+bg.IDP_MBs                   =МБ/с
+bg.IDP_X_of_X                =%.2f от %.2f
+bg.IDP_KB                    =КБ
+bg.IDP_MB                    =МБ
+bg.IDP_GB                    =ГБ
+bg.IDP_Initializing          =Стартиране...
+bg.IDP_GettingFileInformation=Получаване на информация за файла...
+bg.IDP_StartingDownload      =Започване на изтеглянето...
+bg.IDP_Connecting            =Свързване...
+bg.IDP_Downloading           =Изтегляне...
+bg.IDP_DownloadComplete      =Изтеглянето е завършено
+bg.IDP_DownloadFailed        =Изтеглянето беше неуспешно
+bg.IDP_CannotConnect         =Връзката е невъзможна
+bg.IDP_CancellingDownload    =Отмяна на изтеглянето...
+bg.IDP_Unknown               =Неизвестно
+bg.IDP_DownloadCancelled     =Изтеглянето е отменено
+bg.IDP_RetryNext             =Проверете Вашата Интернет връзка и кликнете „Опитай отново“, за да направите повторен опит за изтегляне на файловете, или кликнете „Напред“, за да продължите с инсталацията въпреки това.
+bg.IDP_RetryCancel           =Проверете Вашата Интернет връзка и кликнете „Опитай отново“, за да направите повторен опит за изтегляне на файловете, или кликнете „Отмени“, за да прекратите инсталацията.
+bg.IDP_FilesNotDownloaded    =Следните файлове не бяха изтеглени:
+bg.IDP_HTTPError_X           =HTTP грешка %d
+bg.IDP_400                   =Грешна заявка (400)
+bg.IDP_401                   =Достъпът е отказан (401)
+bg.IDP_404                   =Файлът не е открит (404)
+bg.IDP_407                   =Изисква се идентификация на прокси (407)
+bg.IDP_500                   =Вътрешна сървърна грешка (500)
+bg.IDP_502                   =Грешен шлюз (502)
+bg.IDP_503                   =Услугата е временно недостъпна (503)

idp/unicode/idplang/czech.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+cz.IDP_FormCaption           =Stahování souborů
+cz.IDP_FormDescription       =Prosím čekejte, než instalátor stáhne dodatečné soubory...
+cz.IDP_TotalProgress         =Celkový průběh stahování
+cz.IDP_CurrentFile           =Aktuální soubor
+cz.IDP_File                  =Soubor:
+cz.IDP_Speed                 =Rychlost:
+cz.IDP_Status                =Stav:
+cz.IDP_ElapsedTime           =Uplynulý čas:
+cz.IDP_RemainingTime         =Zbývá:
+cz.IDP_DetailsButton         =Detaily
+cz.IDP_HideButton            =Skrýt
+cz.IDP_RetryButton           =Znovu
+cz.IDP_IgnoreButton          =Ignorovat
+cz.IDP_KBs                   =KB/s
+cz.IDP_MBs                   =MB/s
+cz.IDP_X_of_X                =%.2f of %.2f
+cz.IDP_KB                    =KB
+cz.IDP_MB                    =MB
+cz.IDP_GB                    =GB
+cz.IDP_Initializing          =Inicializace...
+cz.IDP_GettingFileInformation=Stahování informací o souboru...
+cz.IDP_StartingDownload      =Začínám stahovat...
+cz.IDP_Connecting            =Navazování spojení...
+cz.IDP_Downloading           =Stahování...
+cz.IDP_DownloadComplete      =Stahování ukončeno
+cz.IDP_DownloadFailed        =Stahování selhalo
+cz.IDP_CannotConnect         =Není možné navázat spojení
+cz.IDP_CancellingDownload    =Ukončení stahování...
+cz.IDP_Unknown               =Neznámé
+cz.IDP_DownloadCancelled     =Stahování zrušeno
+cz.IDP_RetryNext             =Zkontrolujte připojení k internetu a klikněte na "Znovu" pro opakované stahování souborů, nebo klikměte na "Další" a pokračujte v instalaci.
+cz.IDP_RetryCancel           =Zkontrolujte připojení k internetu a klikněte na "Znovu" pro opakované stahování souborů, nebo klikměte na "Zrušit" a zrušte instalaci.
+cz.IDP_FilesNotDownloaded    =Následující soubory nebyly staženy:
+cz.IDP_HTTPError_X           =Chyba HTTP %d
+cz.IDP_400                   =Nesprávný požadavek (400)
+cz.IDP_401                   =Přístup zakázán (401)
+cz.IDP_404                   =Soubor nenalezen (404)
+cz.IDP_407                   =Vyžadováno ověření proxy (407)
+cz.IDP_500                   =Chyba serveru (500)
+cz.IDP_502                   =Chyba brány (502)
+cz.IDP_503                   =Služba je dočasně nedostupná (503)

idp/unicode/idplang/default.iss

@@ -1,6 +1,6 @@
 [CustomMessages]
 IDP_FormCaption           =Downloading additional files
-IDP_FormDescription       =Please wait, while setup downloading additional files...
+IDP_FormDescription       =Please wait while Setup is downloading additional files...
 IDP_TotalProgress         =Total progress
 IDP_CurrentFile           =Current file
 IDP_File                  =File:

idp/unicode/idplang/finnish.iss

@@ -0,0 +1,42 @@
+[CustomMessages]
+fi.IDP_FormCaption           =Tiedostojen lataus
+fi.IDP_FormDescription       =Odota, asennusohjelma lataa nyt tiedostoja koneellesi...
+fi.IDP_TotalProgress         =Latauksien edistyminen
+fi.IDP_CurrentFile           =Nyt ladattava tiedosto
+fi.IDP_File                  =Tiedosto:
+fi.IDP_Speed                 =Nopeus:
+fi.IDP_Status                =Tila:
+fi.IDP_ElapsedTime           =Aikaa käytetty:
+fi.IDP_RemainingTime         =Aikaa jäljellä:
+fi.IDP_DetailsButton         =Tiedot
+fi.IDP_HideButton            =Piilota
+fi.IDP_RetryButton           =Yritä uudelleen
+fi.IDP_IgnoreButton          =Hylkää
+fi.IDP_KBs                   =KT/s
+fi.IDP_MBs                   =MT/s
+fi.IDP_X_of_X                =%.2f of %.2f
+fi.IDP_KB                    =KT
+fi.IDP_MB                    =MT
+fi.IDP_GB                    =GT
+fi.IDP_Initializing          =Alustetaan...
+fi.IDP_GettingFileInformation=Haetaan tiedostojen tietoja...
+fi.IDP_StartingDownload      =Aloitetaan latausta...
+fi.IDP_Connecting            =Yhdistetään...
+fi.IDP_Downloading           =Ladataan...
+fi.IDP_DownloadComplete      =Lataus valmis
+fi.IDP_DownloadFailed        =Lataus epäonnistui
+fi.IDP_CannotConnect         =Virhe yhdistettäessä
+fi.IDP_CancellingDownload    =Peruutetaan latausta...
+fi.IDP_Unknown               =Tuntematon
+fi.IDP_DownloadCancelled     =Lataus peruttiin
+fi.IDP_RetryNext             =Tarkista nettiyhteytesi tila ja klikkaa 'Yritä uudelleen' jatkaaksesi tiedostojen lataamista, tai klikkaa 'Seuraava' jatkaaksesi asennusta ilman ladattuja tiedostoja.
+fi.IDP_RetryCancel           =Tarkista nettiyhteytesi tila ja klikkaa 'Yritä uudelleen' jatkaaksesi tiedostojen lataamista, tai klikkaa 'Peruuta' keskeyttääksesi asennus.
+fi.IDP_FilesNotDownloaded    =Seuraavia tiedostoja ei pystytty lataamaan:
+fi.IDP_HTTPError_X           =HTTP virhe %d
+fi.IDP_400                   =Virheellinen pyyntö (400)
+fi.IDP_401                   =Käyttö estetty (401)
+fi.IDP_404                   =Tiedostoa ei löydy (404)
+;fi.IDP_407                   =???
+fi.IDP_500                   =Palvelimen sisäinen virhe (500)
+fi.IDP_502                   =Virheellinen gateway (502)
+fi.IDP_503                   =Palvelu väliaikaisesti ei saatavilla (503)