Skip to content

Commit

Permalink
Merge pull request #274 from squidowl/fix/linux-icons
Browse files Browse the repository at this point in the history
Provide more linux icon sizes
  • Loading branch information
tarkah authored Mar 15, 2024
2 parents e509ae6 + 17d336a commit a22f4bc
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions assets/flatpak/org.squidowl.halloy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id": "org.squidowl.halloy",
"runtime": "org.freedesktop.Platform",
"runtime-version": "22.08",
"runtime-version": "23.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable"
Expand Down Expand Up @@ -29,7 +29,7 @@
"build-commands": [
"cargo --offline fetch --manifest-path Cargo.toml --verbose",
"cargo --offline build --release --verbose",
"install -Dm644 ./assets/linux/org.squidowl.halloy.png /app/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png",
"mkdir -p /app/share/icons && cp -R ./assets/linux/icons/. /app/share/icons/",
"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/"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/linux/org.squidowl.halloy.png
Binary file not shown.
4 changes: 2 additions & 2 deletions scripts/flatpak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -xe

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 flathub org.freedesktop.Platform//23.08 org.freedesktop.Sdk//23.08 org.freedesktop.Sdk.Extension.rust-stable//23.08

flatpak install --noninteractive --user org.freedesktop.appstream-glib
flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate assets/linux/org.squidowl.halloy.appdata.xml
Expand All @@ -14,7 +14,7 @@ python3 /tmp/flatpak-cargo-generator.py Cargo.lock -o assets/flatpak/generated-s
if [ "${CI}" != "yes" ] ; then
flatpak-builder \
--install --force-clean --user -y \
--state-dir /var/tmp/halloy-flatpak-builder \
--disable-rofiles-fuse --state-dir /var/tmp/halloy-flatpak-builder \
/var/tmp/halloy-flatpak-repo \
assets/flatpak/org.squidowl.halloy.json
fi
6 changes: 5 additions & 1 deletion scripts/generate-icons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ src=logo.png
conv_opts="-colors 256 -background none -density 300"

# the linux icon
convert $conv_opts -resize "!128x128" "$src" "linux/org.squidowl.halloy.png"
for size in "32" "64" "128" "256" "512"; do
target="linux/icons/hicolor/${size}x${size}/apps"
mkdir -p "$target"
convert $conv_opts -resize "!${size}x${size}" "$src" "$target/org.squidowl.halloy.png"
done

0 comments on commit a22f4bc

Please sign in to comment.