From cd66d3ac946bf259c20f483c9e5678be3926a096 Mon Sep 17 00:00:00 2001
From: Roland Kovacs <zen3ger@gmail.com>
Date: Mon, 21 Jan 2019 21:18:51 +0100
Subject: [PATCH] Fix token order after expansion
---
src/lib/parser/shell_expand/mod.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/parser/shell_expand/mod.rs b/src/lib/parser/shell_expand/mod.rs
index df93ff23..4f718136 100644
--- a/src/lib/parser/shell_expand/mod.rs
+++ b/src/lib/parser/shell_expand/mod.rs
@@ -710,9 +710,9 @@ pub(crate) fn expand_tokens<E: Expander>(
WordToken::Arithmetic(s) => expand_arithmetic(&mut output, s, expand_func),
}
}
- // I'm not entirely sure if empty strings are valid in any case- maarten
+
if output.as_str() != "" {
- expanded_words.push(output);
+ expanded_words.insert(0, output);
}
expanded_words
} else {
--
GitLab