From 99c16ae0c30f5608d1cf6eb47d12c8a5b9ed0bf1 Mon Sep 17 00:00:00 2001 From: doyle Date: Sun, 10 Jul 2022 15:44:05 +1000 Subject: [PATCH] stuff --- win_helpers.bat | 14 +++++++------- win_install.bat | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/win_helpers.bat b/win_helpers.bat index 21bb421..31e59b5 100644 --- a/win_helpers.bat +++ b/win_helpers.bat @@ -80,14 +80,14 @@ for /F "tokens=2 delims= " %%c in ('powershell -NoLogo -NoProfile -NonInteractiv REM Verify Hash if /I "!expected!" neq "!actual!" ( - echo - [FileHashCheck] !file! - echo !algorithm! hash does not match, failing. - echo Expected: !expected! - echo Actual: !actual! + echo - [FileHashCheck] !algorithm! failed [file=!file!, + echo expect=!expected!, + echo actual=!actual! + echo ] exit /B 1 ) -echo - [Verify] !algorithm! Hash OK: !file! !expected! +echo - [FileHashCheck] !algorithm! OK [file=!file! hash=!expected!] exit /B 0 :Move @@ -115,7 +115,7 @@ set executable=%~2 set dest_dir=%~3 if not exist "!executable!" ( - echo - [MakeBatchShortcut] Executable to make shortcut to does not exist [executable=%executable%] + echo - [MakeBatchShortcut] Executable for shortcut does not exist [executable=%executable%] exit /B %ERRORLEVEL% ) @@ -124,7 +124,7 @@ if not exist "!dest_dir!" ( exit /B %ERRORLEVEL% ) -echo - [MakeBatchShortcut] Shortcut [name=!name!, exe=!executable!, dest=!dest_dir!] +echo - [MakeBatchShortcut] Create [name=!name!, exe=!executable!, dest=!dest_dir!] echo @echo off> "!dest_dir!\!name!.bat" echo !executable! %%*>> "!dest_dir!\!name!.bat" exit /B 0 diff --git a/win_install.bat b/win_install.bat index 4d25959..8e37fac 100644 --- a/win_install.bat +++ b/win_install.bat @@ -647,9 +647,9 @@ call win_helpers.bat :MakeBatchShortcut "nvim-qt" "!nvim_dir!\bin\nvim-qt.exe" " REM ---------------------------------------------------------------------------- REM Neovide REM ---------------------------------------------------------------------------- -set neovide_sha256=EF4EBCF41ACB38B418859DD7AEDBCB7B2741EEC9BE0B8D7E1EC5F3001A07E5D8 -set neovide_exe_sha256=BA2CDCE2DE1D4A1DAF6DE6CE1AE132B606CC51A87AA6C9483824829117248AE2 -set neovide_version=0.8.0 +set neovide_sha256=D1DE20E0FCBF68CB4D85CD6F15691DFB77848DAFB97519F8E67E3036A2A7927D +set neovide_exe_sha256=C0F6ED7ED8BAC4EE910267FA785DA698A581004EA45838BE401E3FBA18DD3234 +set neovide_version=0.9.0 set neovide_label=neovide_win64_!neovide_version! set neovide_zip=!downloads_dir!\!neovide_label!.zip @@ -660,7 +660,6 @@ if not exist "!neovide_exe!" ( call win_helpers.bat :DownloadFile "https://github.com/neovide/neovide/releases/download/!neovide_version!/neovide-windows.zip" "!neovide_zip!" || exit /B %ERRORLEVEL% call win_helpers.bat :FileHashCheck sha256 "!neovide_zip!" "!neovide_sha256!" || exit /B %ERRORLEVEL% call win_helpers.bat :Unzip "!zip7_exe!" "!neovide_zip!" "!neovide_dir!" || exit /B %ERRORLEVEL% - call win_helpers.bat :Move "!neovide_dir!\neovide-windows" "!neovide_dir!" || exit /B %ERRORLEVEL% ) call win_helpers.bat :FileHashCheck sha256 "!neovide_exe!" "!neovide_exe_sha256!" || exit /B %ERRORLEVEL%