commit: 4975b6805b692341863383a69e72d91cb10c1870
Author: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
AuthorDate: Wed Jan 12 21:18:49 2022 +0000
Commit: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
CommitDate: Wed Jan 12 21:18:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4975b680
app-misc/far2l: Fix sed for hardcoded rm
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com>
app-misc/far2l/far2l-2.4.0_beta.ebuild | 4 +---
app-misc/far2l/far2l-9999.ebuild | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/app-misc/far2l/far2l-2.4.0_beta.ebuild
b/app-misc/far2l/far2l-2.4.0_beta.ebuild
index 1120beac3..699a53fdc 100644
--- a/app-misc/far2l/far2l-2.4.0_beta.ebuild
+++ b/app-misc/far2l/far2l-2.4.0_beta.ebuild
@@ -64,9 +64,7 @@ pkg_setup() {
src_prepare() {
sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l
\${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
|| die
sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l
\${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
|| die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::"
-i "${S}"/CMakeLists.txt || die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb &&
echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt || die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide &&
echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt || die
+ sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" -i "${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND echo Python\: prepaing virtual
environment)::" -i "${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND \${PYTHON3} -m venv
--system-site-packages
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)::" -i
"${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND echo Python\: installing packages)::"
-i "${S}"/CMakeLists.txt || die
diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
index 1120beac3..699a53fdc 100644
--- a/app-misc/far2l/far2l-9999.ebuild
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -64,9 +64,7 @@ pkg_setup() {
src_prepare() {
sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l
\${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
|| die
sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l
\${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
|| die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::"
-i "${S}"/CMakeLists.txt || die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb &&
echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt || die
- sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide &&
echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt || die
+ sed -e "s:execute_process(COMMAND rm -f
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" -i "${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND echo Python\: prepaing virtual
environment)::" -i "${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND \${PYTHON3} -m venv
--system-site-packages
\${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)::" -i
"${S}"/CMakeLists.txt || die
sed -e "s:execute_process(COMMAND echo Python\: installing packages)::"
-i "${S}"/CMakeLists.txt || die
