-
Notifications
You must be signed in to change notification settings - Fork 24
feat: configurable shell options and shopt command
#164
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.
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| [toolchain] | ||
| channel = "1.89.0" | ||
| channel = "1.92.0" | ||
| components = ["clippy", "rustfmt"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| // Copyright 2018-2025 the Deno authors. MIT license. | ||
|
|
||
| use futures::future::LocalBoxFuture; | ||
|
|
||
| use crate::shell::types::EnvChange; | ||
| use crate::shell::types::ExecuteResult; | ||
| use crate::shell::types::ShellOptions; | ||
|
|
||
| use super::ShellCommand; | ||
| use super::ShellCommandContext; | ||
|
|
||
| pub struct ShoptCommand; | ||
|
|
||
| impl ShellCommand for ShoptCommand { | ||
| fn execute( | ||
| &self, | ||
| mut context: ShellCommandContext, | ||
| ) -> LocalBoxFuture<'static, ExecuteResult> { | ||
| Box::pin(async move { | ||
| let mut set_mode = None; // None = query, Some(true) = -s, Some(false) = -u | ||
| let mut options_to_change = Vec::new(); | ||
|
|
||
| for arg in context.args.into_iter().peekable() { | ||
| let arg_str = arg.to_string_lossy(); | ||
| match arg_str.as_ref() { | ||
| "-s" => { | ||
| if set_mode == Some(false) { | ||
| let _ = context.stderr.write_line( | ||
| "shopt: cannot set and unset options simultaneously", | ||
| ); | ||
| return ExecuteResult::from_exit_code(1); | ||
| } | ||
| set_mode = Some(true); | ||
| } | ||
| "-u" => { | ||
| if set_mode == Some(true) { | ||
| let _ = context.stderr.write_line( | ||
| "shopt: cannot set and unset options simultaneously", | ||
| ); | ||
| return ExecuteResult::from_exit_code(1); | ||
| } | ||
| set_mode = Some(false); | ||
| } | ||
| _ => { | ||
| // treat as option name | ||
| match parse_option_name(&arg_str) { | ||
| Some(opt) => options_to_change.push(opt), | ||
| None => { | ||
| let _ = context.stderr.write_line(&format!( | ||
| "shopt: {}: invalid shell option name", | ||
| arg_str | ||
| )); | ||
| return ExecuteResult::from_exit_code(1); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| match set_mode { | ||
| Some(enabled) => { | ||
| // set or unset mode | ||
| if options_to_change.is_empty() { | ||
| let _ = context.stderr.write_line("shopt: option name required"); | ||
| return ExecuteResult::from_exit_code(1); | ||
| } | ||
|
|
||
| let changes: Vec<EnvChange> = options_to_change | ||
| .into_iter() | ||
| .map(|opt| EnvChange::SetShellOption(opt, enabled)) | ||
| .collect(); | ||
|
|
||
| ExecuteResult::Continue(0, changes, Vec::new()) | ||
| } | ||
| None => { | ||
| // query mode - print option status | ||
| let current_options = context.state.shell_options(); | ||
|
|
||
| if options_to_change.is_empty() { | ||
| // print all options | ||
| let _ = context.stdout.write_line(&format!( | ||
| "failglob\t{}", | ||
| if current_options.contains(ShellOptions::FAILGLOB) { | ||
| "on" | ||
| } else { | ||
| "off" | ||
| } | ||
| )); | ||
| let _ = context.stdout.write_line(&format!( | ||
| "nullglob\t{}", | ||
| if current_options.contains(ShellOptions::NULLGLOB) { | ||
| "on" | ||
| } else { | ||
| "off" | ||
| } | ||
| )); | ||
| ExecuteResult::from_exit_code(0) | ||
| } else { | ||
| // print specified options and return non-zero if any are off | ||
| let mut any_off = false; | ||
| for opt in options_to_change { | ||
| let is_on = current_options.contains(opt); | ||
| if !is_on { | ||
| any_off = true; | ||
| } | ||
| let name = option_to_name(opt); | ||
| let _ = context.stdout.write_line(&format!( | ||
| "{}\t{}", | ||
| name, | ||
| if is_on { "on" } else { "off" } | ||
| )); | ||
| } | ||
| ExecuteResult::from_exit_code(if any_off { 1 } else { 0 }) | ||
| } | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| fn parse_option_name(name: &str) -> Option<ShellOptions> { | ||
| match name { | ||
| "nullglob" => Some(ShellOptions::NULLGLOB), | ||
| "failglob" => Some(ShellOptions::FAILGLOB), | ||
| _ => None, | ||
| } | ||
| } | ||
|
|
||
| fn option_to_name(opt: ShellOptions) -> &'static str { | ||
| if opt == ShellOptions::NULLGLOB { | ||
| "nullglob" | ||
| } else if opt == ShellOptions::FAILGLOB { | ||
| "failglob" | ||
| } else { | ||
| "unknown" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this written by AI? :D This combination is strange compared to using an enum
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes,
but I don’t think it’s that strange because each individual one can be set in an iteration of the loop.Oh wait, I misunderstood this when I originally commented, but I think
Option<bool>makes sense here.