Skip to content

Source ~/.shellrc automatically if it exists #173

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

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Source ~/.shellrc automatically if it exists #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38b014a
Source ~/.shellrc automatically if it exists
certik Sep 30, 2024
9c62bb6
Implement --norc option to skip sourcing .shellrc
certik Sep 30, 2024
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
22 changes: 19 additions & 3 deletions crates/shell/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ struct Options {
#[clap(long)]
interact: bool,

/// Do not source ~/.shellrc on startup
#[clap(long)]
norc: bool,

#[clap(short, long)]
debug: bool,
}
Expand All @@ -34,7 +38,7 @@ fn init_state() -> ShellState {
ShellState::new(env_vars, &cwd, commands::get_commands())
}

async fn interactive(state: Option<ShellState>) -> miette::Result<()> {
async fn interactive(state: Option<ShellState>, norc: bool) -> miette::Result<()> {
let config = Config::builder()
.history_ignore_space(true)
.completion_type(CompletionType::List)
Expand All @@ -53,6 +57,8 @@ async fn interactive(state: Option<ShellState>) -> miette::Result<()> {
let mut state = state.unwrap_or_else(init_state);

let home = dirs::home_dir().ok_or(miette::miette!("Couldn't get home directory"))?;

// Load .shell_history
let history_file: PathBuf = [home.as_path(), Path::new(".shell_history")]
.iter()
.collect();
Expand All @@ -62,6 +68,16 @@ async fn interactive(state: Option<ShellState>) -> miette::Result<()> {
.context("Failed to read the command history")?;
}

// Load ~/.shellrc
let shellrc_file: PathBuf = [home.as_path(), Path::new(".shellrc")].iter().collect();
if !norc && Path::new(shellrc_file.as_path()).exists() {
let line = "source '".to_owned() + shellrc_file.to_str().unwrap() + "'";
let prev_exit_code = execute(&line, &mut state)
.await
.context("Failed to source ~/.shellrc")?;
state.set_last_command_exit_code(prev_exit_code);
}

let mut _prev_exit_code = 0;
loop {
// Reset cancellation flag
Expand Down Expand Up @@ -156,10 +172,10 @@ async fn main() -> miette::Result<()> {
}
execute(&script_text, &mut state).await?;
if options.interact {
interactive(Some(state)).await?;
interactive(Some(state), options.norc).await?;
}
} else {
interactive(None).await?;
interactive(None, options.norc).await?;
}

Ok(())
Expand Down
Loading