Merge branch 'main' into string-subst

README.md

@@ -35,6 +35,9 @@ cargo r
 
 # To run a script
 cargo r -- ./scripts/hello_world.sh
+
+# To run a script and continue in interactive mode
+cargo r -- ./scripts/hello_world.sh --interact
 ```
 
 ## License

crates/deno_task_shell/Cargo.toml

@@ -23,11 +23,11 @@ tokio-util = { version = "0.7.12", optional = true }
 os_pipe = { version = "1.2.1", optional = true }
 serde = { version = "1", features = ["derive"], optional = true }
 thiserror = "1.0.63"
-pest = { git = "https://github.com/pest-parser/pest.git", branch = "master", features = ["miette-error"] }
+pest = { version="2.7.13", features = ["miette-error"] }
 pest_derive = "2.7.12"
 dirs = "5.0.1"
-pest_ascii_tree = { git = "https://github.com/prsabahrami/pest_ascii_tree.git", branch = "master" }
-miette = "7.2.0"
+pest_ascii_tree = "0.1.0"
+miette = { version = "7.2.0", features = ["fancy"] }
 lazy_static = "1.4.0"
 
 [dev-dependencies]

crates/deno_task_shell/src/parser.rs

@@ -1585,7 +1585,7 @@ fn parse_quoted_word(pair: Pair<Rule>) -> Result<WordPart> {
             parts.push(WordPart::Command(command));
           }
           Rule::VARIABLE => {
-            parts.push(WordPart::Variable(part.as_str()[1..].to_string(), None))
+            parts.push(WordPart::Variable(part.as_str().to_string()))
           }
           Rule::QUOTED_CHAR => {
             if let Some(WordPart::Text(ref mut s)) = parts.last_mut() {

crates/shell/Cargo.toml

@@ -32,9 +32,15 @@ uu_ls = "0.0.27"
 dirs = "5.0.1"
 which = "6.0.3"
 uu_uname = "0.0.27"
+uu_touch = "0.0.27"
 uu_date = "0.0.27"
+miette = { version = "7.2.0", features = ["fancy"] }
+filetime = "0.2.25"
+chrono = "0.4.38"
+parse_datetime = "0.6.0"
+dtparse = "2.0.1"
+windows-sys = "0.59.0"
 ctrlc = "3.4.5"
-miette = { version="7.2.0", features = ["fancy"] }
 
 [package.metadata.release]
 # Dont publish the binary

crates/shell/src/commands/mod.rs

@@ -8,10 +8,12 @@ use uu_ls::uumain as uu_ls;
 use crate::execute;
 
 pub mod date;
+pub mod touch;
 pub mod uname;
 pub mod which;
 
 pub use date::DateCommand;
+pub use touch::TouchCommand;
 pub use uname::UnameCommand;
 pub use which::WhichCommand;
 
@@ -46,6 +48,10 @@ pub fn get_commands() -> HashMap<String, Rc<dyn ShellCommand>> {
             "uname".to_string(),
             Rc::new(UnameCommand) as Rc<dyn ShellCommand>,
         ),
+        (
+            "touch".to_string(),
+            Rc::new(TouchCommand) as Rc<dyn ShellCommand>,
+        ),
         (
             "date".to_string(),
             Rc::new(DateCommand) as Rc<dyn ShellCommand>,