Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
07f09f39
by Pier Angelo Vendrame at 2023-03-29T09:37:33+02:00
2 changed files:
Changes:
| ... | ... | @@ -338,7 +338,7 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} |
| 338 | 338 | [% END -%]
|
| 339 | 339 | |
| 340 | 340 | # Set up custom bundled fonts. See fonts-conf(5).
|
| 341 | -export FONTCONFIG_PATH="${HOME}/[% c('var/ProjectName') %]/Data/fontconfig"
|
|
| 341 | +export FONTCONFIG_PATH="${HOME}/fontconfig"
|
|
| 342 | 342 | export FONTCONFIG_FILE="fonts.conf"
|
| 343 | 343 | |
| 344 | 344 | # Avoid overwriting user's dconf values. Fixes #27903.
|
| ... | ... | @@ -219,6 +219,10 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz |
| 219 | 219 | |
| 220 | 220 | for tbdir in "${TBDIRS[@]}"
|
| 221 | 221 | do
|
| 222 | + [% IF c("var/linux") -%]
|
|
| 223 | + mv Bundle-Data/linux/Data/fontconfig "$tbdir/"
|
|
| 224 | + [% END -%]
|
|
| 225 | + |
|
| 222 | 226 | mkdir -p "$tbdir/$DOCSPATH"
|
| 223 | 227 | cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
|
| 224 | 228 | [% IF c("var/tor-browser") -%]
|