Remove bc jars, use @USER var in script

This commit is contained in:
Manfred Karrer 2018-05-11 01:26:22 +02:00
parent 944d750c90
commit daf4433766
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
4 changed files with 2 additions and 12 deletions

View File

@ -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"

View File

@ -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/

View File

@ -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"

View File

@ -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"