diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh index 23bc2bb8f52..c114717fffe 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -7,6 +7,7 @@ # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory version=1.2.7-SNAPSHOT +version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then JAVA_HOME=/usr/lib/jvm/jdk-10.0.2 @@ -120,7 +121,7 @@ fi echo Generating rpm package $JAVA_HOME/bin/javapackager \ -deploy \ - -BappVersion=$version \ + -BappVersion=$version_base \ -Bcategory=Network \ -Bemail=contact@bisq.network \ -BlicenseType=GPLv3 \ @@ -138,8 +139,8 @@ $JAVA_HOME/bin/javapackager \ -outfile Bisq-$version \ -v -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 +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 exit 3 fi @@ -153,10 +154,10 @@ 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 # 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" +# 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-1.x86_64.rpm $base_dir/desktop/package/linux/Bisq-$version.rpm +mv $base_dir/desktop/package/linux/bisq-$version_base-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