mirror of
https://github.com/Grasscutters/GrassClipper.git
synced 2024-11-25 09:27:43 +00:00
slash consistency
This commit is contained in:
parent
06fd68e72b
commit
f4b506435d
@ -1,5 +1,5 @@
|
||||
{
|
||||
"applicationId": "js.grassclipper.app",
|
||||
"version": "0.9.3",
|
||||
"version": "0.9.4",
|
||||
"resourcesURL": "https://github.com/Grasscutters/GrassClipper/releases/latest/download/resources.neu"
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"applicationId": "js.grassclipper.app",
|
||||
"version": "0.9.3",
|
||||
"version": "0.9.4",
|
||||
"defaultMode": "window",
|
||||
"port": 0,
|
||||
"documentRoot": "/resources/",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "grassclipper",
|
||||
"version": "0.9.3",
|
||||
"version": "0.9.4",
|
||||
"repository": "https://github.com/Grasscutters/GrassClipper.git",
|
||||
"author": "SpikeHD <spikegdofficial@gmail.com>",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -14,14 +14,14 @@ if not exist ".\temp" mkdir ".\temp"
|
||||
echo Downloading Grasscutter prebuilt jar...
|
||||
|
||||
:: Download the jar
|
||||
powershell Invoke-WebRequest -Uri %KEYSTORE_URL% -OutFile "./temp/gcjar.zip"
|
||||
powershell Invoke-WebRequest -Uri %KEYSTORE_URL% -OutFile ".\temp\gcjar.zip"
|
||||
|
||||
echo Extracting...
|
||||
|
||||
:: Delete old file if there is one there
|
||||
if exist "%FOLDER_NAME%\grasscutter.jar" del "%FOLDER_NAME%\grasscutter.jar"
|
||||
|
||||
powershell Expand-Archive -Path "./temp/gcjar.zip" -DestinationPath "%FOLDER_NAME%" -Force
|
||||
powershell Expand-Archive -Path ".\temp\gcjar.zip" -DestinationPath "%FOLDER_NAME%" -Force
|
||||
|
||||
:: Find the jar file name and rename it, just in case
|
||||
for %%i in (%FOLDER_NAME%/*) do (
|
||||
@ -32,7 +32,7 @@ for %%i in (%FOLDER_NAME%/*) do (
|
||||
echo Downloading keystore.p12...
|
||||
|
||||
:: Download the keystore.p12 file
|
||||
powershell Invoke-WebRequest -Uri %ARTIFACT_URL% -OutFile "./%FOLDER_NAME%/keystore.p12"
|
||||
powershell Invoke-WebRequest -Uri %ARTIFACT_URL% -OutFile ".\%FOLDER_NAME%\keystore.p12"
|
||||
|
||||
:: Check java version, this will automatically output some tuff
|
||||
call .\scripts\javaver.cmd %BRANCH%
|
||||
|
@ -14,19 +14,19 @@ if not exist "%ORIGIN%/ext" mkdir "%ORIGIN%/ext"
|
||||
if not exist "%ORIGIN%/temp" mkdir "%ORIGIN%/temp
|
||||
|
||||
:: Begin by retrieving mitmproxy 7.0.4
|
||||
powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-windows.zip -OutFile "'%ORIGIN%/temp/mitmproxy-7.0.4-windows.zip'"
|
||||
powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-windows.zip -OutFile "'%ORIGIN%\temp\mitmproxy-7.0.4-windows.zip'"
|
||||
|
||||
echo Extracting...
|
||||
|
||||
:: Extract from temp/ to ext/ with powershell
|
||||
powershell Expand-Archive -Path "'%ORIGIN%/temp/mitmproxy-7.0.4-windows.zip'" -DestinationPath "'%ORIGIN%/ext/'" -Force
|
||||
powershell Expand-Archive -Path "'%ORIGIN%\temp\mitmproxy-7.0.4-windows.zip'" -DestinationPath "'%ORIGIN%\ext\'" -Force
|
||||
|
||||
del /s /q "%ORIGIN%/temp"
|
||||
|
||||
echo Running proxy server in order to generate certificates...
|
||||
|
||||
:: Start proxy server
|
||||
start "Proxy Server" "%ORIGIN%/ext/mitmdump.exe" --ssl-insecure --set ip=%ip%
|
||||
start "Proxy Server" "%ORIGIN%\ext\mitmdump.exe" --ssl-insecure --set ip=%ip%
|
||||
|
||||
:: Allow the proxy server to create the certificates
|
||||
ping 127.0.0.1 -n 6 > nul
|
||||
|
@ -54,7 +54,6 @@ if "%PROXY_IP%" EQU "localhost" (
|
||||
|
||||
:: Ensure proxy is enabled, space is there on purpose
|
||||
IF "%PROXY_ENABLED%" NEQ "0x1 " (
|
||||
echo "Proxy server disabled in windows"
|
||||
goto killgame
|
||||
)
|
||||
|
||||
@ -64,7 +63,6 @@ if "%PROXY_IP%" EQU "localhost" (
|
||||
|
||||
:: There is a space after %PROXY_IP on purpose, Windows is weird
|
||||
if "%CUR_PROXY_IP%" NEQ "%PROXY_IP%:8080 " (
|
||||
echo "Cur proxy: %CUR_PROXY_IP% | Proxy: %PROXY_IP%:8080"
|
||||
goto killgame
|
||||
)
|
||||
|
||||
|
@ -9,12 +9,12 @@ if not exist ".\resources" mkdir ".\resources"
|
||||
echo Downloading resources, this can take a while...
|
||||
|
||||
:: Grab the giant ass resource zip
|
||||
powershell Invoke-WebRequest -Uri https://github.com/Koko-boya/Grasscutter_Resources/archive/refs/heads/main.zip -OutFile "./temp/resources.zip"
|
||||
powershell Invoke-WebRequest -Uri https://github.com/Koko-boya/Grasscutter_Resources/archive/refs/heads/main.zip -OutFile ".\temp\resources.zip"
|
||||
|
||||
echo Extracting...
|
||||
|
||||
:: Extract resources to the folder
|
||||
powershell Expand-Archive -Path "./temp/resources.zip" -DestinationPath "%FOLDER_NAME%" -Force
|
||||
powershell Expand-Archive -Path ".\temp\resources.zip" -DestinationPath "%FOLDER_NAME%" -Force
|
||||
|
||||
:: Delete old resources folder if there is one there
|
||||
del /s /q "%FOLDER_NAME%\resources">nul
|
||||
|
Loading…
Reference in New Issue
Block a user