From 7b0ab047b4a591f7d7f5bb09f31047bd9e5acf77 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Mon, 26 Nov 2018 12:57:39 -0700
Subject: [PATCH] pucked plugins: Punt setup.  Get PLUGINS shell array syntax
 right.

---
 dist/make-src-files | 2 +-
 dist/shared.sh      | 4 ++--
 src/Setup.sh        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dist/make-src-files b/dist/make-src-files
index b349d92cf..6f02c71d9 100755
--- a/dist/make-src-files
+++ b/dist/make-src-files
@@ -57,7 +57,7 @@ notify "Configuring the distribution directory"
 run_command "${SRC_OUT}"-config "${DIST_DIR}"/src ./Setup.sh
 run_command "${DOC_OUT}"-config "${DIST_DIR}"/doc reconf
 
-for PLUGIN in ${PLUGINS}; do
+for PLUGIN in ${PLUGINS[@]}; do
     my_rm_rf "${DIST_DIR}"/src/${PLUGIN}
 done
 
diff --git a/dist/shared.sh b/dist/shared.sh
index e4f719f08..377661326 100644
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@ -101,8 +101,8 @@ NATIVE_OUT=${OUTPUT_DIR}/native
 MACOSX_OUT=${OUTPUT_DIR}/macosx
 
 PLUGINS=(blowfish gdbm mcrypt edwin imail x11 x11-screen)
-PLUGINS=($PLUGINS berkeley-db pgsql)
-PLUGINS=($PLUGINS cairo gl glib gtk gtk-screen pango planetarium devops)
+PLUGINS=(${PLUGINS[@]} berkeley-db pgsql)
+PLUGINS=(${PLUGINS[@]} cairo gl glib gtk gtk-screen pango planetarium devops)
 
 notify ()
 {
diff --git a/src/Setup.sh b/src/Setup.sh
index 538b9ff9d..d65a94577 100755
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@ -108,6 +108,7 @@ for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
     (cd ${SUBDIR} && ./Setup.sh ${1+"$@"})
 done
 
+PLUGIN_SUBDIRS=
 for SUBDIR in ${PLUGIN_SUBDIRS}; do
     echo "setting up ${SUBDIR}"
     (cd ${SUBDIR} && ./autogen.sh)
-- 
2.25.1