From d126de1122bb3b779718e5653d72cc20bd4ad3c8 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Mon, 31 Mar 2025 14:08:25 +1000 Subject: [PATCH 1/5] chore: remove redundant lines in ubuntu souffle install Signed-off-by: Ben Selwyn-Smith --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ae5b648d1..34be1013d 100644 --- a/Makefile +++ b/Makefile @@ -155,13 +155,10 @@ souffle: "Fedora Linux") \ sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ - sudo wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg; \ - echo "deb [signed-by=/usr/share/keyrings/souffle-archive-keyring.gpg] https://souffle-lang.github.io/ppa/ubuntu/ stable main" | sudo tee /etc/apt/sources.list.d/souffle.list; \ sudo apt update; \ sudo wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - sudo apt install souffle;; \ + rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb;; \ "Darwin") \ if command -v brew; then \ brew install --HEAD souffle-lang/souffle/souffle; \ From 86950f11a86e29e8895ccd0e76d2495c79dfc2d5 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Mon, 31 Mar 2025 15:10:16 +1000 Subject: [PATCH 2/5] chore: restore correct indentation Signed-off-by: Ben Selwyn-Smith --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 34be1013d..adab5f14f 100644 --- a/Makefile +++ b/Makefile @@ -156,9 +156,9 @@ souffle: sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ sudo apt update; \ - sudo wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb;; \ + sudo wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ + sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ + rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb;; \ "Darwin") \ if command -v brew; then \ brew install --HEAD souffle-lang/souffle/souffle; \ From 8647377163ec57edfede4ac68fb603ed7960ebb1 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 1 Apr 2025 10:03:40 +1000 Subject: [PATCH 3/5] chore: remove sudo Signed-off-by: Ben Selwyn-Smith --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index adab5f14f..6ec50666f 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ souffle: sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ sudo apt update; \ - sudo wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ + wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb;; \ "Darwin") \ From 693e24fe4079970a9c5b001c6d8cb6658a2d89de Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 1 Apr 2025 14:16:33 +1000 Subject: [PATCH 4/5] chore: support ubuntu 22.04 Signed-off-by: Ben Selwyn-Smith --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6ec50666f..60c83798d 100644 --- a/Makefile +++ b/Makefile @@ -134,13 +134,14 @@ $(PACKAGE_PATH)/resources/schemastore/NOTICE: && wget https://raw.githubusercontent.com/SchemaStore/schemastore/a1689388470d1997f2e5ebd8b430e99587b8d354/NOTICE \ && cd $(REPO_PATH) -# Supports OL8+, Fedora 34+, Ubuntu 20.04+, and macOS. +# Supports OL8+, Fedora 34+, Ubuntu 22.04+ and 24.04+, and macOS. OS := "$(shell uname)" ifeq ($(OS), "Darwin") OS_DISTRO := "Darwin" else ifeq ($(OS), "Linux") OS_DISTRO := "$(shell grep '^NAME=' /etc/os-release | sed 's/^NAME=//' | sed 's/"//g')" + OS_MAJOR_VERSION := "$(shell grep '^VERSION=' /etc/os-release | sed -r 's/^[^0-9]+([0-9]+)\..*/\1/')" endif endif # If Souffle cannot be installed, we advise the user to install it manually @@ -156,9 +157,15 @@ souffle: sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ sudo apt update; \ - wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ - rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb;; \ + if [ $(OS_MAJOR_VERSION) == "24" ]; then \ + wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb -O ./souffle.deb; \ + elif [ $(OS_MAJOR_VERSION) == "22" ]; then \ + wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2204-souffle-2.5-Linux.deb -O ./souffle.deb; \ + else \ + echo "Unsupported Ubuntu major version: $(OS_MAJOR_VERSION)"; exit 0; \ + fi; \ + sudo apt install ./souffle.deb; \ + rm ./souffle.deb;; \ "Darwin") \ if command -v brew; then \ brew install --HEAD souffle-lang/souffle/souffle; \ From 09504e2b105251f40dc81451eacb0a6dc9c3df7f Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 1 Apr 2025 16:56:21 +1000 Subject: [PATCH 5/5] chore: minor fix Signed-off-by: Ben Selwyn-Smith --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 60c83798d..029cdc163 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,6 @@ souffle: "Fedora Linux") \ sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ - sudo apt update; \ if [ $(OS_MAJOR_VERSION) == "24" ]; then \ wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb -O ./souffle.deb; \ elif [ $(OS_MAJOR_VERSION) == "22" ]; then \