From ac641d3c75993551bd9a8b9bbcb366ad5a5d18cb Mon Sep 17 00:00:00 2001 From: Chris Keller Date: Mon, 31 May 2021 21:07:11 -0600 Subject: [PATCH] Remove non-existent subdomain from app ID See https://github.com/flathub/flathub/pull/2360#discussion_r642742121 --- .github/workflows/release.yml | 2 +- Makefile | 8 ++++---- README.md | 2 +- ...nt.Kel_Agent.desktop => radio.k0swe.Kel_Agent.desktop} | 2 +- ...nt.metainfo.xml => radio.k0swe.Kel_Agent.metainfo.xml} | 2 +- ....kel_agent.Kel_Agent.svg => radio.k0swe.Kel_Agent.svg} | 0 ....kel_agent.Kel_Agent.yml => radio.k0swe.Kel_Agent.yml} | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) rename assets/{radio.k0swe.kel_agent.Kel_Agent.desktop => radio.k0swe.Kel_Agent.desktop} (73%) rename assets/{radio.k0swe.kel_agent.Kel_Agent.metainfo.xml => radio.k0swe.Kel_Agent.metainfo.xml} (94%) rename assets/{radio.k0swe.kel_agent.Kel_Agent.svg => radio.k0swe.Kel_Agent.svg} (100%) rename flatpak/{radio.k0swe.kel_agent.Kel_Agent.yml => radio.k0swe.Kel_Agent.yml} (71%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6437e2e..ab9c1e3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3 with: bundle: kel-agent.flatpak - manifest-path: flatpak/radio.k0swe.kel_agent.Kel_Agent.yml + manifest-path: flatpak/radio.k0swe.Kel_Agent.yml branch: main cache-key: flatpak-builder-${{ github.sha }} diff --git a/Makefile b/Makefile index 25dcfee..ecfff79 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ all: kel-agent test: go test ./... go vet ./... - if command -v appstream-util; then appstream-util validate-relax assets/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml; fi - if command -v desktop-file-validate; then desktop-file-validate assets/radio.k0swe.kel_agent.Kel_Agent.desktop; fi + if command -v appstream-util; then appstream-util validate-relax assets/radio.k0swe.Kel_Agent.metainfo.xml; fi + if command -v desktop-file-validate; then desktop-file-validate assets/radio.k0swe.Kel_Agent.desktop; fi kel-agent: test export GITCOMMIT=$(GITCOMMIT) && scripts/build.sh @@ -52,8 +52,8 @@ deb-package: deb-tarball wsjtx-go.deb leemcloughlin-jdn.deb .PHONY: flatpak flatpak: kel-agent cd flatpak && \ - flatpak-builder --force-clean build-out radio.k0swe.kel_agent.Kel_Agent.yml --repo=repo && \ - flatpak build-bundle repo kel_agent.flatpak radio.k0swe.kel_agent.Kel_Agent main + flatpak-builder --force-clean build-out radio.k0swe.Kel_Agent.yml --repo=repo && \ + flatpak build-bundle repo kel_agent.flatpak radio.k0swe.Kel_Agent main .PHONY: mac-package mac-package: kel-agent diff --git a/README.md b/README.md index 41256cc..bae4d10 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Go Report Card](https://goreportcard.com/badge/github.com/k0swe/kel-agent)](https://goreportcard.com/report/github.com/k0swe/kel-agent) [![Release](https://github.com/k0swe/kel-agent/workflows/Release/badge.svg)](https://github.com/k0swe/kel-agent/releases/latest) -# kel-agent logo kel-agent +# kel-agent logo kel-agent An agent program for translating between various amateur radio installed programs and WebSockets. This was built to support https://github.com/k0swe/forester but can be used by any web application diff --git a/assets/radio.k0swe.kel_agent.Kel_Agent.desktop b/assets/radio.k0swe.Kel_Agent.desktop similarity index 73% rename from assets/radio.k0swe.kel_agent.Kel_Agent.desktop rename to assets/radio.k0swe.Kel_Agent.desktop index ad4ceac..8327a01 100644 --- a/assets/radio.k0swe.kel_agent.Kel_Agent.desktop +++ b/assets/radio.k0swe.Kel_Agent.desktop @@ -2,6 +2,6 @@ Name=kel-agent Exec=kel-agent Type=Application -Icon=radio.k0swe.kel_agent.Kel_Agent +Icon=radio.k0swe.Kel_Agent Categories=HamRadio;Network Terminal=true diff --git a/assets/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml b/assets/radio.k0swe.Kel_Agent.metainfo.xml similarity index 94% rename from assets/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml rename to assets/radio.k0swe.Kel_Agent.metainfo.xml index 9ff0268..1700bed 100644 --- a/assets/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml +++ b/assets/radio.k0swe.Kel_Agent.metainfo.xml @@ -1,6 +1,6 @@ - radio.k0swe.kel_agent.Kel_Agent + radio.k0swe.Kel_Agent CC0-1.0 Apache-2.0 kel-agent diff --git a/assets/radio.k0swe.kel_agent.Kel_Agent.svg b/assets/radio.k0swe.Kel_Agent.svg similarity index 100% rename from assets/radio.k0swe.kel_agent.Kel_Agent.svg rename to assets/radio.k0swe.Kel_Agent.svg diff --git a/flatpak/radio.k0swe.kel_agent.Kel_Agent.yml b/flatpak/radio.k0swe.Kel_Agent.yml similarity index 71% rename from flatpak/radio.k0swe.kel_agent.Kel_Agent.yml rename to flatpak/radio.k0swe.Kel_Agent.yml index 19fe724..7163431 100644 --- a/flatpak/radio.k0swe.kel_agent.Kel_Agent.yml +++ b/flatpak/radio.k0swe.Kel_Agent.yml @@ -1,4 +1,4 @@ -app-id: radio.k0swe.kel_agent.Kel_Agent +app-id: radio.k0swe.Kel_Agent default-branch: main runtime: org.freedesktop.Platform runtime-version: '20.08' @@ -39,8 +39,8 @@ modules: - cp assets/modules.txt vendor/ - make - install -D kel-agent /app/bin/kel-agent - - install -Dm644 assets/radio.k0swe.kel_agent.Kel_Agent.svg /app/share/icons/hicolor/scalable/apps/radio.k0swe.kel_agent.Kel_Agent.svg - - install -Dm644 assets/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml /app/share/metainfo/radio.k0swe.kel_agent.Kel_Agent.metainfo.xml - - install -Dm644 assets/radio.k0swe.kel_agent.Kel_Agent.desktop /app/share/applications/radio.k0swe.kel_agent.Kel_Agent.desktop + - install -Dm644 assets/radio.k0swe.Kel_Agent.svg /app/share/icons/hicolor/scalable/apps/radio.k0swe.Kel_Agent.svg + - install -Dm644 assets/radio.k0swe.Kel_Agent.metainfo.xml /app/share/metainfo/radio.k0swe.Kel_Agent.metainfo.xml + - install -Dm644 assets/radio.k0swe.Kel_Agent.desktop /app/share/applications/radio.k0swe.Kel_Agent.desktop cleanup: - /lib/debug