diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2023-08-07 01:19:24 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-08-17 22:35:07 -0400 |
| commit | 71d94f768f84ea5bf05ae1e81cf19899d0b68544 (patch) | |
| tree | 052cba720dfba181be7161393d034a9634213a22 /nonprism/your-privacy | |
| parent | ee3505ff24e4d9b0baf680e856613551f4b87ff4 (diff) | |
[your-privacy]: supress 'archlinux-keyring' uninstall error
Diffstat (limited to 'nonprism/your-privacy')
| -rw-r--r-- | nonprism/your-privacy/PKGBUILD | 16 | ||||
| -rw-r--r-- | nonprism/your-privacy/archlinux-keyring.hook | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index 6b4f52e38..3183ef208 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -13,7 +13,7 @@ pkgname=your-privacy pkgver=20221006 -pkgrel=1 +pkgrel=2 _gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674 pkgdesc="This package will remove support for protocols and services known to endanger privacy." arch=(any) @@ -28,18 +28,20 @@ source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.g archlinux-keyring.hook) sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8' - '4f0e63c89ceb06ac976902355e2b0f9607abc3f910ac16cf90fefb46b70ba5a8c7b4c196a1767bf9b4a274da3b97faa54bed039e83f483dc2bc6d7daa3f20d91') + '864b419e3aec86adc3ee2cc49ccba69e209f53cf174e889f25c21b0f0813760432e98e7eb024d30376163efec2a6e6d2693a871d895d7de5133bcd2f4df9626b') package() { + local blacklist_file=${pkgname}-blacklist-${_gitver}.txt + # collect blacklisted package names as pacman conflicts - conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt | \ - cut -d: -f1,2 | \ - sed -n 's/:$//p' | \ - sort -u ) ) + conflicts=( $( libreblacklist normalize < ${blacklist_file} | \ + cut -d: -f1,2 | \ + sed -n 's/:$//p' | \ + sort -u ) ) - install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt + install -Dm644 ${blacklist_file} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt # disable automatic archlinux-keyring refresh install -Dm644 archlinux-keyring.hook "${pkgdir}"/usr/share/libalpm/hooks/archlinux-keyring.hook diff --git a/nonprism/your-privacy/archlinux-keyring.hook b/nonprism/your-privacy/archlinux-keyring.hook index b06a1a210..a2fb43245 100644 --- a/nonprism/your-privacy/archlinux-keyring.hook +++ b/nonprism/your-privacy/archlinux-keyring.hook @@ -1,7 +1,6 @@ [Trigger] Operation = Install Operation = Upgrade -Operation = Remove Type = Package Target = * |