Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
d536e6ad
by Richard Pospesel at 2023-03-03T17:36:14+00:00
2 changed files:
Changes:
| 1 | 1 | #!/bin/bash
|
| 2 | 2 | |
| 3 | -# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, after
|
|
| 4 | -# moving the signed dmg files from the $tbb_version-macos-signed directory
|
|
| 5 | -# to the normal signed directory.
|
|
| 3 | +# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, and assumes
|
|
| 4 | +# that the final signed dmgs are deployed to the normal signed directory.
|
|
| 6 | 5 | # It should be run after `gatekeeper-bundling.sh`.
|
| 7 | 6 | |
| 8 | 7 | set -e
|
| ... | ... | @@ -12,19 +11,21 @@ source "$script_dir/functions" |
| 12 | 11 | |
| 13 | 12 | cd "$script_dir/../.."
|
| 14 | 13 | |
| 14 | +# some initial checks to make sure directories and file counts are as expected...
|
|
| 15 | + |
|
| 15 | 16 | version=$(./rbm/rbm showconf browser --target alpha --target torbrowser-linux-x86_64 var/torbrowser_version)
|
| 16 | 17 | test "$version" = "$tbb_version" || \
|
| 17 | 18 | exit_error "Incorrect tor browser version: $version != $tbb_version"
|
| 18 | 19 | |
| 19 | -test -d "$macos_signed_dir" || \
|
|
| 20 | - exit_error "$macos_signed_dir does not exist"
|
|
| 20 | +test -d "$signed_version_dir" || \
|
|
| 21 | + exit_error "$signed_version_dir does not exist"
|
|
| 21 | 22 | |
| 22 | 23 | ProjName=$(ProjectName)
|
| 23 | 24 | nb_locales=$(echo $bundle_locales | wc -w)
|
| 24 | -nb_bundles=$(ls -1 "$macos_signed_dir/$ProjName"-*.dmg | wc -l)
|
|
| 25 | +nb_bundles=$(ls -1 "$signed_version_dir/$ProjName"-*.dmg | wc -l)
|
|
| 25 | 26 | test "$nb_locales" -eq "$nb_bundles" || \
|
| 26 | 27 | exit_error "Wrong number of bundles: $nb_locales != $nb_bundles"
|
| 27 | 28 | |
| 28 | -mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/
|
|
| 29 | +# before building converting the dmg to a mar
|
|
| 29 | 30 | |
| 30 | 31 | make $SIGNING_PROJECTNAME-dmg2mar-$tbb_version_type |
| ... | ... | @@ -73,5 +73,7 @@ do |
| 73 | 73 | $script_dir/ddmg.sh $macos_signed_dir/$ProjName-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/ "$Proj_Name"
|
| 74 | 74 | rm -rf "dmg/$Proj_Name.app"
|
| 75 | 75 | done
|
| 76 | - |
|
| 77 | 76 | rm -Rf "$tmpdir"
|
| 77 | + |
|
| 78 | +# move the signed+stapled dmgs to expected output directory for publishing and mar generation
|
|
| 79 | +mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ |