symlink to install folder

Author: stchan

directory.build.props

@@ -5,6 +5,6 @@
 		<AssemblyTrademark></AssemblyTrademark>
 		<AssemblyCulture></AssemblyCulture>
 		<ProductName>SQLcl</ProductName>
-		<ProductVersion>25.2.2.199</ProductVersion>
+		<ProductVersion>25.3.2.317</ProductVersion>
 	</PropertyGroup>
 </Project>

sqlclinstaller/ComponentGroups.wxs

@@ -22,13 +22,14 @@
 		<ComponentGroup Id="EnvironmentChanges" Directory="INSTALLFOLDER">
 			<Component Id="SystemPathUpdate" Guid="{84B1CE94-CF19-4EED-964F-09477D7D8C4F}">
 				<!-- add sqlcl to the system path -->
-				<Environment Id="SQLCLPATH" Name="PATH" Value="[SQLCLFOLDER]bin" Permanent="no" Part="first" Action="set" System="yes" />
+				<Environment Id="SQLCLPATH" Name="PATH" Value="[SQLCLPATHFOLDER]$(ProductName)\bin" Permanent="no" Part="first" Action="set" System="yes" />
 			</Component>
 		</ComponentGroup>
 		<ComponentGroup Id="MainRegistryChanges" Directory="INSTALLFOLDER">
 			<Component Id="MainProductRegistryKey" Guid="{15D465E0-6D7C-4BE1-931B-0ADC650610FB}">
 				<RegistryKey Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" ForceDeleteOnUninstall="yes">
 					<RegistryValue Name="InstallDir" Type="string" Value="[INSTALLFOLDER]" KeyPath="yes" />
+					<RegistryValue Name="EnvPathDir" Type="string" Value="[SQLCLPATHFOLDER]$(ProductName)\bin" />
 					<RegistryValue Name="Version" Type="string" Value="$(ProductVersion)" />
 					<!-- Version of sql.exe - may not match ${ProductVersion) because the product version may have been increased to indicate a new bundled JRE is included -->
 					<RegistryValue Name="OracleVersion" Type="string" Value="$(OracleVersion)" />

sqlclinstaller/Folders.wxs

@@ -8,5 +8,8 @@
 				</Directory>
 			</Directory>
 		</StandardDirectory>
+		<StandardDirectory Id="CommonAppDataFolder">
+			<Directory Id="SQLCLPATHFOLDER" Name="$(ProductName)" />
+		</StandardDirectory>
 	</Fragment>
 </Wix>

sqlclinstaller/Package.wxs

@@ -2,7 +2,7 @@
 	<?include "Include.wxi"?>
 	<Package Name="$(ProductName)" Language="1033" Version="$(ProductVersion)" Manufacturer="$(Manufacturer)" UpgradeCode="{7A4A42D9-448F-48D2-8C42-22C82830705F}" Scope="perMachine">
 		<SummaryInformation Description="Oracle SQLcl $(ProductVersion)" />
-		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
+		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" Schedule="afterInstallFinalize" />
 		<Upgrade Id="{7A4A42D9-448F-48D2-8C42-22C82830705F}">
 			<!-- This ensures upgrades select/deselect JRE install depending on existing install -->
 			<UpgradeVersion Maximum="$(ProductVersion)" MigrateFeatures="yes" Property="PRODUPGRADE" />
@@ -23,6 +23,21 @@
 		<util:BroadcastEnvironmentChange />
 		<util:BroadcastSettingChange />
 
+		<!-- 
+			Custom Actions to create/remove symlink to the install folder in the ProgramData folder. 
+		    This is necessary because sql.exe can't handle spaces in the path to its classes, so we add the symlink folder to the system path instead.
+		-->
+		<SetProperty Id="CreateProgramDataSymlink" Value="&quot;[%ComSpec]&quot; /c IF NOT EXIST &quot;[SQLCLPATHFOLDER]&quot; mklink /D &quot;[SQLCLPATHFOLDER]&quot; &quot;[INSTALLFOLDER]&quot;" Before="CreateProgramDataSymlink" Sequence="execute" />
+		<CustomAction Id="CreateProgramDataSymlink" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="check" />
+		<SetProperty Id="DeleteProgramDataSymlink" Value="&quot;[%ComSpec]&quot; /c rd &quot;[SQLCLPATHFOLDER]&quot;" Before="DeleteProgramDataSymlink" Sequence="execute" />
+		<CustomAction Id="DeleteProgramDataSymlink" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
+
+		<InstallExecuteSequence>
+			<!-- Only create symlink on INSTALL or UPGRADE -->
+			<Custom Action="CreateProgramDataSymlink" Before="InstallFinalize" Condition="(NOT Installed) OR (REINSTALL) OR (UPGRADINGPRODUCTCODE)" />
+			<Custom Action="DeleteProgramDataSymlink" Before="CreateProgramDataSymlink"  />
+		</InstallExecuteSequence>
+
 		<Feature Id="Main" Title="SQLcl $(ProductVersion)" Level="1" AllowAdvertise="no" InstallDefault="local" TypicalDefault="install" AllowAbsent="no" Description="SQLcl application." Display="expand" ConfigurableDirectory="INSTALLFOLDER" >
 			<Feature Id="SQLcl" Title="SQLcl required components" Level="1" InstallDefault="followParent" AllowAdvertise="no" TypicalDefault="install" AllowAbsent="no">
 				<ComponentGroupRef Id="SQLclComponents" />