boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
- 
56df6e4c
by Pier Angelo Vendrame at 2024-02-08T16:06:11+01:00
2 changed files:
Changes:
| ... | ... | @@ -24,18 +24,23 @@ cd /var/tmp/build | 
| 24 | 24 |  mv $rootdir/[% c('input_files_by_name/noscript') %] "$noscript_path"
 | 
| 25 | 25 | |
| 26 | 26 |  [%IF c("var/tor-browser") -%]
 | 
| 27 | -  unzip -j "$apk" assets/omni.ja
 | |
| 28 | 27 |    tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]" tor/pluggable_transports/pt_config.json
 | 
| 29 | -  mkdir omni
 | |
| 30 | -  pushd omni
 | |
| 31 | -  unzip ../omni.ja
 | |
| 32 | -  cp ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json
 | |
| 33 | -  [% c('zip', {
 | |
| 34 | -      zip_src => [ '.' ],
 | |
| 35 | -      zip_args => '../assets/omni.ja',
 | |
| 36 | -    }) %]
 | |
| 37 | -  popd
 | |
| 38 | 28 |  [% END -%]
 | 
| 29 | +unzip -j "$apk" assets/omni.ja
 | |
| 30 | +mkdir omni
 | |
| 31 | +pushd omni
 | |
| 32 | +unzip ../omni.ja
 | |
| 33 | +[%IF c("var/tor-browser") -%]
 | |
| 34 | +  cp -a ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json
 | |
| 35 | +[% END -%]
 | |
| 36 | +[% c('zip', {
 | |
| 37 | +        zip_src   => [ '.' ],
 | |
| 38 | +        zip_args  => '../assets/omni.ja',
 | |
| 39 | +        use_7z    => 1,
 | |
| 40 | +        '7z_bin'  => '7zz',
 | |
| 41 | +        '7z_opts' => '-mx9',
 | |
| 42 | +      }) %]
 | |
| 43 | +popd
 | |
| 39 | 44 | |
| 40 | 45 | |
| 41 | 46 |  [% IF c("var/verify_allowed_addons") %]
 | 
| 1 | -Subproject commit b5e5b04aaf677c4bacfb5ace45598313286bfdf6 | |
| 1 | +Subproject commit 10c6b24e90e3dc9c2578290a7d82a87b7f4eb9a3 |