From 1f8530ec242def629fbc47d731911cf96e552db5 Mon Sep 17 00:00:00 2001
From: Reactor Scram <ReactorScram@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:42:20 -0500
Subject: [PATCH] chore(rust/gui-client): fix Tauri build scripts (#7077)

- We don't need to control our deb's deps since we're sticking with
Tauri
- Specifying `pnpm tauri` fixes an odd issue on one dev system
- `tauri-cli` is a dev dep, not a runtime dep
---
 rust/gui-client/build.bat      | 2 +-
 rust/gui-client/build.sh       | 4 ----
 rust/gui-client/package.json   | 2 +-
 rust/gui-client/pnpm-lock.yaml | 6 +++---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/rust/gui-client/build.bat b/rust/gui-client/build.bat
index 94186c811..12c4b1a35 100755
--- a/rust/gui-client/build.bat
+++ b/rust/gui-client/build.bat
@@ -11,4 +11,4 @@ REM Compile CSS
 call pnpm tailwindcss -i src\input.css -o src\output.css
 
 REM Compile Rust and bundle
-call tauri build
+call pnpm tauri build
diff --git a/rust/gui-client/build.sh b/rust/gui-client/build.sh
index 9120a0af5..4cebf1afd 100755
--- a/rust/gui-client/build.sh
+++ b/rust/gui-client/build.sh
@@ -31,10 +31,6 @@ INTERMEDIATE_DIR=$(ls -d "$BUNDLES_DIR"/*/)
 cp src-tauri/deb_files/postinst src-tauri/deb_files/prerm "$INTERMEDIATE_DIR/control/"
 
 pushd "$INTERMEDIATE_DIR"
-# Substitute our own list of deps
-# This does nothing right now, but we'll need it for replacing Tauri
-sed '/^Depends:/c\Depends: libayatana-appindicator3-1, libwebkit2gtk-4.0-37, libgtk-3-0' control/control > control/control.new
-mv control/control.new control/control
 
 # Rebuild the control tarball
 tar -C "control" -czf "control.tar.gz" control md5sums postinst prerm
diff --git a/rust/gui-client/package.json b/rust/gui-client/package.json
index dbfb6a3b3..d19961841 100644
--- a/rust/gui-client/package.json
+++ b/rust/gui-client/package.json
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^1.6",
-    "@tauri-apps/cli": "^1.6",
     "flowbite": "^2.5.2"
   },
   "devDependencies": {
+    "@tauri-apps/cli": "^1.6",
     "@types/node": "22",
     "http-server": "^14.1.1",
     "run-script-os": "^1.1.6",
diff --git a/rust/gui-client/pnpm-lock.yaml b/rust/gui-client/pnpm-lock.yaml
index 011ce16c1..1879cec78 100644
--- a/rust/gui-client/pnpm-lock.yaml
+++ b/rust/gui-client/pnpm-lock.yaml
@@ -11,13 +11,13 @@ importers:
       '@tauri-apps/api':
         specifier: ^1.6
         version: 1.6.0
-      '@tauri-apps/cli':
-        specifier: ^1.6
-        version: 1.6.2
       flowbite:
         specifier: ^2.5.2
         version: 2.5.2
     devDependencies:
+      '@tauri-apps/cli':
+        specifier: ^1.6
+        version: 1.6.2
       '@types/node':
         specifier: '22'
         version: 22.7.5