[tbb-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40714: Ship NoScript also in the extension distribution directory

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
4e52d507 by Pier Angelo Vendrame at 2023-01-12T15:28:37+01:00
Bug 40714: Ship NoScript also in the extension distribution directory

- - - - -


1 changed file:

- projects/browser/build


Changes:

=====================================
projects/browser/build
=====================================
@@ -40,10 +40,13 @@ touch "$GENERATEDPREFSPATH"
   TBDIRS=("$TBDIR")
 
   DOCSPATH=[% c('var/ProjectName') %]/Docs
-  EXTSPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions
+  EXTSPATH=distribution/extensions
   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"
 [% END %]
 
@@ -57,6 +60,9 @@ unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zi
 MARTOOLS=$rootdir/mar-tools
 
 mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+[% IF !c("var/macos") -%]
+  cp "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$TBDIR/$PROFILEPATH/"
+[% END %]
 
 [% IF c("var/tor-browser") -%]
   function mv_tbdir {
@@ -91,7 +97,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
   # Snowflake's README is a documentation shipped in tor-expert-bundle
   mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
   mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
-  
+
   # WebTunnel's README is a documentation shipped in tor-expert-bundle
   mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]
   mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4e52d50748fe6bb27ad3f81f504b263dfbeb5edf

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4e52d50748fe6bb27ad3f81f504b263dfbeb5edf
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20230112/f6f00ea8/attachment-0001.htm>