From 1558dfbf3b2a42f43594acf6e3d8f9b329ff1133 Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Thu, 3 Sep 2009 19:18:07 -0400
Subject: Exit with error if PRESETS seems to be defined as an array.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 mkinitcpio | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mkinitcpio b/mkinitcpio
index 1b40867..fad9499 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -113,6 +113,8 @@ while getopts ':c:k:s:b:g:a:p:m:vH:LMhS:' arg; do
 done
 shift $((${OPTIND} - 1))
 
+. "${FUNCTIONS}"
+
 # use preset $PRESET
 if [ -n "${PRESET}" ]; then
     if [ -f "${PRESETDIR}/${PRESET}.preset" ]; then
@@ -130,6 +132,10 @@ if [ -n "${PRESET}" ]; then
 
         # Build all images
         echo "==> Using ${PRESETDIR}/${PRESET}.preset"
+        if grep -q "PRESETS=(" ${PRESETDIR}/${PRESET}.preset; then
+            die "Invalid definition of PRESETS."
+        fi
+
         . ${PRESETDIR}/${PRESET}.preset
 
         for p in ${PRESETS}; do
@@ -224,8 +230,6 @@ fi
 BASEDIR=$(echo ${BASEDIR} | tr -s /)
 MODULEDIR=$(echo ${MODULEDIR} | tr -s /)
 
-. "${FUNCTIONS}"
-
 if [ "${SHOW_AUTOMODS}" = "y" ]; then
     echo "Modules autodetected:"
     . "${INSTDIR}/autodetect"
-- 
cgit v1.2.3-24-g4f1b