From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 31 Mar 2021 19:05:11 +0000 (+0200)
Subject: rule.uc: fix redundant whitespace in rules without target
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=694d428d0513bf9d7d09c7b21d4e43fedac7ddbe;p=project%2Ffirewall4.git

rule.uc: fix redundant whitespace in rules without target

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/root/usr/share/firewall4/templates/rule.uc b/root/usr/share/firewall4/templates/rule.uc
index 1f01d5f..0aae480 100644
--- a/root/usr/share/firewall4/templates/rule.uc
+++ b/root/usr/share/firewall4/templates/rule.uc
@@ -65,7 +65,7 @@
 	counter {%+ endif -%}
 {%+ if (rule.log): -%}
 	log prefix {{ fw4.quote(rule.log, true) }} {%+ endif -%}
-{% if (rule.target == "mark"): -%}
+{%+ if (rule.target == "mark"): -%}
 	meta mark set {{
 		(rule.set_xmark.mask == 0xFFFFFFFF)
 			? fw4.hex(rule.set_xmark.mark)
@@ -76,15 +76,16 @@
 					: (rule.set_xmark.mask == 0)
 						? 'mark xor ' + fw4.hex(rule.set_xmark.mark)
 						: 'mark and ' + fw4.hex(~r.set_xmark.mask & 0xFFFFFFFF) + ' xor ' + fw4.hex(r.set_xmark.mark)
-	}}
-{%- elif (rule.target == "dscp"): -%}
-	{{ fw4.ipproto(rule.family) }} dscp set {{ fw4.hex(rule.set_dscp.dscp) }}
-{%- elif (rule.target == "notrack"): -%}
-	notrack
-{%- elif (rule.target == "helper"): -%}
-	ct helper set {{ fw4.quote(rule.set_helper.name, true) }}
-{%- elif (rule.jump_chain): -%}
-	jump {{ rule.jump_chain }}
-{%- else -%}
-	{{ rule.target }}
-{%- endif %} comment {{ fw4.quote("!fw4: " + rule.name, true) }}
+	}} {%+
+   elif (rule.target == "dscp"): -%}
+	{{ fw4.ipproto(rule.family) }} dscp set {{ fw4.hex(rule.set_dscp.dscp) }} {%+
+   elif (rule.target == "notrack"): -%}
+	notrack {%+
+   elif (rule.target == "helper"): -%}
+	ct helper set {{ fw4.quote(rule.set_helper.name, true) }} {%+
+   elif (rule.jump_chain): -%}
+	jump {{ rule.jump_chain }} {%+
+   elif (rule.target): -%}
+	{{ rule.target }} {%+
+   endif -%}
+comment {{ fw4.quote("!fw4: " + rule.name, true) }}