From 5b9f6ec79d9f7b1c86a62a11f535c996483d64ae Mon Sep 17 00:00:00 2001 From: DarkFeather Date: Tue, 18 Jan 2022 10:49:51 -0600 Subject: [PATCH] Keyring updates --- .gitignore | 1 + EtcFiles/Makefile | 7 +------ EtcFiles/aninix.gpg | 24 +++++------------------- EtcFiles/shadowarch | 4 ---- Makefile | 9 +++------ PKGBUILD | 2 +- README.md | 4 +++- 7 files changed, 14 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index cef2199..a006ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ src/ pkg/ *.tar.xz +*.tar.zst diff --git a/EtcFiles/Makefile b/EtcFiles/Makefile index 3f3e0bf..97fd321 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 aninix.gpg +install: compile mkdir -p ${pkgdir}/opt/aninix/ShadowArch/etc/ mkdir -p ${pkgdir}/usr/lib/systemd/system mkdir -p ${pkgdir}/etc/pacman.d/hooks @@ -16,8 +16,6 @@ install: compile aninix.gpg 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} @@ -44,9 +42,6 @@ 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/EtcFiles/aninix.gpg b/EtcFiles/aninix.gpg index 236ee90..2177e41 100644 --- a/EtcFiles/aninix.gpg +++ b/EtcFiles/aninix.gpg @@ -8,23 +8,9 @@ jsDwTgSAZRSiEMIzO0hSTOL//uwaSgQA/iESpuKyfUUoteJhSvwI6PTt0D23F4AR vXWh0f5LqTgLiJAEExYIADgWIQSQTeYnVXnLWJ2FcgwcweP07QbylgUCXg2A8QIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAcweP07QbylvaeAQDvnhvFK3Qt BNLGwwV2w85SCm2ITFK6l4ClmO/EcreNzAEAlNHSEquQRaFwKQD7IUbj1dPllOPY -RUsFyqZetReWlAG0JVNoaWtvYmEgS2FnZSA8RGFya0ZlYXRoZXJAQW5pTklYLm5l -dD6IeAQwFggAIBYhBJBN5idVectYnYVyDBzB4/TtBvKWBQJeDXnvAh0gAAoJEBzB -4/TtBvKWaBIBAMmxrhfNADLxOYv0vFa2H52H6kF0n9ND0hgx6dXZmigzAQD4iDc2 -XkEVjrZFVNh/s5CnkrSLv78Y4NDautjxuDiNB4iWBBMWCAA+FiEEkE3mJ1V5y1id -hXIMHMHj9O0G8pYFAlzgxAUCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgEC -F4AACgkQHMHj9O0G8pYOwgEAk7tDxKzmMEv6h0DMX9QAmjfOkrcmkXlb2EmtialU -lAkA/i3Bg0YGVCF31Zb8IYwlpxvb164/uJucAk/hHm7jZcgOtDBEYXJrRmVhdGhl -ciAoaXJjczovL2FuaW5peC5uZXQ6NjY5Ny9EYXJrRmVhdGhlcimIjwQwFggANxYh -BJBN5idVectYnYVyDBzB4/TtBvKWBQJeDaX8GR0gTW92aW5nIGNvbW1lbnQgdG8g -ZW1haWwACgkQHMHj9O0G8pauXAEA6OZrGGpuEdP4JRLE0wZJEltm0O+2SQF2u8I1 -zjvAiW0BAOXjvIRQmUXuPsNp6KydxDpGP/odn3gpHYl1Qn34iBcJiJAEExYIADgC -GwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQSQTeYnVXnLWJ2FcgwcweP07Qby -lgUCXg16cAAKCRAcweP07QbylmXSAQCtqhmBd8vx5EmCBJSk7/0oLUG4ll8EUjWB -ZLrNQPgIqQEAvbKCHV1Ahh+DTzk+H+HbKaqXEx2gK2KLWnjmFrqGQQ64OARc4MQF -EgorBgEEAZdVAQUBAQdA/TfytUcx/gmKbkMLF1hd49FZIyoq2MKMrjFEHWI/KykD -AQgHiHgEGBYIACACGwwWIQSQTeYnVXnLWJ2FcgwcweP07QbylgUCXg2ltwAKCRAc -weP07Qbylo3PAP0W5BOTL8YMwLbwYzNlxFpiNSCnGHXfxI5/3QRB8Q5kCgD+Og0Y -0Nve58yZj+DkqFCpI0TJReKj+bavK7TJ9ElL8wo= -=odmw +RUsFyqZetReWlAG4OARc4MQFEgorBgEEAZdVAQUBAQdA/TfytUcx/gmKbkMLF1hd +49FZIyoq2MKMrjFEHWI/KykDAQgHiHgEGBYIACACGwwWIQSQTeYnVXnLWJ2Fcgwc +weP07QbylgUCXg2ltwAKCRAcweP07Qbylo3PAP0W5BOTL8YMwLbwYzNlxFpiNSCn +GHXfxI5/3QRB8Q5kCgD+Og0Y0Nve58yZj+DkqFCpI0TJReKj+bavK7TJ9ElL8wo= +=VnrT -----END PGP PUBLIC KEY BLOCK----- diff --git a/EtcFiles/shadowarch b/EtcFiles/shadowarch index 86dbac4..bf25eeb 100644 --- a/EtcFiles/shadowarch +++ b/EtcFiles/shadowarch @@ -227,10 +227,6 @@ echo 'DNSSearch="aninix.net"' >> /mnt/etc/netctl/$interface arch-chroot /mnt systemctl enable netctl arch-chroot /mnt netctl enable $interface -# Vim cleanup for SSH -arch-chroot /mnt mkdir -p /usr/share/vim/vimfiles/plugin -arch-chroot /mnt printf 'set mouse-=a\n' > /usr/share/vim/vimfiles/plugin/shadowarch.vim - ln -sf /etc/skel/.bashrc /mnt/root/.bashrc # Clone ConfigPackags from AniNIX::Foundation diff --git a/Makefile b/Makefile index 403540f..984b769 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,8 @@ compile: ${LIST} for i in ${LIST}; do make -C ./$$i; done install: compile + mkdir -p ${pkgdir}/usr/share/pacman/keyrings + cp EtcFiles/aninix.gpg ${pkgdir}/usr/share/pacman/keyrings for i in ${LIST}; do make -C ./$$i install; done reverse: @@ -21,12 +23,7 @@ clean: diff: @echo Please do this for each individual folder in ${LIST} -localinstall: compile +localinstall: 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 8589a9b..c3a0e68 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ license=('custom') groups=() provides=("${pkgname}") conflicts=() -replaces=("${pkgname,,}", "aninix-${pkgname,,}") +replaces=("${pkgname,,}" "aninix-${pkgname,,}") backup=() options=() install= diff --git a/README.md b/README.md index a2be83e..4e33f83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -ShadowArch is an installation of [ArchLinux](https://www.archlinux.org/) following a general list of installed packages and configuration. We provide scripts to install the underlying OS and configure it, but we do not distribute ArchLinux software. +ShadowArch is an installation of ArchLinux following a general list of installed packages and configuration. We provide scripts to install the underlying OS and configure it, but we do not distribute ArchLinux software. + +For more information on [ArchLinux](https://www.archlinux.org/), check the link. This package holds core files for our environment. * EtcFiles: Core configuration for our experience