From 6647fc07d6385df7c7cb3828136ecca00bf8f764 Mon Sep 17 00:00:00 2001
From: DarkFeather <ircs://aninix.net:6697/DarkFeather>
Date: Mon, 15 Jun 2020 17:14:56 -0500
Subject: [PATCH] Updating install methodology

---
 EtcFiles/shadowarch | 19 ++++++++++++-------
 PKGBUILD            |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/EtcFiles/shadowarch b/EtcFiles/shadowarch
index 4dc2249..54a1e32 100644
--- a/EtcFiles/shadowarch
+++ b/EtcFiles/shadowarch
@@ -2,8 +2,7 @@
 
 function header () {
     tput setaf 1
-    tput bold
-    echo $@
+    tput bold echo $@
     tput sgr0
     return
 }
@@ -18,10 +17,10 @@ function help() {
     echo '\-l FILE -- Log to a file'
     echo '\-p      -- Productivity package additions'
     echo '\-P      -- Power saving for laptops'
-    echo '\-s      -- Create a layout for an AniNIX::Spartacus'
+    echo '\-s      -- Create a layout for an AniNIX/Spartacus'
     echo '\-m      -- Skip disk operations and assume storage is mounted on /mnt'
     echo '\-v      -- Verbose output.'
-    echo '\-z      -- Try to add all the packages on AniNIX::Core'
+    echo '\-z      -- Try to add all the packages on AniNIX/Core'
     exit 1;
 }
 
@@ -76,6 +75,12 @@ if [ "$answer" != "YES" ]; then
     echo User did not confirm.
     exit 1;
 fi
+echo >> /etc/pacman.conf <EOM
+[AniNIX]
+SigLevel = Optional TrustAll
+Server = https://aninix.net/maat/
+EOM
+
 pacman -Syy
 if [ -z "$nodiskbuild" ]; then
     header Allocating space
@@ -156,7 +161,7 @@ fi
 # * make for source packages
 # * tor for anonymity
 header Installing ArchLinux to device\(s\) on /mnt
-export pkglist="base base-devel parted net-tools bind-tools git openssh make elinks weechat vim wget tor torsocks grub os-prober rsync openntpd tmux efibootmgr"
+export pkglist="base base-devel parted net-tools bind-tools git openssh make elinks weechat vim wget tor torsocks grub os-prober rsync openntpd tmux efibootmgr shadowarch"
 if [ ! -z "$gui" ]; then 
     export pkglist="$pkglist"" xorg-server xfce4 chromium conky tigervnc xscreensaver"
 fi
@@ -297,12 +302,12 @@ fi
 
 # Set hostname
 header Set hostname
-printf "What is your fully-qualified hostname? (i.e. core.aninix.net) "
+printf "What is your fully-qualified hostname? (i.e. host.site.example.com) "
 read hostname
 echo "$hostname" > /mnt/etc/hostname
 hostname "$hostname"
 
-header Installed ShadowArch on AniNIX::`hostname -s`\! 
+header "Installed ShadowArch on $HOSTNAME!" 
 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'
diff --git a/PKGBUILD b/PKGBUILD
index afceca8..acecdf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')
+depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13' 'elinks')
 makedepends=('make>=4.2')
 checkdepends=()
 optdepends=()