Set correct xOS value (closes #46 )

Merge pull request #43 from Renegade-Master/correct_win_version
Remove version from Windows Terminal;
2022-11-10 17:56:42 +03:00 · 2022-09-25 15:55:00 +00:00 · 2022-09-24 18:29:12 +01:00 · 2022-09-20 21:58:32 +01:00
3 changed files with 16 additions and 16 deletions
--- a/windows/StartI2PdBrowser.bat
+++ b/windows/StartI2PdBrowser.bat
@ -3,7 +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

-title Starting I2Pd Browser 1.2.8
+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
@ -42,11 +42,11 @@ rem ==========================================================================

 rem ==========================================================================
 rem Ïðîöåäóðà EchoWithoutCrLf
-rem 
+rem
 rem %1 : òåêñò äëÿ âûâîäà.
 rem ==========================================================================
 :EchoWithoutCrLf
-    
+
    <nul set /p strTemp=%~1
    exit /b 0
 rem ==========================================================================
--- a/windows/build/build.cmd
+++ b/windows/build/build.cmd
@ -14,10 +14,10 @@ call :GET_PROXY
 call :GET_ARCH

 if "%locale%"=="ru" (
-	echo ‘¡®àª  I2Pd Browser Portable
-	echo Ÿ§ëª ¡à ã§¥à : %locale%,  àå¨â¥ªâãà : %xOS%
+	echo ‘¡®àª  I2Pd Browser Portable
+	echo Ÿ§ëª ¡à ã§¥à : %locale%,  àå¨â¥ªâãà : %xOS%
 	echo.
-	echo ‡ £àã§ª  ãáâ ®¢é¨ª  Firefox ESR
+	echo ‡ £àã§ª  ãáâ ®¢é¨ª  Firefox ESR
 ) else (
 	echo Building I2Pd Browser Portable
 	echo Browser locale: %locale%, architecture: %xOS%
@ -34,7 +34,7 @@ if errorlevel 1 (

 echo.
 if "%locale%"=="ru" (
-	echo <EFBFBD> á¯ ª®¢ª  ãáâ ®¢é¨ª  ¨ ã¤ «¥¨¥ ¥ ã¦ëå ä ©«®¢
+	echo  á¯ ª®¢ª  ãáâ ®¢é¨ª  ¨ ã¤ «¥¨¥ ¥ ã¦ëå ä ©«®¢
 ) else (
 	echo Unpacking the installer and deleting unnecessary files
 )
@ -64,7 +64,7 @@ echo OK!

 echo.
 if "%locale%"=="ru" (
-	echo <EFBFBD> âç¨¬ ¢ãâà¥¨¥ ä ©«ë ¡à ã§¥à  ¤«ï ®âª«îç¥¨ï  ¢ï§ç¨¢ëå § ¯à®á®¢
+	echo  âç¨¬ ¢ãâà¥¨¥ ä ©«ë ¡à ã§¥à  ¤«ï ®âª«îç¥¨ï  ¢ï§ç¨¢ëå § ¯à®á®¢
 ) else (
 	echo Patching browser internal files to disable annoying external requests
 )
@ -90,7 +90,7 @@ echo OK!

 echo.
 if "%locale%"=="ru" (
-	echo ‡ £àã§ª  ï§ëª®¢ëå ¯ ª¥â®¢
+	echo ‡ £àã§ª  ï§ëª®¢ëå ¯ ª¥â®¢
 ) else (
 	echo Downloading language packs
 )
@ -105,7 +105,7 @@ if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!)

 echo.
 if "%locale%"=="ru" (
-	echo ‡ £àã§ª  ¤®¯®«¥¨ï NoScript
+	echo ‡ £àã§ª  ¤®¯®«¥¨ï NoScript
 ) else (
 	echo Downloading NoScript extension
 )
@ -114,7 +114,7 @@ if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!)

 echo.
 if "%locale%"=="ru" (
-	echo Š®¯¨à®¢ ¨¥ ä ©«®¢  áâà®¥ª ¢ ¯ ¯ªã Firefox
+	echo Š®¯¨à®¢ ¨¥ ä ©«®¢  áâà®¥ª ¢ ¯ ¯ªã Firefox
 ) else (
 	echo Copying Firefox launcher and settings
 )
@ -131,7 +131,7 @@ echo OK!

 echo.
 if "%locale%"=="ru" (
-	echo ‡ £àã§ª  I2Pd
+	echo ‡ £àã§ª  I2Pd
 ) else (
 	echo Downloading I2Pd
 )
@ -144,7 +144,7 @@ xcopy /E /I /Y i2pd ..\i2pd > nul

 echo.
 if "%locale%"=="ru" (
-	echo I2Pd Browser Portable £®â®¢ ª § ¯ãáªã!
+	echo I2Pd Browser Portable £®â®¢ ª § ¯ãáªã!
 ) else (
 	echo I2Pd Browser Portable is ready to start!
 )
@ -166,7 +166,7 @@ goto :eof

 :GET_ARCH
 set xOS=win32
-if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%" neq "x86" (set xOS=win64)
+if defined PROCESSOR_ARCHITEW6432 (set xOS=win64) else if "%PROCESSOR_ARCHITECTURE%" neq "x86" (set xOS=win64)
 goto :eof

 :eof
--- a/windows_prebuilt/src/StartI2PdBrowser.bat
+++ b/windows_prebuilt/src/StartI2PdBrowser.bat
@ -3,7 +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

-title Starting I2Pd Browser 1.2.8
+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
@ -38,6 +38,6 @@ cd %$cd%
 exit /b 0

 :EchoWithoutCrLf
-    
+
    <nul set /p strTemp=%~1
    exit /b 0
Author	SHA1	Message	Date
R4SAS	ce06fc8cf6	Set correct xOS value (closes #46 )	2022-11-10 17:56:42 +03:00
R4SAS	2bbd66f0db	Merge pull request #43 from Renegade-Master/correct_win_version Remove version from Windows Terminal;	2022-09-25 15:55:00 +00:00
Renegade-Master	e0c88df2ca	Remove version from Windows terminals;	2022-09-24 18:29:12 +01:00
Renegade-Master	b87f3c7e39	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.	2022-09-20 21:58:32 +01:00