Skip to content

Follow-up fixes for #112 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MikeTheGreat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Follow-up fixes for #112 #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2283852
Follow-up fixes for #112
MikeTheGreat Nov 8, 2025
f672641
Addressing issues
MikeTheGreat Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions src/fileops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,12 +664,19 @@ pub fn from_stow_cmd(ctx: &Context, stow_path: Option<String>) -> Result<(), Exi
None => std::env::current_dir().unwrap(),
};

if dotfiles_dir.exists() {
let old_dotfiles = {
let old_dirname = dotfiles_dir.file_name().unwrap().to_str().unwrap();
let mut old_dotfiles = dotfiles_dir.clone();
old_dotfiles.set_file_name(format!("{old_dirname}_old"));
old_dotfiles
};

if old_dotfiles.exists() {
println!(
"{}",
format!(
"A dotfiles directory already exists at `{}`\nPlease move it elsewhere or delete it before continuing",
dotfiles_dir.display()
"A backup directory already exists at `{}`\nPlease move it elsewhere or delete it before continuing",
old_dotfiles.display()
).red()
);
return Err(ExitCode::FAILURE);
Expand Down Expand Up @@ -701,8 +708,9 @@ pub fn from_stow_cmd(ctx: &Context, stow_path: Option<String>) -> Result<(), Exi
if file.is_dir() {
if ctx.dry_run {
eprintln!("Creating directory `{}`", tuckr_path.display());
} else {
fs::create_dir_all(tuckr_path).unwrap();
}
fs::create_dir_all(tuckr_path).unwrap();
continue;
}

Expand All @@ -713,17 +721,18 @@ pub fn from_stow_cmd(ctx: &Context, stow_path: Option<String>) -> Result<(), Exi
tuckr_path.display()
);
} else {
fs::copy(file, tuckr_path).unwrap();
if let Err(e) = fs::copy(&file, &tuckr_path) {
let error_message = format!(
"Failed to copy `{}` to `{}`: {}",
file.display(),
tuckr_path.display(),
e.to_string()
);
eprintln!("{}", error_message.red());
}
Comment thread
MikeTheGreat marked this conversation as resolved.
}
}

let old_dotfiles = {
let old_dirname = dotfiles_dir.file_name().unwrap().to_str().unwrap();
let mut old_dotfiles = dotfiles_dir.clone();
old_dotfiles.set_file_name(format!("{old_dirname}_old"));
old_dotfiles
};

if ctx.dry_run {
eprintln!(
"Moving previous dotfiles (`{}`) to `{}`",
Expand All @@ -750,11 +759,11 @@ pub fn from_stow_cmd(ctx: &Context, stow_path: Option<String>) -> Result<(), Exi
old_dotfiles.display()
);

println!(
"{}\n{}",
dotfiles_converted_msg.green(),
old_dotfiles_location_msg.yellow()
);
println!("{}", dotfiles_converted_msg.green());

if old_dotfiles.exists() {
println!("{}", old_dotfiles_location_msg.yellow());
}

Ok(())
}
Expand Down