diff --git a/assets/flatpak/org.squidowl.halloy.json b/assets/flatpak/org.squidowl.halloy.json index c9c26da63..208d549d5 100644 --- a/assets/flatpak/org.squidowl.halloy.json +++ b/assets/flatpak/org.squidowl.halloy.json @@ -29,9 +29,9 @@ "build-commands": [ "cargo --offline fetch --manifest-path Cargo.toml --verbose", "cargo --offline build --release --verbose", - "install -Dm644 ./assets/logo_128px.png /app/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png", - "install -Dm644 ./assets/halloy.appdata.xml /app/share/metainfo/org.squidowl.halloy.appdata.xml", - "install -Dm644 ./assets/halloy.desktop /app/share/applications/org.squidowl.halloy.desktop", + "install -Dm644 ./assets/linux/org.squidowl.halloy.png /app/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png", + "install -Dm644 ./assets/linux/org.squidowl.halloy.appdata.xml /app/share/metainfo/org.squidowl.halloy.appdata.xml", + "install -Dm644 ./assets/linux/org.squidowl.halloy.desktop /app/share/applications/org.squidowl.halloy.desktop", "install -Dm755 ./target/release/halloy -t /app/bin/" ], "sources": [ diff --git a/assets/halloy.appdata.xml b/assets/linux/org.squidowl.halloy.appdata.xml similarity index 100% rename from assets/halloy.appdata.xml rename to assets/linux/org.squidowl.halloy.appdata.xml diff --git a/assets/halloy.desktop b/assets/linux/org.squidowl.halloy.desktop similarity index 100% rename from assets/halloy.desktop rename to assets/linux/org.squidowl.halloy.desktop diff --git a/assets/logo_128px.png b/assets/linux/org.squidowl.halloy.png similarity index 100% rename from assets/logo_128px.png rename to assets/linux/org.squidowl.halloy.png diff --git a/scripts/flatpak.sh b/scripts/flatpak.sh index e45b8fa66..81d289fe0 100755 --- a/scripts/flatpak.sh +++ b/scripts/flatpak.sh @@ -1,13 +1,11 @@ #!/bin/bash set -xe -scripts/generate-icons.sh - flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install --noninteractive --user flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08 org.freedesktop.Sdk.Extension.rust-stable//22.08 flatpak install --noninteractive --user org.freedesktop.appstream-glib -flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate assets/halloy.appdata.xml +flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate assets/linux/org.squidowl.halloy.appdata.xml python3 -m pip install toml aiohttp curl -L 'https://github.com/flatpak/flatpak-builder-tools/raw/master/cargo/flatpak-cargo-generator.py' > /tmp/flatpak-cargo-generator.py diff --git a/scripts/generate-icons.sh b/scripts/generate-icons.sh index bab9de7f4..c6a4e43cd 100755 --- a/scripts/generate-icons.sh +++ b/scripts/generate-icons.sh @@ -7,4 +7,4 @@ src=logo.png conv_opts="-colors 256 -background none -density 300" # the linux icon -convert $conv_opts -resize "!128x128" "$src" "logo_128px.png" +convert $conv_opts -resize "!128x128" "$src" "linux/org.squidowl.halloy.png"