From 030fe862747a76caf00180cc8266f63b3ac23b9c Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Thu, 7 Dec 2023 17:05:27 -0500
Subject: [PATCH] fix(stardust): split git and cargo steps

---
 src/builders/build_stardust.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/builders/build_stardust.rs b/src/builders/build_stardust.rs
index c04ff1d..2fa0301 100644
--- a/src/builders/build_stardust.rs
+++ b/src/builders/build_stardust.rs
@@ -1,4 +1,4 @@
-use crate::ui::job_worker::job::WorkerJob;
+use crate::{build_tools::git::Git, paths::get_data_dir, ui::job_worker::job::WorkerJob};
 use std::{collections::VecDeque, path::PathBuf};
 
 #[derive(Debug, Clone)]
@@ -33,12 +33,18 @@ pub fn get_build_stardust_jobs(
 ) -> VecDeque<WorkerJob> {
     let mut jobs = VecDeque::<WorkerJob>::new();
 
+    let server_git_dir = get_data_dir() + "/stardust-xr-server";
+
+    let server_git_job = Git {
+        repo: server_spec.repo,
+        dir: server_git_dir.clone(),
+        default_branch: server_spec.branch,
+    };
+    jobs.extend(server_git_job.get_pre_build_jobs(true));
     let mut args = vec![
         "install".into(),
-        "--git".into(),
-        server_spec.repo,
-        "--branch".into(),
-        server_spec.branch,
+        "--path".into(),
+        server_git_dir,
         "--root".into(),
         prefix_path.to_string_lossy().to_string(),
         "--no-default-features".into(),