Ignore newlines in commands of "template"

[gigi.git] / src / org / cacert / gigi / output / Template.java

diff --git a/src/org/cacert/gigi/output/Template.java b/src/org/cacert/gigi/output/Template.java
index c64ab15e36596dbe6fc3b897491a476a93840c71..b6fb111e20e5419d31651a78a81df2429e59399f 100644 (file)
--- 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() {