[gentoo-commits] proj/tex:main commit in: /

["Florian Schmaus" <flow@gentoo.org>]

commit:     36bef437c3c22334aac5eeb6074a5aee48d00e0b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 11:47:03 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 11:47:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/tex.git/commit/?id=36bef437

diff-tex: use "pquery --one-attr path"

Thanks to Arthur Zamarin for pointing this out.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 diff-tex | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/diff-tex b/diff-tex
index e80934e..f77898f 100755
--- a/diff-tex
+++ b/diff-tex
@@ -1,27 +1,29 @@
 #!/usr/bin/env bash
 set -eu
 
-GENTOO_REPO_DIR=$(portageq get_repo_path / gentoo)
-TEX_REPO_DIR=$(portageq get_repo_path / tex-overlay)
-
 diff_package() {
 	local pkg="${1}"
-	local cat="${pkg%%/*}"
-
-	local max_gentoo_repo_version=$(pquery --max -r gentoo ${pkg})
-	max_gentoo_repo_version="${max_gentoo_repo_version##${cat}}"
 
-	local max_tex_repo_version=$(pquery --max -r tex-overlay ${pkg})
-	max_tex_repo_version="${max_tex_repo_version##${cat}}"
-
-	local max_gentoo_repo_ebuild="${GENTOO_REPO_DIR}/${pkg}/${max_gentoo_repo_version}.ebuild"
-	local max_tex_repo_ebuild="${TEX_REPO_DIR}/${pkg}/${max_tex_repo_version}.ebuild"
+	local max_gentoo_repo_ebuild=$(pquery --max --one-attr path -r gentoo ${pkg})
+	local max_tex_repo_ebuild=$(pquery    --max --one-attr path -r tex-overlay ${pkg})
 
 	diff -u \
 		 "${max_gentoo_repo_ebuild}" \
 		 "${max_tex_repo_ebuild}"
 }
 
+diff_eclass() {
+	local gentoo_repo_dir=$(portageq get_repo_path / gentoo)
+	local tex_repo_dir=$(portageq get_repo_path / tex-overlay)
+
+	diff -u \
+		 "${gentoo_repo_dir}/eclass/texlive-common.eclass" \
+		 "${tex_repo_dir}/eclass/texlive-common.eclass"
+	diff -u \
+		 "${gentoo_repo_dir}/eclass/texlive-module.eclass" \
+		 "${tex_repo_dir}/eclass/texlive-module.eclass"
+}
+
 case "${1}" in
 	biblatex)
 		diff_package dev-tex/biblatex
@@ -30,11 +32,6 @@ case "${1}" in
 		diff_package app-text/texlive-core
 		;;
 	eclass)
-		diff -u \
-			 "${GENTOO_REPO_DIR}/eclass/texlive-common.eclass" \
-			 "${TEX_REPO_DIR}/eclass/texlive-common.eclass"
-		diff -u \
-			 "${GENTOO_REPO_DIR}/eclass/texlive-module.eclass" \
-			 "${TEX_REPO_DIR}/eclass/texlive-module.eclass"
+		diff_eclass
 		;;
 esac