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
f7ca0b7e
Unverified
Commit
f7ca0b7e
authored
Aug 27, 2020
by
Georg Koppen
Browse files
Merge remote-tracking branch 'gitlab/merge-requests/38' into master
parents
bdcf6b3b
81bae4ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
projects/release/dmg2mar
View file @
f7ca0b7e
#!/bin/bash
[
% c
(
"var/set_default_env"
)
-%]
cd
[
% shell_quote
(
path
(
dest_dir
))
%]/[% c
(
"var/signed_status"
)
%]/[% c
(
"version"
)
%]
[
% shell_quote
(
c
(
"basedir"
))
%]/tools/dmg2mar
[
% shell_quote
(
c
(
"basedir"
))
%]/tools/dmg2mar
[
% c
(
"var/channel"
)
%]
tools/dmg2mar
View file @
f7ca0b7e
...
...
@@ -103,6 +103,7 @@ sub get_dmg_files_from_sha256sums {
}
sub
convert_files
{
my
(
$channel
)
=
@_
;
my
$pm
=
Parallel::
ForkManager
->
new
(
get_nbprocs
);
$pm
->
run_on_finish
(
sub
{
print
"
Finished
$_
[2]
\n
"
});
foreach
my
$file
(
get_dmg_files_from_sha256sums
)
{
...
...
@@ -140,9 +141,13 @@ sub convert_files {
find
(
$wanted
,
"
$tmpdir
/
$appname
.app
");
unlink
$output
;
local
$ENV
{
MOZ_PRODUCT_VERSION
}
=
$file
->
{
version
};
local
$ENV
{
MAR_CHANNEL_ID
}
=
"
torbrowser-torproject-
$channel
";
(
undef
,
$err
,
$success
)
=
capture_exec
('
make_full_update.sh
',
'
-q
',
$output
,
"
$tmpdir
/
$appname
.app
");
exit_error
"
Error updating
$output
:
$err
"
unless
$success
;
exit_error
"
make_full_update.sh failed.
$output
does not exist.
"
unless
-
f
$output
;
$pm
->
finish
;
}
$pm
->
wait_all_children
;
...
...
@@ -164,6 +169,10 @@ sub remove_incremental_mars {
# Set LC_ALL=C to avoid reproducibility issues when creating mar files
$ENV
{
LC_ALL
}
=
'
C
';
exit_error
"
Please specify update channel
"
unless
@ARGV
==
1
;
my
$channel
=
$ARGV
[
0
];
extract_martools
;
convert_files
;
convert_files
$channel
;
remove_incremental_mars
;
tools/update-responses/update_responses
View file @
f7ca0b7e
...
...
@@ -230,8 +230,8 @@ sub create_incremental_mar {
exit_error
"
Missing
code
signature
while
creating
$mar_file
"
;
}
}
$ENV
{MOZ_PRODUCT_VERSION} =
$new_version
;
$ENV
{MAR_CHANNEL_ID} =
"
torbrowser
-
torproject
-
$channel
"
;
local
$ENV
{MOZ_PRODUCT_VERSION} =
$new_version
;
local
$ENV
{MAR_CHANNEL_ID} =
"
torbrowser
-
torproject
-
$channel
"
;
my (
$out
,
$err
,
$success
) = capture_exec('make_incremental_update.sh',
$mar_file_path
,
"
$tmpdir
/A", "$tmpdir/
B
"
);
if (!
$success
) {
...
...
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