From 047582f91e3fb6c73b7db7ac390bb458119e1c90 Mon Sep 17 00:00:00 2001
From: Felix Lohmeier <mail@felixlohmeier.de>
Date: Wed, 25 Oct 2023 23:25:40 +0000
Subject: [PATCH] remove trailing newline from input

---
 orcli                          | 5 ++++-
 src/export_template_command.sh | 5 ++++-
 tests/export-template.sh       | 6 ++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/orcli b/orcli
index 01c84ba..3331992 100755
--- a/orcli
+++ b/orcli
@@ -1777,10 +1777,13 @@ orcli_export_template_command() {
       fi
   fi
 
+  # read args[file] into variable to remove trailing newline
+  template=$(cat "${args[file]}")
+
   # assemble specific post data
   data+=("project=${projectid}")
   data+=("format=template")
-  data+=("template@${args[file]}")
+  data+=("template=${template}")
   if [[ ${args[--prefix]} ]]; then
       data+=("prefix=${args[--prefix]}")
   fi
diff --git a/src/export_template_command.sh b/src/export_template_command.sh
index f799eb9..2057d72 100644
--- a/src/export_template_command.sh
+++ b/src/export_template_command.sh
@@ -29,10 +29,13 @@ else
     fi
 fi
 
+# read args[file] into variable to remove trailing newline
+template=$(cat "${args[file]}")
+
 # assemble specific post data
 data+=("project=${projectid}")
 data+=("format=template")
-data+=("template@${args[file]}")
+data+=("template=${template}")
 if [[ ${args[--prefix]} ]]; then
     data+=("prefix=${args[--prefix]}")
 fi
diff --git a/tests/export-template.sh b/tests/export-template.sh
index 3305af9..6c635d7 100644
--- a/tests/export-template.sh
+++ b/tests/export-template.sh
@@ -12,9 +12,7 @@ cp data/duplicates.csv "${tmpdir}/${t}.csv"
 
 # assertion
 cat << "DATA" > "${tmpdir}/${t}.assert"
-{ "events" : [{ "name" : "Ben Tyler", "purchase" : "Flashlight" }
-,{ "name" : "Ben Morisson", "purchase" : "Amplifier" }
-]}
+{ "events" : [{ "name" : "Ben Tyler", "purchase" : "Flashlight" },{ "name" : "Ben Morisson", "purchase" : "Amplifier" }]}
 DATA
 
 # action
@@ -24,7 +22,7 @@ orcli export template "${t}" --output "${t}.output" \
 <<< '{ "name" : {{jsonize(cells["name"].value)}}, "purchase" : {{jsonize(cells["purchase"].value)}} }' \
 --prefix '{ "events" : [' \
 --separator , \
---mode rows \
+--mode records \
 --suffix ]}$'\n' \
 --facets '[ { "type": "text", "name": "foo", "columnName": "name", "mode": "regex", "caseSensitive": false, "query": "Ben" } ]'