Update

Combination of Russian and main installer into one. It is also now more convenient to add other languages if necessary
2026-04-11 17:37:21 +10:00 · 2022-07-03 20:45:29 +03:00
parent b39f484dbd
commit 0fe08d8f8f
12 changed files with 460 additions and 1526 deletions
--- a/.github/cutt/test-cutt.txt
+++ b/.github/cutt/test-cutt.txt
@@ -0,0 +1 @@
+test
--- a/Install.bat
+++ b/Install.bat
@@ -25,7 +25,7 @@ if %errorlevel% EQU 9009 (
 )
 for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1') do set STATUS_CODE=%%i 2>nul
 if %STATUS_CODE% EQU 200 (
-    powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1' | Invoke-Expression}"
+    powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content | Invoke-Expression}"
 )
 if %STATUS_CODE% LSS 1 (
    echo No network connection
@@ -36,7 +36,7 @@ if %STATUS_CODE% LSS 1 (
    for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1') do set STATUS_CODE=%%i 2>nul
    if "!STATUS_CODE!" EQU "200 " (
        cls
-        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1' | Invoke-Expression}"
+        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content | Invoke-Expression}"
    ) else ( 
        echo Error again
        @echo.
@@ -59,7 +59,7 @@ if %STATUS_CODE% GTR 100 if not %STATUS_CODE% EQU 200 (
    for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1') do set STATUS_CODE=%%i 2>nul
    if "!STATUS_CODE!" EQU "200 " (
        cls
-        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1' | Invoke-Expression}"
+        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content | Invoke-Expression}"
    ) else (
        echo Error again
        @echo.
--- a/Install.ps1
+++ b/Install.ps1
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
      </p>
     <h2> <div align="center"><b> Modified Spotify Client for Windows </b></div> </h2>

-<h1>System requirements:</h1>
+<h1>System requirements</h1>


 * <strong>OS: Windows 7-11</strong>
@@ -19,7 +19,7 @@
 * <strong>For Windows Desktop only (Microsoft store version is not suitable).</strong>
 * <strong>PowerShell: 3 or higher</strong>

-<h1>Features:</h1>
+<h1>Features</h1>

 * <strong>Blocks all banner, video and audio ads in the client</strong>
 * <strong>Unlocks the skip function of any track</strong>
@@ -40,20 +40,20 @@
 * <strong>Code minification</strong>


-<h1>Fast installation / Update:</h1>
-
+<h1>Fast installation / Update</h1>
+<h3>Choose installation type:</h3>
 <details>
 <summary><small>Usual installation</small></summary><p>
  
  <h4>During installation, you need to confirm some actions</h4>
  
-* Just download and run [Install.bat](https://cutt.ly/PErptD8)
+* Just download and run [Install.bat](https://raw.githack.com/amd64fox/SpotX/main/Install.bat) 

 or

 * Run The following command in PowerShell:
 ```ps1
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1' | iex
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content | iex
 ```

 </details>
@@ -64,12 +64,12 @@ or
  
  <h4>Automatic installation without confirmation (remove Spotify MS, install over recommended version, remove podcasts from homepage, block updates, no cache clear installation)</h4>
  
-  * Just download and run [Install_Auto.bat](https://cutt.ly/AKPeK8l)
+  * Just download and run [Install_Auto.bat](https://raw.githack.com/amd64fox/SpotX/main/scripts/Install_Auto.bat)

 or
  
 ```ps1
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex "& { $(iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1') } -confirm_uninstall_ms_spoti -confirm_spoti_recomended_over -podcasts_off -cache_off -block_update_on"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex "& { $((iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content) } -confirm_uninstall_ms_spoti -confirm_spoti_recomended_over -podcasts_off -cache_off -block_update_on -start_spoti"
 ```


@@ -81,13 +81,13 @@ or
  
  <h4>Usual installation only without ad blocking, for those who have a premium account</h4>
  
-* Just download and run [Install_Prem.bat](https://cutt.ly/HKPeXZc)
+* Just download and run [Install_Prem.bat](https://raw.githack.com/amd64fox/SpotX/main/scripts/Install_Prem.bat)

 or

 * Run The following command in PowerShell:
 ```ps1
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex "& { $(iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1') } -premium"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex "& { $((iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content) } -premium"
 ```

 </details>
@@ -102,23 +102,14 @@ You can specify various parameters for a more flexible installation, more [detai


 <details>
-<summary><small>Русский установщик</small></summary><p>
+<summary><small>Установка на русском</small></summary><p>
  
-  <h4>Обычный установщик с подтверждениями на русском языке</h4>
-  
-* Скачайте и запустите [Install_Rus.bat](https://cutt.ly/ZEnk1qf)
-
-или
-
-* Запустите следующую строку напрямую в терминале PowerShell:
-```ps1
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (iwr -useb 'https://raw.githubusercontent.com/amd64fox/SpotX/main/scripts/Install_Rus.ps1').Content | iex
-```
+Теперь установка на русском языке доступна в основном скрипте, просто скачайте и запустите `Install.bat` или выполните другие типы установки указанные выше.

 </details>


-<h1>Uninstall:</h1>
+<h1>Uninstall</h1>

 * Just run [Uninstall.bat](https://cutt.ly/dErpPEK)

@@ -128,7 +119,7 @@ or



-<h1>Possible problems:</h1>
+<h1>Possible problems</h1>

 <details>
 <summary><small>Outdated versions of PowerShell</small></summary><p>
@@ -160,7 +151,7 @@ The curl command was not found in the system (in windows 10 and above it comes o



-<h1>Additional Notes:</h1>
+<h1>Additional Notes</h1>

 * The repository is based on <a href="https://github.com/mrpond/BlockTheSpot">BlockTheSpot</a>, and also some tricks were taken from <a href="https://github.com/khanhas/spicetify-cli">spicetify-cli</a>, many thanks to the contributors
 * SpotX will only work correctly on the latest versions of Spotify, please make sure of this before asking a question.  
--- a/scripts/Install_Auto.bat
+++ b/scripts/Install_Auto.bat
@@ -1,6 +1,6 @@
@echo off

-powershell -Command "&{[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}; """"& { $(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1')} -confirm_uninstall_ms_spoti -confirm_spoti_recomended_over -podcasts_off -cache_off -block_update_on """" | Invoke-Expression"
+powershell -Command "&{[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}; """"& { $((Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content)} -confirm_uninstall_ms_spoti -confirm_spoti_recomended_over -podcasts_off -cache_off -block_update_on -start_spoti """" | Invoke-Expression"

 pause
 exit /b
--- a/scripts/Install_Prem.bat
+++ b/scripts/Install_Prem.bat
@@ -1,6 +1,6 @@
@echo off

-powershell -Command "&{[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}; """"& { $(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1')} -premium """" | Invoke-Expression"
+powershell -Command "&{[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}; """"& { $((Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content)} -premium """" | Invoke-Expression"

 pause
 exit /b
--- a/scripts/Install_Rus.bat
+++ b/scripts/Install_Rus.bat
@@ -1,77 +0,0 @@
-@echo off
-Setlocal EnableDelayedExpansion
-set "exec=powershell $PSVersionTable.PSVersion.major"
-for /f %%i in ('%exec%') do set ps-v=%%i 2>nul
-chcp 65001 >nul
-if  %ps-v% LEQ 2 (
-    echo Powershell %ps-v%не поддерживается
-    @echo.
-    echo Пожалуйста, прочитайте инструкцию "Устаревшие версии PowerShell" по следующей ссылке
-    @echo.
-    echo "https://4pda.to/forum/index.php?act=findpost&pid=104279894&anchor=outdated_versions"
-    @echo.
-    pause
-    exit
-)
-curl -V >nul 2>&1
-if %errorlevel% EQU 9009 (
-    echo Команда "Curl" отсутствует в системе
-    @echo.
-    echo Пожалуйста, перейдите по следующей ссылке для ручной установки "Curl"
-    @echo.
-    echo "http://www.confusedbycode.com/curl/#downloads"
-    @echo.
-    pause
-    exit
-)
-for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1') do set STATUS_CODE=%%i 2>nul
-if %STATUS_CODE% EQU 200 (
-    chcp 866 >nul
-    powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1').Content | Invoke-Expression}"
-)
-if %STATUS_CODE% LSS 1 (
-    echo Нет подключения к сети
-    @echo.
-    echo Попытка повторного подключения через ...
-    TIMEOUT /T 5
-    cls
-    for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1') do set STATUS_CODE=%%i 2>nul
-    if "!STATUS_CODE!" EQU "200 " (
-        cls
-        chcp 866 >nul
-        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1').Content | Invoke-Expression}"
-    ) else ( 
-        echo Снова ошибка 
-        @echo.
-        echo Проверьте свое интернет соединение
-        @echo.
-        echo Скрипт остановлен
-        @echo.
-        pause
-        exit
-    )
-)
-if %STATUS_CODE% GTR 100 if not %STATUS_CODE% EQU 200 (
-    echo Не удалось подключиться к github.com
-    @echo.
-    echo Код ответа HTTP %STATUS_CODE%
-    @echo.
-    echo Попытка повторного подключения через ...
-    TIMEOUT /T 5
-    cls
-    for /f %%i in ('curl --write-out %%{http_code} --silent --output /dev/null --insecure https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1') do set STATUS_CODE=%%i 2>nul
-    if "!STATUS_CODE!" EQU "200 " (
-        cls
-        chcp 866 >nul
-        powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install_Rus.ps1').Content | Invoke-Expression}"
-    ) else (
-        echo Снова ошибка
-        @echo.
-        echo Попробуйте запустить спустя некоторое время
-        @echo.
-        echo Скрипт остановлен
-        @echo.
-    )
-)
-pause
-exit /b
--- a/scripts/Install_Rus.ps1
+++ b/scripts/Install_Rus.ps1
--- a/scripts/cache/cache_spotify.ps1
+++ b/scripts/cache/cache_spotify.ps1
--- a/scripts/cache/cache_spotify_ru.ps1
+++ b/scripts/cache/cache_spotify_ru.ps1
--- a/scripts/cache/hide_window.vbs
+++ b/scripts/cache/hide_window.vbs
--- a/scripts/cache/run_ps.bat
+++ b/scripts/cache/run_ps.bat