From daf44337661ac7c7f5752c89930d5e8e4ba419ef Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 11 May 2018 01:26:22 +0200
Subject: [PATCH] Remove bc jars, use @USER var in script

---
 package/linux/32bitBuild.sh    | 5 +----
 package/linux/64bitBuild.sh    | 5 +----
 package/windows/32bitBuild.bat | 2 --
 package/windows/64bitBuild.bat | 2 --
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh
index efed2e4cea..af57b35c48 100644
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@@ -9,7 +9,6 @@ set -e
 version=0.7.0
 
 dir="/media/sf_vm_shared_ubuntu14_32bit"
-linux_user="bisq"
 
 # Note: fakeroot needs to be installed on Linux
 $JAVA_HOME/bin/javapackager \
@@ -27,8 +26,6 @@ $JAVA_HOME/bin/javapackager \
     -vendor Bisq \
     -outdir deploy \
     -srcfiles "$dir/Bisq-$version.jar" \
-    -srcfiles "$dir/bcpg-jdk15on.jar" \
-    -srcfiles "$dir/bcprov-jdk15on.jar" \
     -srcfiles package/linux/LICENSE \
     -appclass bisq.desktop.app.BisqAppMain \
     -BjvmOptions=-Xss1280k \
@@ -45,7 +42,7 @@ $JAVA_HOME/bin/javapackager \
 
 # sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "deploy/bundles/bisq-$version.deb" "/home/$bisq/Desktop/Bisq-32bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/$USER/Desktop/Bisq-32bit-$version.deb"
 mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
 
 # mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm"
diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh
index 69b9a85d7c..e239464366 100644
--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@@ -9,7 +9,6 @@ set -e
 version=0.7.0
 
 dir="/media/sf_vm_shared_ubuntu"
-linux_user="bisq"
 
 # Note: fakeroot needs to be installed on Linux
 $JAVA_HOME/bin/javapackager \
@@ -27,8 +26,6 @@ $JAVA_HOME/bin/javapackager \
     -vendor Bisq \
     -outdir deploy \
     -srcfiles "$dir/Bisq-$version.jar" \
-    -srcfiles "$dir/bcpg-jdk15on.jar" \
-    -srcfiles "$dir/bcprov-jdk15on.jar" \
     -srcfiles package/linux/LICENSE \
     -appclass bisq.desktop.app.BisqAppMain \
     -BjvmOptions=-Xss1280k \
@@ -45,7 +42,7 @@ $JAVA_HOME/bin/javapackager \
 # uncomment because the build VM does not support alien
 #sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "deploy/bundles/bisq-$version.deb" "/home/$linux_user/Desktop/Bisq-64bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/$USER/Desktop/Bisq-64bit-$version.deb"
 mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb"
 #mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.rpm"
 rm -r deploy/
diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat
index 04f1e66ada..35e685481f 100644
--- a/package/windows/32bitBuild.bat
+++ b/package/windows/32bitBuild.bat
@@ -21,8 +21,6 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
 -outdir %outdir% ^
 -appclass bisq.desktop.app.BisqAppMain ^
 -srcfiles %outdir%\Bisq.jar ^
--srcfiles %outdir%\bcpg-jdk15on.jar ^
--srcfiles %outdir%\bcprov-jdk15on.jar ^
 -outfile Bisq ^
 -Bruntime="%JAVA_HOME%\jre"
 
diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat
index 7cac23ca0a..0e0a325f17 100644
--- a/package/windows/64bitBuild.bat
+++ b/package/windows/64bitBuild.bat
@@ -21,8 +21,6 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
 -outdir %outdir% ^
 -appclass bisq.desktop.app.BisqAppMain ^
 -srcfiles %outdir%\Bisq.jar ^
--srcfiles %outdir%\bcpg-jdk15on.jar ^
--srcfiles %outdir%\bcprov-jdk15on.jar ^
 -outfile Bisq ^
 -Bruntime="%JAVA_HOME%\jre"