From 926a516a7ae8b4c1b4f8e0a719d1aedd61b815e4 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Sat, 31 Jul 2021 18:18:41 -0400
Subject: [PATCH] Clean up NSIS installer script.

---
 installer.nsi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/installer.nsi b/installer.nsi
index 4c032d33..69ffa335 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -2,21 +2,20 @@
 
 !define NAME_FULL "VCV Rack ${EDITION_NAME} ${VERSION}"
 !define NAME "VCV Rack ${EDITION} ${VERSION_MAJOR}"
+!define RACK_DIR "Rack${EDITION}${VERSION_MAJOR}"
+!define INSTALL_REG "Software\VCV\Rack${EDITION}${VERSION_MAJOR}"
+!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${EDITION}${VERSION_MAJOR}"
+
 Name "${NAME_FULL}"
 SetCompressor /solid "lzma"
 SetCompressorDictSize 8
 CRCCheck On
 
 ; Default installation folder
-!define RACK_DIR "Rack${EDITION}${VERSION_MAJOR}"
 InstallDir "$PROGRAMFILES\VCV\${RACK_DIR}"
-
 ; Get installation folder from registry if available
-!define INSTALL_REG "Software\VCV\Rack${EDITION}${VERSION_MAJOR}"
 InstallDirRegKey HKLM "${INSTALL_REG}" ""
 
-!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${EDITION}${VERSION_MAJOR}"
-
 ; Request admin permissions so we can install to Program Files and add a registry entry
 RequestExecutionLevel admin