diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 558cdf6..5d6f1d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,7 @@ jobs: run: | make build-macos brew install create-dmg - create-dmg --volname "Gotify Tray" --app-drop-link 0 0 --no-internet-enable "gotify-tray.dmg" "./dist/Gotify-Tray.app" + create-dmg --volname "Gotify Tray" --app-drop-link 0 0 --no-internet-enable "gotify-tray.dmg" "./dist/Gotify Tray.app" - name: Upload artifact uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 3f03028..4f7020d 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -74,7 +74,7 @@ jobs: run: | make build-macos brew install create-dmg - create-dmg --volname "Gotify Tray" --app-drop-link 0 0 --no-internet-enable "gotify-tray.dmg" "./dist/Gotify-Tray.app" + create-dmg --volname "Gotify Tray" --app-drop-link 0 0 --no-internet-enable "gotify-tray.dmg" "./dist/Gotify Tray.app" - name: Upload artifact uses: actions/upload-artifact@v2 with: diff --git a/Makefile b/Makefile index 6630b98..ed766d7 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ build-macos: clean pip install -r requirements.txt pip install pyinstaller pip install Pillow - pyinstaller gotify-tray-macos.spec + pyinstaller gotify-tray.spec install: build sudo dpkg -i dist/gotify-tray_amd64.deb diff --git a/README.md b/README.md index ea06673..7015572 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ An executable is created at `dist/gotify-tray/`. ``` $ pip install pyinstaller Pillow -$ pyinstaller gotify-tray-macos.spec +$ pyinstaller gotify-tray.spec ``` ### Inno setup (Windows) diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control index aeec92e..c7df3f9 100644 --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -2,5 +2,5 @@ Package: gotify-tray Version: 0.1.14 Architecture: amd64 Maintainer: k.dries@protonmail.com -Description: gotify-tray +Description: Gotify Tray A tray notification application for receiving messages from a Gotify server. diff --git a/debian/usr/share/applications/gotifytray.desktop b/debian/usr/share/applications/gotifytray.desktop index 81ad25b..c98aaff 100644 --- a/debian/usr/share/applications/gotifytray.desktop +++ b/debian/usr/share/applications/gotifytray.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=gotify-tray +Name=Gotify Tray Comment=A tray notification application for receiving messages from a Gotify server. Path=/usr/lib/gotify-tray Exec=/usr/lib/gotify-tray/gotify-tray diff --git a/gotify-tray-macos.spec b/gotify-tray-macos.spec deleted file mode 100644 index 7821b50..0000000 --- a/gotify-tray-macos.spec +++ /dev/null @@ -1,41 +0,0 @@ -# -*- mode: python -*- - -block_cipher = None - -a = Analysis(['gotify_tray/__main__.py'], - pathex=[os.getcwd()], - binaries=[], - datas=[('gotify_tray/gui/images', 'gotify_tray/gui/images')], - hiddenimports=[], - hookspath=[], - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, - noarchive=False) -pyz = PYZ(a.pure, a.zipped_data, - cipher=block_cipher) -exe = EXE(pyz, - a.scripts, - [], - exclude_binaries=True, - name='gotify-tray', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - console=False, - version='version.py', - icon='logo.ico') -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=True, - name='gotify-tray') -app = BUNDLE(coll, - name='Gotify-Tray.app', - icon='logo.ico', - bundle_identifier=None) diff --git a/gotify-tray.spec b/gotify-tray.spec index fd27d06..60b6a66 100644 --- a/gotify-tray.spec +++ b/gotify-tray.spec @@ -1,5 +1,7 @@ # -*- mode: python -*- +import platform + block_cipher = None a = Analysis(['gotify_tray/__main__.py'], @@ -35,3 +37,9 @@ coll = COLLECT(exe, strip=False, upx=True, name='gotify-tray') + +if platform.system() == "Darwin": + app = BUNDLE(coll, + name='Gotify Tray.app', + icon='logo.ico', + bundle_identifier=None)