shellcheck and rhel fixes

Author: jimmckeeth

.github/workflows/commit_test.yml

@@ -55,30 +55,22 @@ jobs:
     needs: shellcheck
     runs-on: ubuntu-latest
     container:
-      image: redhat/ubi10:latest # Targeted version for Delphi 13
+      image: redhat/ubi10:latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Install Basic Dependencies
-        # UBI images are minimal; need sudo and procps for pgrep
-        run: dnf install -y sudo procps-ng
+      - name: Prepare UBI Environment
+        # UBI requires manual installation of basic tools usually found in full distros
+        run: |
+          dnf install -y sudo procps-ng ncurses-devel tar
 
       - name: Make Script Executable
         run: chmod +x ./scripts/SetupLinux4Delphi.sh
 
       - name: Run Setup Script
-        # RHEL uses dnf/yum logic in your script
-        run: ./scripts/SetupLinux4Delphi.sh 13.0
-
-      - name: Verify Installation Files
-        run: |
-          if [ -x "/usr/local/bin/pa13.0.sh" ]; then
-            echo "✅ PAServer launch script found."
-          else
-            echo "❌ PAServer launch script missing."
-            exit 1
-          fi
+        # We pass "13.0" and force "dnf" to bypass registration checks
+        run: ./scripts/SetupLinux4Delphi.sh 13.0 dnf
 
       - name: Test PAServer Execution
         run: |

README.md

@@ -1,8 +1,8 @@
 # Linux4Delphi Setup
 
-[![ShellCheck Status](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml/badge.svg?label=ShellCheck)](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml)
-[![Ubuntu 24.04 Status](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml/badge.svg?label=Ubuntu%2024.04)](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml)
-[![RHEL 10 Status](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml/badge.svg?label=RHEL%2010)](https://github.com/OWNER/REPOSITORY/actions/workflows/commit_test.yml)
+[![ShellCheck Status](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml/badge.svg?label=ShellCheck)](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml)
+[![Ubuntu 24.04 Status](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml/badge.svg?label=Ubuntu%2024.04)](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml)
+[![RHEL 10 Status](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml/badge.svg?label=RHEL%2010)](https://github.com/jimmckeeth/linux4delphi/actions/workflows/commit_test.yml)
 
 
 ![ShellCheck](https://img.shields.io/github/actions/workflow/status/OWNER/REPOSITORY/commit_test.yml?job=shellcheck&label=ShellCheck&logo=shell)

scripts/SetupLinux4Delphi.sh

@@ -304,32 +304,25 @@ if [[ "$PKG" == "apt" ]]; then
       echo "No suitable ncurses package found."
       exit 1
     fi
-    set +e
-    apt install openssh-server -y --no-install-recommends
-    if [ $? -ne 0 ]; then
+    if ! apt install openssh-server -y --no-install-recommends; then
       echo "Warning: openssh-server installation failed, removing..."
       apt purge openssh-server -y 
     fi
-    set -e
     # Removed libosmesa-dev from strict requirements
     apt install joe wget p7zip-full curl build-essential zlib1g-dev libcurl4-gnutls-dev python3 libpython3-dev libgtk-3-dev $NCURSES_PKG xorg libgl1-mesa-dev libgtk-3-bin libc6-dev -y --no-install-recommends
     # Optional installation of OSMesa (handles missing package errors gracefully)
     echo "Attempting to install optional libosmesa-dev..."
-    set +e
-    apt install libosmesa-dev -y --no-install-recommends 2>/dev/null
-    if [ $? -ne 0 ]; then
+    if apt install libosmesa-dev -y --no-install-recommends 2>/dev/null; then
+        osmesa="Installed optional libosmesa-dev successfully."
+    else
         echo "libosmesa-dev not found, checking for libosmesa6-dev..."
-        apt install libosmesa6-dev -y --no-install-recommends  2>/dev/null
-        if [ $? -ne 0 ]; then
-             osmesa="Warning: Optional package libosmesa-dev (or libosmesa6-dev) was not found. Continuing installation without it."
-        else
+        if apt install libosmesa6-dev -y --no-install-recommends  2>/dev/null; then
              osmesa="Installed optional libosmesa6-dev successfully."
+        else
+             osmesa="Warning: Optional package libosmesa-dev (or libosmesa6-dev) was not found. Continuing installation without it."
         fi
-    else
-        osmesa="Installed optional libosmesa-dev successfully."
     fi
     echo "$osmesa"
-    set -e
 elif [[ "$PKG" == "pacman" ]]; then
     # SteamOS has a read-only filesystem, this command disables that.
     if command -v steamos-readonly &> /dev/null; then
@@ -355,7 +348,7 @@ elif [[ "$PKG" == "pacman" ]]; then
     fi
 else
     if [[ "$PKG" == "dnf" ]]; then
-      if [[ ("$ID_LIKE" == *"fedora"* || "$ID" == "fedora") && "${VERSION_ID}" -ge 40 ]]; then
+      if [[ ("$ID_LIKE" == *"fedora"* || "$ID" == "fedora") && "${VERSION_ID%%.*}" -ge 40 ]]; then
         dnf group install c-development development-tools --setopt=install_weak_deps=False -y
       else
         dnf groupinstall 'Development Tools' --setopt=install_weak_deps=False -y
@@ -365,10 +358,6 @@ else
     fi
     $PKG install wget gtk3 mesa-libGL gtk3-devel python3 zlib-devel python3-devel --setopt=install_weak_deps=False -y
 fi
-if [ $? -ne 0 ]; then
-    echo "Package installation failed. Aborting."
-    exit 1
-fi
 
 echo "__________________________________________________________________"
 echo ""
@@ -405,11 +394,11 @@ fi
 if [[ "$PRODUCT" == "11.2" ]]; then
     echo "Fixing lldb Python dependency"
     if [[ "$PKG" == "apt" ]]; then
-        ln -sf "$(ls -1 /usr/lib/x86_64-linux-gnu/libpython3.*.so.1.0 | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
+        ln -sf "$(find /usr/lib/x86_64-linux-gnu -maxdepth 1 -name "libpython3.*.so.1.0" | sort | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
     elif [[ "$PKG" == "pacman" ]]; then
-        ln -sf "$(ls -1 /usr/lib/libpython3.*.so | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
+        ln -sf "$(find /usr/lib -maxdepth 1 -name "libpython3.*.so" | sort | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
     else
-        ln -sf "$(ls -1 /usr/lib64/libpython3*.so.1.0 | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
+        ln -sf "$(find /usr/lib64 -maxdepth 1 -name "libpython3*.so.1.0" | sort | tail -1)" "$INSTALL_DIR"/lldb/lib/libpython3.so
     fi
 fi
 # Ensure ownership by the invoking user