From a836accc07c1c655272c02d02f26c872548ec7a8 Mon Sep 17 00:00:00 2001
From: Yuval Adam <yuv.adm@gmail.com>
Date: Sat, 13 Dec 2014 13:26:23 +0100
Subject: Fix archiso check

---
 liveusb/build.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/liveusb/build.sh b/liveusb/build.sh
index 850e002..289f21c 100755
--- a/liveusb/build.sh
+++ b/liveusb/build.sh
@@ -111,6 +111,7 @@ make_iso() {
     mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${arch}.iso"
 }
 
+(pacman -Qq archiso > /dev/null) || (echo "This script requires archiso(-git) to be installed"; _usage 1)
 if [[ ${EUID} -ne 0 ]]; then
     echo "This script must be run as root."
     _usage 1
@@ -119,11 +120,6 @@ if [[ ${arch} != x86_64 ]]; then
     echo "This script needs to be run on x86_64"
     _usage 1
 fi
-if [[ $(pacman -Q archiso) -ne 0 ]]; then
-    echo "This script requires archiso(-git) to be installed"
-    _usage 1
-fi
-
 
 while getopts 'th' arg; do
     case "${arg}" in
-- 
cgit v1.3.1