Allow outer shebangs so justfiles can be used as scripts

casey · Apr 8, 2019 · 023b051 · 023b051
1 parent cee9ac2
commit 023b051
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 40 deletions.
diff --git a/justfile b/justfile
@@ -1,3 +1,7 @@
+#!/usr/bin/env just --justfile
+# ^ This isn't required, but allows a justfile to be executed
+#   like a script, with `./justfile test`, for example.
+
 bt='0'
 
 export RUST_BACKTRACE=bt

diff --git a/src/compilation_error.rs b/src/compilation_error.rs
@@ -62,7 +62,6 @@ pub enum CompilationErrorKind<'a> {
   MixedLeadingWhitespace {
     whitespace: &'a str,
   },
-  OuterShebang,
   ParameterFollowsVariadicParameter {
     parameter: &'a str,
   },
@@ -229,9 +228,6 @@ impl<'a> Display for CompilationError<'a> {
           show_whitespace(found)
         )?;
       }
-      OuterShebang => {
-        writeln!(f, "`#!` is reserved syntax outside of recipes")?;
-      }
       UnknownDependency { recipe, unknown } => {
         writeln!(
           f,

diff --git a/src/lexer.rs b/src/lexer.rs
@@ -135,7 +135,7 @@ impl<'a> Lexer<'a> {
       static ref BACKTICK: Regex = token(r"`[^`\n\r]*`");
       static ref COLON: Regex = token(r":");
       static ref COMMA: Regex = token(r",");
-      static ref COMMENT: Regex = token(r"#([^!\n\r][^\n\r]*)?\r?$");
+      static ref COMMENT: Regex = token(r"#([^\n\r][^\n\r]*)?\r?$");
       static ref EOF: Regex = token(r"\z");
       static ref EOL: Regex = token(r"\n|\r\n");
       static ref EQUALS: Regex = token(r"=");
@@ -322,8 +322,6 @@ impl<'a> Lexer<'a> {
           return Err(self.error(UnterminatedString));
         }
         (prefix, &self.rest[start..content_end + 1], StringToken)
-      } else if self.rest.starts_with("#!") {
-        return Err(self.error(OuterShebang));
       } else {
         return Err(self.error(UnknownStartOfToken));
       };
@@ -340,7 +338,7 @@ impl<'a> Lexer<'a> {
           _ => {
             return Err(last.error(Internal {
               message: format!("zero length token: {:?}", last),
-            }))
+            }));
           }
         }
       }
@@ -647,16 +645,6 @@ c: b
     kind:   InconsistentLeadingWhitespace{expected: "\t\t", found: "\t  "},
   }
 
-  error_test! {
-    name: tokenize_outer_shebang,
-    input: "#!/usr/bin/env bash",
-    index:  0,
-    line:   0,
-    column: 0,
-    width:  None,
-    kind:   OuterShebang,
-  }
-
   error_test! {
     name: tokenize_unknown,
     input: "~",

diff --git a/tests/integration.rs b/tests/integration.rs
@@ -578,28 +578,6 @@ wut:
   status:   EXIT_SUCCESS,
 }
 
-integration_test! {
-  name:     outer_shebang,
-  justfile: r#"#!/lol/wut
-export FOO = "a"
-baz = "c"
-export BAR = "b"
-export ABC = FOO + BAR + baz
-
-wut:
-  #!/bin/sh
-  echo $FOO $BAR $ABC
-"#,
-  args:     (),
-  stdout:   "",
-  stderr:   "error: `#!` is reserved syntax outside of recipes
-  |
-1 | #!/lol/wut
-  | ^
-",
-  status:   EXIT_FAILURE,
-}
-
 integration_test! {
   name:     export_shebang,
   justfile: r#"