[ros2-setup] make universe check compatible with .sources (#474)

Author: MatthijsBurgh

ros2-setup/install.bash

@@ -1,5 +1,7 @@
 #! /usr/bin/env bash
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 if [[ -f /etc/apt/sources.list.d/ros2.list ]]
 then
     tue-install-echo "Removing the old ROS2 apt sources"
@@ -8,10 +10,30 @@ else
     tue-install-debug "Old ROS2 apt sources do not exist"
 fi
 
+# Check whether universe is enabled
 ubuntu_name=$(lsb_release -cs)
+ubuntu_version=$(lsb_release -rs)
+needs_enabling_universe=true
+# Check whether on ubuntu >= 24.04
+if dpkg --compare-versions "${ubuntu_version}" ge "24.04"
+then
+    if ! "${SCRIPT_DIR}"/read_sources_files.py /etc/apt/sources.list.d/ubuntu.sources | jq -e 'all(.[]; .Components | index("universe") != null)' &>/dev/null
+    then
+        tue-install-debug "Not all sources have the universe repository enabled yet, going to enabled it"
+    else
+        tue-install-debug "All sources have the universe repository enabled"
+        needs_enabling_universe=false
+    fi
+else
+    if ! grep -h ^deb /etc/apt/sources.list 2>/dev/null | grep "${ubuntu_name} (?:[a-z ]*(?:[a-z]+(?: [a-z]+)*)) universe" -q
+    then
+        tue-install-debug "No universe found in the sources.list, going to enable the universe repository"
+    else
+        tue-install-debug "Universe found in the sources.list, no need to enable it"
+    fi
+fi
 
-# Check whether universe is enabled
-if ! grep -h ^deb /etc/apt/sources.list 2>/dev/null | grep "${ubuntu_name} universe" -q
+if [[ ${needs_enabling_universe} == true ]]
 then
     tue-install-echo "Enabling universe repository"
     tue-install-pipe sudo add-apt-repository universe || tue-install-error "Failed to enable universe repository"

ros2-setup/read_sources_files.py

@@ -0,0 +1,51 @@
+#! /usr/bin/env python
+
+import json
+import re
+from argparse import ArgumentParser
+from pathlib import Path
+
+
+def extract_all_sources_entries(text):
+    entry_pattern = re.compile(
+        r"""
+        Types:\s*(?P<Types>[^\n]+)\s+
+        URIs:\s*(?P<URIs>[^\n]+)\s+
+        Suites:\s*(?P<Suites>[^\n]+)\s+
+        Components:\s*(?P<Components>[^\n]+)
+        (?:\s+Signed-By:\s*(?P<SignedBy>[^\n]+))?
+        (?:\s+Architectures:\s*(?P<Architectures>[^\n]+))?
+        """,
+        re.VERBOSE,
+    )
+
+    entries = []
+    for match in entry_pattern.finditer(text):
+        entries.append(
+            {
+                "Types": match.group("Types").strip().split(" "),
+                "URIs": match.group("URIs").strip().split(" "),
+                "Suites": match.group("Suites").strip().split(" "),
+                "Components": match.group("Components").strip().split(" "),
+                "Architectures": match.group("Architectures").strip().split(",")
+                if match.group("Architectures")
+                else None,
+                "SignedBy": match.group("SignedBy").strip() if match.group("SignedBy") else None,
+            }
+        )
+
+    return entries
+
+
+if __name__ == "__main__":
+    parser = ArgumentParser()
+    parser.add_argument("file", type=str, help="Path to the sources files", nargs="+")
+    args = parser.parse_args()
+    entries = []
+    for file in args.file:
+        with Path(file).open("r") as f:
+            content = f.read()
+
+    entries.extend(extract_all_sources_entries(content))
+    print(json.dumps(entries, indent=2))
+