richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • projects/browser/build
    ... ... @@ -302,10 +302,9 @@ do
    302 302
       [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %]
    
    303 303
       zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %]
    
    304 304
       rm -rf defaults
    
    305
    -  [% IF c("var/tor-browser") %]
    
    306
    -    # create tbb_version.json file for tor-browser#25020
    
    307
    -    echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_version.json
    
    308
    -  [% END -%]
    
    305
    +  # create tbb_version.json (torbrowser) or version.json (mullvadbrowser)
    
    306
    +  # file for tor-browser#25020 and tor-browser-build#41044
    
    307
    +  echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../[% c("var/version_json") %]
    
    309 308
       popd
    
    310 309
     done
    
    311 310
     
    

  • projects/browser/config
    ... ... @@ -13,6 +13,7 @@ var:
    13 13
         - bzip2
    
    14 14
         - jq
    
    15 15
       mar_osname: '[% c("var/osname") %]'
    
    16
    +  version_json: version.json
    
    16 17
     
    
    17 18
     targets:
    
    18 19
       linux:
    
    ... ... @@ -49,6 +50,7 @@ targets:
    49 50
       torbrowser:
    
    50 51
         var:
    
    51 52
           prefs_file: 000-tor-browser.js
    
    53
    +      version_json: tbb_version.json
    
    52 54
       basebrowser:
    
    53 55
         var:
    
    54 56
           prefs_file: 001-base-profile.js