Skip to content

chore: remove redundant lines in ubuntu souffle install #1034

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

Merged
Parent: chore: merge changes to main
merged 5 commits into from
Apr 2, 2025
Merged

chore: remove redundant lines in ubuntu souffle install #1034

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d126de1
chore: remove redundant lines in ubuntu souffle install
benmss Mar 31, 2025
86950f1
chore: restore correct indentation
benmss Mar 31, 2025
8647377
chore: remove sudo
benmss Apr 1, 2025
693e24f
chore: support ubuntu 22.04
benmss Apr 1, 2025
09504e2
chore: minor fix
benmss Apr 1, 2025
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
19 changes: 11 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -155,13 +156,15 @@ 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;; \
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; \
Expand Down
Loading