From 0cdede5684d412577d9bb872bb432cd7533ba4ed Mon Sep 17 00:00:00 2001 From: "ingenarel (NeoJesus)" Date: Wed, 9 Sep 2026 00:08:12 +0600 Subject: [PATCH] */*: quote subshells where cargo_target_dir is called [4/4] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous commits fixed instances where ebuilds weren't using cargo_target_dir to get the target directory. But, was either using hardcoded target/release paths, which would break if 'DEBUG' USE flag is enabled, or it was using something else like `usex debug debug release` This commit quotes all the instances where cargo_target_dir is called in a subshell. Because I was doing that anyway for the files I touched in https://codeberg.org/gentoo/guru/pulls/21 Signed-off-by: ingenarel (NeoJesus) Part-of: https://codeberg.org/gentoo/guru/pulls/21 Merges: https://codeberg.org/gentoo/guru/pulls/21 Signed-off-by: Michał Górny --- dev-libs/libsignal-ffi/libsignal-ffi-0.86.8.ebuild | 2 +- dev-libs/libsignal-ffi/libsignal-ffi-0.87.1.ebuild | 2 +- dev-libs/libsignal-ffi/libsignal-ffi-0.87.5.ebuild | 2 +- media-gfx/czkawka/czkawka-12.0.1.ebuild | 6 +++--- www-apps/zola/zola-0.22.1-r2.ebuild | 2 +- www-apps/zola/zola-0.22.1-r3.ebuild | 2 +- www-apps/zola/zola-0.22.1-r5.ebuild | 4 ++-- www-plugins/firefoxpwa/firefoxpwa-2.18.2.ebuild | 10 +++++----- www-plugins/firefoxpwa/firefoxpwa-2.18.4.ebuild | 10 +++++----- www-plugins/firefoxpwa/firefoxpwa-2.19.0.ebuild | 10 +++++----- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.86.8.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.86.8.ebuild index b1270ceb23..70493999e7 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.86.8.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.86.8.ebuild @@ -614,6 +614,6 @@ src_unpack() { } src_install() { - dolib.a "${WORKDIR}"/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a + dolib.a "${WORKDIR}/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a" einstalldocs } diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.87.1.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.87.1.ebuild index 4c6b43c397..7a1f43d48d 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.87.1.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.87.1.ebuild @@ -626,6 +626,6 @@ src_unpack() { } src_install() { - dolib.a "${WORKDIR}"/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a + dolib.a "${WORKDIR}/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a" einstalldocs } diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.87.5.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.87.5.ebuild index 90935b920f..6f9a1e16a5 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.87.5.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.87.5.ebuild @@ -644,6 +644,6 @@ src_configure() { } src_install() { - dolib.a "${WORKDIR}"/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a + dolib.a "${WORKDIR}/libsignal-${PV}/$(cargo_target_dir)/libsignal_ffi.a" einstalldocs } diff --git a/media-gfx/czkawka/czkawka-12.0.1.ebuild b/media-gfx/czkawka/czkawka-12.0.1.ebuild index 70c2456392..bfdf0e659c 100644 --- a/media-gfx/czkawka/czkawka-12.0.1.ebuild +++ b/media-gfx/czkawka/czkawka-12.0.1.ebuild @@ -75,10 +75,10 @@ src_test() { } src_install() { - dobin $(cargo_target_dir)/czkawka_cli + dobin "$(cargo_target_dir)/czkawka_cli" - use gtk && dobin $(cargo_target_dir)/czkawka_gui - use krokiet && dobin $(cargo_target_dir)/krokiet + use gtk && dobin "$(cargo_target_dir)/czkawka_gui" + use krokiet && dobin "$(cargo_target_dir)/krokiet" if use gui; then doicon data/icons/com.github.qarmin.czkawka.svg diff --git a/www-apps/zola/zola-0.22.1-r2.ebuild b/www-apps/zola/zola-0.22.1-r2.ebuild index 8a558b4abf..4b54ed83f6 100644 --- a/www-apps/zola/zola-0.22.1-r2.ebuild +++ b/www-apps/zola/zola-0.22.1-r2.ebuild @@ -668,7 +668,7 @@ src_compile() { echo "Generating shell completion files" for sh in bash fish zsh; do - $(cargo_target_dir)/${PN} completion ${sh} > ${sh}.completion || die + "$(cargo_target_dir)/${PN}" completion ${sh} > ${sh}.completion || die done } diff --git a/www-apps/zola/zola-0.22.1-r3.ebuild b/www-apps/zola/zola-0.22.1-r3.ebuild index c3d66eff36..ccbc114f21 100644 --- a/www-apps/zola/zola-0.22.1-r3.ebuild +++ b/www-apps/zola/zola-0.22.1-r3.ebuild @@ -675,7 +675,7 @@ src_compile() { echo "Generating shell completion files" for sh in bash fish zsh; do - $(cargo_target_dir)/${PN} completion ${sh} > ${sh}.completion || die + "$(cargo_target_dir)/${PN}" completion ${sh} > ${sh}.completion || die done } diff --git a/www-apps/zola/zola-0.22.1-r5.ebuild b/www-apps/zola/zola-0.22.1-r5.ebuild index 27aeb8916a..0f2c82ab53 100644 --- a/www-apps/zola/zola-0.22.1-r5.ebuild +++ b/www-apps/zola/zola-0.22.1-r5.ebuild @@ -679,7 +679,7 @@ src_compile() { echo "Generating shell completion files" for sh in bash fish zsh; do - $(cargo_target_dir)/${PN} completion ${sh} > ${sh}.completion || die + "$(cargo_target_dir)/${PN}" completion ${sh} > ${sh}.completion || die done } @@ -690,5 +690,5 @@ src_install() { newfishcomp fish.completion ${PN}.fish newzshcomp zsh.completion _${PN} - doman $(cargo_target_dir)/build/${PN}-*/out/${PN}{,-build,-check,-init,-serve}.1 + doman "$(cargo_target_dir)/build/${PN}-"*/out/${PN}{,-build,-check,-init,-serve}.1 } diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.18.2.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.18.2.ebuild index f7fe11795d..9f6f4ce2fc 100644 --- a/www-plugins/firefoxpwa/firefoxpwa-2.18.2.ebuild +++ b/www-plugins/firefoxpwa/firefoxpwa-2.18.2.ebuild @@ -114,9 +114,9 @@ src_configure() { src_install() { # Executables - dobin $(cargo_target_dir)/firefoxpwa + dobin "$(cargo_target_dir)/firefoxpwa" exeinto /usr/libexec - doexe $(cargo_target_dir)/firefoxpwa-connector + doexe "$(cargo_target_dir)/firefoxpwa-connector" # Manifest local target_dirs=( /usr/lib{,64}/mozilla/native-messaging-hosts ) @@ -126,9 +126,9 @@ src_install() { done # Completions - newbashcomp $(cargo_target_dir)/completions/firefoxpwa.bash firefoxpwa - dofishcomp $(cargo_target_dir)/completions/firefoxpwa.fish - dozshcomp $(cargo_target_dir)/completions/_firefoxpwa + newbashcomp "$(cargo_target_dir)/completions/firefoxpwa.bash" firefoxpwa + dofishcomp "$(cargo_target_dir)/completions/firefoxpwa.fish" + dozshcomp "$(cargo_target_dir)/completions/_firefoxpwa" # UserChrome insinto /usr/share/firefoxpwa diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.18.4.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.18.4.ebuild index f7fe11795d..9f6f4ce2fc 100644 --- a/www-plugins/firefoxpwa/firefoxpwa-2.18.4.ebuild +++ b/www-plugins/firefoxpwa/firefoxpwa-2.18.4.ebuild @@ -114,9 +114,9 @@ src_configure() { src_install() { # Executables - dobin $(cargo_target_dir)/firefoxpwa + dobin "$(cargo_target_dir)/firefoxpwa" exeinto /usr/libexec - doexe $(cargo_target_dir)/firefoxpwa-connector + doexe "$(cargo_target_dir)/firefoxpwa-connector" # Manifest local target_dirs=( /usr/lib{,64}/mozilla/native-messaging-hosts ) @@ -126,9 +126,9 @@ src_install() { done # Completions - newbashcomp $(cargo_target_dir)/completions/firefoxpwa.bash firefoxpwa - dofishcomp $(cargo_target_dir)/completions/firefoxpwa.fish - dozshcomp $(cargo_target_dir)/completions/_firefoxpwa + newbashcomp "$(cargo_target_dir)/completions/firefoxpwa.bash" firefoxpwa + dofishcomp "$(cargo_target_dir)/completions/firefoxpwa.fish" + dozshcomp "$(cargo_target_dir)/completions/_firefoxpwa" # UserChrome insinto /usr/share/firefoxpwa diff --git a/www-plugins/firefoxpwa/firefoxpwa-2.19.0.ebuild b/www-plugins/firefoxpwa/firefoxpwa-2.19.0.ebuild index f7fe11795d..9f6f4ce2fc 100644 --- a/www-plugins/firefoxpwa/firefoxpwa-2.19.0.ebuild +++ b/www-plugins/firefoxpwa/firefoxpwa-2.19.0.ebuild @@ -114,9 +114,9 @@ src_configure() { src_install() { # Executables - dobin $(cargo_target_dir)/firefoxpwa + dobin "$(cargo_target_dir)/firefoxpwa" exeinto /usr/libexec - doexe $(cargo_target_dir)/firefoxpwa-connector + doexe "$(cargo_target_dir)/firefoxpwa-connector" # Manifest local target_dirs=( /usr/lib{,64}/mozilla/native-messaging-hosts ) @@ -126,9 +126,9 @@ src_install() { done # Completions - newbashcomp $(cargo_target_dir)/completions/firefoxpwa.bash firefoxpwa - dofishcomp $(cargo_target_dir)/completions/firefoxpwa.fish - dozshcomp $(cargo_target_dir)/completions/_firefoxpwa + newbashcomp "$(cargo_target_dir)/completions/firefoxpwa.bash" firefoxpwa + dofishcomp "$(cargo_target_dir)/completions/firefoxpwa.fish" + dozshcomp "$(cargo_target_dir)/completions/_firefoxpwa" # UserChrome insinto /usr/share/firefoxpwa