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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40940: Change position of the `install|portable` in the windows filenames



Title: GitLab

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

Commits:

  • b4f9a5fd
    by Nicolas Vigier at 2023-10-05T09:10:41+02:00
    Bug 40940: Change position of the `install|portable` in the windows filenames
    
    This is also fixing the download-windows-*.json files, which were
    missing since the filename change (for now, we only includ the
    `portable` build).
    

2 changed files:

Changes:

  • projects/browser/build
    ... ... @@ -400,11 +400,11 @@ cd $distdir
    400 400
       makensis browser-portable.nsi
    
    401 401
       # Working around NSIS braindamage
    
    402 402
       python3 $rootdir/pe_checksum_fix.py browser-install.exe
    
    403
    -  mv browser-install.exe $OUTDIR/[% c("var/project-name") %]-portable-[% c("var/osname") %]-[% c("var/torbrowser_version") %].exe
    
    403
    +  mv browser-install.exe $OUTDIR/[% c("var/project-name") %]-[% c("var/osname") %]-portable-[% c("var/torbrowser_version") %].exe
    
    404 404
       [% IF c('var/mullvad-browser') -%]
    
    405 405
         makensis browser-system.nsi
    
    406 406
         python3 $rootdir/pe_checksum_fix.py browser-install.exe
    
    407
    -    mv browser-install.exe $OUTDIR/[% c("var/project-name") %]-install-[% c("var/osname") %]-[% c("var/torbrowser_version") %].exe
    
    407
    +    mv browser-install.exe $OUTDIR/[% c("var/project-name") %]-[% c("var/osname") %]-install-[% c("var/torbrowser_version") %].exe
    
    408 408
       [% END -%]
    
    409 409
       popd
    
    410 410
     [% END %]
    

  • tools/update-responses/update_responses
    ... ... @@ -138,9 +138,9 @@ sub get_version_downloads {
    138 138
                 $os = 'macos';
    
    139 139
             } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
    
    140 140
                 $os = $1;
    
    141
    -        } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-${version}.exe$/) {
    
    141
    +        } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-portable-${version}.exe$/) {
    
    142 142
                 $os = 'win64';
    
    143
    -        } elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-${version}.exe$/) {
    
    143
    +        } elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-portable-${version}.exe$/) {
    
    144 144
                 $os = 'win32';
    
    145 145
             } else {
    
    146 146
                 next;
    
    ... ... @@ -167,7 +167,7 @@ sub get_perplatform_downloads {
    167 167
               $os = 'macos';
    
    168 168
             } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-86_64)-${version}.tar.xz$/) {
    
    169 169
               $os = $1;
    
    170
    -        } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-86_64)-${version}.exe$/) {
    
    170
    +        } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-86_64)-portable-${version}.exe$/) {
    
    171 171
               $os = $1;
    
    172 172
             } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) {
    
    173 173
               $os = $1;
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits