Skip to content
Snippets Groups Projects
Commit 5dc73a09 authored by boklm's avatar boklm Committed by Richard Pospesel
Browse files

Bug 40934: Remove $bundle_locales from signing scripts

IN macos-signer-* we don't remove the loop, since those scripts are
going away soon.
parent 1fec4c32
Branches
No related tags found
No related merge requests found
......@@ -20,12 +20,6 @@ test "$version" = "$tbb_version" || \
test -d "$signed_version_dir" || \
exit_error "$signed_version_dir does not exist"
ProjName=$(ProjectName)
nb_locales=$(echo $bundle_locales | wc -w)
nb_bundles=$(ls -1 "$signed_version_dir/$(project-name)"-*.dmg | wc -l)
test "$nb_locales" -eq "$nb_bundles" || \
exit_error "Wrong number of bundles: $nb_locales != $nb_bundles"
# before building converting the dmg to a mar
make $SIGNING_PROJECTNAME-dmg2mar-$tbb_version_type
......@@ -66,14 +66,11 @@ tar -C "$tmpdir" -xf "$libdmg_file"
tar -C "$tmpdir" -xf "$hfstools_file"
export PATH="$PATH:$tmpdir/libdmg-hfsplus:$tmpdir/hfsplus-tools"
for lang in $bundle_locales
do
cd $tmpdir/dmg
unzip -q $macos_stapled_dir/tb-${tbb_version}_$lang-stapled.zip
unzip -q $macos_stapled_dir/tb-${tbb_version}_ALL-stapled.zip
cd ..
$script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$Proj_Name"
rm -rf "dmg/$Proj_Name.app"
done
rm -Rf "$tmpdir"
# move the signed+stapled dmgs to expected output directory for publishing and mar generation
......
......@@ -53,7 +53,7 @@ security unlock $KPW /Users/torbrowser/Library/Keychains/tbb-signing-2021.keycha
unset KPW KEYCHAIN_PW
for LANG in $bundle_locales
for LANG in ALL
do
if [ -f tb-${tbb_version}_${LANG}.zip ]
then
......
......@@ -14,7 +14,7 @@ if [ -z "${PW}" ]; then
stty -echo; read PW; stty echo; export PW
fi
for LANG in $bundle_locales
for LANG in ALL
do
if test -f ${LANG}/tb-${tbb_version}_$LANG.zip.uuid
then
......
......@@ -12,7 +12,7 @@ app_name=$(Project_Name)
cd ~/$SIGNING_PROJECTNAME-${tbb_version}
for LANG in $bundle_locales
for LANG in ALL
do
echo "Stapling $LANG..."
cd $LANG
......
......@@ -25,8 +25,6 @@ test -z "${rbm_not_available+x}" && rbm="$script_dir/../../rbm/rbm"
. "$script_dir/set-config.tbb-version"
. "$script_dir/set-config.hosts"
bundle_locales="ALL"
signed_dir="$script_dir/../../$SIGNING_PROJECTNAME/$tbb_version_type/signed"
signed_version_dir="$signed_dir/$tbb_version"
macos_stapled_dir="$signed_dir/$tbb_version-macos-stapled"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment