1.2.1

Former-commit-id: 47b5394e91

linux/build/i2pdbrowserportable.sh

@@ -8,9 +8,15 @@
 
 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!";
+	exit 1;
+fi
+
 echo "This script prepearing $application $version for use with I2Pd"
 
 file="$application-$version.tar.bz2"
@@ -19,15 +25,24 @@ url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$lan
 echo "Downloading $application..."
 curl -L -f -# -O $url
 if [ $? -ne 0 ]; then # Not found error, trying to cut language variable
+	echo "[TRY 2] I'll try download Firefox with shortener language code";
 	language=$(echo $language | cut -c-2)
 	# re-create variable with cutted lang
 	url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file"
 	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 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 "Can't find downloaded file. Does FireFox support your system language?"
+	echo "[Error] Can't find downloaded file. Check your internet connectivity."
 	exit 1;
 fi
+
 echo "Extracting archive, please wait..."
 tar xfj $file
 rm $file

linux/i2pd/i2pd

@@ -8,10 +8,14 @@
 
 arch=$(uname -m)
 
+screenfind=$(which screen)
+if [ -z $curlfind ]; then
+		echo "Can't find 'screen' installed. That script needs it!";
+		exit 1;
+fi
+
 if [ $arch == "x86_64" ]
 	screen -Adm -S i2pd ./i2pd-x86_64 --datadir=.
 else
 	screen -Adm -S i2pd ./i2pd-i386 --datadir=.
 fi
-
-

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

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

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

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 ƒ®â®¢®!

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@!

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