Merge remote-tracking branch 'origin/main' into v/tauri-v2

Author: xTVaser

.tauri/latest-release-v2.json

@@ -1,19 +1,19 @@
 {
-  "name": "v2.6.3",
-  "notes": "{\"changes\":[{\"description\":\"Fix install bottlenecks from logging\",\"contributor\":\"trippjoe\",\"pullRequestUrl\":\"https://github.com/open-goal/launcher/pull/659\"},{\"description\":\"frontend: ensure VCC runtime requirement is relevant for windows envs\",\"contributor\":\"xTVaser\",\"pullRequestUrl\":\"https://github.com/open-goal/launcher/pull/661\"}]}",
-  "pub_date": "2025-01-09T20:12:57Z",
+  "name": "v2.6.4",
+  "notes": "{\"changes\":[{\"description\":\"macos: isolate and check the macOS major version number\",\"contributor\":\"xTVaser\",\"pullRequestUrl\":\"https://github.com/open-goal/launcher/pull/664\"},{\"description\":\"README: Add macOS info about log location.\",\"contributor\":\"MaddTheSane\",\"pullRequestUrl\":\"https://github.com/open-goal/launcher/pull/693\"}]}",
+  "pub_date": "2025-03-08T18:29:17Z",
   "platforms": {
     "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT1J3WFZYVUtKaW0va0l4aitwOGxTRUhBazgzUEF2V1FQU050ckJnNExGVThPNHBRRjFUZEkzZUJVc1lrazkyNGRQUURxcUVsaHcveENHL0k4Rk1ST1FjPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM2NDU0MTIwCWZpbGU6b3Blbi1nb2FsLWxhdW5jaGVyXzIuNi4zX2FtZDY0LkFwcEltYWdlLnRhci5negpYWmd2YnpXOThDSDVGUFlkejVZamllM0s4Y3B6WlRVdks3WWVnQkdJb0R0SXUxbnNiNWFCQ0ZzQ3J1Y2JVY2I4a2ZkNlEwNnY0WWFFcGxUbllwcHFDZz09Cg==",
-      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.3/open-goal-launcher_2.6.3_amd64.AppImage.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT2U5eVZobFRUTUw3NjBtMXQzMU50dmJmY1l5TXRTTnVmN1RHTzliRkpRYllOOERvcm1QMGpVUGdEaXYrdFRFM3l1ckd3NFR2UHFFYUd4dGFDQTkxOXcwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzQxNDU5MDk2CWZpbGU6b3Blbi1nb2FsLWxhdW5jaGVyXzIuNi40X2FtZDY0LkFwcEltYWdlLnRhci5negpXSStZb2E2bTRSeVJLL0JEYWg3WHFDakdBV2o4RjA0cEpzemt2MXRtOXNhSWFSdVZOMnJTL3M4Z1c4TnlCNmpDR1dtUUY1d0NrcE9sMko2VExmVklEZz09Cg==",
+      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.4/open-goal-launcher_2.6.4_amd64.AppImage.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT2JTOVBTazRBaEg1R3ZPelFpNDBQVWVuOFBLTTFFMnJZc2Y2Sm1nYmNiWjM4RGNrY2MwdThUcUlETHkvakhXZk9oV2Jnd0VTdU5KRS9FaXJmeTZLNUFZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM2NDU0MzQwCWZpbGU6T3BlbkdPQUwtTGF1bmNoZXJfMi42LjNfeDY0X2VuLVVTLm1zaS56aXAKZTlGTW0yZTA0cXFyVmxwRnVpNUlobEFQcTJJMTYwYTdTRy9BWTVvNzBVQVJTcVFub3E0WGVsdHgxNnFiU0Z0RGJHSGxLKzlEUDdvLzZVYXVNV3l1Q1E9PQo=",
-      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.3/OpenGOAL-Launcher_2.6.3_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT1dyM3lsU1NIMElHbkdWOTZGM0NDbHJsTlVCNmJwN1FHWkV5RVVSRlZSKzRRSFRBb2Q0TkZDejRrdXZqbTAyVnNtWGhSSnZ3UkFvWTlZUTY4N2FJK2dZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzQxNDU5MzY4CWZpbGU6T3BlbkdPQUwtTGF1bmNoZXJfMi42LjRfeDY0X2VuLVVTLm1zaS56aXAKam85Rlh1d1BnRlZzTDZGcWNiYXAzWENBaFBFM2RHdmZ4SGdOSk54M2VkWlNWaW1YcVFIeDZnaVNkM1EwVjEvcVhjamFzUDNsWGtINUVDMmJWcDdxQVE9PQo=",
+      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.4/OpenGOAL-Launcher_2.6.4_x64_en-US.msi.zip"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT1M0ak1iN2dEd0N5aGwyMUpKeDYyV29neUxBem5zdnVEay9tUmRCYW1QZzBCNWQ4b1ZaRFdiR3BybUF2SGdtKy9uVjhaS0xLb081OGEveVNObXRnbUFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM2NDU0NjY1CWZpbGU6T3BlbkdPQUwtTGF1bmNoZXIuYXBwLnRhci5negpMMVJ1YnYyaGlzajNKajZNV2hldnpYb3J1VlN0L3JDcDhUYndiRFVMZXpLL0xGcXVIWGFiOFZOVHNpZ0poWU9VQmw2MFo5clBiMVliVUhaay8xTXNBdz09Cg==",
-      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.3/OpenGOAL-Launcher_x64.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTU1FRci9NckROT1dJRXRpWjZjMXUxTmpCMG1sVnZUVHhIb0dwbkpBdGZudVFjRTVadHZoTmJhUnZkT2RlZlhtTURUS0RGMmJkNjA0ei9UYjhjRXdmR1RtMU83bEhoWGdrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzQxNDU5MzM2CWZpbGU6T3BlbkdPQUwtTGF1bmNoZXIuYXBwLnRhci5negp0YmRUZ1pLek1ZWG5IQ0hLUDVCT2NCVzdya0hWYjRUMFpxRk1IQjlpQmlTVjAyWkVTaS9FaVlPbGp1SFhsT0hsMXFUcGJqaTJzN1J5Sm1SRE03d1JCQT09Cg==",
+      "url": "https://github.com/open-goal/launcher/releases/download/v2.6.4/OpenGOAL-Launcher_x64.app.tar.gz"
     }
   }
 }

README.md

@@ -29,8 +29,9 @@ If you cannot do this (for example, the bug relates to making the package / the
 
 - Windows `C://Users/<YOUR_USER_NAME>/AppData/Roaming/OpenGOAL-Launcher/logs`
 - Linux `/home/<YOUR_USER_NAME>/.config/OpenGOAL-Launcher/logs`
+- macOS `/Users/<YOUR_USER_NAME>/Library/Logs/OpenGOAL-Launcher/app/logs`
 
-Note that both `AppData` and `.config` are hidden folders.
+Note that both `AppData` and `.config` are hidden folders, and `Library` is hidden by default.
 
 ## Development
 

metadata/dev.opengoal.OpenGOAL.appdata.xml

@@ -29,7 +29,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release type="stable" version="2.6.3" date="2025-01-09T00:00:00Z"/>
+    <release type="stable" version="2.6.4" date="2025-03-08T00:00:00Z"/>
   </releases>
   <content_rating type="oars-1.1"/>
 </component>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opengoal-launcher",
   "private": true,
-  "version": "2.6.3",
+  "version": "2.6.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "opengoal-launcher"
-version = "2.6.3" # APP_VERSION
+version = "2.6.4" # APP_VERSION
 description = "A frontend for the OpenGOAL project"
 authors = ["OpenGOAL"]
 license = "ISC"

src-tauri/Cargo.toml

@@ -137,9 +137,20 @@ pub async fn is_macos_version_15_or_above() -> Result<bool, CommandError> {
 pub async fn is_macos_version_15_or_above() -> Result<bool, CommandError> {
   if let Ok(ctl) = sysctl::Ctl::new("kern.osproductversion") {
     if let Ok(ctl_val) = ctl.value_string() {
-      let version = ctl_val.parse::<f32>();
-      if let Ok(os_version) = version {
-        return Ok(os_version >= 15.0);
+      info!("MacOS Version Number: {}", ctl_val);
+      let mut stripped_ctl_val = ctl_val.as_str();
+      if stripped_ctl_val.contains(".") {
+        let first_value = stripped_ctl_val.split(".").next();
+        if first_value.is_none() {
+          error!("Unable to parse MacOS major version number");
+          return Ok(false);
+        }
+        stripped_ctl_val = first_value.unwrap();
+      }
+      info!("Checking MacOS Version Number: {}", stripped_ctl_val);
+      let version = stripped_ctl_val.parse::<f32>();
+      if version.is_ok() {
+        return Ok(version.unwrap() >= 15.0);
       }
     }
   }

src-tauri/src/commands/util.rs

@@ -35,7 +35,7 @@
   },
   "productName": "OpenGOAL-Launcher",
   "mainBinaryName": "OpenGOAL-Launcher",
-  "version": "2.5.1",
+  "version": "2.6.4",
   "identifier": "OpenGOAL-Launcher",
   "plugins": {
     "updater": {