From 60b89b6d3022967e182ff1d026cd11373f7a5041 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Wed, 7 Jun 2023 10:29:15 +0200 Subject: [PATCH] githook: Fix showing pkgs in commit message Quick fix to show difference in committed and installed packages in the commit editor window again. Due to Arch moving the base-devel package from a group to a meta-package we can not just remove all packages that are in the group anymore - it will simply error out instead. This removes the check and thus provides a quick and dirty fix for the time being. --- .githooks/prepare-commit-msg | 2 +- bootstrap/update_package_list.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.githooks/prepare-commit-msg b/.githooks/prepare-commit-msg index c8a6b77..a643c00 100755 --- a/.githooks/prepare-commit-msg +++ b/.githooks/prepare-commit-msg @@ -5,7 +5,7 @@ COMMIT_SOURCE="$2" BOOTSTRAPDIR="bootstrap" pkg_committed="$(cat "$(git rev-parse --show-toplevel)"/$BOOTSTRAPDIR/packages*.tsv | grep -v -e '^Name Description Source Target' | cut -f1 | sort)" -pkg_onsystem=$(pacman -Qqett | grep -v "$(pacman -Qqg base-devel)" | sort) +pkg_onsystem=$(pacman -Qqett | sort) # get files only in repo, and only on machine only_committed=$(comm -23 <(echo "$pkg_committed") <(echo "$pkg_onsystem")) diff --git a/bootstrap/update_package_list.sh b/bootstrap/update_package_list.sh index bb37f4d..7010b38 100755 --- a/bootstrap/update_package_list.sh +++ b/bootstrap/update_package_list.sh @@ -3,7 +3,7 @@ BOOTSTRAP_DIR=${BOOTSTRAP_DIR:-$(pwd)/bootstrap} INPUTFILES=$(find "${BOOTSTRAP_DIR}" -type f -name 'packages*.tsv') OUTPUTFILE=${BOOTSTRAP_DIR}/packages_testing.tsv -pkg_all=$(pacman -Qqett | grep -v "$(pacman -Qqg base-devel)") +pkg_all=$(pacman -Qqett) pkg_repo=$(pacman -Qqn) pkg_aur=$(pacman -Qqm)