Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle SNAPSHOT versioning differently for rpm packages #4009

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Handle SNAPSHOT versioning differently for rpm packages #4009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions desktop/package/linux/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -120,7 +121,7 @@ fi
echo Generating rpm package
$JAVA_HOME/bin/javapackager \
-deploy \
-BappVersion=$version \
-BappVersion="$version_base" \
-Bcategory=Network \
[email protected] \
-BlicenseType=GPLv3 \
Expand All @@ -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

Expand All @@ -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
Expand Down