From f3c8f91d209ebd07406b3e8524256aac02ce5bac Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Tue, 14 Mar 2017 15:03:30 +0300
Subject: [PATCH] 1.2.1

Former-commit-id: 47b5394e91a9517af223d81c9a522b5d5121349b
---
 linux/build/i2pdbrowserportable.sh            |  14 +++++++-------
 linux/i2pd/i2pd                               |   6 ++----
 windows/StartI2PdBrowser.bat                  |   4 ++--
 windows/build/build.cmd                       |  11 ++++++++---
 windows_prebuilt/StartI2PdBrowser.exe         | Bin 250728 -> 250728 bytes
 ...2.sfx => 7zsd_LZMA2_i2pdbrowser_1.2.1.sfx} | Bin 300544 -> 300544 bytes
 windows_prebuilt/build/build_7z.bat           |   2 +-
 windows_prebuilt/build/build_exe.bat          |   2 +-
 windows_prebuilt/build/config.txt             |  10 +++++-----
 windows_prebuilt/src/StartI2PdBrowser.bat     |   4 ++--
 10 files changed, 28 insertions(+), 25 deletions(-)
 rename windows_prebuilt/build/{7zsd_LZMA2_i2pdbrowser_1.2.sfx => 7zsd_LZMA2_i2pdbrowser_1.2.1.sfx} (99%)

diff --git a/linux/build/i2pdbrowserportable.sh b/linux/build/i2pdbrowserportable.sh
index 6d78e5b..57c3ac2 100755
--- a/linux/build/i2pdbrowserportable.sh
+++ b/linux/build/i2pdbrowserportable.sh
@@ -8,12 +8,12 @@
 
 arch=$(uname -m)
 language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
-version="45.7.0esr"
+version="45.8.0esr"
 application="firefox"
 
 curlfind=$(which curl)
 if [ -z $curlfind ]; then
-	echo "Can't find cURL installed. That script needs it!";
+	echo "Can't find 'cURL' installed. That script needs it!";
 	exit 1;
 fi
 
@@ -32,11 +32,11 @@ if [ $? -ne 0 ]; then # Not found error, trying to cut language variable
 	curl -L -f -# -O $url
 fi
 if [ $? -ne 0 ]; then # Not found error, trying to download english version
-        echo "[TRY 3] I'll try download Firefox with English language code";
-        language="en_US"
-        # re-create variable with cutted lang
-        url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file"
-        curl -L -f -# -O $url
+		echo "[TRY 3] I'll try download Firefox with English language code";
+		language="en_US"
+		# re-create lang variable
+		url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file"
+		curl -L -f -# -O $url
 fi
 if [ ! -f $file ]; then
 	echo "[Error] Can't find downloaded file. Check your internet connectivity."
diff --git a/linux/i2pd/i2pd b/linux/i2pd/i2pd
index 85a8ef6..b7cd806 100755
--- a/linux/i2pd/i2pd
+++ b/linux/i2pd/i2pd
@@ -10,8 +10,8 @@ arch=$(uname -m)
 
 screenfind=$(which screen)
 if [ -z $curlfind ]; then
-        echo "Can't find 'screen' installed. That script needs it!";
-        exit 1;
+		echo "Can't find 'screen' installed. That script needs it!";
+		exit 1;
 fi
 
 if [ $arch == "x86_64" ]
@@ -19,5 +19,3 @@ if [ $arch == "x86_64" ]
 else
 	screen -Adm -S i2pd ./i2pd-i386 --datadir=.
 fi
-
-
diff --git a/windows/StartI2PdBrowser.bat b/windows/StartI2PdBrowser.bat
index 931b067..e362f5a 100644
--- a/windows/StartI2PdBrowser.bat
+++ b/windows/StartI2PdBrowser.bat
@@ -9,11 +9,11 @@ REM BFCPEEMBEDDELETE=1
 REM BFCPEADMINEXE=0
 REM BFCPEINVISEXE=0
 REM BFCPEVERINCLUDE=1
-REM BFCPEVERVERSION=1.2.0.0
+REM BFCPEVERVERSION=1.2.1.0
 REM BFCPEVERPRODUCT=I2Pd Browser Portable
 REM BFCPEVERDESC=I2Pd Browser
 REM BFCPEVERCOMPANY=PurpleI2P
-REM BFCPEVERCOPYRIGHT=Copyright й 2013-2016 PurpleI2P Project
+REM BFCPEVERCOPYRIGHT=Copyright й 2013-2017 PurpleI2P Project
 REM BFCPEOPTIONEND
 
 REM Copyright (c) 2013-2017, The PurpleI2P Project
diff --git a/windows/build/build.cmd b/windows/build/build.cmd
index 778958d..6da4f26 100644
--- a/windows/build/build.cmd
+++ b/windows/build/build.cmd
@@ -1,4 +1,9 @@
 @echo off
+
+REM Copyright (c) 2013-2017, 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
+
 setlocal enableextensions
 
 set CURL=%~dp0curl.exe
@@ -18,7 +23,7 @@ if "%locale%"=="Russian" (
 	echo Downloading Firefox Portable ESR installer
 )
 
-"%CURL%" -L -f -# -O https://downloads.sourceforge.net/project/portableapps/Mozilla%%20Firefox%%2C%%20Portable%%20Ed./Mozilla%%20Firefox%%20ESR%%2C%%20Portable%%20Edition%%2045.7.0/FirefoxPortableESR_45.7.0_%locale%.paf.exe %$X%
+"%CURL%" -L -f -# -O https://downloads.sourceforge.net/project/portableapps/Mozilla%%20Firefox%%2C%%20Portable%%20Ed./Mozilla%%20Firefox%%20ESR%%2C%%20Portable%%20Edition%%2045.8.0/FirefoxPortableESR_45.8.0_%locale%.paf.exe %$X%
 if errorlevel 1 (
 	echo ERROR:%ErrorLevel%
 	pause
@@ -32,8 +37,8 @@ if "%locale%"=="Russian" (
 	echo Unpacking the installer and delete unnecessary files
 )
 
-7z x -y -o..\Firefox FirefoxPortableESR_45.7.0_%locale%.paf.exe > nul
-del /Q FirefoxPortableESR_45.7.0_%locale%.paf.exe
+7z x -y -o..\Firefox FirefoxPortableESR_45.8.0_%locale%.paf.exe > nul
+del /Q FirefoxPortableESR_45.8.0_%locale%.paf.exe
 rmdir /S /Q ..\Firefox\$PLUGINSDIR
 rmdir /S /Q ..\Firefox\App\AppInfo
 rmdir /S /Q ..\Firefox\App\Bin
diff --git a/windows_prebuilt/StartI2PdBrowser.exe b/windows_prebuilt/StartI2PdBrowser.exe
index c7944af2b8717d083d6cea2d65e706d78684a497..c531685c01efed1ab1c7c209e5ee1b9c7cdc587e 100644
GIT binary patch
delta 67
zcmaE{jQ_<l{tXt4%!~|7&DM<V){G#`wB4GKdHz98pdbSy0|Nu&^v8#o8yO9!rygcD
T22wK*GoNNO-=2DenVBB|cjyw`

delta 67
zcmaE{jQ_<l{tXt4%zyqfHd`~cTQh<%({^h{=J^LX85o!t7#V<I`r|{)jf@7<Qx7v6
T1F4yZnNKsCZBISI%*+n}=JFKL

diff --git a/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.sfx b/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.1.sfx
similarity index 99%
rename from windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.sfx
rename to windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.1.sfx
index c629e5f66678fdb17dcdc6c68e0a2da7ab815edf..bd790777c4f2bc6f0786285d9d668a6d47705bf9 100644
GIT binary patch
delta 132
zcmZozBh;`)Xu=N0gA;ceGoL%jG=1SIMz6`1jPn`KHQ!|1ev^?=`wZ_KW(GLuXcs)k
z2*ga=1<x_xKEOC<`rAGhQ%*((CI&{JBF5?3{VcMKf2Mo(vnVs(n4a6ua+}d`y5|Iz
d%giYZHq+%NvV;Qpg%eqhGa7EUoWydN8353qD_Z~n

delta 133
zcmZozBh;`)Xu=LgtBE^}nNOW$n!fN9qt|3h#`%n=nr||0zsbm`eTH`iGXos7v<seN
z1Y)M`g6EiTA7Gp@{cRtMDJKI169Xei(RA&87Fot0(>?oHlo_u~&+TWq&1f*)a{|j{
e<^%?d>GBg<LZ??uWI4iUu-$eN%VFk;1}p%%@+(IG

diff --git a/windows_prebuilt/build/build_7z.bat b/windows_prebuilt/build/build_7z.bat
index 167ef53..fabb426 100644
--- a/windows_prebuilt/build/build_7z.bat
+++ b/windows_prebuilt/build/build_7z.bat
@@ -6,7 +6,7 @@ REM See full license text in LICENSE file at top of project tree
 
 echo Создаем 7z архив с набором...
 REM На выходе получаем 7z архив, в котором будут лежать папки Firefox, I2Pd и StartI2PdBrowser.bat из папки src уровнем выше.
-7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.7z ..\Firefox ..\I2Pd ..\src\StartI2PdBrowser.bat
+7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.1.7z ..\Firefox ..\I2Pd ..\src\StartI2PdBrowser.bat
 
 echo Готово!
 pause
\ No newline at end of file
diff --git a/windows_prebuilt/build/build_exe.bat b/windows_prebuilt/build/build_exe.bat
index d497fef..3206870 100644
--- a/windows_prebuilt/build/build_exe.bat
+++ b/windows_prebuilt/build/build_exe.bat
@@ -10,7 +10,7 @@ REM 
 
 echo Создаем 7z SFX - самораспаковывающийся архив...
 REM На выходе получаем самораспаковывающийся архив, архив после этого удаляем.
-copy /b 7zsd_LZMA2_i2pdbrowser_1.2.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.exe >> nul
+copy /b 7zsd_LZMA2_i2pdbrowser_1.2.1.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.1.exe >> nul
 del I2PdBrowserPortable.7z >> nul
 
 echo Готово!
diff --git a/windows_prebuilt/build/config.txt b/windows_prebuilt/build/config.txt
index 983a5fc..2f28a63 100644
--- a/windows_prebuilt/build/config.txt
+++ b/windows_prebuilt/build/config.txt
@@ -3,10 +3,10 @@
 ; See full license text in LICENSE file at top of project tree
 ;!@Install@!UTF-8!
 GUIFlags="2+4+8+16+32+64+1024+2048+4096"
-Title="╨г╤Б╤В╨░╨╜╨╛╨▓╨║╨░ I2Pd Browser Portable"
-BeginPromptTimeout="30"
-BeginPrompt="╨б╨╡╨╣╤З╨░╤Б ╨▒╤Г╨┤╨╡╤В ╨┐╤А╨╛╨╕╨╖╨▓╨╡╨┤╨╡╨╜╨╛ ╨╕╨╖╨▓╨╗╨╡╤З╨╡╨╜╨╕╨╡:\n\tI2Pd Browser Portable"
-ExtractTitle="╨Я╨╛╨┤╨╛╨╢╨┤╨╕╤В╨╡..."
-ExtractDialogText="╨а╨░╤Б╨┐╨░╨║╨╛╨▓╨║╨░ ╤Д╨░╨╣╨╗╨╛╨▓..."
+Title="Extracting I2Pd Browser Portable"
+BeginPromptTimeout="15"
+BeginPrompt="Now we will extract: I2Pd Browser Portable"
+ExtractTitle="Please wait..."
+ExtractDialogText="Extracting files..."
 InstallPath="%UserDesktop%\\I2PdBrowserPortable"
 ;!@InstallEnd@!
\ No newline at end of file
diff --git a/windows_prebuilt/src/StartI2PdBrowser.bat b/windows_prebuilt/src/StartI2PdBrowser.bat
index 931b067..e362f5a 100644
--- a/windows_prebuilt/src/StartI2PdBrowser.bat
+++ b/windows_prebuilt/src/StartI2PdBrowser.bat
@@ -9,11 +9,11 @@ REM BFCPEEMBEDDELETE=1
 REM BFCPEADMINEXE=0
 REM BFCPEINVISEXE=0
 REM BFCPEVERINCLUDE=1
-REM BFCPEVERVERSION=1.2.0.0
+REM BFCPEVERVERSION=1.2.1.0
 REM BFCPEVERPRODUCT=I2Pd Browser Portable
 REM BFCPEVERDESC=I2Pd Browser
 REM BFCPEVERCOMPANY=PurpleI2P
-REM BFCPEVERCOPYRIGHT=Copyright й 2013-2016 PurpleI2P Project
+REM BFCPEVERCOPYRIGHT=Copyright й 2013-2017 PurpleI2P Project
 REM BFCPEOPTIONEND
 
 REM Copyright (c) 2013-2017, The PurpleI2P Project