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.

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

build: Add support for Ubuntu 23.10 (Mantic) #1466

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,11 @@ jobs:
matrix:
include:
- name: Ubuntu
release_num: 22.04
release_num: '22.04'
- name: Ubuntu
release_num: 23.04
release_num: '23.04'
- name: Ubuntu
release_num: '23.10'

name: 🐧 Ubuntu ${{ matrix.release_num }}
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ To use ImHex, the following minimal system requirements need to be met.
- **Windows**: Windows 7 or higher (Windows 10/11 recommended)
- **macOS**: macOS 11 (Big Sur) or higher,
- **Linux**: "Modern" Linux. The following distributions have official releases available. Other distros are supported through the AppImage and Flatpak releases.
- Ubuntu 22.04/23.04
- Ubuntu 22.04/23.04/23.10
- Fedora 36/37
- RHEL/AlmaLinux 9
- Arch Linux
Expand Down
9 changes: 6 additions & 3 deletions main/updater/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,12 @@ std::string getUpdateType() {
return "mac-dmg";
#elif defined (OS_LINUX)
if (hex::executeCommand("lsb_release -a | grep Ubuntu") == 0) {
if (hex::executeCommand("lsb_release -a | grep 22.") == 0)
if (hex::executeCommand("lsb_release -a | grep 22\.") == 0)
return "linux-deb-22.04";
else if (hex::executeCommand("lsb_release -a | grep 23.") == 0)
else if (hex::executeCommand("lsb_release -a | grep 23\.04") == 0)
return "linux-deb-23.04";
else if (hex::executeCommand("lsb_release -a | grep 23\.10") == 0)
return "linux-deb-23.10";
}
#endif

Expand All @@ -101,6 +103,7 @@ int installUpdate(const std::string &type, std::fs::path updatePath) {
UpdateHandler { "macos-dmg", ".dmg", "hdiutil attach {}" },
UpdateHandler { "linux-deb-22.04", ".deb", "sudo apt update && sudo apt install -y --fix-broken {}" },
UpdateHandler { "linux-deb-23.04", ".deb", "sudo apt update && sudo apt install -y --fix-broken {}" },
UpdateHandler { "linux-deb-23.10", ".deb", "sudo apt update && sudo apt install -y --fix-broken {}" },
};

for (const auto &handler : UpdateHandlers) {
Expand Down Expand Up @@ -164,4 +167,4 @@ int main(int argc, char **argv) {

// Install the update
return installUpdate(updateType, *updatePath);
}
}