From f5ebd3edac7a99b15a8e35f5aee9453eb2d78030 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Fri, 25 Oct 2019 13:52:41 +0200
Subject: [PATCH 1/2] Add Raspberry Pi to build process

---
 desktop/package/macosx/create_app.sh | 10 ++++++++--
 desktop/package/macosx/finalize.sh   | 13 +++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh
index 358b0c3ad9f..fde4d6608a4 100755
--- a/desktop/package/macosx/create_app.sh
+++ b/desktop/package/macosx/create_app.sh
@@ -13,6 +13,7 @@ cd ..
 cd desktop
 
 EXE_JAR=build/libs/desktop-$version-all.jar
+JAR_LIB=build/app/lib
 
 # we need to strip out Java 9 module configuration used in the fontawesomefx library as it causes the javapackager to stop,
 # because of this existing module information, although it is not used as a module.
@@ -38,8 +39,13 @@ java -jar ./package/tools-1.0.jar $EXE_JAR
 echo SHA 256 after stripping jar file to get a deterministic jar:
 shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt
 
-vmPath=/Users/christoph/Documents/Workspaces/Java
-#vmPath=/Volumes
+# zip jar lib for Raspberry Pi
+echo "Zipping jar lib for raspberry pi"
+zip -r -X -q "deploy/jar-lib-for-raspberry-pi-$version.zip" $JAR_LIB
+
+# Set BISQ_VM_PATH as environment var to the directory where your shared folders for virtual box are residing
+
+vmPath=$BISQ_VM_PATH
 linux64=$vmPath/vm_shared_ubuntu/desktop
 linux64Package=$linux64/package/linux
 win64=$vmPath/vm_shared_windows/desktop
diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
index 01aff195865..0ddc44d2cc6 100755
--- a/desktop/package/macosx/finalize.sh
+++ b/desktop/package/macosx/finalize.sh
@@ -6,15 +6,15 @@ version="1.2.0"
 
 target_dir="releases/$version"
 
-vmPath=/Users/christoph/Documents/Workspaces/Java
-#vmPath=/Volumes
+# Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. BISQ_GPG_USER=manfred@bitsquare.io
+# Set BISQ_VM_PATH as environment var to the directory where your shared folders for virtual box are residing
+
+vmPath=$BISQ_VM_PATH
 linux64=$vmPath/vm_shared_ubuntu/desktop/package/linux
 win64=$vmPath/vm_shared_windows/desktop/package/windows
 
 macOS=deploy
 
-# Set BISQ_GPG_USER as environment var to the email address used for gpg signing. e.g. BISQ_GPG_USER=manfred@bitsquare.io
-
 rm -r $target_dir
 
 mkdir -p $target_dir
@@ -45,6 +45,9 @@ exe="Bisq-$version.exe"
 exe64="Bisq-64bit-$version.exe"
 cp "$win64/$exe" "$target_dir/$exe64"
 
+rpi="jar-lib-for-raspberry-pi-$version.zip"
+cp "$macOS/$rpi" "$target_dir/"
+
 cd "$target_dir"
 
 echo Create signatures
@@ -52,12 +55,14 @@ gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $dmg.asc --detach-
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $deb64.asc --detach-sig --armor $deb64
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpm64.asc --detach-sig --armor $rpm64
 gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $exe64.asc --detach-sig --armor $exe64
+gpg --digest-algo SHA256 --local-user $BISQ_GPG_USER --output $rpi.asc --detach-sig --armor $rpi
 
 echo Verify signatures
 gpg --digest-algo SHA256 --verify $dmg{.asc*,}
 gpg --digest-algo SHA256 --verify $deb64{.asc*,}
 gpg --digest-algo SHA256 --verify $rpm64{.asc*,}
 gpg --digest-algo SHA256 --verify $exe64{.asc*,}
+gpg --digest-algo SHA256 --verify $rpi{.asc*,}
 
 mkdir $win64/$version
 cp -r . $win64/$version

From e63f332024cc2c61f222a34d9507a3e6231e7ca7 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Fri, 25 Oct 2019 14:07:13 +0200
Subject: [PATCH 2/2] Rename deploy variable to improve readability

---
 desktop/package/macosx/finalize.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
index 0ddc44d2cc6..c66632aa6b8 100755
--- a/desktop/package/macosx/finalize.sh
+++ b/desktop/package/macosx/finalize.sh
@@ -13,7 +13,7 @@ vmPath=$BISQ_VM_PATH
 linux64=$vmPath/vm_shared_ubuntu/desktop/package/linux
 win64=$vmPath/vm_shared_windows/desktop/package/windows
 
-macOS=deploy
+deployDir=deploy
 
 rm -r $target_dir
 
@@ -31,7 +31,7 @@ cp "$target_dir/../../package/signingkey.asc" "$target_dir/"
 cp "deploy/Bisq-$version.jar.txt" "$target_dir/"
 
 dmg="Bisq-$version.dmg"
-cp "$macOS/$dmg" "$target_dir/"
+cp "$deployDir/$dmg" "$target_dir/"
 
 deb="Bisq-$version.deb"
 deb64="Bisq-64bit-$version.deb"
@@ -46,7 +46,7 @@ exe64="Bisq-64bit-$version.exe"
 cp "$win64/$exe" "$target_dir/$exe64"
 
 rpi="jar-lib-for-raspberry-pi-$version.zip"
-cp "$macOS/$rpi" "$target_dir/"
+cp "$deployDir/$rpi" "$target_dir/"
 
 cd "$target_dir"