Adding GPG signing as recommended by man 8 pacman-key; SSH-agent improvements

AdminScripts/shadowarch-sync

@@ -9,4 +9,19 @@
 # 
 # Author: DarkFeather <darkfeather@aninix.net>
 
+seconds=10
+echo "This will sync your /etc files with the AniNIX defaults and add the AniNIX
+GPG key for pacman." 
+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/
+keyid=D9DC5933A1B0D4F7
+if ! gpg --homedir /etc/pacman.d/gnupg --list-key "${keyid}"; then
+    pacman-key --add /usr/share/pacman/keyrings/aninix.gpg
+    pacman-key --finger "${keyid}"
+    pacman-key --lsign-key "${keyid}"
+fi

EtcFiles/pacman.conf

@@ -102,10 +102,10 @@ Include = /etc/pacman.d/mirrorlist
 #Server = file:///home/custompkgs
 
 [aninix]
-SigLevel = Optional TrustAll
+SigLevel = Required DatabaseOptional
 Server = https://aninix.net/maat/
 
 [aur]
-SigLevel = Optional TrustAll
+SigLevel = Required DatabaseOptional
 Server = https://aninix.net/maat/aur/
 

EtcFiles/shadowarch

@@ -311,11 +311,12 @@ fi
 
 # Set hostname
 header Set hostname
-printf "What is your hostname? AniNIX::"
+printf "What is your fully-qualified hostname? (i.e. core.aninix.net) "
 read hostname
 echo "$hostname" > /mnt/etc/hostname
+hostname "$hostname"
 
-header Installed ShadowArch\! 
+header Installed ShadowArch on AniNIX::`hostname -s`\! 
 if [ ! -z "$nodiskbuild" ]; then
     header Remember to run grub-install and set up your bootloader.
     echo 'https://wiki.archlinux.org/index.php/Installation_guide#Boot_loader'

EtcFiles/ssh-agent@.service

@@ -3,11 +3,10 @@ Description=SSH-Agent for User %I
 After=network.target shadow.service
 
 [Service]
-ExecStart=/bin/bash -c "ssh-agent -s > /home/%I/.bashrc.ssh-agent"
+ExecStart=ssh-agent -s
 ExecReload=/bin/kill -HUP $MAINPID
 Type=oneshot
 KillMode=process
-Restart=on-failed
 User=%I
 Group=%I
 

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 ./aninix.gpg ${pkgdir}/usr/share/pacman/keyrings
 	for i in ${LIST}; do make -C ./$$i install; done
 
 reverse: 

PKGBUILD

@@ -1,14 +1,14 @@
 # Maintainer: Shikoba Kage <darkfeather@aninix.net>
-pkgname=shadowarch
-pkgver=0.1.310c778
-pkgver() {
-    printf "0.1.""$(git rev-parse --short HEAD)"
-}
+pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//' | tr '[[:upper:]]' '[[:lower:]]')"
+pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)"
 pkgrel=1
+pkgrel() { 
+    git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit
+}
 epoch=
-pkgdesc="AniNIX::ShadowArch \\\\ AniNIX preferred shell environment"
+pkgdesc="$(head -n 1 README)"
 arch=("x86_64")
-url="https://aninix.net/foundation/ShadowArch"
+url="https://aninix.net/foundation/${pkgname}"
 license=('custom')
 groups=()
 depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')

README

@@ -0,0 +1,6 @@
+AniNIX::ShadowArch \\ AniNIX preferred shell environment
+
+This package holds core files for our environment.
+* EtcFiles: Core configuration for our experience
+* AdminScripts: Scripts requiring root access for administration
+* UserScripts: Useful user-space deprivileged scripts