Skip to content

Commit 6f54975

Browse files
authored
chore: remove redundant lines in ubuntu souffle install (#1034)
Signed-off-by: Ben Selwyn-Smith <[email protected]>
1 parent 9a8a741 commit 6f54975

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

Makefile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,14 @@ $(PACKAGE_PATH)/resources/schemastore/NOTICE:
134134
&& wget https://raw.githubusercontent.com/SchemaStore/schemastore/a1689388470d1997f2e5ebd8b430e99587b8d354/NOTICE \
135135
&& cd $(REPO_PATH)
136136

137-
# Supports OL8+, Fedora 34+, Ubuntu 20.04+, and macOS.
137+
# Supports OL8+, Fedora 34+, Ubuntu 22.04+ and 24.04+, and macOS.
138138
OS := "$(shell uname)"
139139
ifeq ($(OS), "Darwin")
140140
OS_DISTRO := "Darwin"
141141
else
142142
ifeq ($(OS), "Linux")
143143
OS_DISTRO := "$(shell grep '^NAME=' /etc/os-release | sed 's/^NAME=//' | sed 's/"//g')"
144+
OS_MAJOR_VERSION := "$(shell grep '^VERSION=' /etc/os-release | sed -r 's/^[^0-9]+([0-9]+)\..*/\1/')"
144145
endif
145146
endif
146147
# If Souffle cannot be installed, we advise the user to install it manually
@@ -155,13 +156,15 @@ souffle:
155156
"Fedora Linux") \
156157
sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \
157158
"Ubuntu") \
158-
sudo wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg; \
159-
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; \
160-
sudo apt update; \
161-
sudo wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \
162-
sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \
163-
rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \
164-
sudo apt install souffle;; \
159+
if [ $(OS_MAJOR_VERSION) == "24" ]; then \
160+
wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb -O ./souffle.deb; \
161+
elif [ $(OS_MAJOR_VERSION) == "22" ]; then \
162+
wget https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2204-souffle-2.5-Linux.deb -O ./souffle.deb; \
163+
else \
164+
echo "Unsupported Ubuntu major version: $(OS_MAJOR_VERSION)"; exit 0; \
165+
fi; \
166+
sudo apt install ./souffle.deb; \
167+
rm ./souffle.deb;; \
165168
"Darwin") \
166169
if command -v brew; then \
167170
brew install --HEAD souffle-lang/souffle/souffle; \

0 commit comments

Comments
 (0)