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

5 Oct 2023


      boklm pushed to branch main 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:

- projects/browser/build
- tools/update-responses/update_responses


Changes:

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


=====================================
tools/update-responses/update_responses
=====================================
@@ -138,9 +138,9 @@ sub get_version_downloads {
             $os = 'macos';
         } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
             $os = $1;
-        } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-${version}.exe$/) {
+        } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-portable-${version}.exe$/) {
             $os = 'win64';
-        } elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-${version}.exe$/) {
+        } elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-portable-${version}.exe$/) {
             $os = 'win32';
         } else {
             next;
@@ -167,7 +167,7 @@ sub get_perplatform_downloads {
           $os = 'macos';
         } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-86_64)-${version}.tar.xz$/) {
           $os = $1;
-        } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-86_64)-${version}.exe$/) {
+        } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-86_64)-portable-${version}.exe$/) {
           $os = $1;
         } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) {
           $os = $1;



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b4...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b4...
You're receiving this email because of your account on gitlab.torproject.org.

    

boklm (＠boklm)

tags

participants (1)