Update download.py

download.py

@@ -1,84 +1,71 @@
-import os
-import subprocess
-
-# 1. 安装 aria2
-def install_aria2():
-    print("正在安装 aria2...")
-    try:
-        subprocess.run(['sudo', 'apt', 'update'], check=True)
-        subprocess.run(['sudo', 'apt', 'install', '-y', 'aria2'], check=True)
-        print("aria2 安装完成。")
-    except subprocess.CalledProcessError as e:
-        print(f"安装 aria2 失败: {e}")
-        exit(1)
-
-# 2. 下载文件
-def download_files():
-    download_list = [
-        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/frp.py?download=true",
-        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/jupyterlab.sh?download=true",
-        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/frpc?download=true",
-        # 添加更多需要下载的文件URL
-    ]
-
-    download_dir = "/root"  # 文件下载路径改为 /root
-    os.makedirs(download_dir, exist_ok=True)
-
-    print("准备开始下载文件...")
-
-    for file_url in download_list:
-        print(f"下载中: {file_url}")
-        try:
-            subprocess.run(['aria2c', '--dir', download_dir, file_url], check=True)
-        except subprocess.CalledProcessError as e:
-            print(f"下载文件失败: {e}")
-
-    print("所有文件下载完成。")
-
-# 3. 运行 Python 脚本和 Shell 脚本
-def run_scripts():
-    scripts_to_run = [
-        os.path.join("/root", "frp.py"),  # 运行的 Python 脚本路径
-        os.path.join("/root", "jupyterlab.sh"),  # 运行的 Shell 脚本路径
-        #os.path.join("/root", "frpc"),  # 运行的二进制文件路径
-        # 可以在此处继续添加更多脚本
-    ]
-
-    for script in scripts_to_run:
-        if os.path.isfile(script):
-            # 如果是 Python 脚本
-            if script.endswith(".py"):
-                print(f"运行 Python 脚本: {script}")
-                try:
-                    subprocess.run(['python3', script], check=True)
-                except subprocess.CalledProcessError as e:
-                    print(f"运行 Python 脚本失败: {e}")
-            # 如果是 Shell 脚本
-            elif script.endswith(".sh"):
-                print(f"运行 Shell 脚本: {script}")
-                try:
-                    # 确保 shell 脚本具有执行权限
-                    subprocess.run(['chmod', '+x', script], check=True)
-                    subprocess.run([script], check=True)
-                except subprocess.CalledProcessError as e:
-                    print(f"运行 Shell 脚本失败: {e}")
-            # 如果是二进制文件
-            elif script.endswith("frpc"):
-                print(f"运行二进制文件: {script}")
-                try:
-                    subprocess.run([script], check=True)
-                except subprocess.CalledProcessError as e:
-                    print(f"运行二进制文件失败: {e}")
-        else:
-            print(f"找不到脚本: {script}")
-
-    print("所有脚本执行完成。")
-
-# 主函数
-def main():
-    install_aria2()   # 安装 aria2
-    download_files()  # 下载文件
-    run_scripts()     # 运行脚本
-
-if __name__ == "__main__":
-    main()
+import os
+import subprocess
+
+# 安装 aria2
+def install_aria2():
+    print("正在安装 aria2...")
+    try:
+        subprocess.run(['sudo', 'apt', 'update'], check=True)
+        subprocess.run(['sudo', 'apt', 'install', '-y', 'aria2'], check=True)
+        print("aria2 安装完成。")
+    except subprocess.CalledProcessError as e:
+        print(f"安装 aria2 失败: {e}")
+        exit(1)
+
+# 下载文件使用 aria2
+def download_files():
+    download_list = [
+        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/frp.py?download=true",
+        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/jupyterlab.sh?download=true",
+        "https://hf-mirror.com/HOPStudio/modelscope/resolve/main/frpc?download=true"
+    ]
+
+    download_dir = "/root"  # 文件下载路径
+    os.makedirs(download_dir, exist_ok=True)
+
+    print("准备开始下载文件...")
+
+    for file_url in download_list:
+        print(f"下载中: {file_url}")
+        try:
+            # 使用 aria2 下载文件
+            subprocess.run(['aria2c', '--dir', download_dir, file_url], check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"下载文件失败: {e}")
+
+    print("所有文件下载完成。")
+
+# 运行脚本：先运行 jupyterlab.sh，再运行 frp.py
+def run_scripts():
+    shell_script = os.path.join("/root", "jupyterlab.sh")
+    python_script = os.path.join("/root", "frp.py")
+
+    # 运行 Shell 脚本
+    if os.path.isfile(shell_script):
+        print(f"运行 Shell 脚本: {shell_script}")
+        try:
+            subprocess.run(['chmod', '+x', shell_script], check=True)  # 确保脚本具有执行权限
+            subprocess.run([shell_script], check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"运行 Shell 脚本失败: {e}")
+    else:
+        print(f"找不到 Shell 脚本: {shell_script}")
+
+    # 运行 Python 脚本
+    if os.path.isfile(python_script):
+        print(f"运行 Python 脚本: {python_script}")
+        try:
+            subprocess.run(['python3', python_script], check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"运行 Python 脚本失败: {e}")
+    else:
+        print(f"找不到 Python 脚本: {python_script}")
+
+# 主函数
+def main():
+    install_aria2()   # 安装 aria2
+    download_files()  # 下载文件
+    run_scripts()     # 运行脚本
+
+if __name__ == "__main__":
+    main()