aboutsummaryrefslogtreecommitdiffstats
path: root/src/command/client/sync
diff options
context:
space:
mode:
authorLuke Karrys <luke@lukekarrys.com>2023-03-06 15:46:03 -0700
committerGitHub <noreply@github.com>2023-03-06 22:46:03 +0000
commitca5bbea0d4c4fd86eb80f99688bcb78f8ba68877 (patch)
treeec0328acc9168672ec9d4cb22d022c83a02d43b1 /src/command/client/sync
parentWindows support (#754) (diff)
downloadatuin-ca5bbea0d4c4fd86eb80f99688bcb78f8ba68877.zip
fix(client): always read session_path from settings (#757)
* fix(client): always read session_path from settings * fixup! fix(client): always read session_path from settings * fixup! fix(client): always read session_path from settings
Diffstat (limited to 'src/command/client/sync')
-rw-r--r--src/command/client/sync/login.rs4
-rw-r--r--src/command/client/sync/logout.rs12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/command/client/sync/login.rs b/src/command/client/sync/login.rs
index 06e65196..6aa2d847 100644
--- a/src/command/client/sync/login.rs
+++ b/src/command/client/sync/login.rs
@@ -33,9 +33,9 @@ fn get_input() -> Result<String> {
impl Cmd {
pub async fn run(&self, settings: &Settings) -> Result<()> {
- let session_path = atuin_common::utils::data_dir().join("session");
+ let session_path = settings.session_path.as_str();
- if session_path.exists() {
+ if PathBuf::from(session_path).exists() {
println!(
"You are already logged in! Please run 'atuin logout' if you wish to login again"
);
diff --git a/src/command/client/sync/logout.rs b/src/command/client/sync/logout.rs
index a7e9541d..90b49d6d 100644
--- a/src/command/client/sync/logout.rs
+++ b/src/command/client/sync/logout.rs
@@ -1,11 +1,15 @@
+use std::path::PathBuf;
+
use eyre::{Context, Result};
use fs_err::remove_file;
-pub fn run() -> Result<()> {
- let session_path = atuin_common::utils::data_dir().join("session");
+use atuin_client::settings::Settings;
+
+pub fn run(settings: &Settings) -> Result<()> {
+ let session_path = settings.session_path.as_str();
- if session_path.exists() {
- remove_file(session_path.as_path()).context("Failed to remove session file")?;
+ if PathBuf::from(session_path).exists() {
+ remove_file(session_path).context("Failed to remove session file")?;
println!("You have logged out!");
} else {
println!("You are not logged in");