From f78104328dd01b0030ca935c61b8acbf930a2246 Mon Sep 17 00:00:00 2001 From: Keloran Date: Thu, 31 Oct 2024 10:55:48 +0000 Subject: [PATCH 1/3] make xdg-desktop-portal-cosmic path non fixed to libexec --- Justfile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 051f889..151ab46 100644 --- a/Justfile +++ b/Justfile @@ -9,7 +9,18 @@ target := if debug == '1' { 'debug' } else { 'release' } vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } debug_args := if debug == '1' { '' } else { '--release' } cargo_args := vendor_args + ' ' + debug_args -xdp_cosmic := '/usr/libexec/xdg-desktop-portal-cosmic' + +xdp_cosmic := ` +if [ -f "/usr/libexec/xdg-desktop-portal-cosmic" ]; then + echo "/usr/libexec/xdg-desktop-portal-cosmic" +elif [ -f "/usr/lib/xdg-desktop-portal-cosmic" ]; then + echo "/usr/lib/xdg-desktop-portal-cosmic" +else + echo "Error: xdg-desktop-portal-cosmic not found in /usr/libexec or /usr/lib" >&2 + exit 1 +fi +` + bindir := prefix + '/bin' systemddir := prefix + '/lib/systemd/user' From 1b7f0322df53dfe887db3bed55bb3c5d22dc6438 Mon Sep 17 00:00:00 2001 From: Keloran Date: Thu, 31 Oct 2024 13:55:32 +0000 Subject: [PATCH 2/3] moved to env setting and default to libexec --- Justfile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Justfile b/Justfile index 151ab46..cc29f78 100644 --- a/Justfile +++ b/Justfile @@ -10,17 +10,7 @@ vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } debug_args := if debug == '1' { '' } else { '--release' } cargo_args := vendor_args + ' ' + debug_args -xdp_cosmic := ` -if [ -f "/usr/libexec/xdg-desktop-portal-cosmic" ]; then - echo "/usr/libexec/xdg-desktop-portal-cosmic" -elif [ -f "/usr/lib/xdg-desktop-portal-cosmic" ]; then - echo "/usr/lib/xdg-desktop-portal-cosmic" -else - echo "Error: xdg-desktop-portal-cosmic not found in /usr/libexec or /usr/lib" >&2 - exit 1 -fi -` - +xdp_cosmic := env('COSMIC_DESKTOP_PORTAL', '/usr/libexec/xdg-desktop-portal-cosmic') bindir := prefix + '/bin' systemddir := prefix + '/lib/systemd/user' From fedddf6dbeed56d61f88ae578341855c4f8445a0 Mon Sep 17 00:00:00 2001 From: Max Hooton Date: Mon, 18 Nov 2024 11:47:13 +0000 Subject: [PATCH 3/3] Update Justfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Neal Gompa (ニール・ゴンパ) --- Justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 9ae60e1..eceee14 100644 --- a/Justfile +++ b/Justfile @@ -10,7 +10,7 @@ vendor_args := if vendor == '1' { '--frozen --offline' } else { '' } debug_args := if debug == '1' { '' } else { '--release' } cargo_args := vendor_args + ' ' + debug_args -xdp_cosmic := env('COSMIC_DESKTOP_PORTAL', '/usr/libexec/xdg-desktop-portal-cosmic') +xdp_cosmic := env('LIBEXECDIR', '/usr/libexec') + '/xdg-desktop-portal-cosmic' orca := '/usr/bin/orca' bindir := prefix + '/bin'