From a681b42cacb145c2aa008c9ca8be15e89f3ac5a5 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Tue, 9 Jul 2024 20:33:40 +0500 Subject: [PATCH] =?UTF-8?q?boinc-app.eclass:=20rename=20doappinfo=20?= =?UTF-8?q?=E2=86=92=20boinc=5Finstall=5Fappinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the same naming style as in "boinc_install_wrapper". "doappinfo" is kept for compatibility but deprecated and will be removed sooner or later. Signed-off-by: Anna (cybertailor) Vyalkova --- eclass/boinc-app.eclass | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/eclass/boinc-app.eclass b/eclass/boinc-app.eclass index 689be49923..a20c800cb8 100644 --- a/eclass/boinc-app.eclass +++ b/eclass/boinc-app.eclass @@ -173,8 +173,8 @@ boinc-app_appinfo_prepare() { || die "app_info.xml sed failed" } -# @FUNCTION: doappinfo -# @USAGE: +# @FUNCTION: boinc_install_appinfo +# @USAGE: # @DESCRIPTION: # Installs given app_info.xml file to the project root. # @@ -191,36 +191,45 @@ boinc-app_appinfo_prepare() { # } # # src_install() { -# doappinfo "${FILESDIR}"/app_info_${PV}.xml +# boinc_install_appinfo "${FILESDIR}"/app_info_1.0.xml # # exeinto $(get_project_root) # exeopts -m 0755 --owner root --group boinc -# newexe bin/${PN} example_app_v${PV} +# newexe bin/${PN} example_app_v1.0 # } # @CODE -doappinfo() { +boinc_install_appinfo() { debug-print-function ${FUNCNAME} "${@}" (( $# == 1 )) || \ die "${FUNCNAME} takes exactly one argument" - cp "$1" "${T}"/app_info.xml || die + cp "${1:?}" "${T:?}"/app_info.xml || die if declare -f appinfo_prepare >/dev/null; then - appinfo_prepare "${T}"/app_info.xml + appinfo_prepare "${T:?}"/app_info.xml else - boinc-app_appinfo_prepare "${T}"/app_info.xml + boinc-app_appinfo_prepare "${T:?}"/app_info.xml fi ( # subshell to avoid pollution of calling environment - insinto $(get_project_root) + insinto "$(get_project_root)" insopts -m 0644 --owner root --group boinc - doins "${T}"/app_info.xml + doins "${T:?}"/app_info.xml ) || die "failed to install app_info.xml" _boinc-app_fix_permissions } +# @FUNCTION: doappinfo +# @DEPRECATED: boinc_install_appinfo +# @USAGE: +# @DESCRIPTION: +# Installs given app_info.xml file to the project root. +doappinfo() { + boinc_install_appinfo "${@}" +} + # @FUNCTION: boinc-app_foreach_wrapper_job # @USAGE: # @DESCRIPTION: @@ -256,7 +265,7 @@ boinc-app_foreach_wrapper_job() { # meson_src_install # # boinc_install_wrapper boinc-example_wrapper "${FILESDIR}"/job.xml -# doappinfo "${FILESDIR}"/app_info_${PV}.xml +# boinc_install_appinfo "${FILESDIR}"/app_info_1.0.xml # } # @CODE #