From f1f28a764e24a519aaa1d4c01097acee93b4eb1b Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Mon, 21 Oct 2024 17:14:35 +0200 Subject: shell defaults: properly deduplicate "bin dirs" to the left --- shell/RULES | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/shell/RULES b/shell/RULES index 2ce078e..5ac07e6 100644 --- a/shell/RULES +++ b/shell/RULES @@ -137,14 +137,24 @@ } ] , [ "bin dirs" - , { "type": "++" + , { "type": "reverse" , "$1": - [ {"type": "FIELD", "name": "bin dirs"} - , { "type": "let*" - , "bindings": [["provider", "bin dirs"]] - , "body": {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + { "type": "nub_right" + , "$1": + { "type": "reverse" + , "$1": + { "type": "++" + , "$1": + [ {"type": "FIELD", "name": "bin dirs"} + , { "type": "let*" + , "bindings": [["provider", "bin dirs"]] + , "body": + {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + } + ] + } } - ] + } } ] ] -- cgit v1.2.3