From 8f10d90f2ce6f174f14002e366760d1fb55aba66 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 6 Aug 2021 17:27:14 +0200 Subject: [PATCH] Add flatpak dependency handling --- flatpaks/.repos/flathub | 1 + flatpaks/discord | 1 + flatpaks/schildichat | 4 ++++ install.zsh | 41 ++++++++++++++++++++++++++++++++++------- lib/common.zsh | 2 ++ 5 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 flatpaks/.repos/flathub create mode 100755 flatpaks/schildichat diff --git a/flatpaks/.repos/flathub b/flatpaks/.repos/flathub new file mode 100644 index 0000000..4c2fafa --- /dev/null +++ b/flatpaks/.repos/flathub @@ -0,0 +1 @@ +https://flathub.org/repo/flathub.flatpakrepo diff --git a/flatpaks/discord b/flatpaks/discord index 78aa6ce..887f773 100755 --- a/flatpaks/discord +++ b/flatpaks/discord @@ -1,3 +1,4 @@ #!/bin/zsh +#flatpak: flathub:com.discordapp.Discord export $(dbus-launch) exec flatpak run com.discordapp.Discord diff --git a/flatpaks/schildichat b/flatpaks/schildichat new file mode 100755 index 0000000..e8dc904 --- /dev/null +++ b/flatpaks/schildichat @@ -0,0 +1,4 @@ +#!/bin/zsh +#flatpak: flathub:chat.schildi.desktop +export $(dbus-launch) +exec flatpak run chat.schildi.desktop diff --git a/install.zsh b/install.zsh index f6634d1..1ea3302 100755 --- a/install.zsh +++ b/install.zsh @@ -24,7 +24,24 @@ uses_interpreter() { } get_dependencies() { - sed -n '2{/^#dep:/{s/^#dep://;p;q}}' $1 + sed -n '2,4{/^#dep:/{s/^#dep://;p;q}}' $1 +} +get_flatpak_dependencies() { + sed -n '2,4{/^#flatpak:/{s/^#flatpak://;p;q}}' $1 +} + +have_flatpak() { + check "Checking for flatpak: $1… " + flatpak info "$@" &> /dev/null +} + +install_flatpak() { + if [[ ! -e flatpaks/.repos/$1 ]]; then + fail "Unknown flatpak repo: $1. Add its URL in flatpaks/.repos/$1" + else + flatpak --user remote-add --if-not-exists $1 $(