Update nsi and bootstrap scripts

Replace required ZipDLL plugin with nsisunz
zevlee · May 5, 2022 · afa5c9f · afa5c9f
1 parent c94a3be
commit afa5c9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/windows/bootstrap.sh b/windows/bootstrap.sh
@@ -7,12 +7,9 @@ pacman -Sy --noconfirm mingw-w64-i686-gtk3 mingw-w64-i686-python3 mingw-w64-i686
 pacman -Sy --noconfirm mingw-w64-i686-python3-pip
 pip install pyinstaller
 
-mkdir zipdll
-wget https://nsis.sourceforge.io/mediawiki/images/d/d9/ZipDLL.zip
-unzip ZipDLL.zip -d zipdll
-cp zipdll/ZipDLL.dll /mingw32/share/nsis/Plugins/ansi
-cp zipdll/ZipDLL.dll /mingw32/share/nsis/Plugins/unicode
-cp zipdll/zipdll.nsh /mingw32/share/nsis/Include
-rm -r zipdll ZipDLL.zip
+wget https://nsis.sourceforge.io/mediawiki/images/5/5a/NSISunzU.zip
+unzip NSISunzU.zip
+cp "NSISunzU/Plugin unicode/nsisunz.dll" /mingw32/share/nsis/Plugins/unicode
+rm -r NSISunzU*
 
 echo "Done"
diff --git a/windows/hello-world-gtk.nsi b/windows/hello-world-gtk.nsi
@@ -4,10 +4,11 @@
 !define FILENAME "hello-world-gtk"
 !define AUTHOR "Author Name"
 !define DESCRIPTION "Hello World GTK"
+!define INSTALLSIZE 109976
 
-!define /file VERSION "..\VERSION"
+Unicode True
 
-!define INSTALLSIZE 105572
+!define /file VERSION "..\VERSION"
 
 InstallDir "$PROGRAMFILES\${APPNAME}"
 
@@ -35,15 +36,13 @@ function .onInit
 	!insertmacro VerifyUserIsAdmin
 functionEnd
 
-!include zipdll.nsh
-
 section "install"
 
 	setOutPath $INSTDIR
 	file "${FILENAME}.ico"
 	file "${FILENAME}.zip"
 
-	ZipDLL::extractall "$INSTDIR\${FILENAME}.zip" "$INSTDIR"
+	nsisunz::Unzip "$INSTDIR\${FILENAME}.zip" "$INSTDIR"
 
 	delete "$INSTDIR\${FILENAME}.zip"