moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

hooks/pre-pkg: prohibit /usr/doc, mention /usr/share/doc

Browse source
This commit is contained in:
maxice8 2018-12-13 10:18:27 -02:00 • committed by maxice8
parent f68d10a467
commit 9251941c99
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/hooks/post-install/00-uncompress-manpages.sh
View file

@ -3,10 +3,6 @@
hook() { hook() {
local f lnkat mandir=${PKGDESTDIR}/usr/share/man local f lnkat mandir=${PKGDESTDIR}/usr/share/man
if [ -d ${PKGDESTDIR}/usr/man ]; then
msg_error "${pkgver}: /usr/man directory is not allowed, use /usr/share/man.\n"
fi
if [ ! -d $mandir ] || if [ ! -d $mandir ] ||
[ -z "$(find $mandir -regex '.*\.\(gz\|bz2\)' -print -quit)" ]; then [ -z "$(find $mandir -regex '.*\.\(gz\|bz2\)' -print -quit)" ]; then
return 0 return 0

23
common/hooks/pre-pkg/99-pkglint.sh
View file

@ -37,7 +37,7 @@ hook() {
# Check for bash completions in etc/bash_completion.d # Check for bash completions in etc/bash_completion.d
# should be on usr/share/bash-completion/completions # should be on usr/share/bash-completion/completions
if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then
msg_red "${pkgver}: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions\n" msg_red "${pkgver}: /etc/bash_completion.d is forbidden. Use /usr/share/bash-completion/completions.\n"
error=1 error=1
fi fi
@ -45,7 +45,7 @@ hook() {
# their equivalent in usr/lib # their equivalent in usr/lib
for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
if [ -d ${PKGDESTDIR}/etc/${f} ]; then if [ -d ${PKGDESTDIR}/etc/${f} ]; then
msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}\n" msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
error=1 error=1
fi fi
done done
@ -53,13 +53,28 @@ hook() {
# Likewise with the comment above but for usr/share # Likewise with the comment above but for usr/share
for f in X11/xorg.conf.d gconf/schemas; do for f in X11/xorg.conf.d gconf/schemas; do
if [ -d ${PKGDESTDIR}/etc/${f} ]; then if [ -d ${PKGDESTDIR}/etc/${f} ]; then
msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/share/${f}\n" msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/share/${f}.\n"
error=1 error=1
fi fi
done done
if [ -d ${PKGDESTDIR}/etc/dracut.conf.d ]; then if [ -d ${PKGDESTDIR}/etc/dracut.conf.d ]; then
msg_red "${pkgver}: /etc/dracut.conf.d is forbidden. Use /usr/lib/dracut/dracut.conf.d\n" msg_red "${pkgver}: /etc/dracut.conf.d is forbidden. Use /usr/lib/dracut/dracut.conf.d.\n"
error=1
fi
if [ -d ${PKGDESTDIR}/usr/man ]; then
msg_red "${pkgver}: /usr/man is forbidden, use /usr/share/man.\n"
error=1
fi
if [ -d ${PKGDESTDIR}/usr/doc ]; then
msg_red "${pkgver}: /usr/doc is forbidden. Use /usr/share/doc.\n"
error=1
fi
if [ -d ${PKGDESTDIR}/usr/dict ]; then
msg_red "${pkgver}: /usr/dict is forbidden. Use /usr/share/dict.\n"
error=1 error=1
fi fi