From 03931af6e8f6c3901b1b16baab545942e8f73014 Mon Sep 17 00:00:00 2001
From: James Bunton <jamesbunton@delx.net.au>
Date: Wed, 24 Oct 2018 22:13:44 +1100
Subject: [PATCH] Arch build script improvements for managing my own repo

---
 aur-install       | 12 +++++++++---
 check-aur-updates |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/aur-install b/aur-install
index f31bbad..6c5b5a2 100755
--- a/aur-install
+++ b/aur-install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 PKGNAME="$1"
 if [ -z "$PKGNAME" ]; then
@@ -8,6 +8,12 @@ if [ -z "$PKGNAME" ]; then
     exit 1
 fi
 
+shift
+MAKEPKG_CMD=("$@")
+if [ ${#MAKEPKG_CMD[@]} -eq 0 ]; then
+    MAKEPKG_CMD=("makepkg" "-sri")
+fi
+
 function enter_directory {
     mkdir -p "$1"
     cd "$1"
@@ -27,7 +33,7 @@ function show_diff {
 }
 
 function ask_user_to_continue {
-    read -p "Ok? (y/n) " ok
+    read -r -p "Ok? (y/n) " ok
     if [ "$ok" != "y" ]; then
         return 1
     fi
@@ -35,7 +41,7 @@ function ask_user_to_continue {
 
 function build_and_install {
     git checkout .
-    makepkg -sri
+    "${MAKEPKG_CMD[@]}"
 }
 
 enter_directory "/var/abs/${PKGNAME}"
diff --git a/check-aur-updates b/check-aur-updates
index cec4e9e..2a238b3 100755
--- a/check-aur-updates
+++ b/check-aur-updates
@@ -5,12 +5,12 @@ set -eu
 declare -A pkg_versions
 query_url='https://aur.archlinux.org/rpc/?v=5&type=info'
 
-while read pkg installed_version; do
+while read -r pkg installed_version; do
     pkg_versions[$pkg]="$installed_version"
     query_url="${query_url}&arg[]=${pkg}"
-done < <(pacman -Qm)
+done < <(if [ -t 0 ]; then pacman -Qm; else cat; fi)
 
-curl -gsSf "$query_url" | jq -r '.results[] | .Name, .Version, "\u0000"' | while read -d $'\0' pkg aur_version; do
+curl -gsSf "$query_url" | jq -r '.results[] | .Name, .Version, "\u0000"' | while read -r -d $'\0' pkg aur_version; do
     installed_version="${pkg_versions[$pkg]}"
     if [ "$installed_version" != "$aur_version" ]; then
         echo "${pkg} $installed_version -> $aur_version"
-- 
2.39.2