From 2a98d8f3d515797a13e725c57107601d484993bb Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Thu, 3 Nov 2022 13:44:03 +0100 Subject: [PATCH] Fix postinst on new releases --- debian/changelog | 2 +- debian/ubuntu-make.postinst | 6 +++++- umake/frameworks/java.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88091f18..66b8704f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ubuntu-make (22.10) kinetic; urgency=medium +ubuntu-make (22.10) UNRELEASED; urgency=medium [ Galileo Sartor ] * Update url parsing and tests diff --git a/debian/ubuntu-make.postinst b/debian/ubuntu-make.postinst index 06426319..c7015a61 100644 --- a/debian/ubuntu-make.postinst +++ b/debian/ubuntu-make.postinst @@ -3,7 +3,11 @@ set -e case "$1" in configure) - register-python-argcomplete3 umake > /etc/bash_completion.d/umake + if [ -f "$(which register-python-argcomplete3)" ]; then + register-python-argcomplete3 umake > /etc/bash_completion.d/umake + else + register-python-argcomplete umake > /etc/bash_completion.d/umake + fi ;; *) diff --git a/umake/frameworks/java.py b/umake/frameworks/java.py index 8bfbe56f..e6789dba 100644 --- a/umake/frameworks/java.py +++ b/umake/frameworks/java.py @@ -159,7 +159,7 @@ def parse_download_link(self, line, in_download): version = re.search(r'release-notes-(.*).md', item["name"]).group(1) with suppress(AttributeError): self.new_download_url = \ - f"https://download2.gluonhq.com/openjfx/{version}/openjfx-{version}_linux-x64_bin-sdk.zip.sha256" + "https://download2.gluonhq.com/openjfx/{}/openjfx-{}_linux-x64_bin-sdk.zip.sha256".format(version, version) return (None, in_download) @MainLoop.in_mainloop_thread