diff --git a/EtcFiles/Makefile b/EtcFiles/Makefile index 97fd321..3f3e0bf 100644 --- a/EtcFiles/Makefile +++ b/EtcFiles/Makefile @@ -7,7 +7,7 @@ pacmanHooks = mediawiki.hook tt-rss.hook shadowarch.hook compile: ./shadowarch @echo Nothing to compile -install: compile +install: compile aninix.gpg mkdir -p ${pkgdir}/opt/aninix/ShadowArch/etc/ mkdir -p ${pkgdir}/usr/lib/systemd/system mkdir -p ${pkgdir}/etc/pacman.d/hooks @@ -16,6 +16,8 @@ install: compile for i in ${serviceList}; do cp "$$i" ${pkgdir}/usr/lib/systemd/system/"$$i"; done for i in ${pacmanHooks}; do cp "$$i" ${pkgdir}/etc/pacman.d/hooks/"$$i"; done cp ./shadowarch.vim ${pkgdir}/usr/share/vim/vimfiles/plugin/shadowarch.vim + mkdir -p ${pkgdir}/usr/share/pacman/keyrings + cp ./aninix.gpg ${pkgdir}/usr/share/pacman/keyrings cp -pr ./skel ${pkgdir}/opt/aninix/ShadowArch/etc repository: shadowarch ${httpRoot} @@ -42,6 +44,9 @@ reverse: ${httpRoot}/shadowarch ${syncList} clean: @echo Nothing to do. +aninix.gpg: + gpg --export --armor --output ./aninix.gpg 904DE6275579CB589D85720C1CC1E3F4ED06F296 + diff: ${syncList} if [ -f ${httpRoot}/shadowarch ]; then diff ./shadowarch ${httpRoot}/shadowarch; echo; fi for i in ${syncList}; do diff -rc "$$i" ./`echo $$i | rev | cut -f 1 -d '/' | rev`; echo; done diff --git a/Makefile b/Makefile index a06058d..403540f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ compile: ${LIST} for i in ${LIST}; do make -C ./$$i; done install: compile - mkdir -p ${pkgdir}/usr/share/pacman/keyrings for i in ${LIST}; do make -C ./$$i install; done reverse: @@ -22,7 +21,12 @@ clean: diff: @echo Please do this for each individual folder in ${LIST} -localinstall: +localinstall: compile mkdir -p ~/bin/ for i in AdminScripts UserScripts; do cd $$i; for j in `ls -1 | grep -v Makefile`; do install -o ${USER} -m 0755 "$$j" /home/${USER}/bin/; done; cd ..; done cd EtcFiles; for i in `ls -1 | egrep -v '*.service|skel|Makefile'`; do cp "$$i" /home/${USER}/."$$i"; done + +pacmankey: + sudo pacman-key --add EtcFiles/aninix.gpg + sudo pacman-key --finger 904DE6275579CB589D85720C1CC1E3F4ED06F296 + sudo pacman-key --lsign 904DE6275579CB589D85720C1CC1E3F4ED06F296 diff --git a/PKGBUILD b/PKGBUILD index acecdf3..8589a9b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgrel() { echo $(( `git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit` + 1 )) } epoch="$(git log | grep -c commit)" -pkgdesc="$(head -n 1 README)" +pkgdesc="$(head -n 1 README.md)" arch=("x86_64") url="https://aninix.net/foundation/${pkgname}" license=('custom')