From 7ed86391af6833e2828960ff517f892080d59ca7 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 5 May 2017 21:23:58 +0200
Subject: [PATCH] os/+arch: update bootstrap/install scripts

---
 os/+arch/bootstrap |  6 +-----
 os/+arch/install   | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/os/+arch/bootstrap b/os/+arch/bootstrap
index 7c8a2958..f8ff1bea 100755
--- a/os/+arch/bootstrap
+++ b/os/+arch/bootstrap
@@ -32,8 +32,6 @@ read -rp "Hostname:\t" host
 echo "$host" > "$MOUNT/etc/hostname"
 
 # ensure keys are up to date
-pacman-key --init
-pacman-key --populate arch-linux
 pacman-key --refresh-keys
 pacman -Syy
 
@@ -41,14 +39,12 @@ pacman -Syy
 pac base base-devel intel-ucode
 # device mounting drivers
 pac dosfstools ntfs-3g exfat-utils hfsprogs
-# nc
-pac gnu-netcat
 
 # networking support
 WIRELESS_DEV=$(ip link | grep wlp | awk '{print $2}'| sed 's/://' | sed '1!d')
 if [[ $WIRELESS_DEV ]]; then
     echo "==> ${WIRELESS_DEV} interface detected"
-    pac iw wireless_tools wpa_actiond wpa_supplicant dialog
+    pac iw wireless_tools wpa_actiond wpa_supplicant dialog netctl
 fi
 
 WIRED_DEV=$(ip link | grep "en[sop]" | awk '{print $2}'| sed 's/://' | sed '1!d')
diff --git a/os/+arch/install b/os/+arch/install
index a1194fe5..1302fd2d 100755
--- a/os/+arch/install
+++ b/os/+arch/install
@@ -32,12 +32,16 @@ $pacman -S wget git curl tree rsync openssh dnsutils
 
 # Set up pacaur (AUR helper)
 if ! exists pacaur; then
-    pushd $(mktemp -d)
+    TEMP="$(mktemp -d)"
+    function cleanup {
+        rm -rf "$TEMP"
+    }
+    trap cleanup EXIT
+
+    pushd "$TEMP"
     curl -o PKGBUILD https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=cower && makepkg --needed --noconfirm --skippgpcheck -sri
     curl -o PKGBUILD https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacaur && makepkg --needed --noconfirm --skippgpcheck -sri
-    TEMP=$(pwd)
     popd
-    rm -rf "$TEMP"
 
     if ! exists pacaur; then
         >&2 echo "Pacaur wasn't successfully installed"
@@ -49,13 +53,19 @@ fi
 ## Bootstrap
 # Helpful utilities
 $pacaur -S the_silver_searcher tmux hub bc keybase-bin cronie
-systemctl enable cronie.service
+sudo systemctl enable cronie.service
 
 if [[ -z $SERVER ]]; then
     if exists crontab; then
-        [[ -f $PWD/crontab ]] && crontab $PWD/crontab
+        [[ -f $PWD/crontab ]] && crontab "$PWD/crontab"
     fi
 
+    hookdest=/etc/pacman.d/hooks
+    sudo mkdir -p "$hookdest"
+    for hook in $PWD/$hookdest/*.hook; do
+        [[ -f $hookdest/${hook##*/} ]] || sudo ln -svf "$hook" "$hookdest/"
+    done
+
     # desktop essentials
     $pacaur -S \
         xorg-xinit xorg-server \
@@ -67,10 +77,4 @@ if [[ -z $SERVER ]]; then
         redshift chromium chromium-widevine \
         alsa-utils \
         dictd dict-gcide
-
-    hookdest=/etc/pacman.d/hooks
-    sudo mkdir -p "$hookdest"
-    for hook in $PWD/$hookdest/*.hook; do
-        [[ -f $hookdest/${hook##*/} ]] || sudo ln -svf $hook $hookdest/
-    done
 fi