Skip to content
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

cargo shuttle init does not handle directory argument properly #671

Closed
wants to merge 9 commits into from
Closed

cargo shuttle init does not handle directory argument properly #671

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d322466
cargo shuttle init does not handle directory argument properly
h-dav Mar 2, 2023
a937575
cargo shuttle init does not handle directory argument properly
h-dav Mar 2, 2023
8259c24
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
5f1ed89
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
49a17f8
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
89c26c8
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
659e9d3
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
d64471f
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
462ebaa
Merge branch 'shuttle_init_directory_bug_665' of github.com:h-dav/shu…
h-dav Mar 2, 2023
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
21 changes: 15 additions & 6 deletions cargo-shuttle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,21 @@ impl Shuttle {

// 3. Confirm the project directory
let path = if interactive {
println!("Where should we create this project?");
let directory_str: String = Input::with_theme(&theme)
.with_prompt("Directory")
.default(".".to_owned())
.interact()?;
println!();
let directory_str: String;
if project_args.working_directory.as_os_str().is_empty() {
println!("Where should we create this project?");
directory_str = Input::with_theme(&theme)
.with_prompt("Directory")
.default(".".to_owned())
.interact()?;
println!();
} else {
directory_str = project_args
.working_directory
.into_os_string()
.into_string()
.unwrap();
}
oddgrd marked this conversation as resolved.
Show resolved Hide resolved
args::parse_init_path(OsString::from(directory_str))?
} else {
args.path.clone()
Expand Down