[gentoo-dev] [PATCH v3 0/1] Add edo.eclass

[gentoo-dev] [PATCH v3 0/1] Add edo.eclass

[Sam James]

Changes since v2:
- Fix typo in eclass guard
- Rework description of edob
- Use 'einfo', not 'elog'
- Change die message for clarity

Changes since v1:
- Add EAPI 7 support (useful for e.g. base-system@ ebuilds)
- Add 'edob' (edo with ebegin/eend for better logs log-running commands, UX)
Sam James (1):
  edo.eclass: add new eclass

 eclass/edo.eclass | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 eclass/edo.eclass

-- 
2.35.1

[gentoo-dev] [PATCH v3 1/1] edo.eclass: add new eclass

[Sam James]

Bug: https://bugs.gentoo.org/744880
Signed-off-by: Sam James <sam@gentoo.org>
---
 eclass/edo.eclass | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 eclass/edo.eclass

diff --git a/eclass/edo.eclass b/eclass/edo.eclass
new file mode 100644
index 000000000000..e7b3b95df4ae
--- /dev/null
+++ b/eclass/edo.eclass
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: edo.class
+# @MAINTAINER:
+# QA Team <qa@gentoo.org>
+# @AUTHOR:
+# Sam James <sam@gentoo.org>
+# @SUPPORTED_EAPIS: 7 8
+# @BLURB: Convenience function to run commands verbosely and die on failure
+# @DESCRIPTION:
+# This eclass provides the 'edo' command, and an 'edob' variant for ebegin/eend,
+# which dies (exits) on failure and logs the command used verbosely.
+#
+
+case ${EAPI:-0} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_EDO_ECLASS} ]] ; then
+_EDO_ECLASS=1
+
+# @FUNCTION: edo
+# @USAGE: <command> [<args>...]
+# @DESCRIPTION:
+# Executes a short 'command' with any given arguments and exits on failure unless
+# called under 'nonfatal'.
+edo() {
+	einfo "$@"
+	"$@" || die -n "Failed to run command: $@"
+}
+
+# @FUNCTION: edob
+# @USAGE: <command> [<args>...]
+# @DESCRIPTION:
+# Executes 'command' with ebegin & eend with any given arguments and exits
+# on failure unless called under 'nonfatal'.
+edob() {
+	ebegin "Running $@"
+	"$@"
+	eend $? || die -n "Failed to run command: $@"
+}
+
+fi
-- 
2.35.1

[gentoo-dev] Re: [PATCH v3 1/1] edo.eclass: add new eclass

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]

>>>>> On Sun, 17 Apr 2022, Sam James wrote:

> --- /dev/null
> +++ b/eclass/edo.eclass
> @@ -0,0 +1,45 @@
> +# Copyright 2022 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +# @ECLASS: edo.class
> +# @MAINTAINER:
> +# QA Team <qa@gentoo.org>
> +# @AUTHOR:
> +# Sam James <sam@gentoo.org>
> +# @SUPPORTED_EAPIS: 7 8
> +# @BLURB: Convenience function to run commands verbosely and die on failure
> +# @DESCRIPTION:
> +# This eclass provides the 'edo' command, and an 'edob' variant for ebegin/eend,
> +# which dies (exits) on failure and logs the command used verbosely.
> +#
> +
> +case ${EAPI:-0} in

Just ${EAPI} here, the fallback isn't necessary.

> +	7|8) ;;
> +	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> +esac
> +
> +if [[ -z ${_EDO_ECLASS} ]] ; then
> +_EDO_ECLASS=1
> +
> +# @FUNCTION: edo
> +# @USAGE: <command> [<args>...]
> +# @DESCRIPTION:
> +# Executes a short 'command' with any given arguments and exits on failure unless

Long line.

> +# called under 'nonfatal'.
> +edo() {
> +	einfo "$@"
> +	"$@" || die -n "Failed to run command: $@"
> +}
> +
> +# @FUNCTION: edob
> +# @USAGE: <command> [<args>...]
> +# @DESCRIPTION:
> +# Executes 'command' with ebegin & eend with any given arguments and exits
> +# on failure unless called under 'nonfatal'.
> +edob() {
> +	ebegin "Running $@"
> +	"$@"
> +	eend $? || die -n "Failed to run command: $@"
> +}
> +
> +fi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]