From 9384bedab1ee5d4aa80abf52e51849b0a0f58ac7 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Fri, 3 May 2024 20:00:54 -0400
Subject: [PATCH] Use original SLUG-VERSION-OS-CPU.vcvplugin filename for
 bundled Fundamental package.

---
 Makefile       | 6 +++---
 src/plugin.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1fb58e49..f5ed8702 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ ifdef ARCH_LIN
 	# Copy resources
 	cp -R $(DIST_RES) dist/"$(DIST_DIR)"/
 	cp $(DIST_HTML) dist/"$(DIST_DIR)"/
-	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_DIR)"/Fundamental.vcvplugin
+	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_DIR)"/
 	# Make ZIP
 	cd dist && zip -q -9 -r "$(DIST_NAME)".zip "$(DIST_DIR)"
 endif
@@ -204,7 +204,7 @@ ifdef ARCH_MAC
 	cp -R $(DIST_RES) dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp $(DIST_HTML) dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp -R icon.icns dist/"$(DIST_BUNDLE)"/Contents/Resources/
-	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_BUNDLE)"/Contents/Resources/Fundamental.vcvplugin
+	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	# Clean up and sign bundle
 	xattr -cr dist/"$(DIST_BUNDLE)"
 	codesign --verbose --sign "Developer ID Application: Andrew Belt (V8SW9J626X)" --options runtime --entitlements Entitlements.plist --timestamp --deep dist/"$(DIST_BUNDLE)"/Contents/Resources/$(TARGET) dist/"$(DIST_BUNDLE)"
@@ -230,7 +230,7 @@ ifdef ARCH_WIN
 	cp /mingw64/bin/libwinpthread-1.dll dist/"$(DIST_DIR)"/
 	cp /mingw64/bin/libstdc++-6.dll dist/"$(DIST_DIR)"/
 	cp /mingw64/bin/libgcc_s_seh-1.dll dist/"$(DIST_DIR)"/
-	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_DIR)"/Fundamental.vcvplugin
+	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_DIR)"/
 	# Make NSIS installer
 	# pacman -S mingw-w64-x86_64-nsis
 	makensis -DVERSION_MAJOR="$(VERSION_MAJOR)" -DVERSION="$(VERSION)" "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 7f607880..cff9a5c5 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -284,12 +284,12 @@ void init() {
 
 	// If Fundamental wasn't loaded, copy the bundled Fundamental package and load it
 	if (!settings::devMode && !getPlugin("Fundamental")) {
-		std::string fundamentalSrc = asset::system("Fundamental.vcvplugin");
+		std::string fundamentalPackage = get(system::glob(asset::system("Fundamental-*-" + APP_OS + "-" + APP_CPU + ".vcvplugin")), 0);
 		std::string fundamentalDir = system::join(pluginsPath, "Fundamental");
-		if (system::isFile(fundamentalSrc)) {
+		if (fundamentalPackage != "" && system::isFile(fundamentalPackage)) {
 			INFO("Extracting bundled Fundamental package");
 			try {
-				system::unarchiveToDirectory(fundamentalSrc.c_str(), pluginsPath.c_str());
+				system::unarchiveToDirectory(fundamentalPackage.c_str(), pluginsPath.c_str());
 				loadPlugin(fundamentalDir);
 			}
 			catch (Exception& e) {