GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-06-04 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

better version check in linux build script (#9496)

Browse Source 
* better version check in linux build script

Running `BuildLinux.sh` on Debian Trixie (and probably on other platforms)
results in this warning:
```
$ sudo ./BuildLinux.sh -u
./linux.d/debian: line 32: [: ==: unary operator expected
./linux.d/debian: line 32: [: ==: unary operator expected
...
```

The script is looking for the `VERSION_ID` variable
in `/etc/os-release`, but that variable is optional (see
https://www.linux.org/docs/man5/os-release.html) and is not present in
my install of Debian Trixie.  The script handles the missing variable
incorrectly, resulting in the above warning.

This commit fixes the version check to be more tolerant and IMO clearer.

Tested on Ubuntu 22.04, 24.04, and Debian Trixie.
This commit is contained in:
Sebastian Kuzminsky 2025-06-02 09:11:19 -06:00 committed by GitHub
parent f978a584fe
commit 91ffc79c7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linux.d/debian
View File

@ -28,12 +28,16 @@ REQUIRED_DEV_PACKAGES=(
if [[ -n "$UPDATE_LIB" ]] if [[ -n "$UPDATE_LIB" ]]
then then
# for ubuntu 22+ and 23+: source /etc/os-release
ubu_major_version="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d /\"/)" if [ "${ID}" == "ubuntu" ] && [ -n "${VERSION_ID}" ]; then
if [ $ubu_major_version == "22" ] || [ $ubu_major_version == "23" ] # It's ubuntu and we have a VERSION_ID like "24.04".
then if dpkg --compare-versions "${VERSION_ID}" ge 22 && dpkg --compare-versions "${VERSION_ID}" lt 24 ;
REQUIRED_DEV_PACKAGES+=(curl libfuse-dev libssl-dev libcurl4-openssl-dev m4) then
# Some extra packages needed on Ubuntu 22.x and 23.x:
REQUIRED_DEV_PACKAGES+=(curl libfuse-dev libssl-dev libcurl4-openssl-dev m4)
fi
fi fi
if [[ -n "$BUILD_DEBUG" ]] if [[ -n "$BUILD_DEBUG" ]]
then then
REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev) REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev)