From: Felix Dörre <felix@dogcraft.de>
Date: Wed, 9 Jul 2014 07:08:13 +0000 (+0200)
Subject: Ignore newlines in commands of "template"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=8adafa292d8cb42406068b5900385f2ea3d6509a;hp=b2b98b2b0adf445d77a88e23e6460ab3e1803607

Ignore newlines in commands of "template"
---

diff --git a/src/org/cacert/gigi/output/Template.java b/src/org/cacert/gigi/output/Template.java
index c64ab15e..b6fb111e 100644
--- a/src/org/cacert/gigi/output/Template.java
+++ b/src/org/cacert/gigi/output/Template.java
@@ -44,6 +44,7 @@ public class Template implements Outputable {
 			splitted.add(buf.toString());
 			contents = splitted.toArray(new String[splitted.size()]);
 			vars = commands.toArray(new Outputable[commands.size()]);
+			r.close();
 		} catch (IOException e) {
 			throw new Error(e);
 		}
@@ -54,6 +55,7 @@ public class Template implements Outputable {
 						.equals(string);
 	}
 	private Outputable parseCommand(String s2) {
+		s2 = s2.replace("\n", "");
 		if (s2.startsWith("=_")) {
 			final String raw = s2.substring(2);
 			return new Outputable() {