diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh index f854042e9a..26c1a2225e 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -119,7 +119,7 @@ fi echo Generating rpm package $JAVA_HOME/bin/javapackager \ -deploy \ - -BappVersion=$version_base \ + -BappVersion=$version \ -Bcategory=Network \ -Bemail=contact@bisq.network \ -BlicenseType=GPLv3 \ @@ -136,8 +136,8 @@ $JAVA_HOME/bin/javapackager \ -outfile Bisq-$version \ -v -if [ ! -f "$base_dir/desktop/package/linux/bisq-$version_base-1.x86_64.rpm" ]; then - echo No rpm file found at $base_dir/desktop/package/linux/bisq-$version_base-1.x86_64.rpm +if [ ! -f "$base_dir/desktop/package/linux/bisq-$version-1.x86_64.rpm" ]; then + echo No rpm file found at $base_dir/desktop/package/linux/bisq-$version-1.x86_64.rpm exit 3 fi @@ -150,10 +150,11 @@ mv $base_dir/desktop/package/linux/bisq-$version.deb $base_dir/desktop/package/l echo SHA256 of $base_dir/desktop/package/linux/Bisq-$version.deb: shasum -a256 $base_dir/desktop/package/linux/Bisq-$version.deb | awk '{print $1}' | tee $base_dir/desktop/package/linux/Bisq-$version.deb.txt -if [ -f "$base_dir/desktop/package/linux/Bisq-$version_base-1.x86_64.rpm" ]; then - rm "$base_dir/desktop/package/linux/Bisq-$version_base-1.x86_64.rpm" -fi -mv $base_dir/desktop/package/linux/bisq-$version_base-1.x86_64.rpm $base_dir/desktop/package/linux/Bisq-$version.rpm +# FIXME: My Ubuntu somehow also deletes the lower case file +# if [ -f "$base_dir/desktop/package/linux/Bisq-$version-1.x86_64.rpm" ]; then +# rm "$base_dir/desktop/package/linux/Bisq-$version-1.x86_64.rpm" +# fi +mv $base_dir/desktop/package/linux/bisq-$version-1.x86_64.rpm $base_dir/desktop/package/linux/Bisq-$version.rpm echo SHA256 of $base_dir/desktop/package/linux/Bisq-$version.rpm: shasum -a256 $base_dir/desktop/package/linux/Bisq-$version.rpm | awk '{print $1}' | tee $base_dir/desktop/package/linux/Bisq-$version.rpm.txt