[Scummvm-git-logs] scummvm-web master -> 18afd42fee0818b5c25f77462a5c8eab1477d699

[lotharsm]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
aa1b1c4de4 DATA: Remove the workaround for providing the Win32 and Mac version by variable
18afd42fee DATA: Move the snap store link to the 2.1.2 subsection


Commit: aa1b1c4de4a33fc66b9f94302424ab4e923069bd
    https://github.com/scummvm/scummvm-web/commit/aa1b1c4de4a33fc66b9f94302424ab4e923069bd
Author: Lothar Serra Mari (mail at serra.me)
Date: 2020-04-01T00:00:30+02:00

Commit Message:
DATA: Remove the workaround for providing the Win32 and Mac version by variable

Changed paths:
    include/Models/DownloadsModel.php


diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index f4f924d5..a3a1e5d8 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -116,16 +116,6 @@ abstract class DownloadsModel
                         $extra_text = '(snap install scummvm)';
                     }
 
-                    /*
-                    HACK: Hard-code the version for Mac and Win32 due to the 2.1.2
-                          interim release. Setting it to the Snap Store version since
-                          that's always up to date. REMOVE with the next major release!
-                    */
-
-                    if ($os['name'] === 'windows' || 'Mac') {
-                        $version = RELEASE_SNAP_STORE;
-                    }
-
                     return array(
                     'os' => $name,
                     'ver' => $version,


Commit: 18afd42fee0818b5c25f77462a5c8eab1477d699
    https://github.com/scummvm/scummvm-web/commit/18afd42fee0818b5c25f77462a5c8eab1477d699
Author: Lothar Serra Mari (mail at serra.me)
Date: 2020-04-01T00:00:30+02:00

Commit Message:
DATA: Move the snap store link to the 2.1.2 subsection

Changed paths:
    data/downloads.xml


diff --git a/data/downloads.xml b/data/downloads.xml
index e9b2b411..cee53562 100644
--- a/data/downloads.xml
+++ b/data/downloads.xml
@@ -28,6 +28,12 @@
 					<url>scummvm-2.1.2-macosx-ppc.dmg</url>
 					<name>Mac OS X 10.4+ PPC 32 bits (without Sparkle) Disk Image</name>
 				</file>
+				<file>
+					<category_icon>snap</category_icon>
+					<url>https://snapcraft.io/scummvm</url>
+					<name>Snap package at the Snap Store</name>
+					<user_agent>Ubuntu</user_agent>
+				</file>
 			</entries>
 		</subsection>
 		<subsection>
@@ -82,12 +88,6 @@
 					<user_agent>Fedora</user_agent>
 				</file>
 -->
-				<file>
-					<category_icon>snap</category_icon>
-					<url>https://snapcraft.io/scummvm</url>
-					<name>Snap package at the Snap Store</name>
-					<user_agent>Ubuntu</user_agent>
-				</file>
 
 				<file>
 					<category_icon>debian</category_icon>