Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthew Finkel
tor-browser-build
Commits
551dd7a7
Unverified
Commit
551dd7a7
authored
Jul 19, 2017
by
boklm
Browse files
Set bridges prefs depending on platform
parent
9b591074
Changes
1
Hide whitespace changes
Inline
Side-by-side
projects/tor-browser/build
View file @
551dd7a7
...
...
@@ -109,7 +109,17 @@ cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH
tar
-
C
Bundle
-
Data
/
[
%
bundledata_osname
%
]
-
c
.
|
tar
-
C
$
TBDIR
[
%
IF
!
c
(
"var/osx"
)
%
]
/
TorBrowser
[
%
END
%
]
-
x
cat
Bundle
-
Data
/
PTConfigs
/
[
%
bundledata_osname
%
]
/
torrc
-
defaults
-
appendix
>>
$
TBDIR
/
$
TORCONFIGPATH
/
torrc
-
defaults
cat
Bundle
-
Data
/
PTConfigs
/
bridge_prefs
.
js
>>
$
TBDIR
/
$
EXTOVERRIDESPATH
[
%
IF
c
(
"var/linux"
)
-%
]
cat
Bundle
-
Data
/
PTConfigs
/
bridge_prefs
.
js
>>
$
TBDIR
/
$
EXTOVERRIDESPATH
[
%
END
-%
]
[
%
IF
c
(
"var/windows"
)
-%
]
# We don't have snowflake available on Windows yet
grep
-
v
'default_bridge\.snowflake'
Bundle
-
Data
/
PTConfigs
/
bridge_prefs
.
js
>>
$
TBDIR
/
$
EXTOVERRIDESPATH
[
%
END
-%
]
[
%
IF
c
(
"var/osx"
)
-%
]
# FTE is temporarily removed due to bug 18495.
grep
-
Ev
'default_bridge\.fte'
Bundle
-
Data
/
PTConfigs
/
bridge_prefs
.
js
>>
$
TBDIR
/
$
EXTOVERRIDESPATH
[
%
END
-%
]
cat
Bundle
-
Data
/
PTConfigs
/
meek
-
http
-
helper
-
user
.
js
>>
$
TBDIR
/
$
MEEKPROFILEPATH
/
user
.
js
[
%
IF
c
(
"var/osx"
)
%
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment