1.2.7 init

Former-commit-id: 153796d35e

linux/build/build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2013-2017, The PurpleI2P Project
+# Copyright (c) 2013-2018, The PurpleI2P Project
 #
 # This file is part of Purple I2P project and licensed under BSD3
 #
@@ -8,7 +8,7 @@
 
 arch=$(uname -m)
 language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
-version="52.6.0esr"
+version="52.7.2esr"
 application="firefox"
 ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version"
 

linux/build/preferences/syspref.js

@@ -1,7 +1,7 @@
 # Mozilla User preferences
 
 /*
- * Copyright (c) 2013-2017, The PurpleI2P Project
+ * Copyright (c) 2013-2018, The PurpleI2P Project
  *
  * This file is part of Purple i2pd project and licensed under BSD3
  *

osx/.gitignore

@@ -0,0 +1,3 @@
+./FirefoxESR.app
+./i2pd
+./data

osx/build/build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2013-2017, The PurpleI2P Project
+# Copyright (c) 2013-2018, The PurpleI2P Project
 #
 # This file is part of Purple I2P project and licensed under BSD3
 #
@@ -8,8 +8,10 @@
 
 arch=$(uname -m)
 language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
-version="52.6.0esr"
+version="52.7.2esr"
-ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/$version"
+i2pdversion="2.18.0"
+
+ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/${version}"
 
 curlfind=$(which curl)
 if [ -z $curlfind ]; then
@@ -19,23 +21,23 @@ fi
 
 echo "This script is preparing Firefox $version for use with I2Pd"
 
-file="Firefox\ $version.dmg"
+file="Firefox\ ${version}.dmg"
-filepath="mac/$language/$file"
+filepath="mac/${language}/${file}"
 
 echo "Downloading $application..."
-curl -L -f -# -O $ftpmirror/$filepath
+curl -L -f -# -O ${ftpmirror}/${filepath}
 if [ $? -ne 0 ]; then # Not found error, trying to cut language variable
 	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="mac/$language/$file"
-	curl -L -f -# -O $ftpmirror/$filepath
+	curl -L -f -# -O ${ftpmirror}/${filepath}
 	if [ $? -ne 0 ]; then # Not found error, trying to download english version
 		echo "[TRY 3] I'll try downloading Firefox with the English language code";
 		language="en_US"
 		# re-create lang variable
 		filepath="mac/$language/$file"
-		curl -L -f -# -O $ftpmirror/$filepath
+		curl -L -f -# -O ${ftpmirror}/${filepath}
 		if [ $? -ne 0 ]; then # After that i can say only that user haven't internet connection
 			echo "[Error] Can't download file. Check your internet connectivity."
 			exit 1;
@@ -49,7 +51,7 @@ if [ ! -f $file ]; then
 fi
 
 echo "Downloading checksum file and checking SHA512 checksum"
-curl -L -f -# -O $ftpmirror/SHA512SUMS
+curl -L -f -# -O ${ftpmirror}/SHA512SUMS
 recv_sum=$(grep "$filepath" SHA512SUMS | cut -c-128)
 file_sum=$(sha512sum $file | cut -c-128)
 if [ $recv_sum != $file_sum ]; then
@@ -105,5 +107,11 @@ echo 'FirefoxESR.app/Contents/MacOS/firefox -profile ../data -no-remote' >> "../
 
 chmod +x "../i2pdbrowser-portable"
 
+echo "Downloading i2pd..."
+curl -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/${i2pdversion}/i2pd_${i2pdversion}_osx.tar.gz
+mkdir ../i2pd
+tar xfz i2pd_${i2pdversion}_osx.tar.gz -C ../i2pd
+mv ../i2pd/i2pd ../i2pd/i2pd-osx
+cp -rf i2pd ../i2pd
 
 echo "... finished"

osx/build/preferences/syspref.js

@@ -1,7 +1,7 @@
 # Mozilla User preferences
 
 /*
- * Copyright (c) 2013-2017, The PurpleI2P Project
+ * Copyright (c) 2013-2018, The PurpleI2P Project
  *
  * This file is part of Purple i2pd project and licensed under BSD3
  *

osx/i2pd/i2pd-osx.REMOVED.git-id

@@ -1 +0,0 @@
-e75a2150455e50e501a074031293bda5b6b24be6

windows/StartI2PdBrowser.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
-REM Copyright (c) 2013-2017, The PurpleI2P Project
+REM Copyright (c) 2013-2018, 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.6
+title Starting I2Pd Browser 1.2.7
 set $pause=ping.exe 0.0.0.0 -n
 set $cd=%CD%
 ver| find "6." >nul && set $pause=timeout.exe /t

windows/build/build.cmd

@@ -1,14 +1,14 @@
 @echo off
 
-REM Copyright (c) 2013-2017, The PurpleI2P Project
+REM Copyright (c) 2013-2018, 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
-set FFversion=52.6.0
+set FFversion=52.7.2
-set I2Pdversion=2.17.0
+set I2Pdversion=2.18.0
 call :GET_LOCALE
 call :GET_PROXY
 call :GET_ARCH
@@ -132,7 +132,7 @@ goto :eof
 
 :GET_ARCH
 set xOS=win32
-REM if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set xOS=win64
+if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%" neq "x86" (set xOS=win64)
 goto :eof
 
 :eof

windows/build/preferences/syspref.js

@@ -1,7 +1,7 @@
 # Mozilla User preferences
 
 /*
- * Copyright (c) 2013-2017, The PurpleI2P Project
+ * Copyright (c) 2013-2018, The PurpleI2P Project
  *
  * This file is part of Purple i2pd project and licensed under BSD3
  *

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 <20>  ¢ë室¥ ¯®«ãç ¥¬ 7z  à娢, ¢ ª®â®à®¬ ¡ã¤ãâ «¥¦ âì ¯ ¯ª¨ Firefox, I2Pd ¨ StartI2PdBrowser.bat ¨§ ¯ ¯ª¨ src ã஢­¥¬ ¢ëè¥.
-7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.6.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src\StartI2PdBrowser.bat
+7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.7.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src\StartI2PdBrowser.bat
 
 echo ƒ®â®¢®!
 pause

windows_prebuilt/build/build_exe.bat

@@ -1,16 +1,16 @@
 @echo off
 
-REM Copyright (c) 2013-2017 The PurpleI2P Project
+REM Copyright (c) 2013-2018 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
 
 echo ‘®§¤ ¥¬ 7z  à娢 á ­ ¡®à®¬...
 REM <20>  ¢ë室¥ ¯®«ãç ¥¬ 7z  à娢, ¢ ª®â®à®¬ ¡ã¤ãâ «¥¦ âì ¯ ¯ª¨ Firefox, I2Pd, src ¨ ä ©« StartI2PdBrowser.exe ã஢­¥¬ ¢ëè¥.
-7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src ..\StartI2PdBrowser.exe
+7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\windows\Firefox ..\..\windows\i2pd ...\src\StartI2PdBrowser.bat ..\src\browser.ico
 
 echo ‘®§¤ ¥¬ 7z SFX - á ¬®à á¯ ª®¢ë¢ î騩áï  à娢...
 REM <20>  ¢ë室¥ ¯®«ãç ¥¬ á ¬®à á¯ ª®¢ë¢ î騩áï  à娢,  à娢 ¯®á«¥ í⮣® 㤠«ï¥¬.
-copy /b 7zsd_LZMA2_i2pdbrowser_1.2.6.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.6.exe >> nul
+copy /b 7zsd_LZMA2_i2pdbrowser_1.2.7.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.7.exe >> nul
 del I2PdBrowserPortable.7z >> nul
 
 echo ƒ®â®¢®!

windows_prebuilt/build/config.txt

@@ -1,4 +1,4 @@
-; Copyright (c) 2013-2017, The PurpleI2P Project
+; Copyright (c) 2013-2018, The PurpleI2P Project
 ; This file is part of Purple i2pd project and licensed under BSD3
 ; See full license text in LICENSE file at top of project tree
 ;!@Install@!UTF-8!

windows_prebuilt/src/StartI2PdBrowser.bat

@@ -1,26 +1,9 @@
 @ECHO OFF
-REM BFCPEOPTIONSTART
+REM Copyright (c) 2013-2018, The PurpleI2P Project
-REM Advanced BAT to EXE Converter www.BatToExeConverter.com
-REM BFCPEEXE=StartI2PdBrowser.exe
-REM BFCPEICON=i2pd_browser_icon_v3.ico
-REM BFCPEICONINDEX=-1
-REM BFCPEEMBEDDISPLAY=0
-REM BFCPEEMBEDDELETE=1
-REM BFCPEADMINEXE=0
-REM BFCPEINVISEXE=0
-REM BFCPEVERINCLUDE=1
-REM BFCPEVERVERSION=1.2.6.0
-REM BFCPEVERPRODUCT=I2Pd Browser Portable
-REM BFCPEVERDESC=I2Pd Browser
-REM BFCPEVERCOMPANY=PurpleI2P
-REM BFCPEVERCOPYRIGHT=Copyright © 2013-2017 PurpleI2P Project
-REM BFCPEOPTIONEND
-
-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
 
-title Starting I2Pd Browser 1.2.6
+title Starting I2Pd Browser 1.2.7
 set $pause=ping.exe 0.0.0.0 -n
 set $cd=%CD%
 ver| find "6." >nul && set $pause=timeout.exe /t
@@ -54,15 +37,7 @@ start "" "%port%"
 cd %$cd%
 exit /b 0
 
-rem ==========================================================================
-
-rem ==========================================================================
-rem Ïðîöåäóðà EchoWithoutCrLf
-rem 
-rem %1 : òåêñò äëÿ âûâîäà.
-rem ==========================================================================
 :EchoWithoutCrLf
     
     <nul set /p strTemp=%~1
     exit /b 0
-rem ==========================================================================