From b87f3c7e39e701296eb632f23f787583fd067194 Mon Sep 17 00:00:00 2001 From: Renegade-Master Date: Tue, 20 Sep 2022 21:58:32 +0100 Subject: [PATCH 1/2] Correct version in Windows Terminal; - windows/StartI2PdBrowser.bat - windows_prebuilt/src/StartI2PdBrowser.bat - Uses Git to determine current version. - Displays the correct version in the startup window. --- windows/StartI2PdBrowser.bat | 8 +++++--- windows_prebuilt/src/StartI2PdBrowser.bat | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/windows/StartI2PdBrowser.bat b/windows/StartI2PdBrowser.bat index 9d7ee59..e099bbf 100644 --- a/windows/StartI2PdBrowser.bat +++ b/windows/StartI2PdBrowser.bat @@ -3,7 +3,9 @@ REM Copyright (c) 2013-2019, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree -title Starting I2Pd Browser 1.2.8 +FOR /F "tokens=*" %%t IN ('git describe --tags') do (SET version=%%t) + +title Starting I2Pd Browser %version% set $pause=ping.exe 0.0.0.0 -n set $cd=%CD% ver| find "6." >nul && set $pause=timeout.exe /t @@ -42,11 +44,11 @@ rem ========================================================================== rem ========================================================================== rem Процедура EchoWithoutCrLf -rem +rem rem %1 : текст для вывода. rem ========================================================================== :EchoWithoutCrLf - + nul && set $pause=timeout.exe /t @@ -38,6 +40,6 @@ cd %$cd% exit /b 0 :EchoWithoutCrLf - + Date: Sat, 24 Sep 2022 18:29:12 +0100 Subject: [PATCH 2/2] Remove version from Windows terminals; --- windows/StartI2PdBrowser.bat | 4 +--- windows_prebuilt/src/StartI2PdBrowser.bat | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/windows/StartI2PdBrowser.bat b/windows/StartI2PdBrowser.bat index e099bbf..fd01168 100644 --- a/windows/StartI2PdBrowser.bat +++ b/windows/StartI2PdBrowser.bat @@ -3,9 +3,7 @@ REM Copyright (c) 2013-2019, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree -FOR /F "tokens=*" %%t IN ('git describe --tags') do (SET version=%%t) - -title Starting I2Pd Browser %version% +title Starting I2Pd Browser set $pause=ping.exe 0.0.0.0 -n set $cd=%CD% ver| find "6." >nul && set $pause=timeout.exe /t diff --git a/windows_prebuilt/src/StartI2PdBrowser.bat b/windows_prebuilt/src/StartI2PdBrowser.bat index f0047ea..0fdc5ba 100644 --- a/windows_prebuilt/src/StartI2PdBrowser.bat +++ b/windows_prebuilt/src/StartI2PdBrowser.bat @@ -3,9 +3,7 @@ REM Copyright (c) 2013-2019, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree -FOR /F "tokens=*" %%t IN ('git describe --tags') do (SET version=%%t) - -title Starting I2Pd Browser %version% +title Starting I2Pd Browser set $pause=ping.exe 0.0.0.0 -n set $cd=%CD% ver| find "6." >nul && set $pause=timeout.exe /t