From 43a4a36429a376fb1533c6c77d49830e47138df8 Mon Sep 17 00:00:00 2001
From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com>
Date: Tue, 4 Feb 2025 01:43:21 -0500
Subject: [PATCH] pkg: add completion files to winget/msi installer (#1666)

* pkg: add completion files to winget/msi installer

* hmmm

* hmmmm

* oh lol
---
 .github/workflows/build_releases.yml | 12 ++++---
 .github/workflows/post_release.yml   |  2 +-
 Cargo.toml                           |  1 +
 wix/main.wxs                         | 53 ++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml
index dd87aa16..2438ce07 100644
--- a/.github/workflows/build_releases.yml
+++ b/.github/workflows/build_releases.yml
@@ -301,7 +301,7 @@ jobs:
           path: release
 
   build-msi:
-    name: "Build MSI installer"
+    name: "Build MSI (WiX) installer"
     runs-on: "windows-2019"
     timeout-minutes: 12
     steps:
@@ -325,13 +325,17 @@ jobs:
           toolchain: stable
           target: x86_64-pc-windows-msvc
 
+      - name: Install cargo-wix
+        shell: powershell
+        run: |
+          cargo install cargo-wix --version 0.3.8 --locked
+
       - name: Build MSI file
         shell: powershell
         env:
-          BTM_GENERATE: ""
+          BTM_GENERATE: true
         run: |
-          cargo install cargo-wix --version 0.3.8 --locked
-          cargo wix
+          cargo wix --nocapture
 
       - name: Generate artifact attestation for file
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
diff --git a/.github/workflows/post_release.yml b/.github/workflows/post_release.yml
index 60726c1a..0ce281c3 100644
--- a/.github/workflows/post_release.yml
+++ b/.github/workflows/post_release.yml
@@ -116,7 +116,7 @@ jobs:
           echo "Release version: ${{ env.RELEASE_VERSION }}"
 
       - name: Automatically create PR for winget repos
-        uses: vedantmgoyal2009/winget-releaser@0db4f0a478166abd0fa438c631849f0b8dcfb99f
+        uses: vedantmgoyal2009/winget-releaser@4ffc7888bffd451b357355dc214d43bb9f23917e
         with:
           identifier: Clement.bottom
           installers-regex: '^bottom_x86_64_installer\.msi$'
diff --git a/Cargo.toml b/Cargo.toml
index 31ffca16..16e45293 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -222,6 +222,7 @@ depends = "libc6:armhf (>= 2.28)"
 [package.metadata.wix]
 output = "bottom_x86_64_installer.msi"
 
+
 [package.metadata.generate-rpm]
 assets = [
     { source = "target/release/btm", dest = "/usr/bin/", mode = "755" },
diff --git a/wix/main.wxs b/wix/main.wxs
index bfc19402..904f64c6 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -101,6 +101,53 @@
                             Source='wix\License.rtf'
                             KeyPath='yes'/>
                     </Component>
+
+                    <Directory Id='Completions' Name='completions'>
+                      <Component Id='btmPowershell' Guid='*'>
+                        <File
+                            Id='btmPs1'
+                            Name='_btm.ps1'
+                            DiskId='1'
+                            Source='$(var.CargoTargetDir)\tmp\bottom\completion\_btm.ps1'
+                            KeyPath='yes'/>
+                      </Component>
+
+                      <Component Id='btmNu' Guid='*'>
+                        <File
+                            Id='btmNu'
+                            Name='btm.nu'
+                            DiskId='1'
+                            Source='$(var.CargoTargetDir)\tmp\bottom\completion\btm.nu'
+                            KeyPath='yes'/>
+                      </Component>
+
+                      <Component Id='btmFish' Guid='*'>
+                        <File
+                            Id='btmFish'
+                            Name='btm.fish'
+                            DiskId='1'
+                            Source='$(var.CargoTargetDir)\tmp\bottom\completion\btm.fish'
+                            KeyPath='yes'/>
+                      </Component>
+
+                      <Component Id='btmBash' Guid='*'>
+                        <File
+                            Id='btmBash'
+                            Name='btm.bash'
+                            DiskId='1'
+                            Source='$(var.CargoTargetDir)\tmp\bottom\completion\btm.bash'
+                            KeyPath='yes'/>
+                      </Component>
+
+                      <Component Id='btmZsh' Guid='*'>
+                        <File
+                            Id='btmZsh'
+                            Name='_btm'
+                            DiskId='1'
+                            Source='$(var.CargoTargetDir)\tmp\bottom\completion\_btm'
+                            KeyPath='yes'/>
+                      </Component>
+                    </Directory>
                     
                     <Directory Id='Bin' Name='bin'>
                         <Component Id='Path' Guid='15D841CF-0363-4DBB-BF55-ECCB43B9EB03' KeyPath='yes'>
@@ -141,6 +188,12 @@
             -->
             <ComponentRef Id='License'/>
             
+            <ComponentRef Id='btmPowershell'/>
+            <ComponentRef Id='btmNu'/>
+            <ComponentRef Id='btmFish'/>
+            <ComponentRef Id='btmBash'/>
+            <ComponentRef Id='btmZsh'/>
+
             <ComponentRef Id='binary0'/>
 
             <Feature