[gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/

[Sam James]

commit:     5d7c36cf37f85f10bb440da0eab736bb97e6f269
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  2 00:28:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  2 00:28:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7c36cf

sys-fs/mergerfs: simplify & fix version setting

* Use heredoc rather than two consecutive echos to the same file, simpler
  w/o escaping too

* Fix path to update-version script, it moved directories

* Style tweaks

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/mergerfs/mergerfs-2.40.2.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild 
b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild
index 6946ee8428b0..12c52da625d1 100644
--- a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild
@@ -18,21 +18,21 @@ IUSE="+xattr"
 DEPEND="
        xattr? ( sys-apps/attr )
 "
-
 RDEPEND="${DEPEND}"
-
 BDEPEND="sys-devel/gettext"
 
 src_prepare() {
        default
 
-       # Hand made build system at it's finest.
-       echo -e "#!/bin/sh\ntrue" >tools/update-version || die
-       echo "#pragma once" >src/version.hpp || die
-       echo "static const char MERGERFS_VERSION[] = \"${PV}\";" 
>>src/version.hpp || die
+       # Hand made build system at its finest.
+       echo -e "#!/bin/sh\ntrue" > buildtools/update-version || die
+       cat <<-EOF > src/version.hpp || die
+       #pragma once
+       static const char MERGERFS_VERSION[] = "${PV}";
+       EOF
 
        if ! use xattr; then
-               sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+               sed -i -e 's%USE_XATTR = 1%USE_XATTR = 0%g' Makefile || die
        fi
 }