From 3c4c8c200684b215f643839c77feba09434dd767 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 13 Nov 2024 22:09:12 +0900 Subject: [PATCH 1/2] net-misc/yacy: fix bashisms in init script Closes: https://bugs.gentoo.org/847196 Signed-off-by: Takuya Wakazono --- net-misc/yacy/files/yacy.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/yacy/files/yacy.rc b/net-misc/yacy/files/yacy.rc index 045a045c32..1c292ea972 100644 --- a/net-misc/yacy/files/yacy.rc +++ b/net-misc/yacy/files/yacy.rc @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { @@ -40,7 +40,7 @@ start() { stop() { ebegin "Shutting down YaCy" - sudo -u ${YACY_USER} ${JAVA} ${JAVA_OPTIONS} ${JAVA_ARGS} ${CLASSPATH} net.yacy.yacy -shutdown &> /dev/null & + sudo -u ${YACY_USER} ${JAVA} ${JAVA_OPTIONS} ${JAVA_ARGS} ${CLASSPATH} net.yacy.yacy -shutdown >/dev/null 2>&1 & einfon "Waiting ." cnt=0 while ( ps ax|grep "^ *$(cat /var/run/yacy.pid)" > /dev/null ) @@ -51,7 +51,7 @@ stop() { exit fi sleep 2 - echo -n "." + printf "." done rm /var/run/yacy.pid echo "done." @@ -60,7 +60,7 @@ stop() { status() { if service_started "${myservice}" ; then - if ! ps p `cat /var/run/yacy.pid` &> /dev/null ; then + if ! ps p `cat /var/run/yacy.pid` >/dev/null 2>&1 ; then eerror "Service seems to be down" return 1 fi From 296af6d1786fd7bbaa6bfb12e8b144280680ae53 Mon Sep 17 00:00:00 2001 From: Dawn Xu <18202203719@163.com> Date: Wed, 13 Nov 2024 21:59:23 +0800 Subject: [PATCH 2/2] net-p2p/ipfs-desktop-bin:fix last commit Signed-off-by: Dawn Xu <18202203719@163.com> --- net-p2p/ipfs-desktop-bin/ipfs-desktop-bin-0.39.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/ipfs-desktop-bin/ipfs-desktop-bin-0.39.0.ebuild b/net-p2p/ipfs-desktop-bin/ipfs-desktop-bin-0.39.0.ebuild index 08a18198e8..246196426f 100644 --- a/net-p2p/ipfs-desktop-bin/ipfs-desktop-bin-0.39.0.ebuild +++ b/net-p2p/ipfs-desktop-bin/ipfs-desktop-bin-0.39.0.ebuild @@ -47,7 +47,7 @@ QA_PREBUILT="*" src_prepare(){ default unpacker "${S}/usr/share/doc/ipfs-desktop/changelog.gz" - sed -i 's|/opt/IPFS Desktop/ipfs-desktop|/usr/bin/ipfs-desktop|g' "${S}/usr/share/applications/ipfs-desktop.desktop" | die + sed -i 's|/opt/IPFS Desktop/ipfs-desktop|/usr/bin/ipfs-desktop|g' "${S}/usr/share/applications/ipfs-desktop.desktop" || die } src_install(){ # clean up build-in kubo