1. 统一cpu类型

2. 同步脚本目录下的json配置文件

Author: kelvinBen

README.md

@@ -3,7 +3,7 @@
 ## AutoRedTools
 
 AutoRedTools是一款轻量级一站式自动下载/自动更新常用开源软件的工具，主要帮助安全从业者/安全开发人员快速进行环境搭建以及常用软件的更新，节约软件的更新或者安
-的时间，提升生产或工作效率。
+装的时间，从而提升生产效率或工作效率。
 
 (注：本工具使用GitHub API能力，需要配置GitHub Token，未配置GitHub Token会被GitHub限制IP访问)
 

UPDATE.md

@@ -1,3 +1,4 @@
+
 ## V1.0.2
 
 1. 修改输入参数支持类库

app.py

@@ -30,6 +30,7 @@ def __init__(self, github_token, github_proxy, tools_path) -> None:
 
     def start(self, out_path):
         self.__set_proxy__()
+        tools_name = ""
         with open(file=self.tools_path, encoding="utf8") as open_file:
             content = open_file.read()
             try:
@@ -60,7 +61,7 @@ def start(self, out_path):
                 raise(CustomException(error_msg))
             except KeyError as e:
                 msg = re.sub(r'KeyError.*?:',"", str(e)).strip()
-                error_msg = ("配置文件: %s 中未检索到Key: %s ，请参考配置样例文件后重新输入!!!") % (self.tools_path,msg)
+                error_msg = ("%s, 配置文件: %s 中未检索到Key: %s ，请参考配置样例文件后重新输入!!!") % (tools_name,self.tools_path,msg)
                 raise(CustomException(error_msg))
             except Exception as e:
                 raise(e)
@@ -105,21 +106,25 @@ def download_code_or_binary(self, tools_out_path, tools_url, platforms, tools_ty
         except KeyError as e:
             # 如果是Java版本则下载所有Java版本的
             sys_platform = platforms["java"]
-        except Exception as e:
-            raise(e)
-
-        if type(sys_platform) == type("str"):
-            # 如果是str类型则直接获取工具名称
-            file_name = sys_platform
-        else:
-            cpu_type = get_cpu_type()  # 获取CPU类型
-            file_name = sys_platform[cpu_type]
-
-        if "www" in tools_url:
-            api_url = tools_url.replace("www", "")
-        api_url = tools_url.replace("github.com", "api.github.com/repos") + "/releases/latest"
 
         try:
+            if type(sys_platform) == type("str"): 
+                # 如果是str类型则直接获取工具名称
+                file_name = sys_platform
+            else:
+                cpu_type = get_cpu_type().lower()  # 获取CPU类型
+                if cpu_type == "x86" or cpu_type=="i386" or cpu_type=="ia32":
+                    cpu_type = "i386"
+                if cpu_type=="x86_64" or cpu_type=="x64" or cpu_type=="amd64": 
+                    cpu_type = "amd64"
+                if cpu_type=="arm" or cpu_type=="arm64":
+                    cpu_type = "arm64"
+                file_name = sys_platform[cpu_type]
+
+            if "www" in tools_url:
+                api_url = tools_url.replace("www", "")
+            api_url = tools_url.replace("github.com", "api.github.com/repos") + "/releases/latest"
+
             resp = self.__requsets__(api_url)
             repos_json_obj = resp.json()
             tools_vesion = str(repos_json_obj["tag_name"])
@@ -144,7 +149,7 @@ def download_code_or_binary(self, tools_out_path, tools_url, platforms, tools_ty
             # 无发布版本忽略
             return
         except AttributeError as e:
-            errmsg= ("访问地址 %s 地址异常，请检查网络或者使用-p参数配置代理后重试!!!" % api_url)
+            errmsg= ("访问地址 %s 地址异常，请检查网络或者使用-p参数配置代理后重试或者使用-t参数追加github token!!!" % api_url)
             raise(CustomException(errmsg))
         except Exception as e:
             raise(e)
@@ -255,7 +260,16 @@ def init():
     if not os.path.exists(tools_path):
         script_tools = os.path.join(os.path.dirname(__file__), "tools.json")
         shutil.copyfile(script_tools, tools_path)
-    
+    else:
+        # 文件存在将最新的tools.json文件替换,并备份旧的配置文件
+        script_tools = os.path.join(os.path.dirname(__file__), "tools.json")
+        tools_mtime = os.path.getmtime(tools_path)
+        script_tools_mtime = os.path.getmtime(script_tools)
+        if script_tools_mtime > tools_mtime:
+            old_script_tools = os.path.join(doc_dir, "tools.json_" + str(tools_mtime))
+            shutil.move(tools_path, old_script_tools) # 备份旧的tools.json文件
+            shutil.copyfile(script_tools, tools_path) # 替换为新的tools.json文件
+
     # 获取全局配置文件信息
     config_dict = None
     with open(config_path, "r" ,encoding="utf-8") as config_file:

tools.json

@@ -60,16 +60,17 @@
         "type": "binary",
         "platform": {
           "win32": {
-            "i386": "xray_windows_386.exe",
-            "x86_64": "xray_windows_amd64"
+            "x86": "xray_windows_386.exe",
+            "amd64": "xray_windows_amd64"
           },
           "darwin": {
-            "x86_64": "xray_darwin_amd64",
+            "x86": "xray_darwin_amd64",
+            "amd64": "xray_darwin_amd64",
             "arm64": "xray_darwin_arm64"
           },
           "linux": {
-            "i386": "xray_linux_386",
-            "x86_64": "xray_linux_amd64",
+            "x86": "xray_linux_386",
+            "amd64": "xray_linux_amd64",
             "arm64": "xray_linux_arm64"
           }
         }
@@ -94,11 +95,13 @@
         "platform": {
           "win32": "win",
           "darwin": {
-            "x86_64": "macos.tar.gz",
+            "x86": "macos.tar.gz",
+            "amd64": "macos.tar.gz",
             "arm64": "macos_arm64"
           },
           "linux": {
-            "x86_64": "linux.tar.gz",
+            "x86": "linux.tar.gz",
+            "amd64": "linux.tar.gz",
             "arm64": "linux_arm64"
           }
         }
@@ -118,15 +121,16 @@
         "type": "binary",
         "platform": {
           "win32": {
-            "i386": "windows_386",
-            "x86_64": "windows_amd64"
+            "x86": "windows_386",
+            "amd64": "windows_amd64"
           },
           "darwin": {
-            "x86_64": "darwin_amd64",
+            "x86": "darwin_amd64",
+            "amd64": "darwin_amd64",
             "arm64": "darwin_arm64"
           },
           "linux": {
-            "x86_64": "Ladon64.lnx",
+            "amd64": "Ladon64.lnx",
             "arm": "linux_arm",
             "arm64": "linux_arm64"
           }
@@ -138,15 +142,16 @@
       "type": "binary",
       "platform": {
         "win32": {
-          "i386": "Ladon.exe",
-          "x86_64": "Ladon64.exe"
+          "x86": "Ladon.exe",
+          "amd64": "Ladon64.exe"
         },
         "darwin": {
-          "x86_64": "Ladon.mac",
+          "x86": "Ladon.mac",
+          "amd64": "Ladon.mac",
           "arm64": "Ladon64.arm"
         },
         "linux": {
-          "x86_64": "Ladon64.lnx",
+          "amd64": "Ladon64.lnx",
           "arm64": "Ladon64.arm"
         }
       }
@@ -221,16 +226,18 @@
         "type": "binary",
         "platform": {
           "win32": {
-            "i386": "win32-ia32",
-            "x86_64": "win32-x64"
+            "x86": "win32-ia32",
+            "amd64": "win32-x64",
+            "arm64": "win32-x64"
           },
           "darwin": {
-            "x86_64": "darwin-x64",
+            "x86": "darwin-x64",
+            "amd64": "darwin-x64",
             "arm64": "darwin-x64"
           },
           "linux": {
-            "i386": "linux-ia32",
-            "x86_64": "linux-x64",
+            "x86": "linux-ia32",
+            "amd64": "linux-x64",
             "arm": "linux-ia32",
             "arm64": "linux-arm64"
           }

utils.py

@@ -14,6 +14,6 @@ def get_cpu_type():
         if "Apple" in cpu_type:
             return "arm64"
         else:
-            return "x86_64"
+            return "amd64"
     else:
         return platform.machine()