aboutsummaryrefslogtreecommitdiffstats
path: root/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/augeas/0014-Shellvars-Allow-almost-any-command.patch')
-rw-r--r--main/augeas/0014-Shellvars-Allow-almost-any-command.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch b/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
deleted file mode 100644
index e5aec91949..0000000000
--- a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 296764fe7baa4d023d58661e6b600116b3b90b21 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphink@gmail.com>
-Date: Thu, 24 Apr 2014 16:10:50 +0200
-Subject: [PATCH 14/19] Shellvars: Allow (almost) any command
-
- Note: this may have edge effects in recursive sublenses
- that augparse cannot check.
----
- lenses/shellvars.aug | 7 +++++++
- lenses/tests/test_shellvars.aug | 12 +++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index c47f566..f9e03ff 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -116,6 +116,11 @@ module Shellvars =
- . ( action "&&" "@and" | action "||" "@or" )*
- in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
-
-+ let command =
-+ let reserved_key = /exit|shift|return|ulimit|unset|export|source|\.|if|for|select|while|until|then|else|fi|done|case|eval|alias/
-+ in let word = /[A-Za-z0-9_.-\/]+/
-+ in Util.indent . label "@command" . store (word - reserved_key)
-+ . [ Sep.space . label "@arg" . sto_to_semicol]?
-
- (************************************************************************
- * Group: CONDITIONALS AND LOOPS
-@@ -185,6 +190,7 @@ module Shellvars =
- | entry_eol_item condition
- | entry_eol_item eval
- | entry_eol_item alias
-+ | entry_eol_item command
-
- let entry_noeol =
- let entry_item (item:lens) = [ item ] in
-@@ -197,6 +203,7 @@ module Shellvars =
- | entry_item condition
- | entry_item eval
- | entry_item alias
-+ | entry_item command
-
- let rec rec_entry =
- let entry = comment | entry_eol | rec_entry in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 0f27a73..f065ce4 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -609,7 +609,17 @@ esac\n" =
- { "@condition" = "-f $FILENAME"
- { "type" = "[" }
- { "@and" = "do this" }
-- { "@or" = "or that" }
-+ { "@or" = "or that" } }
-+
-+(* Test: Shellvars.lns
-+ Parse (almost) any command *)
-+test Shellvars.lns get "echo foobar 'and this is baz'
-+/usr/local/bin/myscript.sh with args\n" =
-+ { "@command" = "echo"
-+ { "@arg" = "foobar 'and this is baz'" }
-+ }
-+ { "@command" = "/usr/local/bin/myscript.sh"
-+ { "@arg" = "with args" }
- }
-
- (* Local Variables: *)
---
-2.5.0
-