Browse Source

Merge pull request #29 from rex4539/macos-update

Update to Firefox 60.9.0esr, i2pd 2.28.0, NoScript 11.0.3

Former-commit-id: 96fe25cf09
pull/43/head
R4SAS 5 years ago committed by GitHub
parent
commit
0a1be3ac45
  1. 4
      linux/build/build
  2. 2
      linux/i2pd/i2pd-amd64.REMOVED.git-id
  3. 2
      linux/i2pd/i2pd-i386.REMOVED.git-id
  4. 6
      osx/build/build
  5. 6
      windows/build/build.cmd

4
linux/build/build

@ -12,7 +12,7 @@ cd $dir
arch=$(uname -m) arch=$(uname -m)
language=$(echo $LANG | cut -c-5 | sed s/_/-/g) language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
version="60.7.1esr" version="60.9.0esr"
application="firefox" application="firefox"
ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version" ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version"
@ -100,7 +100,7 @@ curl -L -f -# -o ../app/browser/extensions/langpack-ru@firefox.mozilla.org.xpi h
curl -L -f -# -o ../app/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi curl -L -f -# -o ../app/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi
echo "Downloading NoScript extension..." echo "Downloading NoScript extension..."
curl -L -f -# -o ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi curl -L -f -# -o ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi
echo "Adding standard configs..." echo "Adding standard configs..."
cp profile/* ../data/ cp profile/* ../data/

2
linux/i2pd/i2pd-amd64.REMOVED.git-id

@ -1 +1 @@
8ac8c1452a00b9654755be88ab805982c1d56a92 48a65b189f6d01cb50c7d7a48c4d430d8f6d0a3f

2
linux/i2pd/i2pd-i386.REMOVED.git-id

@ -1 +1 @@
af5de0612c40f715740fd4d168aa444b4baca790 fbf287fc4d521a4cdb1345779045e3f8375bb14b

6
osx/build/build

@ -12,8 +12,8 @@ cd $dir
arch=$(uname -m) arch=$(uname -m)
language=$(osascript -e 'user locale of (get system info)' | sed -e 's/_/-/g') language=$(osascript -e 'user locale of (get system info)' | sed -e 's/_/-/g')
version="60.7.1esr" version="60.9.0esr"
i2pdversion="2.26.0" i2pdversion="2.28.0"
ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/${version}" ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/${version}"
@ -107,7 +107,7 @@ curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpac
curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi "https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi" curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi "https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi"
echo "Downloading NoScript extension..." echo "Downloading NoScript extension..."
curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi" curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi"
echo "Adding standard configs..." echo "Adding standard configs..."
cp profile/* ../data/ cp profile/* ../data/

6
windows/build/build.cmd

@ -7,8 +7,8 @@ REM See full license text in LICENSE file at top of project tree
setlocal enableextensions setlocal enableextensions
set CURL=%~dp0curl.exe set CURL=%~dp0curl.exe
set FFversion=60.7.1 set FFversion=60.9.0
set I2Pdversion=2.26.0 set I2Pdversion=2.28.0
call :GET_LOCALE call :GET_LOCALE
call :GET_PROXY call :GET_PROXY
call :GET_ARCH call :GET_ARCH
@ -89,7 +89,7 @@ if "%locale%"=="ru" (
) else ( ) else (
echo Downloading NoScript extension echo Downloading NoScript extension
) )
"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi "%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi
if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!) if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!)
REM echo. REM echo.

Loading…
Cancel
Save