mirror of
https://github.com/SpotX-Official/SpotX.git
synced 2026-04-11 17:37:21 +10:00
Cleanup readme, simplifying install.bat
This commit is contained in:
73
Install.bat
73
Install.bat
@@ -1,73 +1,6 @@
|
||||
@echo off
|
||||
Setlocal EnableDelayedExpansion
|
||||
set "exec=powershell $PSVersionTable.PSVersion.major"
|
||||
for /f %%i in ('%exec%') do set ps-v=%%i 2>nul
|
||||
if %ps-v% LEQ 2 (
|
||||
Echo Powershell %ps-v%is not supported
|
||||
@echo.
|
||||
Echo Please read the instruction "Outdated versions of PowerShell" at the following link
|
||||
@echo.
|
||||
Echo "https://github.com/amd64fox/SpotX#possible-problems"
|
||||
@echo.
|
||||
pause
|
||||
exit
|
||||
)
|
||||
curl -V >nul 2>&1
|
||||
if %errorlevel% EQU 9009 (
|
||||
echo "Curl" command line utility not found
|
||||
@echo.
|
||||
echo Please follow the link, download and install "Curl" manually
|
||||
@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.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').Content | Invoke-Expression}"
|
||||
)
|
||||
if %STATUS_CODE% LSS 1 (
|
||||
echo No network connection
|
||||
@echo.
|
||||
echo Trying to reconnect via...
|
||||
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.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').Content | Invoke-Expression}"
|
||||
) else (
|
||||
echo Error again
|
||||
@echo.
|
||||
echo Check your internet connection
|
||||
@echo.
|
||||
echo Script stopped
|
||||
@echo.
|
||||
pause
|
||||
exit
|
||||
)
|
||||
)
|
||||
if %STATUS_CODE% GTR 100 if not %STATUS_CODE% EQU 200 (
|
||||
echo Failed to connect to github.com
|
||||
@echo.
|
||||
echo HTTP response code %STATUS_CODE%
|
||||
@echo.
|
||||
echo Trying to reconnect via...
|
||||
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.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').Content | Invoke-Expression}"
|
||||
) else (
|
||||
echo Error again
|
||||
@echo.
|
||||
echo Try to run after some time
|
||||
@echo.
|
||||
echo Script stopped
|
||||
@echo.
|
||||
)
|
||||
)
|
||||
|
||||
powershell -Command "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12}"; "& {(Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content | Invoke-Expression}"
|
||||
|
||||
pause
|
||||
exit /b
|
||||
|
||||
29
README.md
29
README.md
@@ -41,7 +41,11 @@
|
||||
<details>
|
||||
<summary><small>Usual installation</small></summary><p>
|
||||
|
||||
<h4>During installation, you need to confirm some actions</h4>
|
||||
<h4>During installation, you need to confirm some actions, what does it do?</h4>
|
||||
|
||||
- All [experimental features](https://github.com/amd64fox/SpotX/discussions/50) included
|
||||
|
||||
<h4> </h4>
|
||||
|
||||
* Just download and run [Install.bat](https://raw.githack.com/amd64fox/SpotX/main/Install.bat)
|
||||
|
||||
@@ -107,7 +111,11 @@ or
|
||||
<details>
|
||||
<summary><small>Installation for premium</small></summary><p>
|
||||
|
||||
<h4>Usual installation only without ad blocking, for those who have a premium account</h4>
|
||||
<h4>Usual installation only without ad blocking, for those who have a premium account, what does it do?</h4>
|
||||
|
||||
- All [experimental features](https://github.com/amd64fox/SpotX/discussions/50) included
|
||||
|
||||
<h4> </h4>
|
||||
|
||||
* Just download and run [Install_Prem.bat](https://raw.githack.com/amd64fox/SpotX/main/scripts/Install_Prem.bat)
|
||||
|
||||
@@ -128,13 +136,6 @@ You can specify various parameters for a more flexible installation, more [detai
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><small>Установка на русском</small></summary><p>
|
||||
|
||||
Теперь установка на русском языке доступна в основном скрипте, просто скачайте и запустите `Install.bat` или выполните другие типы установки указанные выше.
|
||||
|
||||
</details>
|
||||
|
||||
<h1>Uninstall</h1>
|
||||
|
||||
- Just run [Uninstall.bat](https://cutt.ly/dErpPEK)
|
||||
@@ -169,16 +170,6 @@ Do the following:
|
||||
- Upgrade to [WMF 5.1](https://www.microsoft.com/en-us/download/details.aspx?id=54616)
|
||||
- Reboot your PC
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><small>After running Install.bat, the message "Curl command line utility not found" appeared</small></summary><p>
|
||||
|
||||
The curl command was not found in the system (in windows 10 and above it comes out of the box), you need to install it manually:
|
||||
|
||||
- Follow the [link](http://www.confusedbycode.com/curl/#downloads) and download the installation file, depending on the bitness of the OS.
|
||||
- We start the installation process, at the end we must restart the PC.
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
|
||||
Reference in New Issue
Block a user