WiX: Add docker-cli-plugins to PATH

Now that we ship the plugins in a separate directory, we also need to add that directory to $PATH so that if the user wants to call it directly it can be done. Signed-off-by: Mark Yen <[email protected]>
rancher-sandbox · Sep 9, 2024 · 3900234 · 3900234
1 parent 227eec9
commit 3900234
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/build/wix/main.wxs b/build/wix/main.wxs
@@ -132,12 +132,18 @@
         Type="string"
         KeyPath="yes"
       />
-      <Environment Id="PathWindowsUser" Name="PATH"
+      <Environment Id="PathWindowsUserBin" Name="PATH"
         Action="set" Part="last" System="no" Permanent="no"
         Value="[APPLICATIONFOLDER]resources\resources\win32\bin\" />
-      <Environment Id="PathLinuxUser" Name="PATH"
+      <Environment Id="PathWindowsUserDockerCLIPlugins" Name="PATH"
+        Action="set" Part="last" System="no" Permanent="no"
+        Value="[APPLICATIONFOLDER]resources\resources\win32\docker-cli-plugins\" />
+      <Environment Id="PathLinuxUserBin" Name="PATH"
         Action="set" Part="last" System="no" Permanent="no"
         Value="[APPLICATIONFOLDER]resources\resources\linux\bin\" />
+      <Environment Id="PathLinuxUserDockerCLIPlugins" Name="PATH"
+        Action="set" Part="last" System="no" Permanent="no"
+        Value="[APPLICATIONFOLDER]resources\resources\linux\docker-cli-plugins\" />
     </Component>
     <Component Id="PathSystem" Directory="APPLICATIONFOLDER">
       <Condition>
@@ -151,12 +157,18 @@
         Type="string"
         KeyPath="yes"
       />
-      <Environment Id="PathWindowsSystem" Name="PATH"
+      <Environment Id="PathWindowsSystemBin" Name="PATH"
         Action="set" Part="last" System="yes" Permanent="no"
         Value="[APPLICATIONFOLDER]resources\resources\win32\bin\" />
-      <Environment Id="PathLinuxSystem" Name="PATH"
+      <Environment Id="PathWindowsSystemDockerCLIPlugins" Name="PATH"
+        Action="set" Part="last" System="yes" Permanent="no"
+        Value="[APPLICATIONFOLDER]resources\resources\win32\docker-cli-plugins\" />
+      <Environment Id="PathLinuxSystemBin" Name="PATH"
         Action="set" Part="last" System="yes" Permanent="no"
         Value="[APPLICATIONFOLDER]resources\resources\linux\bin\" />
+      <Environment Id="PathLinuxSystemDockerCLIPlugins" Name="PATH"
+        Action="set" Part="last" System="yes" Permanent="no"
+        Value="[APPLICATIONFOLDER]resources\resources\linux\docker-cli-plugins\" />
     </Component>