Skip to content
Snippets Groups Projects
Unverified Commit dcc49985 authored by boklm's avatar boklm
Browse files

Bug 41177: Include Windows installers without -portable- in download-*.json files

After #41167, the portable Windows installer are not
generated anymore for Mullvad Browser. We should include the normal
installer (without `-portable-` or `-install-` in the filename) in
the download-*.json files.
parent 53b34799
No related branches found
No related tags found
No related merge requests found
...@@ -138,9 +138,9 @@ sub get_version_downloads { ...@@ -138,9 +138,9 @@ sub get_version_downloads {
$os = 'macos'; $os = 'macos';
} elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) { } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
$os = $1; $os = $1;
} elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-portable-${version}.exe$/) { } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-(portable-|)${version}.exe$/) {
$os = 'win64'; $os = 'win64';
} elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-portable-${version}.exe$/) { } elsif ($file =~ m/^$config->{appname_bundle}-windows-i686-(portable-|)${version}.exe$/) {
$os = 'win32'; $os = 'win32';
} else { } else {
next; next;
...@@ -167,7 +167,7 @@ sub get_perplatform_downloads { ...@@ -167,7 +167,7 @@ sub get_perplatform_downloads {
$os = 'macos'; $os = 'macos';
} elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) { } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
$os = $1; $os = $1;
} elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-portable-${version}.exe$/) { } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-(portable-|)${version}.exe$/) {
$os = $1; $os = $1;
} elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) { } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) {
$os = $1; $os = $1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment