From aeb3a541b9e9c3711b4f27cac11c880a2ff4b8b1 Mon Sep 17 00:00:00 2001 From: faxboss Date: Thu, 16 Nov 2017 19:20:08 +0100 Subject: [PATCH 1/3] Corrected some typos and incorrect spelling in build.sh/.cmd. --- linux/build/build.sh | 12 ++++++------ windows/build/build.cmd | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/linux/build/build.sh b/linux/build/build.sh index 6190d07..71c8bbb 100755 --- a/linux/build/build.sh +++ b/linux/build/build.sh @@ -14,11 +14,11 @@ ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version" curlfind=$(which curl) if [ -z $curlfind ]; then - echo "Can't find 'cURL' installed. That script needs it!"; + echo "'cURL' does not seem to be installed. The script needs it!"; exit 1; fi -echo "This script prepearing $application $version for use with I2Pd" +echo "This script is preparing $application $version for use with I2Pd" file="$application-$version.tar.bz2" filepath="linux-$arch/$language/$file" @@ -26,13 +26,13 @@ filepath="linux-$arch/$language/$file" echo "Downloading $application..." curl -L -f -# -O $ftpmirror/$filepath if [ $? -ne 0 ]; then # Not found error, trying to cut language variable - echo "[TRY 2] I'll try download Firefox with shortener language code"; + echo "[TRY 2] I'll try downloading Firefox with shorter language code"; language=$(echo $language | cut -c-2) # re-create variable with cutted lang filepath="linux-$arch/$language/$file" curl -L -f -# -O $ftpmirror/$filepath if [ $? -ne 0 ]; then # Not found error, trying to download english version - echo "[TRY 3] I'll try download Firefox with English language code"; + echo "[TRY 3] I'll try downloading Firefox with the English language code"; language="en_US" # re-create lang variable filepath="linux-$arch/$language/$file" @@ -45,7 +45,7 @@ if [ $? -ne 0 ]; then # Not found error, trying to cut language variable fi if [ ! -f $file ]; then - echo "[Error] Can't find downloaded file. Is it really exists?" + echo "[Error] Can't find downloaded file. Does it really exist?" exit 1; fi @@ -85,7 +85,7 @@ echo "Downloading NoScript extension..." curl -L -f -# -O https://addons.mozilla.org/firefox/downloads/latest/noscript/addon-722-latest.xpi mv addon-722-latest.xpi ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi -echo "Adding standart configs..." +echo "Adding standard configs..." cp profile/* ../data/ mkdir -p ../app/browser/defaults cp -r preferences ../app/browser/defaults/ diff --git a/windows/build/build.cmd b/windows/build/build.cmd index 5e9e3f1..55befd7 100644 --- a/windows/build/build.cmd +++ b/windows/build/build.cmd @@ -14,10 +14,10 @@ call :GET_PROXY call :GET_ARCH if "%locale%"=="Russian" ( - echo ઠ I2Pd Browser Portable - echo ⥬ : %locale%, ⥪: %xOS% + echo ���ઠ I2Pd Browser Portable + echo ���⥬��� ������: %locale%, ����⥪����: %xOS% echo. - echo 㧪 ⠭騪 Firefox Portable ESR + echo ����㧪� ��⠭��騪� Firefox Portable ESR ) else ( echo Building I2Pd Browser Portable echo System locale: %locale%, architecture: %xOS% @@ -34,9 +34,9 @@ if errorlevel 1 ( echo. if "%locale%"=="Russian" ( - echo ᯠ ⠭騪 㤠 㦭 䠩 + echo ��ᯠ����� ��⠭��騪� � 㤠����� �� �㦭�� 䠩��� ) else ( - echo Unpacking the installer and delete unnecessary files + echo Unpacking the installer and deleting unnecessary files ) 7z x -y -o..\Firefox FirefoxPortableESR_%FFversion%_%locale%.paf.exe > nul @@ -69,7 +69,7 @@ rem rmdir /S /Q ..\Firefox\App\Firefox rem ) if "%locale%"=="Russian" ( - echo ⪫祭 ⮢ + echo �⪫�祭�� ����⮢ � ������� ) else ( echo Disabling crash reports ) @@ -82,7 +82,7 @@ rem ) else ( rem ) if "%locale%"=="Russian" ( - echo 㧪 NoScript + echo ����㧪� ���������� NoScript ) else ( echo Downloading NoScript extension ) @@ -95,7 +95,7 @@ del /Q addon-722-latest.xpi echo. if "%locale%"=="Russian" ( - echo ஢ 䠩 ஥ Firefox + echo ����஢���� 䠩��� ����஥� � ����� Firefox ) else ( echo Copying Firefox settings ) @@ -108,7 +108,7 @@ copy /Y preferences\* ..\Firefox\App\Firefox\browser\defaults\preferences\ > nul copy /Y preferences\* ..\Firefox\App\Firefox64\browser\defaults\preferences\ > nul if "%locale%"=="Russian" ( - echo 㧪 I2Pd + echo ����㧪� I2Pd ) else ( echo Downloading I2Pd ) @@ -127,9 +127,9 @@ xcopy /E /I /Y i2pd ..\i2pd > nul echo. if "%locale%"=="Russian" ( - echo I2Pd Browser portable ⮢ ! + echo I2Pd Browser Portable ��⮢ � �������! ) else ( - echo I2Pd Browser portable is ready to start! + echo I2Pd Browser Portable is ready to start! ) pause exit @@ -152,4 +152,4 @@ set xOS=x86 if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set xOS=x64 goto :eof -:eof \ No newline at end of file +:eof From eaa429fe2b192053c665e5bf2f7b7cc5bd8594c3 Mon Sep 17 00:00:00 2001 From: faxboss Date: Thu, 16 Nov 2017 19:27:08 +0100 Subject: [PATCH 2/3] Put back cyrillic that had been replaced in build.cmd --- windows/build/build.cmd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/windows/build/build.cmd b/windows/build/build.cmd index 55befd7..453c148 100644 --- a/windows/build/build.cmd +++ b/windows/build/build.cmd @@ -14,10 +14,10 @@ call :GET_PROXY call :GET_ARCH if "%locale%"=="Russian" ( - echo ���ઠ I2Pd Browser Portable - echo ���⥬��� ������: %locale%, ����⥪����: %xOS% + echo ‘¡®àª I2Pd Browser Portable + echo ‘¨á⥬­ ï «®ª «ì: %locale%, àå¨â¥ªâãà : %xOS% echo. - echo ����㧪� ��⠭��騪� Firefox Portable ESR + echo ‡ £à㧪 ãáâ ­®¢é¨ª Firefox Portable ESR ) else ( echo Building I2Pd Browser Portable echo System locale: %locale%, architecture: %xOS% @@ -34,7 +34,7 @@ if errorlevel 1 ( echo. if "%locale%"=="Russian" ( - echo ��ᯠ����� ��⠭��騪� � 㤠����� �� �㦭�� 䠩��� + echo ᯠª®¢ª ãáâ ­®¢é¨ª ¨ 㤠«¥­¨¥ ­¥ ­ã¦­ëå ä ©«®¢ ) else ( echo Unpacking the installer and deleting unnecessary files ) @@ -69,7 +69,7 @@ rem rmdir /S /Q ..\Firefox\App\Firefox rem ) if "%locale%"=="Russian" ( - echo �⪫�祭�� ����⮢ � ������� + echo Žâª«î祭¨¥ ®âç¥â®¢ ® ¯ ¤¥­¨¨ ) else ( echo Disabling crash reports ) @@ -82,7 +82,7 @@ rem ) else ( rem ) if "%locale%"=="Russian" ( - echo ����㧪� ���������� NoScript + echo ‡ £à㧪 ¤®¯®«­¥­¨ï NoScript ) else ( echo Downloading NoScript extension ) @@ -95,7 +95,7 @@ del /Q addon-722-latest.xpi echo. if "%locale%"=="Russian" ( - echo ����஢���� 䠩��� ����஥� � ����� Firefox + echo Š®¯¨à®¢ ­¨¥ ä ©«®¢ ­ áâ஥ª ¢ ¯ ¯ªã Firefox ) else ( echo Copying Firefox settings ) @@ -108,7 +108,7 @@ copy /Y preferences\* ..\Firefox\App\Firefox\browser\defaults\preferences\ > nul copy /Y preferences\* ..\Firefox\App\Firefox64\browser\defaults\preferences\ > nul if "%locale%"=="Russian" ( - echo ����㧪� I2Pd + echo ‡ £à㧪 I2Pd ) else ( echo Downloading I2Pd ) @@ -127,7 +127,7 @@ xcopy /E /I /Y i2pd ..\i2pd > nul echo. if "%locale%"=="Russian" ( - echo I2Pd Browser Portable ��⮢ � �������! + echo I2Pd Browser Portable £®â®¢ ª § ¯ãáªã! ) else ( echo I2Pd Browser Portable is ready to start! ) From 90acffd01a5fdf8869c3d69d6514db6b7b0f9ca6 Mon Sep 17 00:00:00 2001 From: faxboss Date: Thu, 16 Nov 2017 19:59:36 +0100 Subject: [PATCH 3/3] Corrected spelling in README.md in /linux --- linux/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/README.md b/linux/README.md index 787c54a..631f6c9 100644 --- a/linux/README.md +++ b/linux/README.md @@ -1,24 +1,24 @@ I2Pd Browser Portable builder for Linux ===== -This is script-based builder of I2Pd Browser Portable +This is a script-based builder of I2Pd Browser Portable What works now ----- * Auto detecting system language * Auto detecting architecture -* Pre-configuring FireFox to use with I2Pd +* Pre-configuring Firefox to use with I2Pd * Auto downloading NoScript extension How to use ----- -1. Build preconfigured FireFox using script `build.sh` from `build` folder -2. Run i2pd by executing `./i2pd` from `i2pd` folder -3. Run FireFox by executing `./firefox-portable` +1. Build pre-configured Firefox using script `build.sh` from `build` folder +2. Run I2Pd by executing `./i2pd` from `i2pd` folder +3. Run Firefox by executing `./firefox-portable` Additional info ----- -`./i2pd` from `i2pd` folder starts screen session with i2pd in it. -To stop i2pd router you can use command `Start graceful shutdown` of `Force shutdown` +`./i2pd` from `i2pd` folder starts a screen session with i2pd in it. +To stop the i2pd router you can use the commands `Start graceful shutdown` or `Force shutdown` from i2pd webconsole page `http://127.0.0.1:7070/?page=commands` SHA512SUMS created with `find * -type f -print0 | xargs -0 -i sha512sum {}` command