Skip to content

Commit 2faca68

Browse files
committed
Revert "When running pnpm tauri dev, make sure askpass is checked in the right directory"
This reverts commit b1fb45b. Let's try to give better instructions instead.
1 parent b1fb45b commit 2faca68

File tree

1 file changed

+13
-46
lines changed

1 file changed

+13
-46
lines changed

crates/gitbutler-git/src/repository.rs

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -95,56 +95,23 @@ where
9595
#[cfg(feature = "test-askpass-path")]
9696
let current_exe = current_exe.parent().unwrap();
9797

98-
let mut bin_dir = current_exe.parent().unwrap().to_path_buf();
99-
100-
let askpass_name = {
101-
#[cfg(unix)]
102-
{
103-
"gitbutler-git-askpass"
104-
}
105-
#[cfg(windows)]
106-
{
107-
"gitbutler-git-askpass.exe"
108-
}
109-
};
110-
111-
// Only in dev mode, check that we're in the right dir.
112-
// When running from tauri CARGO_TARGET_DIR=target/tauri, the tauri binary is in target/tauri/debug
113-
// but auxiliary binaries are in target/debug. Detect this and use the correct directory.
114-
#[cfg(debug_assertions)]
115-
{
116-
let candidate_dirs = [
117-
bin_dir.to_path_buf(),
118-
bin_dir
119-
.parent()
120-
.and_then(|p| p.parent())
121-
.map(|p| p.join("debug").to_path_buf())
122-
.unwrap_or_else(|| bin_dir.to_path_buf()),
123-
];
124-
125-
for candidate_dir in candidate_dirs.iter() {
126-
let candidate_path = candidate_dir.join(askpass_name);
127-
if executor
128-
.stat(&candidate_path.to_string_lossy().into_owned())
129-
.await
130-
.is_ok()
98+
let askpath_path = current_exe
99+
.with_file_name({
100+
#[cfg(unix)]
131101
{
132-
bin_dir = candidate_dir.clone();
133-
break;
102+
"gitbutler-git-askpass"
134103
}
135-
}
136-
tracing::info!(
137-
"Using askpass binary directory: {:?} after checking candidates: {:?}",
138-
bin_dir,
139-
candidate_dirs
140-
);
141-
}
142-
143-
let askpath_path = bin_dir.join(askpass_name).to_string_lossy().into_owned();
104+
#[cfg(windows)]
105+
{
106+
"gitbutler-git-askpass.exe"
107+
}
108+
})
109+
.to_string_lossy()
110+
.into_owned();
144111

145112
#[cfg(unix)]
146-
let setsid_path = bin_dir
147-
.join("gitbutler-git-setsid")
113+
let setsid_path = current_exe
114+
.with_file_name("gitbutler-git-setsid")
148115
.to_string_lossy()
149116
.into_owned();
150117

0 commit comments

Comments
 (0)