From 67d0931c190410392ff79c3cb620e42cd6e8a0bc Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Fri, 16 Jul 2021 09:35:32 +0200
Subject: [PATCH] Added parameters to script build-arduino-package.sh

---
 extras/scripts/build-arduino-package.sh | 30 +++++++++++++------------
 extras/scripts/publish.sh               |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/extras/scripts/build-arduino-package.sh b/extras/scripts/build-arduino-package.sh
index 44067205..339db2f6 100755
--- a/extras/scripts/build-arduino-package.sh
+++ b/extras/scripts/build-arduino-package.sh
@@ -1,21 +1,23 @@
 #!/bin/bash
 
-TAG=$(git describe)
-OUTPUT="ArduinoJson-$TAG.zip"
+set -eu
 
-cd $(dirname $0)/../../..
+INPUT=$1
+OUTPUT=$2
+
+cd "$INPUT"
 
 # remove existing file
-rm -f $OUTPUT
+rm -f "$OUTPUT"
 
 # create zip
-7z a $OUTPUT \
-    -xr!.vs \
-	ArduinoJson/CHANGELOG.md \
-	ArduinoJson/examples \
-	ArduinoJson/src \
-	ArduinoJson/keywords.txt \
-	ArduinoJson/library.properties \
-	ArduinoJson/LICENSE.md \
-	ArduinoJson/README.md \
-	ArduinoJson/ArduinoJson.h
+7z a "$OUTPUT" \
+	-xr!.vs \
+	CHANGELOG.md \
+	examples \
+	src \
+	keywords.txt \
+	library.properties \
+	LICENSE.md \
+	README.md \
+	ArduinoJson.h
diff --git a/extras/scripts/publish.sh b/extras/scripts/publish.sh
index 670e83ab..f045683c 100755
--- a/extras/scripts/publish.sh
+++ b/extras/scripts/publish.sh
@@ -59,7 +59,7 @@ commit_new_version
 add_tag
 push
 
-extras/scripts/build-arduino-package.sh
+extras/scripts/build-arduino-package.sh . "../ArduinoJson-$TAG.zip"
 extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h"
 extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp"
 extras/scripts/wandbox/publish.sh "../ArduinoJson-$TAG.h"