From b76ff2724a1791fd22cab3bbf272f39006c0c080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B1=BC=E9=A6=99ROS?=
 <87068644+fishros@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:15:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(ros):=20=E5=9F=BA=E7=A1=80=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=89=E8=A3=85=E5=87=BA=E7=8E=B0=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/tool_install_ros.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/tool_install_ros.py b/tools/tool_install_ros.py
index 8902622..a93baeb 100644
--- a/tools/tool_install_ros.py
+++ b/tools/tool_install_ros.py
@@ -345,6 +345,7 @@ def choose_and_install_ros(self):
         if install_tool=='aptitude':
             AptUtils.install_pkg('aptitude')
 
+        # ======================================================基础版本==============================================================
         if code==2:
             # 第一次尝试
             cmd_result = CmdTask("sudo {} install  {} -y".format(install_tool_apt,dic_base[install_version]),300,os_command=True).run()
@@ -355,9 +356,10 @@ def choose_and_install_ros(self):
                 PrintUtils.print_delay("请注意我，检测你在安装过程中出现依赖问题，请在稍后输入n,再选择y,即可解决")
                 import time
                 input("确认了解情况，请输入回车继续安装")
-                cmd_result = CmdTask("sudo {} install   {} ".format(install_tool,install_version),300,os_command=True).run()
+                cmd_result = CmdTask("sudo {} install   {} ".format(install_tool,dic_base[install_version]),300,os_command=True).run()
                 cmd_result = CmdTask("sudo {} install   {} -y".format(install_tool,dic_base[install_version]),300,os_command=False).run()
         
+        # ======================================================桌面版本==============================================================
         elif code==1:
             cmd_result = CmdTask("sudo {} install   {} -y".format(install_tool_apt,RosVersions.get_desktop_version(install_version)),300,os_command=True).run()
             cmd_result = CmdTask("sudo {} install   {} -y".format(install_tool_apt,RosVersions.get_desktop_version(install_version)),300,os_command=False).run()