From 381d9e03c56f75c7d412fcefb86fe3b4cb08c7f4 Mon Sep 17 00:00:00 2001 From: fishros Date: Tue, 14 May 2024 14:11:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(wechat):=20=E4=B8=80=E9=94=AE=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/tool_install_wechat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tool_install_wechat.py b/tools/tool_install_wechat.py index 5d90160..8054f91 100644 --- a/tools/tool_install_wechat.py +++ b/tools/tool_install_wechat.py @@ -91,7 +91,7 @@ def install_wechat(self): if code==4: try: CmdTask("sudo apt remove wechat-linux-spark -y",os_command=True).run() - CmdTask("sudo apt remove ukylin-wechat -y",os_command=True).run() + CmdTask("sudo apt remove wechat-* -y",os_command=True).run() CmdTask("sudo docker stop wechat",os_command=True).run() CmdTask("sudo docker rm wechat",os_command=True).run() CmdTask("sudo docker image rm bestwu/wechat",os_command=True).run() From b91b48d84798170545ab43846f50bb384cd879a3 Mon Sep 17 00:00:00 2001 From: fishros Date: Tue, 14 May 2024 14:12:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(ros):=20=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E5=AE=89=E8=A3=85ROS=E5=9C=A8Ubuntu22.04=E4=B8=8A?= =?UTF-8?q?=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/base.py | 2 +- tools/tool_install_ros.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/base.py b/tools/base.py index 76b6c37..7b34dfc 100644 --- a/tools/base.py +++ b/tools/base.py @@ -1214,7 +1214,7 @@ def getArch(): @staticmethod def search_package(name,pattern,replace1="",replace2=""): - result = CmdTask("sudo apt-cache search {} ".format(name),20).run() + result = CmdTask("sudo apt search {} ".format(name),20).run() if result[0]!=0: PrintUtils.print_error("搜索不到任何{}相关的包".format(name)) return None diff --git a/tools/tool_install_ros.py b/tools/tool_install_ros.py index 65b9709..3587d53 100644 --- a/tools/tool_install_ros.py +++ b/tools/tool_install_ros.py @@ -243,9 +243,9 @@ def add_source(self): PrintUtils.print_success("恭喜，成功添加ROS源，接下来可以使用apt安装ROS或者使用[1]一键安装ROS安装！") return - #add source2 - PrintUtils.print_warn("换源后更新失败，第三次开始切换源，尝试更换ROS2源为ROS2官方源！") - mirrors = self.get_mirror_by_code(osversion.get_codename(),arch=arch,first_choose="packages.ros") + + PrintUtils.print_warn("换源后更新失败，第三次开始切换源，尝试使用https-ROS官方源～！") + mirrors = self.get_mirror_by_code(osversion.get_codename(),arch=arch,first_choose="https.packages.ros") PrintUtils.print_info("根据您的系统，为您推荐安装源为{}".format(mirrors)) source_data = '' for mirror in mirrors: @@ -257,8 +257,9 @@ def add_source(self): PrintUtils.print_success("恭喜，成功添加ROS源，接下来可以使用apt安装ROS或者使用[1]一键安装ROS安装！") return - PrintUtils.print_warn("换源后更新失败，第四次开始切换源，尝试使用https-ROS2官方源～！") - mirrors = self.get_mirror_by_code(osversion.get_codename(),arch=arch,first_choose="https.packages.ros") + #add source2 + PrintUtils.print_warn("换源后更新失败，第四次开始切换源，尝试更换ROS源为http-ROS官方源！") + mirrors = self.get_mirror_by_code(osversion.get_codename(),arch=arch,first_choose="packages.ros") PrintUtils.print_info("根据您的系统，为您推荐安装源为{}".format(mirrors)) source_data = '' for mirror in mirrors: @@ -274,7 +275,6 @@ def add_source(self): if not AptUtils.checkapt(): PrintUtils.print_error("四次换源后都失败了，请及时联系小鱼获取解决方案并处理！") - def support_install(self): # check support if (osversion.get_codename() not in ros_dist_dic.keys()) and (osversion.get_codename() not in ros2_dist_dic.keys()):