From 3a55652c32b2efe0d55d6741f0dd1275caf997b0 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Tue, 15 Nov 2016 19:29:47 +0800
Subject: [PATCH] MAS Resource/Helper

---
 build-data/build-data-import.sh               | 2 +-
 build.xml                                     | 2 +-
 installer/appbundle/{MacOS => Helper}/brew.sh | 2 +-
 installer/appbundle/Helper/subtitles.sh       | 7 +++++++
 website/.htaccess                             | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)
 rename installer/appbundle/{MacOS => Helper}/brew.sh (97%)
 create mode 100755 installer/appbundle/Helper/subtitles.sh

diff --git a/build-data/build-data-import.sh b/build-data/build-data-import.sh
index 8ca63db2..32a93b46 100755
--- a/build-data/build-data-import.sh
+++ b/build-data/build-data-import.sh
@@ -8,7 +8,7 @@ fetch()
 
 	echo "Fetch $FILE"
 	if [ ! -f "$FILE" ] || test "`find $FILE -mtime $TIME`"; then
-		curl -L -o "$FILE" -z "$FILE" "$LINK"
+		curl -L -o "$FILE" -z "$FILE" --retry 5 "$LINK"
 
 		if [[ "${FILE##*.}" == "gz" ]]; then
 			gunzip -k -f "$FILE"
diff --git a/build.xml b/build.xml
index ba297d1c..90d7c103 100644
--- a/build.xml
+++ b/build.xml
@@ -456,7 +456,7 @@
 
 		<!-- include brew install script (can't put it into Contents/MacOS because that will break codesign and MAS submissions -->
 		<copy todir="${path.app}/Contents/Resources">
-			<fileset dir="${dir.installer}/appbundle/MacOS" includes="brew.sh" />
+			<fileset dir="${dir.installer}/appbundle" includes="Helper/**" />
 		</copy>
 
 		<!-- fix broken symlink -->
diff --git a/installer/appbundle/MacOS/brew.sh b/installer/appbundle/Helper/brew.sh
similarity index 97%
rename from installer/appbundle/MacOS/brew.sh
rename to installer/appbundle/Helper/brew.sh
index 2e30c73b..e3af6498 100755
--- a/installer/appbundle/MacOS/brew.sh
+++ b/installer/appbundle/Helper/brew.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # brew requires Command Line Tools for Xcode
 xcode-select --print-path || sudo xcode-select --install
diff --git a/installer/appbundle/Helper/subtitles.sh b/installer/appbundle/Helper/subtitles.sh
new file mode 100755
index 00000000..89163efd
--- /dev/null
+++ b/installer/appbundle/Helper/subtitles.sh
@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+PKG_NAME="FileBot_Subtitles_Installer.pkg"
+PKG_URL="https://app.filebot.net/files/$PKG_NAME"
+PKG="/tmp/$PKG_NAME"
+
+curl -L -o "$PKG" -z "$PKG" --retry 5 "$PKG_URL" && spctl -a -v --type install "$PKG" && sudo installer -verbose -pkg "$PKG" -target LocalSystem
diff --git a/website/.htaccess b/website/.htaccess
index 5750aa79..442bd08c 100644
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -1,6 +1,7 @@
 # dynamic links
 redirect 302 /files/FileBot-setup.exe https://github.com/filebot/filebot-installer/releases/download/v1.0/FileBot-setup.exe
 redirect 302 /files/FileBot.app https://itunes.apple.com/us/app/filebot/id905384638?mt=12&uo=6&at=1l3vupy&ct=app
+redirect 302 /files/FileBot_Subtitles_Installer.pkg https://downloads.sourceforge.net/project/filebot/filebot/LATEST/FileBot_Subtitles_Installer.pkg
 redirect 302 /files/FileBot.appx https://www.microsoft.com/store/apps/9nblggh52t9x
 redirect 302 /purchase/FileBot.app https://itunes.apple.com/us/app/filebot/id905384638?mt=12&uo=6&at=1l3vupy&ct=darwin
 redirect 302 /forums/faq.php https://www.filebot.net/forums/viewtopic.php?f=3&t=7