[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41403: Reorder the definitions in generate_config.

Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 3925e37e
    by Pier Angelo Vendrame at 2025-03-21T09:25:50+01:00 
    Bug 41403: Reorder the definitions in generate_config.

We need to define the variables about channel and version before the
signing configuration.

1 changed file:

Changes:

  • tools/signing/functions
    ... ... @@ -30,24 +30,24 @@ function is_project {
    30 30 
     }
    31 31
    32 32 
     function generate_config {
    33 
    +  local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \
    34 
    +                           --target "$SIGNING_PROJECTNAME")
    35 
    +  local tbb_version=$("$rbm" showconf browser var/torbrowser_version \
    36 
    +                      --target "$SIGNING_PROJECTNAME" --target \
    37 
    +                      "$tbb_version_type")
    38 
    +  local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \
    39 
    +                            --target "$SIGNING_PROJECTNAME" --target \
    40 
    +                            "$tbb_version_type")
    33 41 
       local p1=$("$rbm" showconf browser var/project-name --target \
    34 42 
            "$SIGNING_PROJECTNAME")
    35 43 
       local p2=$("$rbm" showconf browser var/Project_Name --target \
    36 44 
                  "$SIGNING_PROJECTNAME")
    37 45 
       local p3=$("$rbm" showconf browser var/ProjectName --target \
    38 46 
                  "$SIGNING_PROJECTNAME")
    39 
    -  p4=$("$rbm" showconf browser var/display_name --target \
    47 
    +  local p4=$("$rbm" showconf browser var/display_name --target \
    40 48 
            "$SIGNING_PROJECTNAME"  --target "$tbb_version_type")
    41 49 
       echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \
    42 50 
            "$script_dir/set-config.generated-config"
    43 
    -  local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \
    44 
    -                           --target "$SIGNING_PROJECTNAME")
    45 
    -  local tbb_version=$("$rbm" showconf browser var/torbrowser_version \
    46 
    -                      --target "$SIGNING_PROJECTNAME" --target \
    47 
    -                      "$tbb_version_type")
    48 
    -  local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \
    49 
    -                            --target "$SIGNING_PROJECTNAME" --target \
    50 
    -                            "$tbb_version_type")
    51 51 
       for v in tbb_version_type tbb_version tbb_version_build; do
    52 52 
         echo "$v=$(shell-quote "${!v}")" >> "$script_dir/set-config.generated-config"
    53 53 
       done

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx