Skip to content

Commit 67280d5

Browse files
committed
Fix
1 parent d92ded1 commit 67280d5

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

src/core.rs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,33 @@ impl ShellCore {
179179
.map(|e| e.to_string())
180180
.collect();
181181

182-
let _ = self.db.set_param(
183-
"SUSH_VERSION",
184-
&format!("{version}({symbol})-{profile}"),
185-
None,
186-
);
182+
187183
let _ = self.db.set_param(
188184
"BASH_VERSION",
189185
&format!("{t_bash_ver}({t_bash_symbol})-{profile}"),
190186
None,
191187
);
188+
192189
let _ = self.db.set_param("MACHTYPE", &machtype, None);
193190
let _ = self.db.set_param("HOSTTYPE", t_arch, None);
194191
let _ = self.db.set_param("OSTYPE", t_os, None);
195-
let _ = self
196-
.db
197-
.set_array("SUSH_VERSINFO", Some(sush_versinfo), None);
192+
193+
if let Ok("1") = env::var("SUSH_COMPAT_TEST_MODE").as_deref() {
194+
}else{
195+
let _ = self
196+
.db
197+
.set_array("SUSH_VERSINFO", Some(sush_versinfo), None);
198+
let _ = self.db.set_param(
199+
"SUSH_VERSION",
200+
&format!("{version}({symbol})-{profile}"),
201+
None,
202+
);
203+
self.db.set_flag("SUSH_VERSINFO", 'r', None);
204+
}
205+
198206
let _ = self
199207
.db
200208
.set_array("BASH_VERSINFO", Some(bash_versinfo), None);
201-
self.db.set_flag("SUSH_VERSINFO", 'r', None);
202209
self.db.set_flag("BASH_VERSINFO", 'r', None);
203210
}
204211

src/elements/command/simple/parser.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ impl SimpleCommand {
2424

2525
pub fn eat_substitution_as_arg(&mut self, feeder: &mut Feeder,core: &mut ShellCore)
2626
-> Result<bool, ParseError> {
27-
//if let Some(s) = Substitution::parse_as_arg(feeder, core)? {
2827
if let Some(s) = Substitution::parse(feeder, core, false, true)? {
2928
self.text += &s.text;
3029
self.substitutions_as_args

src/elements/command/simple/run_internal.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@ fn other_to_subst(arg: &str,
7474
subs: &mut Vec<Substitution>
7575
) -> Result<(), ExecError> {
7676
let mut f = Feeder::new(arg);
77-
match Substitution::parse(&mut f, core, true, false)? {
78-
Some(mut s) => {
79-
s.quoted = true;
80-
subs.push(s);
81-
}
82-
None => {
83-
let mut s = Substitution::default();
84-
s.text = arg.to_string();
85-
s.left_hand.text = s.text.clone();
86-
s.left_hand.name = s.text.clone();
87-
s.quoted = true;
88-
subs.push(s);
89-
}
77+
78+
if let Some(mut s) = Substitution::parse(&mut f,
79+
core, true, false)? {
80+
s.quoted = true;
81+
subs.push(s);
82+
return Ok(());
9083
}
9184

85+
let mut s = Substitution::default();
86+
s.text = arg.to_string();
87+
s.left_hand.text = s.text.clone();
88+
s.left_hand.name = s.text.clone();
89+
s.quoted = true;
90+
subs.push(s);
91+
9292
Ok(())
9393
}

0 commit comments

Comments
 (0)