From e53d8ac4818b1fda39b0cca573b205d0474625c1 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 22 Jul 2021 06:44:02 -0400
Subject: [PATCH] Clean up dist filenames.

---
 Makefile       |  4 ++--
 src/plugin.cpp | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 7754f858..e4a7ff97 100644
--- a/Makefile
+++ b/Makefile
@@ -139,9 +139,9 @@ endif
 
 
 DIST_RES := LICENSE* CHANGELOG.md res cacert.pem Core.json template.vcv
-DIST_NAME := VCV-Rack-$(VERSION)-$(ARCH)
+DIST_NAME := Rack.$(VERSION).$(ARCH)
 DIST_SDK_DIR := Rack-SDK
-DIST_SDK := Rack-SDK-$(VERSION).zip
+DIST_SDK := Rack-SDK.$(VERSION).zip
 ifdef ARCH_MAC
 	DIST_DIR := VCV Rack.app
 else
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 44df9239..f47c1018 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -228,12 +228,14 @@ void init() {
 	loadPlugins(pluginsPath);
 
 	// If Fundamental wasn't loaded, copy the bundled Fundamental package and load it
-	std::string fundamentalSrc = asset::system("Fundamental.vcvplugin");
-	std::string fundamentalDir = system::join(pluginsPath, "Fundamental");
-	if (!settings::devMode && !getPlugin("Fundamental") && system::isFile(fundamentalSrc)) {
-		INFO("Extracting bundled Fundamental package");
-		system::unarchiveToDirectory(fundamentalSrc.c_str(), pluginsPath.c_str());
-		loadPlugin(fundamentalDir);
+	if (!settings::devMode && !getPlugin("Fundamental")) {
+		std::string fundamentalSrc = asset::system("Fundamental.vcvplugin");
+		std::string fundamentalDir = system::join(pluginsPath, "Fundamental");
+		if (system::isFile(fundamentalSrc)) {
+			INFO("Extracting bundled Fundamental package");
+			system::unarchiveToDirectory(fundamentalSrc.c_str(), pluginsPath.c_str());
+			loadPlugin(fundamentalDir);
+		}
 	}
 }