diff options
author | maxice8 <thinkabit.ukim@gmail.com> | 2018-12-13 12:18:27 +0000 |
---|---|---|
committer | maxice8 <30738253+maxice8@users.noreply.github.com> | 2018-12-20 18:33:35 +0000 |
commit | 9251941c99d135d447c83285ba11f754068897e2 (patch) | |
tree | 8c8e10bf4ab9edc244baf990ba80f22ab8670755 /common | |
parent | f68d10a467e1287047483b33b84f45601a759b99 (diff) | |
download | void-packages-9251941c99d135d447c83285ba11f754068897e2.tar void-packages-9251941c99d135d447c83285ba11f754068897e2.tar.gz void-packages-9251941c99d135d447c83285ba11f754068897e2.tar.bz2 void-packages-9251941c99d135d447c83285ba11f754068897e2.tar.lz void-packages-9251941c99d135d447c83285ba11f754068897e2.tar.xz void-packages-9251941c99d135d447c83285ba11f754068897e2.tar.zst void-packages-9251941c99d135d447c83285ba11f754068897e2.zip |
hooks/pre-pkg: prohibit /usr/doc, mention /usr/share/doc
Diffstat (limited to 'common')
-rw-r--r-- | common/hooks/post-install/00-uncompress-manpages.sh | 4 | ||||
-rw-r--r-- | common/hooks/pre-pkg/99-pkglint.sh | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/common/hooks/post-install/00-uncompress-manpages.sh b/common/hooks/post-install/00-uncompress-manpages.sh index 00d7adff8b8..d5a1d31fe37 100644 --- a/common/hooks/post-install/00-uncompress-manpages.sh +++ b/common/hooks/post-install/00-uncompress-manpages.sh @@ -3,10 +3,6 @@ hook() { 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 ] || [ -z "$(find $mandir -regex '.*\.\(gz\|bz2\)' -print -quit)" ]; then return 0 diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index 20b8fe799a9..6fdad9c67e1 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -37,7 +37,7 @@ hook() { # Check for bash completions in etc/bash_completion.d # should be on usr/share/bash-completion/completions 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 fi @@ -45,7 +45,7 @@ hook() { # their equivalent in usr/lib for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do 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 fi done @@ -53,13 +53,28 @@ hook() { # Likewise with the comment above but for usr/share for f in X11/xorg.conf.d gconf/schemas; do 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 fi done 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 fi |