feat: support ubuntu24.04

fishros · Apr 16, 2024 · fbd739b · fbd739b
1 parent de791b0
commit fbd739b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/install b/install
@@ -6,10 +6,10 @@ source /etc/profile
 # sudo rm /var/cache/apt/archives/lock
 # sudo rm /var/lib/dpkg/lock
 # sudo rm /var/lib/dpkg/lock-frontend
-sudo apt install python3-distro python3-yaml  -y
 if [ $UID -eq 0 ];then
     apt-get install sudo 
 fi
+sudo apt install python3-distro python3-yaml  -y
 sudo python3 /tmp/fishinstall/install.py
 sudo rm -rf /tmp/fishinstall/
 sudo rm fishros

diff --git a/install.py b/install.py
@@ -79,7 +79,7 @@ def main():
                     __.'              ~.   .~              `.__
                 .'//     开卷有益        \./     书山有路     \\ `.
                 .'// 可以多看看小鱼的文章   |    关注公众号鱼香ROS  \\ `.
-            .'// .-~"""""""~~~~-._     |     _,-~~~~"""""""~-. \\`.
+            .'// .-~'''''''''~~~~-._     |     _,-~~~~'''''''[-. \\`.
             .'//.-"                 `-.  |  .-'                 "-.\\`.
         .'//______.============-..   \ | /   ..-============.______\\`.
         .'______________________________\|/______________________________`

diff --git a/tools/tool_config_system_source.py b/tools/tool_config_system_source.py
@@ -53,6 +53,7 @@
     'focal':{"tsinghua","huawei","packages.ros"},
     'jessie':{"tsinghua","huawei"},
     'jammy':{"packages.ros"},
+    'noble':{"packages.ros"},
     'stretch':{"tsinghua","huawei","packages.ros"},
     'trusty':{"tsinghua","huawei"},
     'xenial':{"tsinghua","huawei","packages.ros"},

diff --git a/tools/tool_install_ros.py b/tools/tool_install_ros.py
@@ -120,6 +120,7 @@ def get_desktop_version(name):
     'focal':{"tsinghua","huawei","packages.ros","https.packages.ros"},
     'jessie':{"tsinghua","huawei"},
     'jammy':{"tsinghua","huawei","packages.ros","https.packages.ros"},
+    'noble':{"tsinghua","huawei","packages.ros","https.packages.ros"},
     'stretch':{"tsinghua","huawei","packages.ros","https.packages.ros"},
     'trusty':{"tsinghua","huawei"},
     'xenial':{"tsinghua","huawei","packages.ros","https.packages.ros"},