commit 2a9d74cba72862ce3da57852958b3173927fb371 Author: Georg Koppen gk@torproject.org Date: Wed Jul 22 16:31:54 2020 +0000
Bug 40028: Do not reference unset env variables --- projects/tor-browser/build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 155a7bc..24c8265 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -121,14 +121,7 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files
mkdir -p "$TBDIR/$DOCSPATH" cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" -[% IF c("var/namecoin") %] - EXCLUDE_ELECTRUM="" - EXCLUDE_NCPROP279="" -[% ELSE %] - EXCLUDE_ELECTRUM="--exclude=*Electrum-NMC*" - EXCLUDE_NCPROP279="--exclude=*ncprop279*" -[% END %] -tar -C Bundle-Data/[% bundledata_osname %] "${EXCLUDE_ELECTRUM}" "${EXCLUDE_NCPROP279}" -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x +tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x
cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" [% IF ! c("var/snowflake") %]