From 14dbbaf689aba6eb3f1d27804196c19381a50471 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sat, 9 Sep 2023 12:12:12 +0300 Subject: [PATCH] bash/flatpak-*: allow additional arguments such as -u for immutable root filesystems --- bash/flatpak-add-remotes.bash | 16 ++++++------ bash/flatpak-workarounds.bash | 46 +++++++++++++++++------------------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bash/flatpak-add-remotes.bash b/bash/flatpak-add-remotes.bash index e52d9cf..d2666f7 100755 --- a/bash/flatpak-add-remotes.bash +++ b/bash/flatpak-add-remotes.bash @@ -5,20 +5,20 @@ set -x # So I don't have to remember these of wonder why my systems have different # set of remotes and are missing something existing on another -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo -flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo -flatpak remote-add --if-not-exists nheko-nightly https://nheko.im/nheko-reborn/nheko/-/raw/master/nheko-nightly.flatpakrepo +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo $@ +flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo $@ +flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo $@ +flatpak remote-add --if-not-exists nheko-nightly https://nheko.im/nheko-reborn/nheko/-/raw/master/nheko-nightly.flatpakrepo $@ # As I cannot find a .flatpakrepo -flatpak install https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.Devel.flatpakref +flatpak install https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.Devel.flatpakref $@ # Fedora? -flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org -flatpak remote-add --if-not-exists fedora-testing oci+https://registry.fedoraproject.org#testing +flatpak remote-add --if-not-exists fedora oci+https://registry.fedoraproject.org $@ +flatpak remote-add --if-not-exists fedora-testing oci+https://registry.fedoraproject.org#testing $@ # the previous command does nothing on Fedora as it already exists, but it still # needs to be enabled -flatpak remote-modify --enable fedora-testing +flatpak remote-modify --enable fedora-testing $@ # Hide commands being executed again set +x diff --git a/bash/flatpak-workarounds.bash b/bash/flatpak-workarounds.bash index 05b4f6d..ddbbf25 100755 --- a/bash/flatpak-workarounds.bash +++ b/bash/flatpak-workarounds.bash @@ -10,61 +10,61 @@ set -x #flatpak install --assumeyes flathub org.briarproject.Briar im.riot.Riot com.nextcloud.desktopclient.nextcloud # Allowing system themes in flatpaks -flatpak override --filesystem=/usr/local/share/themes:ro --filesystem=/usr/share/themes:ro --filesystem=~/.themes:ro -flatpak override --filesystem=/usr/local/share/icons:ro --filesystem=/usr/share/icons:ro --filesystem=~/.icons:ro -flatpak override --filesystem=/usr/local/share/cursors:ro --filesystem=/usr/share/cursors:ro --filesystem=~/.cursors:ro +flatpak override --filesystem=/usr/local/share/themes:ro --filesystem=/usr/share/themes:ro --filesystem=~/.themes:ro $@ +flatpak override --filesystem=/usr/local/share/icons:ro --filesystem=/usr/share/icons:ro --filesystem=~/.icons:ro $@ +flatpak override --filesystem=/usr/local/share/cursors:ro --filesystem=/usr/share/cursors:ro --filesystem=~/.cursors:ro $@ # In case debugging flatpaks is subject to the other restrictions and running # gdb there is made easier by access to the file. By same logic, they need # to be able to write to the log. -flatpak override --filesystem=~/.gdbinit:ro --filesystem=~/gdb.txt +flatpak override --filesystem=~/.gdbinit:ro --filesystem=~/gdb.txt $@ # Allow read-only access to ~/.curlrc in case a flatpak is utilising curl # or libcurl starts reading it -flatpak override --filesystem=~/.curlrc:ro +flatpak override --filesystem=~/.curlrc:ro $@ # Backticks and a lot of common characters in all Flatpaks # https://github.com/flatpak/flatpak/issues/2031 -flatpak override --talk-name=org.fcitx.Fcitx --talk-name=org.freedesktop.portal.Fcitx +flatpak override --talk-name=org.fcitx.Fcitx --talk-name=org.freedesktop.portal.Fcitx $@ # https://github.com/flathub/org.briarproject.Briar/issues/5 -flatpak override org.briarproject.Briar --filesystem=~/.briar:create -flatpak override org.briarproject.Briar --filesystem=~/.java/.userPrefs/org/briarproject/briar:create +flatpak override org.briarproject.Briar --filesystem=~/.briar:create $@ +flatpak override org.briarproject.Briar --filesystem=~/.java/.userPrefs/org/briarproject/briar:create $@ # This is an ugly hack so I don't have to maintain the config.json separately # in every profile and can just symlink it -flatpak override im.riot.Riot --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist/matrix/Element:ro +flatpak override im.riot.Riot --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist/matrix/Element:ro $@ # email signature #flatpak override org.claws_mail.Claws-Mail --filesystem=~/.signature:create # Directory I have normal Nextcloud in -flatpak override com.nextcloud.desktopclient.nextcloud --filesystem=~/Nextcloud:create +flatpak override com.nextcloud.desktopclient.nextcloud --filesystem=~/Nextcloud:create $@ # PCSX2 files -flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create -flatpak override net.pcsx2.PCSX2 --filesystem=~/PS2:create +flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create $@ +flatpak override net.pcsx2.PCSX2 --filesystem=~/PS2:create $@ # A directory I can share between native and flatpak Steam so both have the # same games without having to navigate weird paths. -flatpak override com.valvesoftware.Steam --filesystem=~/SteamLibrary:create -flatpak override net.lutris.Lutris --filesystem=~/SteamLibrary:create +flatpak override com.valvesoftware.Steam --filesystem=~/SteamLibrary:create $@ +flatpak override net.lutris.Lutris --filesystem=~/SteamLibrary:create $@ # For use with system syncthing, note its flags -flatpak override me.kozec.syncthingtk --filesystem=~/.config/syncthing:create +flatpak override me.kozec.syncthingtk --filesystem=~/.config/syncthing:create $@ # Just for verbosity. The results can be seen in /var/lib/flatpak/overrides/global … -flatpak override --show +flatpak override --show $@ # …and /var/lib/flatpak/overrides/org.briarproject.Briar -flatpak override --show org.briarproject.Briar +flatpak override --show org.briarproject.Briar $@ # do I need to list those? -flatpak override --show im.riot.Riot +flatpak override --show im.riot.Riot $@ #flatpak override --show org.claws_mail.Claws-Mail -flatpak override --show com.nextcloud.desktopclient.nextcloud -flatpak override --show net.pcsx2.PCSX2 -flatpak override --show com.valvesoftware.Steam -flatpak override --show net.lutris.Lutris -flatpak override --show me.kozec.syncthingtk +flatpak override --show com.nextcloud.desktopclient.nextcloud $@ +flatpak override --show net.pcsx2.PCSX2 $@ +flatpak override --show com.valvesoftware.Steam $@ +flatpak override --show net.lutris.Lutris $@ +flatpak override --show me.kozec.syncthingtk $@ # Hide commands being executed again set +x