From: Thomas Berezansky <tsbere@mvlc.org>
Date: Mon, 30 Jan 2012 18:11:19 +0000 (-0500)
Subject: Fix AccessControl plugin extraction
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=69b708f8647c34c42b375c223de42ef4b72086f7;p=evergreen%2Fjoelewis.git

Fix AccessControl plugin extraction

Apparently they ditched a containing folder in the zip...lets autodetect
that from now on.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index 2105271d70..bcd8bd353b 100644
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -290,7 +290,7 @@ linux-xulrunner: client_app
 # Build a windows installer.
 
 win-client: nsis_check win-xulrunner
-	@if [ "${NSIS_AUTOUPDATE}${NSIS_PERMACHINE}" -a ! -d AccessControl ]; then echo 'Fetching AccessControl Plugin'; wget ${NSIS_ACCESSCONTROL} -O AccessControl.zip; unzip AccessControl.zip; fi
+	@if [ "${NSIS_AUTOUPDATE}${NSIS_PERMACHINE}" -a ! -d AccessControl ]; then echo 'Fetching AccessControl Plugin'; wget ${NSIS_ACCESSCONTROL} -O AccessControl.zip; unzip AccessControl.zip $$(unzip -t AccessControl.zip | grep 'AccessControl/Contrib/' > /dev/null || echo "-dAccessControl"); fi
 	@echo 'Building installer'
 	@makensis -V2 -DPRODUCT_VERSION="${STAFF_CLIENT_VERSION}" ${NSIS_WICON} ${NSIS_AUTOUPDATE} ${NSIS_DEV} ${NSIS_PERMACHINE} ${NSIS_EXTRAS} ${NSIS_EXTRAOPTS} windowssetup.nsi
 	@echo 'Done'