From 8b923aeb18e54c41f7765e59784cd7a5e355b6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 18 Sep 2019 22:19:54 +0200
Subject: [PATCH] Inline release script into compileOSX

---
 compileOSX.sh | 29 ++++++++++++++++++++++++++++-
 releaseOSX.sh | 32 --------------------------------
 2 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100755 releaseOSX.sh

diff --git a/compileOSX.sh b/compileOSX.sh
index 619b0d6a..d04c0d49 100755
--- a/compileOSX.sh
+++ b/compileOSX.sh
@@ -35,7 +35,34 @@ cp -R YACReader/YACReader.app YACReader.app
 cp -R YACReaderLibrary/YACReaderLibrary.app YACReaderLibrary.app
 cp -R YACReaderLibraryServer/YACReaderLibraryServer.app YACReaderLibraryServer.app
 
-./releaseOSX.sh
+hash macdeployqt 2>/dev/null || { echo >&2 "macdeployqt command not available. Please add the bin subfolder of your Qt installation  to the PATH environment variable."; exit 1; }
+
+echo "Preparing apps for release ..."
+
+macdeployqt YACReader.app
+macdeployqt YACReaderLibrary.app -qmldir=YACReaderLibrary/qml
+macdeployqt YACReaderLibraryServer.app
+
+mkdir -p YACReader.app/Contents/MacOS/utils
+mkdir -p YACReaderLibrary.app/Contents/MacOS/utils
+mkdir -p YACReaderLibraryServer.app/Contents/MacOS/utils
+
+cp dependencies/qrencode/macx/libqrencode.4.0.0.dylib \
+YACReaderLibrary.app/Contents/MacOS/utils/libqrencode.dylib
+
+cp -R dependencies/7zip/macx/* YACReader.app/Contents/MacOS/utils/
+cp -R dependencies/7zip/macx/* YACReaderLibrary.app/Contents/MacOS/utils/
+cp -R dependencies/7zip/macx/* YACReaderLibraryServer.app/Contents/MacOS/utils/
+
+cp -R release/server YACReaderLibrary.app/Contents/MacOS/
+cp -R release/server YACReaderLibraryServer.app/Contents/MacOS/
+cp -R release/languages YACReader.app/Contents/MacOS/
+cp -R release/languages YACReaderLibrary.app/Contents/MacOS/
+cp -R release/languages YACReaderLibraryServer.app/Contents/MacOS/
+
+./signapps.sh
+
+echo "Preparing apps for release, Done."
 
 echo "Copying to destination folder"
 dest="YACReader-$VERSION.$BUILD_NUMBER MacOSX-Intel"
diff --git a/releaseOSX.sh b/releaseOSX.sh
deleted file mode 100755
index a5d77a73..00000000
--- a/releaseOSX.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-
-hash macdeployqt 2>/dev/null || { echo >&2 "macdeployqt command not available. Please add the bin subfolder of your Qt installation  to the PATH environment variable."; exit 1; }
-
-echo "Preparing apps for release ..."
-
-macdeployqt YACReader.app
-macdeployqt YACReaderLibrary.app -qmldir=YACReaderLibrary/qml
-macdeployqt YACReaderLibraryServer.app
-
-mkdir -p YACReader.app/Contents/MacOS/utils
-mkdir -p YACReaderLibrary.app/Contents/MacOS/utils
-mkdir -p YACReaderLibraryServer.app/Contents/MacOS/utils
-
-cp dependencies/qrencode/macx/libqrencode.4.0.0.dylib \
-YACReaderLibrary.app/Contents/MacOS/utils/libqrencode.dylib
-
-cp -R dependencies/7zip/macx/* YACReader.app/Contents/MacOS/utils/
-cp -R dependencies/7zip/macx/* YACReaderLibrary.app/Contents/MacOS/utils/
-cp -R dependencies/7zip/macx/* YACReaderLibraryServer.app/Contents/MacOS/utils/
-
-cp -R release/server YACReaderLibrary.app/Contents/MacOS/
-cp -R release/server YACReaderLibraryServer.app/Contents/MacOS/
-cp -R release/languages YACReader.app/Contents/MacOS/
-cp -R release/languages YACReaderLibrary.app/Contents/MacOS/
-cp -R release/languages YACReaderLibraryServer.app/Contents/MacOS/
-
-./signapps.sh
-
-echo "Done."
-