move files under linux assets folder

squidowl · Jul 28, 2023 · 37ed62d · 37ed62d
1 parent 7347a1f
commit 37ed62d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git 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 → assets/linux/org.squidowl.halloy.appdata.xml b/assets/halloy.appdata.xml → assets/linux/org.squidowl.halloy.appdata.xml
diff --git a/assets/halloy.desktop → assets/linux/org.squidowl.halloy.desktop b/assets/halloy.desktop → assets/linux/org.squidowl.halloy.desktop
diff --git a/assets/logo_128px.png → assets/linux/org.squidowl.halloy.png b/assets/logo_128px.png → assets/linux/org.squidowl.halloy.png
diff --git 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
@@ -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"