From 4deb0403867bff6747a05cc62672e69a7a10e407 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 5 Aug 2020 15:51:46 -0300
Subject: [PATCH] Fixing windows installer default options.

---
 win/pack.sh       | 10 +++++++---
 win/pw3270.nsi.in | 29 ++++++++++++++++-------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/win/pack.sh b/win/pack.sh
index f933337..e060a77 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -561,7 +561,7 @@ copy_install_file() {
 		TARGET_PATH="/${PRODUCT_NAME}/stable/${ARCH}"
 	fi
 
-	if [ -d ~/public_html ]; then
+	if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
 		mkdir -p ~/public_html/win/${TARGET_PATH}
 		ln -f -v "${FILENAME}" ~/public_html/win/${TARGET_PATH}
 		if [ "$?" != "0" ]; then
@@ -569,7 +569,7 @@ copy_install_file() {
 		fi
 	fi
 
-	if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}" ]; then
+	if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
 
 		mkdir -p "${XDG_PUBLICSHARE_DIR}/${TARGET_PATH}"	
 		if [ "$?" != "0" ]; then
@@ -766,6 +766,10 @@ do
 				rm -fr ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}
 			fi
 
+			if [ ! -z "${XDG_PUBLICSHARE_DIR}" ] && [ -d "${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}" ]; then
+				rm -fr ${XDG_PUBLICSHARE_DIR}/${PRODUCT_NAME}/{x86_32,x86_64}
+			fi
+
 			;;
 
 		EXTRA-PACKAGES)
@@ -846,7 +850,7 @@ do
 			fi
 
 			if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
-				echo "  --clear		Replace the contents of ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
+				echo "  --clear		Replace the contents of public folders"
 			fi
 
 			echo ""
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 5e127b9..6b21ebf 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -212,7 +212,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 
 	SubSection "Plugins" SecPLugin
 
-		Section /o "Remote control" IPCPlugin
+		Section "Remote control" IPCPlugin
 
 			setOutPath $INSTDIR
 
@@ -235,7 +235,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 	SubSection "Extra modules" Languages
 
 !ifdef WITHLIBHLLAPI
-		Section /o "HLLAPI" HLLAPIBinding
+		Section "HLLAPI" HLLAPIBinding
 
 			${@NSISREDIR@}
 
@@ -309,7 +309,7 @@ SubSectionEnd
 
 
 !ifdef WITHGTK
-Section /o "GTK+ Runtime" SecGTK
+Section "GTK+ Runtime" SecGTK
 
 	setOutPath $INSTDIR
 	file /r "runtime\*.*"
@@ -387,16 +387,16 @@ Function .onInit
 	ClearErrors
 	${GetOptions} $R0 /SDK= $0
 
-	${if} $0 == "NO"
+	${if} $0 == "YES"
 
 		SectionGetFlags ${SDK} $0
-		IntOp $0 $0 & ${SECTION_OFF}
+		IntOp $0 $0 | ${SF_SELECTED}
 		SectionSetFlags ${SDK} $0
 
 	${else}
 
 		SectionGetFlags ${SDK} $0
-		IntOp $0 $0 | ${SF_SELECTED}
+		IntOp $0 $0 & ${SECTION_OFF}
 		SectionSetFlags ${SDK} $0
 
 	${EndIf}
@@ -413,13 +413,8 @@ Function .onInit
 	ClearErrors
 	${GetOptions} $R0 /DOTNET= $0
 
-	${if} $0 == "NO"
-
-		SectionGetFlags ${DOTNET} $0
-		IntOp $0 $0 & ${SECTION_OFF}
-		SectionSetFlags ${DOTNET} $0
-
-	${else}
+	# Default = NO
+	${if} $0 == "YES"
 
 		SectionGetFlags ${DOTNET} $0
 		IntOp $0 $0 | ${SF_SELECTED}
@@ -429,6 +424,12 @@ Function .onInit
 		IntOp $0 $0 | ${SF_SELECTED}
 		SectionSetFlags ${IPCPlugin} $0
 
+	${else}
+
+		SectionGetFlags ${DOTNET} $0
+		IntOp $0 $0 & ${SECTION_OFF}
+		SectionSetFlags ${DOTNET} $0
+
 	${EndIf}
 
 	Pop $0
@@ -444,6 +445,7 @@ Function .onInit
 	ClearErrors
 	${GetOptions} $R0 /HLLAPI= $0
 
+	# Default = YES
 	${if} $0 == "NO"
 
 		SectionGetFlags ${HLLAPIBinding} $0
@@ -460,6 +462,7 @@ Function .onInit
 		IntOp $0 $0 | ${SF_SELECTED}
 		SectionSetFlags ${IPCPlugin} $0
 
+
 	${EndIf}
 
 	Pop $0
--
libgit2 0.21.2