February 2016 - tor-commits - lists.torproject.org

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit b4df0be140f443868b78e16ef33d0a150914e6d6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 10:45:41 2016 +0000 Update translations for mat-gui_completed --- pt_BR.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 3764e8f..099a8f5 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -8,6 +8,7 @@ # Danton Medrado, 2015 # Eduardo Bonsi, 2013-2014 # Eduardo Luis Voltolini Tafner, 2013 +# Helder, 2016 # Marcos Ortiz <marcosortizf(a)gmail.com>, 2013 # Marcus Vinicius Lemes de Oliveira <mlemes(a)live.com>, 2015 # Matheus Boni Vicari <matheus_boni_vicari(a)hotmail.com>, 2016 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2016-01-20 10:12+0000\n" -"Last-Translator: Matheus Boni Vicari <matheus_boni_vicari(a)hotmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-16 10:44+0000\n" +"Last-Translator: Helder\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,12 +81,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Reduzir o tamanho e a qualidade do PDF produzido" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Guardar arquivos que não possuam suporte " +msgid "Remove unsupported file from archives" +msgstr "Remover arquivo não suportado dos arquivos" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Guardar arquivo que não possua suporte (e não-anônimo) no arquivo de saída" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Remover arquivo não suportado (e como tal não anônimo) do arquivo de saída" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 8f0b18836214c76e91585f9a8938f89bcbca3a2b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 10:45:34 2016 +0000 Update translations for mat-gui --- pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 3f6154d..099a8f5 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -8,6 +8,7 @@ # Danton Medrado, 2015 # Eduardo Bonsi, 2013-2014 # Eduardo Luis Voltolini Tafner, 2013 +# Helder, 2016 # Marcos Ortiz <marcosortizf(a)gmail.com>, 2013 # Marcus Vinicius Lemes de Oliveira <mlemes(a)live.com>, 2015 # Matheus Boni Vicari <matheus_boni_vicari(a)hotmail.com>, 2016 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-16 10:44+0000\n" +"Last-Translator: Helder\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,11 +82,11 @@ msgstr "Reduzir o tamanho e a qualidade do PDF produzido" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Remover arquivo não suportado dos arquivos" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Remover arquivo não suportado (e como tal não anônimo) do arquivo de saída" #: mat-gui:280 msgid "Unknown"

1 0

[gettor/master] Updating landing page.
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 45d1df459b69642623b01a4aba107e89745d2488 Author: Israel Leiva <ilv(a)users.noreply.github.com> Date: Tue Feb 16 03:17:01 2016 +0000 Updating landing page. --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html new file mode 100644 index 0000000..28d6b19 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +<!DOCTYPE html><html lang="en"> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> <title>GetTor | Download Tor Browser for Android, Windows, Linux, OS X</title> <link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/gettor.css" rel="stylesheet"> </head> <body> <nav class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> <div class="navbar-header"> <span class="navbar-brand"> <span id="head-title">GetTor</span> </span> </div> <div class="navbar-right"> <span class="navbar-brand"> <span id="head-link"><a href="https://www.torproject.org">The Tor Project</a></span> </span> < /div> </div> </nav> <div id="main"> <div class="container text-justify"> <div id="description"> <p> <h1>Download Tor Browser</h1> <hr /> Below you will find links to download the latest version of Tor Browser (5.5.2). </p> </div> <br /> <h2>Direct downloads</h2>  <div class="row well"> <div class="col-lg-2"> <img src="img/windows-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Windows</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">signature file</a>) </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/osx-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…" class="big-link">Tor Browser for OS X</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">signature file</a>) </div> </div> <div class="row we ll"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Linux 32-bit</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">signature file</a>) </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Linux 64-bit</a><br />(<a href="https://github.com/TheTorProje ct/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz.asc">signature file</a>) </div> </div> </div> </div> <hr /> <footer class="pad-big-left"> <p>© The Tor Project</p> </footer> </div> </body></html> \ No newline at end of file

1 0

[gettor/master] Merge branch 'master' of https://github.com/thetorproject/gettor
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit a5568260606ab31a08f6e478bf994c34f245b167 Merge: c674089 45d1df4 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 01:26:40 2016 -0300 Merge branch 'master' of https://github.com/thetorproject/gettor index.html | 1 + 1 file changed, 1 insertion(+)

1 0

[gettor/master] Deleted testing file
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit ba0236bb2acc966d8ca72697a68f0c7129e7f03c Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 01:26:54 2016 -0300 Deleted testing file --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html deleted file mode 100644 index 28d6b19..0000000 --- a/index.html +++ /dev/null @@ -1 +0,0 @@ -<!DOCTYPE html><html lang="en"> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> <title>GetTor | Download Tor Browser for Android, Windows, Linux, OS X</title> <link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/gettor.css" rel="stylesheet"> </head> <body> <nav class="navbar navbar-inverse navbar-fixed-top"> <div class="container"> <div class="navbar-header"> <span class="navbar-brand"> <span id="head-title">GetTor</span> </span> </div> <div class="navbar-right"> <span class="navbar-brand"> <span id="head-link"><a href="https://www.torproject.org">The Tor Project</a></span> </span> < /div> </div> </nav> <div id="main"> <div class="container text-justify"> <div id="description"> <p> <h1>Download Tor Browser</h1> <hr /> Below you will find links to download the latest version of Tor Browser (5.5.2). </p> </div> <br /> <h2>Direct downloads</h2>  <div class="row well"> <div class="col-lg-2"> <img src="img/windows-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Windows</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">signature file</a>) </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/osx-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…" class="big-link">Tor Browser for OS X</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/Tor…">signature file</a>) </div> </div> <div class="row we ll"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Linux 32-bit</a><br />(<a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…">signature file</a>) </div> </div> <div class="row well"> <div class="col-lg-2"> <img src="img/linux-logo.png" class="pad-big-right"> </div> <div class="col-lg-10"> <a href="https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor…" class="big-link">Tor Browser for Linux 64-bit</a><br />(<a href="https://github.com/TheTorProje ct/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz.asc">signature file</a>) </div> </div> </div> </div> <hr /> <footer class="pad-big-left"> <p>© The Tor Project</p> </footer> </div> </body></html> \ No newline at end of file

1 0

[gettor/master] Changed to tpo address
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 519708f3947b7d906086362f7e52c7a44ff67025 Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Feb 15 21:19:25 2016 -0300 Changed to tpo address --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6e3edb0..347db0b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ Current maintainer/core developers: - Israel Leiva <ilv(a)riseup.net> 4096R/540BFC0E + Israel Leiva <ilv(a)torproject.org> 4096R/540BFC0E Past core developers: Jacob Appelbaum <jacob(a)appelbaum.net>

1 0

[gettor/master] aagbsn and donncha made some nice contributions
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit c6c019fb18f2527867bf13529e641fa25fb6f8c6 Author: ilv <ilv(a)users.noreply.github.com> Date: Mon Feb 15 21:22:19 2016 -0300 aagbsn and donncha made some nice contributions --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 347db0b..3d84253 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,3 +11,5 @@ Contributors: Nima Fatemi <nima(a)torproject.org> Poly <poly(a)darkdepths.net> Sukhbir Singh <sukhbir(a)torproject.org> 4096R/B297B391 + Aaron Gibson + Donncha O'Cearbhaill

1 0

[gettor/master] Template files used for generating the landing page and README in Github mirrors
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 608e6ccd6acd0bd3e57e307848add257d552a492 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 01:21:09 2016 -0300 Template files used for generating the landing page and README in Github mirrors --- upload/landing_gh.tpl | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ upload/readme_gh.tpl | 40 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/upload/landing_gh.tpl b/upload/landing_gh.tpl new file mode 100644 index 0000000..9e083f1 --- /dev/null +++ b/upload/landing_gh.tpl @@ -0,0 +1,96 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="description" content=""> + <meta name="author" content=""> + <title>GetTor | Download Tor Browser for Android, Windows, Linux, OS X</title> + <link href="css/bootstrap.min.css" rel="stylesheet"> + <link href="css/gettor.css" rel="stylesheet"> + </head> + + <body> + + <nav class="navbar navbar-inverse navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <span class="navbar-brand"> + <span id="head-title">GetTor</span> + </span> + </div> + <div class="navbar-right"> + <span class="navbar-brand"> + <span id="head-link"><a href="https://www.torproject.org">The Tor Project</a></span> + </span> + </div> + </div> + </nav> + + <div id="main"> + <div class="container text-justify"> + <div id="description"> + <p> + <h1>Download Tor Browser</h1> + <hr /> + Below you will find links to download the latest version of Tor Browser (%VERSION%). + </p> + </div> + <br /> + <h2>Direct downloads</h2> +  + <div class="row well"> + <div class="col-lg-2"> + <img src="img/windows-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <a href="%WINDOWS%" class="big-link">Tor Browser for Windows</a><br />(<a href="%WINDOWS_SIG%">signature file</a>) + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/osx-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <a href="%OSX%" class="big-link">Tor Browser for OS X</a><br />(<a href="%OSX_SIG%">signature file</a>) + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/linux-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <a href="%LINUX32%" class="big-link">Tor Browser for Linux 32-bit</a><br />(<a href="%LINUX32_SIG%">signature file</a>) + </div> + </div> + <div class="row well"> + <div class="col-lg-2"> + <img src="img/linux-logo.png" class="pad-big-right"> + </div> + <div class="col-lg-10"> + <a href="%LINUX64%" class="big-link">Tor Browser for Linux 64-bit</a><br />(<a href="%LINUX64_SIG%">signature file</a>) + </div> + </div> + </div> + </div> + + <hr /> + + <footer class="pad-big-left"> + <p>© The Tor Project</p> + </footer> + + </div> + + </body> +</html> diff --git a/upload/readme_gh.tpl b/upload/readme_gh.tpl new file mode 100644 index 0000000..80952f3 --- /dev/null +++ b/upload/readme_gh.tpl @@ -0,0 +1,40 @@ +# Download Tor Browser + +In this repository you will find links to download the latest version of +Tor Browser, which currently is %VERSION%. Please select one of the links below: + +## Windows +[Download Tor Browser](%WINDOWS_EN%) (English) ([signature file](%WINDOWS_EN_SIG%)). + +[Download Tor Browser](%WINDOWS_FA%) (Farsi) ([signature file](%WINDOWS_FA_SIG%)). + +[Download Tor Browser](%WINDOWS_TR%) (Turkish) ([signature file](%WINDOWS_TR_SIG%)). + +[Download Tor Browser](%WINDOWS_ZH%) (Chinese) ([signature file](%WINDOWS_ZH_SIG%)). + +## OS X +[Download Tor Browser](%OSX_EN%) (English) ([signature file](%OSX_EN_SIG%)). + +[Download Tor Browser](%OSX_FA%) (Farsi) ([signature file](%OSX_FA_SIG%)). + +[Download Tor Browser](%OSX_TR%) (Turkish) ([signature file](%OSX_TR_SIG%)). + +[Download Tor Browser](%OSX_ZH%) (Chinese) ([signature file](%OSX_ZH_SIG%)). + +## Linux 32-bit +[Download Tor Browser](%LINUX32_EN%) (English) ([signature file](%LINUX32_EN_SIG%)). + +[Download Tor Browser](%LINUX32_FA%) (Farsi) ([signature file](%LINUX32_FA_SIG%)). + +[Download Tor Browser](%LINUX32_TR%) (Turkish) ([signature file](%LINUX32_TR_SIG%)). + +[Download Tor Browser](%LINUX32_ZH%) (Chinese) ([signature file](%LINUX32_ZH_SIG%)). + +## Linux 64-bit +[Download Tor Browser](%LINUX64_EN%) (English) ([signature file](%LINUX64_EN_SIG%)). + +[Download Tor Browser](%LINUX64_FA%) (Farsi) ([signature file](%LINUX64_FA_SIG%)). + +[Download Tor Browser](%LINUX64_TR%) (Turkish) ([signature file](%LINUX64_TR_SIG%)). + +[Download Tor Browser](%LINUX64_ZH%) (Chinese) ([signature file](%LINUX64_ZH_SIG%)).

1 0

[gettor/master] Latest version of github3 replaces iter_releases() by releases()
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit bd107baa96f3a6f2663a9fde999e1f6b690d6726 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 01:19:52 2016 -0300 Latest version of github3 replaces iter_releases() by releases() --- upload/bundles2github.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/bundles2github.py b/upload/bundles2github.py index e670f85..2e3c888 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -108,7 +108,7 @@ if __name__ == '__main__': readable_fp = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4)) # Find any published releases with this version number - for release in target_repo.iter_releases(): + for release in target_repo.releases(): if release.tag_name == 'v{}'.format(version) and not release.draft: print("Found an existing published release with this version. " "Not uploading again unless you delete the published "

1 0

[gettor/master] Script for generating landing page in gettor gh-pages and readme file in gettorbrowser
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit c6740894c25f5b367a01b67d940047fe34decd67 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 01:25:46 2016 -0300 Script for generating landing page in gettor gh-pages and readme file in gettorbrowser --- create_gh_mirrors.py | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/create_gh_mirrors.py b/create_gh_mirrors.py new file mode 100644 index 0000000..a341940 --- /dev/null +++ b/create_gh_mirrors.py @@ -0,0 +1,181 @@ +# -*- coding: utf-8 -*- +# +# This file is part of GetTor +# +# :authors: Israel Leiva <ilv(a)torproject.org> +# see also AUTHORS file +# +# :license: This is Free Software. See LICENSE for license information. + +"""create_gh_mirrors -- Create landing page and readme for Github.""" + +import os +import ConfigParser + +import github3 + +import gettor.core + + +def create_readme(tpl_path, md_path, version, links): + """Create README file with links stored in github.links. + + :param: tpl_path (string) path to file used as template. + :param: md_path (string) path to file generated. + :param: version (string) tor browser version. + :param: links (object) github links. + + """ + lcs = ['FA', 'ZH', 'TR', 'EN'] + + md_file = open(md_path, 'w') + with open(tpl_path, 'r') as tpl_file: + content_md = tpl_file.read() + + for lc in lcs: + win_link = links.get('windows', lc.lower()) + win_pkg, win_sig, win_sha = [e for e in win_link.split("$") if e] + + osx_link = links.get('osx', lc.lower()) + osx_pkg, osx_sig, osx_sha = [e for e in osx_link.split("$") if e] + + linux_links = links.get('linux', lc.lower()) + linux32_link, linux64_link = linux_links.split(',') + linux32_pkg, linux32_sig, linux32_sha = [ + e for e in linux32_link.split("$") if e + ] + linux64_pkg, linux64_sig, linux64_sha = [ + e for e in linux64_link.split("$") if e + ] + + content_md = content_md.replace( + "%WINDOWS_{}%".format(lc), win_pkg + ) + content_md = content_md.replace( + "%WINDOWS_{}_SIG%".format(lc), win_sig + ) + + content_md = content_md.replace( + "%OSX_{}%".format(lc), osx_pkg + ) + content_md = content_md.replace( + "%OSX_{}_SIG%".format(lc), osx_sig + ) + + content_md = content_md.replace( + "%LINUX32_{}%".format(lc), linux32_pkg + ) + content_md = content_md.replace( + "%LINUX32_{}_SIG%".format(lc), linux32_sig + ) + content_md = content_md.replace( + "%LINUX64_{}%".format(lc), linux64_pkg + ) + content_md = content_md.replace( + "%LINUX64_{}_SIG%".format(lc), linux64_sig + ) + + content_md = content_md.replace("%VERSION%", version) + md_file.write(content_md) + + print "README generated with version %s" % version + + +def create_landing_html(tpl_path, html_path, version, links): + """Create README file with links stored in github.links. + + :param: tpl_path (string) path to file used as template. + :param: html_path (string) path to file generated. + :param: version (string) tor browser version. + :param: links (object) github links. + + """ + win_link = links.get('windows', 'en') + win_pkg, win_sig, win_sha = [e for e in win_link.split("$") if e] + + osx_link = links.get('osx', 'en') + osx_pkg, osx_sig, osx_sha = [e for e in osx_link.split("$") if e] + + linux_links = links.get('linux', 'en') + linux32_link, linux64_link = linux_links.split(',') + linux32_pkg, linux32_sig, linux32_sha = [ + e for e in linux32_link.split("$") if e + ] + linux64_pkg, linux64_sig, linux64_sha = [ + e for e in linux64_link.split("$") if e + ] + + html_file = open(html_path, 'w') + with open(tpl_path, 'r') as tpl_file: + content_tpl = tpl_file.read().replace('\n', '') + content_html = '' + + content_html = content_tpl.replace("%WINDOWS%", win_pkg) + content_html = content_html.replace("%WINDOWS_SIG%", win_sig) + + content_html = content_html.replace("%OSX%", osx_pkg) + content_html = content_html.replace("%OSX_SIG%", osx_sig) + + content_html = content_html.replace("%LINUX32%", linux32_pkg) + content_html = content_html.replace("%LINUX32_SIG%", linux32_sig) + content_html = content_html.replace("%LINUX64%", linux64_pkg) + content_html = content_html.replace("%LINUX64_SIG%", linux64_sig) + + content_html = content_html.replace("%VERSION%", version) + html_file.write(content_html) + + print "HTML generated with version %s" % version + + +def main(): + """Generate HTML and md files and update it in Github.""" + github_links = 'providers/github.links' + tbb_version_path = 'latest_torbrowser.cfg' + md_path = 'upload/readme_gh.md' + html_path = 'upload/landing_gh.html' + md_tpl_path = 'upload/readme_gh.tpl' + html_tpl_path = 'upload/landing_gh.tpl' + github_access_token = '' + + tbb_version_config = ConfigParser.ConfigParser() + tbb_version_config.read(tbb_version_path) + version = tbb_version_config.get('version', 'current') + + links = ConfigParser.ConfigParser() + links.read(github_links) + + create_landing_html(html_tpl_path, html_path, version, links) + create_readme(md_tpl_path, md_path, version, links) + + landing = open(html_path, 'r') + content_landing = landing.read().replace('\n', '') + + readme = open(md_path, 'r') + content_readme = readme.read() + + gh = github3.login(token=github_access_token) + repo_landing = gh.repository('thetorproject', 'gettor') + repo_readme = gh.repository('thetorproject', 'gettorbrowser') + + file_landing_gh = repo_landing.file_contents('index.html') + file_readme_gh = repo_readme.file_contents('README.md') + + data_landing = { + 'message': 'Updating landing page.', + 'content': content_landing, + 'branch': 'gh-pages' + } + + data_readme = { + 'message': 'Updating README.', + 'content': content_readme + } + + file_landing_gh.update(**data_landing) + print "Landing page updated in gettor" + + file_readme_gh.update(**data_readme) + print "README updated in gettorbrowser" + +if __name__ == "__main__": + main()

1 0