Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
ion
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
94
Issues
94
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
redox-os
ion
Commits
04f7be9f
Commit
04f7be9f
authored
Jun 02, 2019
by
Michael Aaron Murphy
2
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'intellij-fix' into 'master'
Add interactive option See merge request
!1018
parents
0653ff9a
5a0202ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
src/main.rs
src/main.rs
+3
-1
No files found.
src/main.rs
View file @
04f7be9f
...
...
@@ -26,6 +26,7 @@ fn main() {
let
mut
args
=
env
::
args
()
.skip
(
1
);
let
mut
script_path
=
None
;
let
mut
key_bindings
=
None
;
let
mut
force_interactive
=
false
;
while
let
Some
(
arg
)
=
args
.next
()
{
match
arg
.as_str
()
{
"-o"
=>
match
args
.next
()
.as_ref
()
.map
(|
s
|
s
.as_str
())
{
...
...
@@ -51,6 +52,7 @@ fn main() {
println!
(
"{}"
,
MAN_ION
);
return
;
}
"-i"
|
"--interactive"
=>
force_interactive
=
true
,
_
=>
{
script_path
=
Some
(
arg
);
break
;
...
...
@@ -75,7 +77,7 @@ fn main() {
shell
.execute_script
(
command
.as_bytes
());
}
else
if
let
Some
(
path
)
=
script_path
{
shell
.execute_file
(
&
path
.as_str
());
}
else
if
stdin_is_a_tty
{
}
else
if
stdin_is_a_tty
||
force_interactive
{
let
mut
interactive
=
InteractiveBinary
::
new
(
shell
);
if
let
Some
(
key_bindings
)
=
key_bindings
{
interactive
.set_keybindings
(
key_bindings
);
...
...
Roland Kovács
@zen3ger
mentioned in issue
#880
·
Jun 14, 2019
mentioned in issue
#880
mentioned in issue #880
Toggle commit list
Roland Kovács
@zen3ger
mentioned in issue
#881
·
Jun 14, 2019
mentioned in issue
#881
mentioned in issue #881
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment