Updates for GPG signing; PKGBUILD cleanup

This commit is contained in:
DarkFeather 2019-05-20 13:27:29 -05:00
parent bf08781422
commit 19189392bc
4 changed files with 20 additions and 23 deletions

View File

@ -9,19 +9,17 @@
# #
# Author: DarkFeather <darkfeather@aninix.net> # Author: DarkFeather <darkfeather@aninix.net>
# seconds=10 seconds=10
# echo "This will sync your /etc files with the AniNIX defaults and add the AniNIX echo "Syncing in $seconds seconds. Press Ctrl+C to cancel."
# GPG key for pacman." sleep $seconds
# echo "Proceeding in $seconds seconds. Is this OK? [YES/no] "
# timeout $seconds cat | read answer
# if [[ "${answer,,}" =~ ^n ]]; then
# exit 0;
# fi
rsync -avz /opt/aninix/ShadowArch/etc/ /etc/ # AniNIX GPG Package Signing
keyid=D9DC5933A1B0D4F7 keyid=1CC1E3F4ED06F296
if ! gpg --homedir /etc/pacman.d/gnupg --list-key "${keyid}"; then if ! gpg --homedir /etc/pacman.d/gnupg --list-key "${keyid}"; then
pacman-key --add /usr/share/pacman/keyrings/aninix.gpg pacman-key --recv-key "${keyid}"
pacman-key --finger "${keyid}" pacman-key --finger "${keyid}"
pacman-key --lsign-key "${keyid}" pacman-key --lsign-key "${keyid}"
fi fi
# Sync configuration
rsync -avz /opt/aninix/ShadowArch/etc/ /etc/

View File

@ -5,7 +5,6 @@ compile: ${LIST}
install: compile install: compile
mkdir -p ${pkgdir}/usr/share/pacman/keyrings mkdir -p ${pkgdir}/usr/share/pacman/keyrings
cp ./aninix.gpg ${pkgdir}/usr/share/pacman/keyrings
for i in ${LIST}; do make -C ./$$i install; done for i in ${LIST}; do make -C ./$$i install; done
reverse: reverse:

View File

@ -1,23 +1,22 @@
# Maintainer: Shikoba Kage <darkfeather@aninix.net> depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')
pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//' | tr '[[:upper:]]' '[[:lower:]]')" makedepends=('make>=4.2')
checkdepends=()
optdepends=()
pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')"
pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)" pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)"
pkgrel=1 pkgrel=1
pkgrel() { pkgrel() {
git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit echo $(( `git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit` + 1 ))
} }
epoch= epoch="$(git log | grep -c commit)"
pkgdesc="$(head -n 1 README)" pkgdesc="$(head -n 1 README)"
arch=("x86_64") arch=("x86_64")
url="https://aninix.net/foundation/${pkgname}" url="https://aninix.net/foundation/${pkgname}"
license=('custom') license=('custom')
groups=() groups=()
depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13') provides=("${pkgname}")
makedepends=('make>=4.2')
checkdepends=()
optdepends=()
provides=('shadowarch')
conflicts=() conflicts=()
replaces=('aninix-misc-scripts') replaces=("${pkgname,,}", "aninix-${pkgname,,}")
backup=() backup=()
options=() options=()
install= install=
@ -36,7 +35,8 @@ build() {
} }
check() { check() {
printf 'quit\n\n' | make -C .. test chmod -R u+r ../pkg
make -C .. test
} }
package() { package() {

Binary file not shown.