From 183aca8dd5e45e0048c2ffe1fe2f07d6b74398de Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 19 Apr 2022 22:31:23 -0700 Subject: [PATCH] misc fixes --- .gitignore | 1 + install.cmd | 17 +++++++---------- resources/js/index.js | 3 ++- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5a37163..c32966e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules/ bin/ dist/ ext/ +temp/ resources/js/neutralino.js resources/bg diff --git a/install.cmd b/install.cmd index 401d96e..1173d4d 100644 --- a/install.cmd +++ b/install.cmd @@ -1,17 +1,10 @@ @echo off :: Ensure we are elevated for certs ->nul 2>&1 reg query "HKU\S-1-5-19" || ( - echo Currently running with non Administrator privileges, raising... - echo set UAC = CreateObject^("Shell.Application"^) > "%temp%\UAC.vbs" - echo UAC.ShellExecute "%~f0", "%1", "", "runas", 1 >> "%temp%\UAC.vbs" - "%temp%\UAC.vbs" - del /f /q "%temp%\UAC.vbs" >nul 2>nul - exit /b +>nul 2>&1 certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer || ( + echo Currently running with non Administrator privileges, run as Administrator to install the certificate. ) -certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer - echo Downloading proxy server... if not exist "./ext" mkdir "ext" @@ -20,7 +13,11 @@ if not exist "./temp" mkdir "temp" :: Begin by retrieving mitmproxy 8.0.0 powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/8.0.0/mitmproxy-8.0.0-windows.zip -OutFile "./temp/mitmproxy-8.0.0-windows.zip" +echo Extracting... + :: Extract from temp/ to ext/ with powershell powershell Expand-Archive -Path "./temp/mitmproxy-8.0.0-windows.zip" -DestinationPath "./ext/" -Force -echo Done! You can now open \ No newline at end of file +del /s /q "./temp" + +echo Done! You can now open GrassClipper.exe! \ No newline at end of file diff --git a/resources/js/index.js b/resources/js/index.js index ab04e60..b60ad81 100644 --- a/resources/js/index.js +++ b/resources/js/index.js @@ -71,8 +71,9 @@ async function setGenshinImpactFolder() { config.genshinImpactFolder = folder Neutralino.storage.setData('config', JSON.stringify(config)) - // Refresh background + // Refresh background and path setBackgroundImage() + displayGenshinFolder() } async function getGenshinExecName() {