From 1b5f55dd8bc226eb771a4bdbab466962082f7c0c Mon Sep 17 00:00:00 2001
From: Ian Mancini <ianmethyst@gmail.com>
Date: Sun, 12 Apr 2020 05:17:36 -0300
Subject: [PATCH] Check for wget and fix package name (keyring -> keychain)

---
 setup/packages/ssh |  2 +-
 setup/setup_pacman | 29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/setup/packages/ssh b/setup/packages/ssh
index 48d9266..66808bf 100644
--- a/setup/packages/ssh
+++ b/setup/packages/ssh
@@ -1 +1 @@
-openssh rsync keyring
+openssh rsync keychain
diff --git a/setup/setup_pacman b/setup/setup_pacman
index 100efab..3e23565 100755
--- a/setup/setup_pacman
+++ b/setup/setup_pacman
@@ -1,12 +1,30 @@
 #!/bin/sh
 
-set -Eeuo pipefail
+set -uo pipefail
 
 if (( $EUID != 0 )); then
     echo "Should be run as root"
     exit 1
 fi
 
+# Enable wget?
+read -p ":: Enable wget? [Y/n] " enablewget
+enablewget=${enablewget:-Y}
+
+if [[ $enablewget =~ [yY] ]]; then
+  echo ":: Checking if wget is installed"
+  pacman -Q wget &> /dev/null
+  if [ $? = 1 ]; then
+    echo ":: Installing wget"
+    pacman -Syu wget 
+  else
+    echo ":: Success: wget is installed"
+  fi
+
+  echo "Enabling wget"
+  sed -i '/XferCommand \= \/usr\/bin\/wget/s/^#//g' /etc/pacman.conf
+fi
+
 # Enable multilib?
 read -p ":: Enable multilib? [Y/n] " enablemultilib
 enablemultilib=${enablemultilib:-Y}
@@ -22,12 +40,3 @@ Include = /etc/pacman.d/mirrorlist
 EOF
   fi
 fi
-
-# Enable wget?
-read -p ":: Enable wget? [Y/n] " enablewget
-enablewget=${enablewget:-Y}
-
-if [[ $enablewget =~ [yY] ]]; then
-  echo "Enabling wget"
-  sed -i '/XferCommand \= \/usr\/bin\/wget/s/^#//g' /etc/pacman.conf
-fi