From b175fa71a0bff13e9211c9c1d8abae75864c8cf1 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 28 Sep 2017 15:39:22 +0200
Subject: [PATCH] Revert "Update appbundler"

This reverts commit 0c325b4ff6118be331dfb27db06a6596bb6ebde8.
The 10.13 workaround seems to work also without this update AND it was causing a regression on testCommandLineBuildWithRelativePath (cwd() was not being exported)
---
 build/build.xml                                    | 10 +++++-----
 build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha |  1 +
 build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha |  1 -
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha
 delete mode 100644 build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha

diff --git a/build/build.xml b/build/build.xml
index b6cdf2498..d95f8def6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -373,13 +373,13 @@
     <mkdir dir="${staging_folder}/work" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
-      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
     </antcall>
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino5/appbundler-1.0ea-arduino5.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>
 
     <bundleapp
             jvmRequired="1.8"
diff --git a/build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha
new file mode 100644
index 000000000..15cbc3db3
--- /dev/null
+++ b/build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha
@@ -0,0 +1 @@
+89ef9e3ab1572e0bf2edfae2c9d6c0a03dcf2665
diff --git a/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
deleted file mode 100644
index ab2284098..000000000
--- a/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-63259fca0c3c7588d3d01a5aeec96c615362186a