mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-10-12 17:51:11 -04:00
*/*: quote subshells where cargo_target_dir is called [4/4]
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) <ingenarel_neojesus@disroot.org> Part-of: https://codeberg.org/gentoo/guru/pulls/21 Merges: https://codeberg.org/gentoo/guru/pulls/21 Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
ingenarel (NeoJesus) authored and Michał Górny committed
1 parent
cc7ba6a578
commit
0cdede5684
10 files changed
+25
-25
No files matched your search
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user