From 20bdfaef3928400a22fe4172044d21d493343cff Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Sun, 16 Apr 2023 21:05:51 +0200
Subject: [PATCH] Use `macos` rather than `osx` in filenames (#4550)

---
 .CI/CreateDMG.sh            | 2 +-
 .github/workflows/build.yml | 8 ++++----
 CHANGELOG.md                | 1 +
 src/singletons/Toasts.cpp   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.CI/CreateDMG.sh b/.CI/CreateDMG.sh
index c5cf2d209..5eaddc071 100755
--- a/.CI/CreateDMG.sh
+++ b/.CI/CreateDMG.sh
@@ -28,5 +28,5 @@ echo "Entering python3 virtual environment"
 echo "Installing dmgbuild"
 python3 -m pip install dmgbuild
 echo "Running dmgbuild.."
-dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-osx-Qt-$1.dmg
+dmgbuild --settings ./../.CI/dmg-settings.py -D app=./chatterino.app Chatterino2 chatterino-macos-Qt-$1.dmg
 echo "Done!"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b786a4157..c9beb6b34 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -348,8 +348,8 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: actions/upload-artifact@v3
         with:
-          name: chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
-          path: build/chatterino-osx-Qt-${{ matrix.qt-version }}.dmg
+          name: chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
+          path: build/chatterino-macos-Qt-${{ matrix.qt-version }}.dmg
   create-release:
     needs: build
     runs-on: ubuntu-latest
@@ -411,13 +411,13 @@ jobs:
       - uses: actions/download-artifact@v3
         name: macOS x86_64 Qt5.15.2 dmg
         with:
-          name: chatterino-osx-Qt-5.15.2.dmg
+          name: chatterino-macos-Qt-5.15.2.dmg
           path: release-artifacts/
 
       - uses: actions/download-artifact@v3
         name: macOS x86_64 Qt6.5.0 dmg
         with:
-          name: chatterino-osx-Qt-6.5.0.dmg
+          name: chatterino-macos-Qt-6.5.0.dmg
           path: release-artifacts/
 
       - name: Copy flatpakref
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdf47b1d6..2378a428e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Dev: Added tests and benchmarks for `LinkParser`. (#4436)
 - Dev: Experimental builds with Qt 6 are now provided. (#4522)
 - Dev: Removed `CHATTERINO_TEST` definitions. (#4526)
+- Dev: Builds for macOS now have `macos` in their name (previously: `osx`). (#4550)
 
 ## 2.4.2
 
diff --git a/src/singletons/Toasts.cpp b/src/singletons/Toasts.cpp
index 09fbf8fbc..b421e46d8 100644
--- a/src/singletons/Toasts.cpp
+++ b/src/singletons/Toasts.cpp
@@ -76,7 +76,7 @@ void Toasts::sendChannelNotification(const QString &channelName,
     };
 #else
     auto sendChannelNotification = [] {
-        // Unimplemented for OSX and Linux
+        // Unimplemented for macOS and Linux
     };
 #endif
     // Fetch user profile avatar