Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

githook: Fix showing pkgs in commit message

Browse source 
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.
This commit is contained in:
Marty Oehme 2023-06-07 10:29:15 +02:00
parent bce5675795
commit 60b89b6d30
Signed by: Marty
GPG key ID: EDBF2ED917B2EF6A
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.githooks/prepare-commit-msg
View file

@ -5,7 +5,7 @@ COMMIT_SOURCE="$2"
BOOTSTRAPDIR="bootstrap" BOOTSTRAPDIR="bootstrap"
pkg_committed="$(cat "$(git rev-parse --show-toplevel)"/$BOOTSTRAPDIR/packages*.tsv | grep -v -e '^Name Description Source Target' | cut -f1 | sort)" 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 # get files only in repo, and only on machine
only_committed=$(comm -23 <(echo "$pkg_committed") <(echo "$pkg_onsystem")) only_committed=$(comm -23 <(echo "$pkg_committed") <(echo "$pkg_onsystem"))

2
bootstrap/update_package_list.sh
View file

@ -3,7 +3,7 @@ BOOTSTRAP_DIR=${BOOTSTRAP_DIR:-$(pwd)/bootstrap}
INPUTFILES=$(find "${BOOTSTRAP_DIR}" -type f -name 'packages*.tsv') INPUTFILES=$(find "${BOOTSTRAP_DIR}" -type f -name 'packages*.tsv')
OUTPUTFILE=${BOOTSTRAP_DIR}/packages_testing.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_repo=$(pacman -Qqn)
pkg_aur=$(pacman -Qqm) pkg_aur=$(pacman -Qqm)