From 785fb8cb9193ae87b984f2d2f8dd2ffdd45dcb66 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 16 Sep 2019 16:39:32 -0300
Subject: [PATCH] Fixing custom cert installation on windows packages.

---
 win/pack.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/win/pack.sh b/win/pack.sh
index 07aecf4..be29512 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -420,12 +420,6 @@ makeInstaller()
 
 		NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
 
-		mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
-		cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
-		if [ "$?" != "0" ]; then
-			failed "Can't copy certs"
-		fi
-
 	fi
 
 	if [ ! -z "${PACKAGE_PLUGINS}" ]; then
@@ -447,6 +441,16 @@ makeInstaller()
 		echo -e "\e]2;Creating installers for ${ARCH}\a"
 		echo "Creating installers for ${ARCH}"
 
+		if [ -d ${CERTS_DIR} ]; then
+
+			mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
+			cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
+			if [ "$?" != "0" ]; then
+				failed "Can't copy certs"
+			fi
+
+		fi
+
 		cd ${WORKDIR}/build/${ARCH}
 
 		TARCH=${ARCH}
@@ -459,12 +463,9 @@ makeInstaller()
 			makensis ${NSIS_ARGS} ${NSI}
 			if [ "$?" != "0" ]; then
 				echo makensis ${NSIS_ARGS} ${NSI}
-				failed "Error building ${NSI}"
+				failed "Error building ${ARCH} ${NSI}"
 			fi
 
-			echo "TARCH="[${TARCH}]" ARCH=[${ARCH}]"
-			ls -l *-[0-9]*-${TARCH}.exe
-
 			if [ -d ~/public_html ]; then
 				mkdir -p ~/public_html/win/${PRODUCT_NAME}/${ARCH}
 				cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${PRODUCT_NAME}/${ARCH}
--
libgit2 0.21.2