Skip to content
Snippets Groups Projects
Verified Commit 31439ea7 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 40773: Copy some documentation files only on Tor Browser

Also, clean up other files that should not be on Privacy Browser, such
as the skeleton of the default profile, which Privacy Browser and Base
Browser do not have.
parent 7103ec20
No related branches found
No related tags found
1 merge request!650Bug 40773: Copy some documentation files only on Tor Browser
Showing
with 691 additions and 23 deletions
projects/browser/Bundle-Data/Docs/ChangeLog.txt
\ No newline at end of file
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
\ No newline at end of file
This diff is collapsed.
HTTPS Everywhere:
Copyright © 2010-2018 Electronic Frontier Foundation and others
Licensed GPL v2+
HTTPS Everywhere Rulesets (src/chrome/content/rules):
To the extent copyright applies to the rulesets, they can be used according to GPL v2 or later.
Issue Format Bot (utils/issue-format-bot/*):
Copyright © 2017 AJ Jordan, AGPLv3+
The build system incorporates code from Python 3.6
Copyright © 2001-2018 Python Software Foundation; All Rights Reserved
NoScript - a Firefox extension for whitelist driven safe JavaScript execution
Copyright (C) 2005-2020 Giorgio Maone - https://maone.net
Copyright (C) 2005-2023 Giorgio Maone - https://maone.net
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
......@@ -45,10 +45,15 @@ touch "$GENERATEDPREFSPATH"
TORBINPATH=TorBrowser/Tor
TORCONFIGPATH=TorBrowser/Data/Tor
PROFILEPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions
mkdir -p "$TBDIR/$PROFILEPATH"
mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches"
[% IF c("var/tor-browser") -%]
PROFILEPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions
mkdir -p "$TBDIR/$PROFILEPATH"
[% END -%]
[% IF !c("var/privacy-browser") -%]
# For Privacy Browser, we keep the data directory at the same level of
# Browser, instead of creating a Data directory with the program files.
mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches"
[% END -%]
[% END %]
for tbdir in "${TBDIRS[@]}"
......@@ -102,7 +107,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
# Move READMEs from tor-expert-bundle to the doc dir
mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]
mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]
mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
......@@ -217,9 +222,12 @@ do
mkdir -p "$tbdir/$DOCSPATH"
cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
[% IF c("var/tor-browser") -%]
cp -a Bundle-Data/Docs-TBB/* "$tbdir/$DOCSPATH"
tar -C Bundle-Data/[% bundledata_osname %] \
[% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \
-c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x
[% ELSIF c("var/privacy-browser") -%]
cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH"
[% END -%]
done
......@@ -244,11 +252,9 @@ done
bridges_conf snowflake
[% END -%]
[% IF c("var/linux") %]
[% IF c("var/linux") && c("var/tor-browser") %]
chmod 700 ${TB_STAGE_DIR}/Browser/[% c('var/ProjectName') %]/Data/Browser
[% IF c("var/tor-browser") -%]
chmod 700 ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Tor
[% END -%]
chmod 700 ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Tor
[% END %]
# With multi-lingual builds, we use "ALL" in the package name as the locale for
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment