From 13ce7627fb0459edeff18e21690f8b4d555ba1e5 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Sat, 15 Jul 2017 09:32:14 +0300
Subject: [PATCH] move versions to variables. update FF to 52.2.1esr

Former-commit-id: 71fab4086b5bfce247807cf8f0edbe3ccc09619c
---
 linux/build/build.sh    |  2 +-
 windows/build/build.cmd | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/linux/build/build.sh b/linux/build/build.sh
index 34b33a5..62a81ec 100755
--- a/linux/build/build.sh
+++ b/linux/build/build.sh
@@ -8,7 +8,7 @@
 
 arch=$(uname -m)
 language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
-version="52.1.2esr"
+version="52.2.1esr"
 application="firefox"
 ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version"
 
diff --git a/windows/build/build.cmd b/windows/build/build.cmd
index 0abb296..2c59188 100644
--- a/windows/build/build.cmd
+++ b/windows/build/build.cmd
@@ -7,6 +7,8 @@ REM See full license text in LICENSE file at top of project tree
 setlocal enableextensions
 
 set CURL=%~dp0curl.exe
+set FFversion=52.2.1
+set I2Pdversion=2.14.0
 call :GET_LOCALE
 call :GET_PROXY
 call :GET_ARCH
@@ -23,7 +25,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%%2052.1.2/FirefoxPortableESR_52.1.2_%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%%20%FFversion%/FirefoxPortableESR_%FFversion%_%locale%.paf.exe %$X%
 if errorlevel 1 (
 	echo ERROR:%ErrorLevel%
 	pause
@@ -37,8 +39,8 @@ if "%locale%"=="Russian" (
 	echo Unpacking the installer and delete unnecessary files
 )
 
-7z x -y -o..\Firefox FirefoxPortableESR_52.1.2_%locale%.paf.exe > nul
-del /Q FirefoxPortableESR_52.1.2_%locale%.paf.exe
+7z x -y -o..\Firefox FirefoxPortableESR_%FFversion%_%locale%.paf.exe > nul
+del /Q FirefoxPortableESR_%FFversion%_%locale%.paf.exe
 rmdir /S /Q ..\Firefox\$PLUGINSDIR
 rmdir /S /Q ..\Firefox\App\AppInfo
 rmdir /S /Q ..\Firefox\App\Bin
@@ -111,15 +113,15 @@ if "%locale%"=="Russian" (
 	echo Downloading I2Pd
 )
 if "xOS"=="x86" (
-	"%CURL%" -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/2.14.0/i2pd_2.14.0_win32_mingw.zip
+	"%CURL%" -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/%I2Pdversion%/i2pd_%I2Pdversion%_win32_mingw.zip
 	if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!)
-	7z x -y -o..\i2pd i2pd_2.14.0_win32_mingw.zip > nul
-	del /Q i2pd_2.14.0_win32_mingw.zip
+	7z x -y -o..\i2pd i2pd_%I2Pdversion%_win32_mingw.zip i2pd.exe > nul
+	del /Q i2pd_%I2Pdversion%_win32_mingw.zip
 ) else (
-	"%CURL%" -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/2.14.0/i2pd_2.14.0_win64_mingw.zip
+	"%CURL%" -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/%I2Pdversion%/i2pd_%I2Pdversion%_win64_mingw.zip
 	if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!)
-	7z x -y -o..\i2pd i2pd_2.14.0_win64_mingw.zip > nul
-	del /Q i2pd_2.14.0_win64_mingw.zip
+	7z x -y -o..\i2pd i2pd_%I2Pdversion%_win64_mingw.zip i2pd.exe > nul
+	del /Q i2pd_%I2Pdversion%_win64_mingw.zip
 )
 xcopy /E /I /Y i2pd ..\i2pd > nul