From be1f2c2bce1ba5e81ce14e9cb82c0d2fb251b60e Mon Sep 17 00:00:00 2001
From: Louie Shprung <lshprung@tutanota.com>
Date: Fri, 30 Aug 2024 18:37:12 -0400
Subject: Option to install lua-filesystem in nsis installer

---
 nsis/Makefile.am      | 5 +++--
 nsis/installer.nsi.in | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nsis/Makefile.am b/nsis/Makefile.am
index 8eead42..c27b3fd 100644
--- a/nsis/Makefile.am
+++ b/nsis/Makefile.am
@@ -1,12 +1,13 @@
 EXTRA_DIST = installer.nsi.in
 
-CLEANFILES = *Setup.exe deps/*
+CLEANFILES = *Setup.exe deps/* deps_luarocks/*
 
 SEARCHPATH=$$PATH
 DLLS = $(shell ntldd -R ../src/$(PACKAGE_NAME).exe | sed 's/.*=> //g' | grep -v "not found" | sed 's/ (.*)$$//g' | sed 's/\\/\\\\/g' | xargs cygpath -u | grep "$$MINGW_PREFIX")
 
 .PHONY: installer
 installer: installer.nsi
-	mkdir -p deps
+	mkdir -p deps deps_luarocks
 	for file in $(DLLS); do install "$$file" "deps/$$(basename "$$file")"; done
+	cp /"$$(pacman -Fl $$MINGW_PACKAGE_PREFIX-lua-luafilesystem | grep -io $${MSYSTEM}.* | grep lfs.dll)" deps_luarocks/
 	makensis installer.nsi
diff --git a/nsis/installer.nsi.in b/nsis/installer.nsi.in
index 066d4a9..e526ed7 100644
--- a/nsis/installer.nsi.in
+++ b/nsis/installer.nsi.in
@@ -69,7 +69,9 @@ Var StartMenuFolder
 
 ;-------------------------------------------------------------------------------
 ; Installer Sections
-Section "My Application" MyApp
+Section "Core" MyApp
+	; Don't allow this section to be deselected
+	SectionIn RO
 	SetOutPath $INSTDIR
 	File "..\src\@PACKAGE_NAME@.exe"
 	File "deps\*.*"
@@ -82,6 +84,11 @@ Section "My Application" MyApp
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 SectionEnd
 
+Section "lua-filesystem" lfs
+	SetOutPath $INSTDIR
+	File "deps_luarocks\lfs.dll"
+SectionEnd
+
 Function installDesktopShortcut
 	CreateShortCut "$Desktop\${PRODUCT_NAME}.lnk" "$INSTDIR\@PACKAGE_NAME@.exe"
 FunctionEnd
-- 
cgit