From 32445cd3cd12064736bbc24acaed8c75fc3a43c7 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 26 Dec 2020 02:54:00 +0000 Subject: [PATCH] build: share desktop file between flatpak and snap Fix https://github.com/zoeyfyi/Boop-GTK/issues/192 I'm hoping I didn't just break the snap --- build.rs | 4 +- .../fyi.zoey.Boop-GTK-symbolic.svg | 0 .../fyi.zoey.Boop-GTK.Source.svg | 0 .../data => data}/fyi.zoey.Boop-GTK.desktop | 0 .../fyi.zoey.Boop-GTK.metainfo.xml | 0 {flatpak/data => data}/fyi.zoey.Boop-GTK.png | Bin {flatpak/data => data}/fyi.zoey.Boop-GTK.svg | 0 flatpak/fyi.zoey.Boop-GTK.json | 10 +- snap/gui/boop-gtk.desktop | 10 - snap/gui/boop-gtk.svg | 406 ------------------ snap/snapcraft.yaml | 7 +- 11 files changed, 13 insertions(+), 424 deletions(-) rename {flatpak/data => data}/fyi.zoey.Boop-GTK-symbolic.svg (100%) rename fyi.zoey.Boop-GTK.Source.svg => data/fyi.zoey.Boop-GTK.Source.svg (100%) rename {flatpak/data => data}/fyi.zoey.Boop-GTK.desktop (100%) rename {flatpak/data => data}/fyi.zoey.Boop-GTK.metainfo.xml (100%) rename {flatpak/data => data}/fyi.zoey.Boop-GTK.png (100%) rename {flatpak/data => data}/fyi.zoey.Boop-GTK.svg (100%) delete mode 100644 snap/gui/boop-gtk.desktop delete mode 100644 snap/gui/boop-gtk.svg diff --git a/build.rs b/build.rs index 81d181b9..eca0acda 100644 --- a/build.rs +++ b/build.rs @@ -18,7 +18,7 @@ fn add_files(xml: &mut String, folder: &str) { continue; } - if path.file_type().unwrap().is_file() { + if path.path().is_file() { xml.push_str(&format!( "\t\t{}\n", path.path() @@ -27,7 +27,7 @@ fn add_files(xml: &mut String, folder: &str) { .replace("\\", "/") .trim_start_matches("resources/") )); - } else if path.file_type().unwrap().is_dir() { + } else if path.path().is_dir() { add_files(xml, &path.path().display().to_string()); } else { panic!("expected file or folder"); diff --git a/flatpak/data/fyi.zoey.Boop-GTK-symbolic.svg b/data/fyi.zoey.Boop-GTK-symbolic.svg similarity index 100% rename from flatpak/data/fyi.zoey.Boop-GTK-symbolic.svg rename to data/fyi.zoey.Boop-GTK-symbolic.svg diff --git a/fyi.zoey.Boop-GTK.Source.svg b/data/fyi.zoey.Boop-GTK.Source.svg similarity index 100% rename from fyi.zoey.Boop-GTK.Source.svg rename to data/fyi.zoey.Boop-GTK.Source.svg diff --git a/flatpak/data/fyi.zoey.Boop-GTK.desktop b/data/fyi.zoey.Boop-GTK.desktop similarity index 100% rename from flatpak/data/fyi.zoey.Boop-GTK.desktop rename to data/fyi.zoey.Boop-GTK.desktop diff --git a/flatpak/data/fyi.zoey.Boop-GTK.metainfo.xml b/data/fyi.zoey.Boop-GTK.metainfo.xml similarity index 100% rename from flatpak/data/fyi.zoey.Boop-GTK.metainfo.xml rename to data/fyi.zoey.Boop-GTK.metainfo.xml diff --git a/flatpak/data/fyi.zoey.Boop-GTK.png b/data/fyi.zoey.Boop-GTK.png similarity index 100% rename from flatpak/data/fyi.zoey.Boop-GTK.png rename to data/fyi.zoey.Boop-GTK.png diff --git a/flatpak/data/fyi.zoey.Boop-GTK.svg b/data/fyi.zoey.Boop-GTK.svg similarity index 100% rename from flatpak/data/fyi.zoey.Boop-GTK.svg rename to data/fyi.zoey.Boop-GTK.svg diff --git a/flatpak/fyi.zoey.Boop-GTK.json b/flatpak/fyi.zoey.Boop-GTK.json index 60955fe9..9b0961fd 100644 --- a/flatpak/fyi.zoey.Boop-GTK.json +++ b/flatpak/fyi.zoey.Boop-GTK.json @@ -39,11 +39,11 @@ "ls -al target/release/gn_out/obj", "cargo --offline build --release", "install -Dm755 ./target/release/boop-gtk -t /app/bin/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.metainfo.xml -t /app/share/metainfo/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.desktop -t /app/share/applications/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.svg -t /app/share/icons/hicolor/scalable/apps/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.png -t /app/share/icons/hicolor/256x256/apps/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}-symbolic.svg -t /app/share/icons/hicolor/symbolic/apps/" + "install -Dm644 ./data/${FLATPAK_ID}.metainfo.xml -t /app/share/metainfo/", + "install -Dm644 ./data/${FLATPAK_ID}.desktop -t /app/share/applications/", + "install -Dm644 ./data/${FLATPAK_ID}.svg -t /app/share/icons/hicolor/scalable/apps/", + "install -Dm644 ./data/${FLATPAK_ID}.png -t /app/share/icons/hicolor/256x256/apps/", + "install -Dm644 ./data/${FLATPAK_ID}-symbolic.svg -t /app/share/icons/hicolor/symbolic/apps/" ], "sources": [ { diff --git a/snap/gui/boop-gtk.desktop b/snap/gui/boop-gtk.desktop deleted file mode 100644 index 46c6b27d..00000000 --- a/snap/gui/boop-gtk.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Boop-GTK -Comment=Port of IvanMathy's Boop to GTK, a scriptable scratchpad for developers. -Type=Application -Exec=boop-gtk -Terminal=false -Categories=Utility;GTK; -Keywords=Rust;Flatpak;GTK;Tools; -Icon=${SNAP}/meta/gui/boop-gtk.svg -StartupNotify=true \ No newline at end of file diff --git a/snap/gui/boop-gtk.svg b/snap/gui/boop-gtk.svg deleted file mode 100644 index 58634a36..00000000 --- a/snap/gui/boop-gtk.svg +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 259ff629..bbc59834 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,7 +1,7 @@ name: boop-gtk title: Boop-GTK version: '1.5.0' -icon: snap/gui/boop-gtk.svg +icon: data/fyi.zoey.Boop-GTK.svg summary: Port of IvanMathy's Boop to GTK, a scriptable scratchpad for developers. description: | Paste text, transform it (with user extendible javascipt), move on. Stop pasting sensitive infomation into sketchy sites to format JSON, compute a hash, etc. @@ -17,6 +17,11 @@ parts: boop-gtk: plugin: rust source: . + override-build: | + snapcraftctl build + mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/ + cp data/fyi.zoey.Boop-GTK.svg $SNAPCRAFT_PART_INSTALL/meta/gui/ + cp data/fyi.zoey.Boop-GTK.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/ slots: dbus-daemon: