pindo 5.18.20 → 5.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004b03010300629da1e55b7c6b34eada7cd76e55247deb8f76865d7446ef3572
-  data.tar.gz: 44757caa7ef3e6ae5253bd17d4a0c35ebe0c4cb6120d7ee2840c1a010b6800d2
+  metadata.gz: 68c6a51d50dad94212ebaf6360ce8a9f6a196b30aaf98a98e2114875ed6c0984
+  data.tar.gz: 34d0ca5bf09f50c5c3d2d25fa48cf761f526bd15381c57fca95c6b73567a41c1
 SHA512:
-  metadata.gz: 05bd2c5264163a1ec12aa545e165f2bee0d832e2c038cd30d506c932842c024f9664d6ecd51c7aa80a71f061ffcaf4747a56caac6223b2c34fe4887845681fc6
-  data.tar.gz: 03d477b345f080c1dfe28e5367786d2147029e86aac185c4aa698b8d17acc98064bee17958060be7d1f44ebb5a41e2790a228a9a4b4699d5d9e2bb6f99709a1d
+  metadata.gz: 7318ecbfadf6b0bee7febebff7f35e289984049f37b95760722abed6a59cc497b58f3fcb6786566a0f0ea71688da5434fc1c139cd68905f8b24dd326628a2187
+  data.tar.gz: c08a9a8fc36bdbe9850bff8601c1d4da3a371466fa2c7b95c24cdcdcbe9fa4e059d12e3cd692a7491c15f6faa7d5cbaac3f73b855b0b69470790a5c72e184f56

data/lib/pindo/base/git_handler.rb

@@ -86,8 +86,7 @@ module Pindo
       end
 
       def add_branch(local_repo_dir: nil, branch: nil)
-
-          current=Dir.pwd
+          # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
 
           if !local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
@@ -97,13 +96,11 @@ module Pindo
 
           git_remote!(local_repo_dir, %W(-C #{local_repo_dir} push origin #{branch}:#{branch}))
 
-          Dir.chdir(current)
           return result
       end
 
       def remove_branch(local_repo_dir: nil, branch: nil)
-          current=Dir.pwd
-
+          # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
           if File.exist?(local_repo_dir)
             current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
@@ -120,51 +117,40 @@ module Pindo
           else
             result = false
           end
-          Dir.chdir(current)
           return result
       end
 
 
       def local_branch_exists?(local_repo_dir: nil, branch: nil)
-          current=Dir.pwd
+          # 命令改带 -C，去掉 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
 
           if File.exist?(local_repo_dir)
-            Dir.chdir(local_repo_dir)
-
-            res_data = Executable.capture_command('git', %W(rev-parse --verify #{branch}), :capture => :out)
-            # puts "=====1"
-            # puts res_data
-            # res_data = git!(%W(-C #{local_repo_dir} --no-pager branch --list origin/#{branch} --no-color -r))
+            res_data = Executable.capture_command('git', %W(-C #{local_repo_dir} rev-parse --verify #{branch}), :capture => :out)
             result = !res_data.nil? && !res_data.empty?
           else
             result = false
           end
-          Dir.chdir(current)
           return result
       end
 
       def remote_branch_exists?(local_repo_dir: nil, branch: nil)
-          current=Dir.pwd
+          # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
           if File.exist?(local_repo_dir)
-            Dir.chdir(local_repo_dir)
             res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --heads origin refs/heads/#{branch}))
             result = !res_data.nil? && !res_data.empty?
           else
             result = false
           end
-          Dir.chdir(current)
           return result
       end
 
 
       def add_tag(local_repo_dir: nil, tag_name: nil)
-
-          current=Dir.pwd
+          # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
           if File.exist?(local_repo_dir)
-            Dir.chdir(local_repo_dir)
             if !local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
                 git!(%W(-C #{local_repo_dir} tag #{tag_name}))
                 result = true
@@ -173,7 +159,6 @@ module Pindo
           else
             result = false
           end
-          Dir.chdir(current)
           return result
       end
 
@@ -207,11 +192,9 @@ module Pindo
       end
 
       def remove_tag(local_repo_dir: nil, tag_name: nil)
-
+          # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
           result = false
-          current=Dir.pwd
           if File.exist?(local_repo_dir)
-            Dir.chdir(local_repo_dir)
             if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
                 git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
                 result = true
@@ -223,7 +206,6 @@ module Pindo
           else
             result = false
           end
-          Dir.chdir(current)
           return result
 
       end
@@ -234,12 +216,17 @@ module Pindo
       def remote_tag_commit(local_repo_dir: nil, tag_name: nil)
           return nil if local_repo_dir.nil? || !File.exist?(local_repo_dir)
           tag_ref = "refs/tags/#{tag_name}"
-          res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref}))
-          lines = res_data.to_s.lines.map(&:strip).reject(&:empty?)
-          return nil if lines.empty?
-          # annotated tag 的 ^{} 解引用行才是真实 commit，优先取它
-          deref = lines.find { |l| l.include?("^{}") }
-          (deref || lines.first).split(/\s+/).first
+          peeled_ref = "#{tag_ref}^{}"
+          # annotated tag 需要 ^{} 解引用行才能拿到真实 commit；但只传 tag_ref 精确过滤时，
+          # git ls-remote 不会附带 ^{} 行，必须显式把 peeled_ref 一起传入才能拿到它
+          res_data = git_remote!(local_repo_dir, %W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref} #{peeled_ref}))
+          entries = res_data.to_s.lines.map { |l| l.strip.split(/\s+/, 2) }
+                            .select { |sha, ref| sha && ref }
+          return nil if entries.empty?
+          # 优先取 ^{} 行（annotated tag 的真实 commit）；lightweight tag 只有 tag_ref 行且本身即 commit
+          peeled = entries.find { |_sha, ref| ref == peeled_ref }
+          plain  = entries.find { |_sha, ref| ref == tag_ref }
+          (peeled || plain)&.first
       end
 
       def remote_tag_exists?(local_repo_dir: nil, tag_name: nil)
@@ -253,9 +240,7 @@ module Pindo
       end
 
       def git_latest_commit_id(local_repo_dir:nil)
-
-        current=Dir.pwd
-
+        # 命令已带 -C，无需 Dir.chdir（并发模式下 chdir 会污染全局 cwd）
         unless File.exist?(File::join(local_repo_dir, ".git"))
           return nil
         end
@@ -263,16 +248,9 @@ module Pindo
         commit_id = nil
 
         if File.exist?(local_repo_dir)
-          Dir.chdir(local_repo_dir)
           current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
-          # puts "current_branch: #{current_branch}"
-
-          # git log -n 1 --pretty=format:"commit %H"
-          # format_str = "commit %H"
-          # latest_log_info = git!(%W(-C #{current} log -n 1 --pretty=#{format_str} #{current_branch})).strip
           commit_id = git!(%W(-C #{local_repo_dir} rev-parse #{current_branch})).strip
         end
-        Dir.chdir(current)
 
         return commit_id
       end
@@ -362,9 +340,11 @@ module Pindo
         rescue StandardError => e
           Funlog.instance.fancyinfo_error("仓库#{local_repo_dir}更新失败!")
           raise Informative, e.to_s
+        ensure
+          # 无论成功失败都还原 cwd，避免异常路径下污染全局工作目录
+          Dir.chdir(current)
         end
 
-        Dir.chdir(current)
         return local_repo_dir
       end
 
@@ -464,12 +444,8 @@ module Pindo
       end
 
       def git_addpush_repo(path:nil, message:"res", commit_file_params:nil)
-        current=Dir.pwd
-        Dir.chdir(path)
-
-        # gitee.com 仓库自动去除代理
+        # gitee.com 仓库自动去除代理；is_gitee_repo? 命令已带 -C，无需 chdir
         if is_gitee_repo?(local_repo_dir: path)
-          Dir.chdir(current)
           return without_proxy { git_addpush_repo_impl(path: path, message: message, commit_file_params: commit_file_params) }
         end
 
@@ -512,10 +488,10 @@ module Pindo
         rescue => error
             # puts(error.to_s)
             raise Informative, "\n#{path}\n 仓库失败 ！！！"
+        ensure
+            # 无论成功失败都还原 cwd，避免异常路径下污染全局工作目录
+            Dir.chdir(current)
         end
-
-
-        Dir.chdir(current)
       end
 
 
@@ -548,8 +524,11 @@ module Pindo
                     return nil
                 end
 
-                # 将字符串转换为数组
-                files_list.is_a?(String) ? files_list.split("\n").reject(&:empty?) : files_list
+                # git!/IO#readpartial 返回的是 ASCII-8BIT 字符串，含非 ASCII 字节（如中文路径、
+                # core.quotePath=false 时的原始多字节）会与下游 UTF-8 字面量拼接失败，这里统一
+                # 标成 UTF-8 并 scrub 无效字节，避免上层 `puts "...#{file}"` 抛 Encoding::CompatibilityError
+                raw_list = files_list.is_a?(String) ? files_list.split("\n") : Array(files_list)
+                raw_list.map { |f| f.dup.force_encoding('UTF-8').scrub }.reject(&:empty?)
             rescue => e
                 Funlog.instance.fancyinfo_error("获取未提交文件列表失败: #{e.message}")
                 nil
@@ -624,14 +603,13 @@ module Pindo
             puts
 
             # 将文件列表分行并用红色显示
-            if files.is_a?(String)
-                files.split("\n").each do |file|
-                    puts "  • #{file}".red unless file.empty?
-                end
-            else
-                files.each do |file|
-                    puts "  • #{file}".red unless file.empty?
-                end
+            # 防御性编码归一化：git! 返回的是 ASCII-8BIT，与 UTF-8 字面量 "  • " 拼接会抛
+            # Encoding::CompatibilityError；此处再兜一层，避免其它调用方传入 BINARY 字符串时崩溃
+            file_lines = files.is_a?(String) ? files.split("\n") : Array(files)
+            file_lines.each do |file|
+                next if file.nil? || file.empty?
+                safe_file = file.dup.force_encoding('UTF-8').scrub
+                puts "  • #{safe_file}".red
             end
 
             puts

data/lib/pindo/command/android/autobuild.rb

@@ -98,7 +98,7 @@ module Pindo
           @option_items ||= Pindo::Options::OptionGroup.merge(
             Pindo::Options::BuildOptions.select(:bundle_name, :release),
             Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
-            Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+            Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
             Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
             Pindo::Options::TaskOptions.select(:multi),
             Pindo::Options::GitOptions.all
@@ -130,6 +130,7 @@ module Pindo
           # Unity 参数
           @args_skip_lib = @options[:skiplib] || false
           @args_skip_yoo = @options[:skipyoo] || false
+          @args_kill_unity = @options[:kill_unity] || false
 
           # Task 参数
           @args_multi_flag = @options[:multi] || false
@@ -313,7 +314,8 @@ module Pindo
               # 2.1 Unity 更新必备库任务（可选）
               unless @args_skip_lib
                 unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                  project_path: config[:project_path]
+                  project_path: config[:project_path],
+                  auto_kill: @args_kill_unity
                 )
                 unity_update_task.dependencies << last_task.id
                 tasks << unity_update_task
@@ -324,7 +326,8 @@ module Pindo
               unless @args_skip_yoo
                 unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                   'android',
-                  project_path: config[:project_path]
+                  project_path: config[:project_path],
+                  auto_kill: @args_kill_unity
                 )
                 unity_yoo_task.dependencies << last_task.id
                 tasks << unity_yoo_task
@@ -339,7 +342,8 @@ module Pindo
                 'android',
                 project_path: config[:project_path],
                 export_path: android_export_path,
-                context: unity_context
+                context: unity_context,
+                auto_kill: @args_kill_unity
               )
               unity_export_task.dependencies << last_task.id
               tasks << unity_export_task

data/lib/pindo/command/ios/autobuild.rb

@@ -101,7 +101,7 @@ module Pindo
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid, :build_type),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
-                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
                         Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::GitOptions.all
@@ -141,6 +141,7 @@ module Pindo
                     # Unity 参数
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
+                    @args_kill_unity = @options[:kill_unity] || false
 
                     # Task 参数
                     @args_multi_flag = @options[:multi] || false
@@ -282,7 +283,8 @@ module Pindo
                             # 2.1 Unity 更新必备库任务（可选）
                             unless @args_skip_lib
                                 unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                                    project_path: config[:project_path]
+                                    project_path: config[:project_path],
+                                    auto_kill: @args_kill_unity
                                 )
                                 unity_update_task.dependencies << last_task.id
                                 tasks << unity_update_task
@@ -293,7 +295,8 @@ module Pindo
                             unless @args_skip_yoo
                                 unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                                     'ios',
-                                    project_path: config[:project_path]
+                                    project_path: config[:project_path],
+                                    auto_kill: @args_kill_unity
                                 )
                                 unity_yoo_task.dependencies << last_task.id
                                 tasks << unity_yoo_task
@@ -309,7 +312,8 @@ module Pindo
                                 project_path: config[:project_path],
                                 export_path: ios_export_path,
                                 deploy_mode: @build_type,  # 根据 build_type 传递部署模式
-                                context: unity_context
+                                context: unity_context,
+                                auto_kill: @args_kill_unity
                             )
                             unity_export_task.dependencies << last_task.id
                             tasks << unity_export_task

data/lib/pindo/command/repo/create.rb

@@ -43,7 +43,7 @@ module Pindo
                 def initialize(argv)
 
                     @args_repo_name = argv.shift_argument 
-                    @args_login_flag = argv.flag?('force', false)
+                    @args_login_flag = argv.flag?('login', false)
                     @repo_name = argv.option('repo')
                     @org_name = argv.option('org')
 

data/lib/pindo/command/repo/search.rb

@@ -48,7 +48,7 @@ module Pindo
                 def initialize(argv)
 
                     @args_repo_name = argv.shift_argument 
-                    @args_login_flag = argv.flag?('force', false)
+                    @args_login_flag = argv.flag?('login', false)
                     @repo_name = argv.option('repo')
                     @org_name = argv.option('org')
 

data/lib/pindo/command/unity/autobuild.rb

@@ -90,7 +90,7 @@ module Pindo
 
                         $ pindo unity autobuild --multi                # 使用并发模式执行
 
-                        $ pindo unity autobuild --kill-unity           # 自动关闭 Unity 进程（不询问确认）
+                        $ pindo unity autobuild --kill_unity           # 自动关闭 Unity 进程（不询问确认）
                 DESC
 
                 # 命令参数

data/lib/pindo/command/utils/installskills.rb

@@ -159,8 +159,8 @@ module Pindo
           Funlog.fancyinfo_start("克隆仓库: #{url}...")
           Funlog.info("仓库 URL: #{url}") if ENV['PINDO_DEBUG']
 
-          # 克隆仓库
-          success = system("git clone #{url} #{temp_dir} --quiet 2>/dev/null")
+          # 克隆仓库（数组参数形式，避免 URL 中的 shell 元字符注入）
+          success = system("git", "clone", url, temp_dir, "--quiet", err: File::NULL)
 
           unless success && File.exist?(File.join(temp_dir, '.git'))
             Funlog.fancyinfo_error("仓库克隆失败: #{url}")

data/lib/pindo/command/utils/renewproj.rb

@@ -142,7 +142,6 @@ module Pindo
                     new_project_dir = File.join(File::expand_path(current_dir + "/../") , temp_dir_name)
 
                     if File.exist?(new_project_dir)
-                        system 'sh rm -rf ' + new_project_dir
                         FileUtils.rm_rf(new_project_dir)
                     end
                     FileUtils.mkdir(new_project_dir)

data/lib/pindo/command/web/autobuild.rb

@@ -94,7 +94,7 @@ module Pindo
                     @option_items ||= Pindo::Options::OptionGroup.merge(
                         Pindo::Options::BuildOptions.select(:bundleid),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :send, :media, :bind),
-                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo, :kill_unity),
                         Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::UtilsOptions.select(:run),
@@ -128,6 +128,7 @@ module Pindo
                     # Unity 参数
                     @args_skip_lib = @options[:skiplib] || false
                     @args_skip_yoo = @options[:skipyoo] || false
+                    @args_kill_unity = @options[:kill_unity] || false
 
                     # Task 参数
                     @args_multi_flag = @options[:multi] || false
@@ -283,7 +284,8 @@ module Pindo
                     # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib
                       unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
-                        project_path: config[:project_path]
+                        project_path: config[:project_path],
+                        auto_kill: @args_kill_unity
                       )
                       unity_update_task.dependencies << last_task.id if last_task
                       tasks << unity_update_task
@@ -294,7 +296,8 @@ module Pindo
                     unless @args_skip_yoo
                       unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
                         'web',
-                        project_path: config[:project_path]
+                        project_path: config[:project_path],
+                        auto_kill: @args_kill_unity
                       )
                       unity_yoo_task.dependencies << last_task.id if last_task
                       tasks << unity_yoo_task
@@ -313,7 +316,8 @@ module Pindo
                       'web',
                       project_path: config[:project_path],
                       export_path: web_export_path,
-                      context: unity_context
+                      context: unity_context,
+                      auto_kill: @args_kill_unity
                     )
                     unity_export_task.dependencies << last_task.id if last_task
                     tasks << unity_export_task

data/lib/pindo/module/android/android_build_helper.rb

@@ -6,6 +6,7 @@ require_relative 'java_env_helper'
 require_relative 'keystore_helper'
 require_relative 'workflow_gradle_injector'
 require 'fileutils'
+require 'find'
 
 module Pindo
   class AndroidBuildHelper
@@ -24,6 +25,10 @@ module Pindo
       raise ArgumentError, "项目目录不能为空" if project_dir.nil?
       raise ArgumentError, "项目目录不存在" unless File.directory?(project_dir)
 
+      # 构建前先清理 macOS 自动生成的 .DS_Store
+      # 避免其被带入 base / asset pack 模块的 assets/ 导致冲突，或引起 Gradle clean 在遍历删除时出现竞态
+      prune_ds_store_files!(project_dir)
+
       # 设置 Java Home 环境变量
       Pindo::JavaEnvHelper.setup_java_home_from_project(project_dir)
 
@@ -396,20 +401,19 @@ module Pindo
       puts '  AAB 构建前先执行 Gradle clean'
       gradle_clean_resilient!(project_path)
 
-      cmd = "cd \"#{project_path}\" && ./gradlew --no-daemon #{bundle_task}"
-      system(cmd)
+      # 数组参数 + chdir，避免 project_path 拼接进 shell
+      system("./gradlew", "--no-daemon", bundle_task, chdir: project_path)
     end
 
     # clean 失败（占用、.DS_Store 竞态等）时：停 Daemon → 再删 .DS_Store → 物理删除各模块 build/，与 Gradle clean 产物一致，不中断后续 bundle
     private def gradle_clean_resilient!(project_path)
-      prune_ds_store_before_gradle_clean!(project_path)
-      cmd = %(cd "#{project_path}" && ./gradlew --no-daemon clean)
-      return if system(cmd)
+      prune_ds_store_files!(project_path)
+      return if system("./gradlew", "--no-daemon", "clean", chdir: project_path)
 
       puts '  ⚠ Gradle clean 失败，正在自动恢复：--stop、清理 .DS_Store、删除各模块 build/ ...'
-      system(%(cd "#{project_path}" && ./gradlew --stop), out: File::NULL, err: File::NULL)
+      system("./gradlew", "--stop", chdir: project_path, out: File::NULL, err: File::NULL)
       sleep 0.3
-      prune_ds_store_before_gradle_clean!(project_path)
+      prune_ds_store_files!(project_path)
       remove_android_module_build_dirs!(project_path)
     end
 
@@ -445,18 +449,37 @@ module Pindo
       puts "  ⚠ 物理删除 build 目录时出现异常（将继续尝试 bundle）: #{e.message}"
     end
 
-    # macOS 在 clean 遍历删除 build 目录时 Finder 可能写入 .DS_Store，Gradle 会报 Unable to delete / New files were found
-    private def prune_ds_store_before_gradle_clean!(project_path)
-      return unless project_path && File.directory?(project_path)
-
-      system('find', project_path, '-name', '.DS_Store', '-type', 'f', '-delete',
-             out: File::NULL, err: File::NULL)
+    # 清理 macOS 自动生成的 .DS_Store 文件
+    # 作用：
+    # 1) 避免被带入 base 与 asset pack 模块的 assets/ 造成打包冲突
+    # 2) 避免 Gradle clean 遍历删除 build 目录时 Finder 回写 .DS_Store 触发
+    #    Unable to delete / New files were found 的竞态错误
+    private def prune_ds_store_files!(project_path)
+      return 0 unless project_path && File.directory?(project_path)
+
+      count = 0
+      Find.find(project_path) do |path|
+        next unless File.basename(path) == '.DS_Store'
+        next unless File.file?(path)
+
+        begin
+          File.delete(path)
+          count += 1
+        rescue StandardError
+          # 个别文件删除失败不影响整体流程
+          next
+        end
+      end
+      puts "  已清理 #{count} 个 .DS_Store 文件" if count.positive?
+      count
+    rescue StandardError => e
+      puts "  ⚠ 清理 .DS_Store 异常：#{e.message}"
+      0
     end
 
     def build_so_library(project_path)
-      # 编译so库 (Thread Safe)
-      cmd = "cd \"#{project_path}\" && ./gradlew unityLibrary:BuildIl2CppTask"
-      system(cmd)
+      # 编译so库 (Thread Safe)；数组参数 + chdir，避免 project_path 拼接进 shell
+      system("./gradlew", "unityLibrary:BuildIl2CppTask", chdir: project_path)
     end
 
     def copy_so_files(source_path, target_path)

data/lib/pindo/module/android/gradle_helper.rb

@@ -518,18 +518,16 @@ module Pindo
           return false
         end
 
-        # 3. 使用unzip -t测试ZIP文件完整性
-        test_cmd = "unzip -t '#{zip_file}' > /dev/null 2>&1"
-        system(test_cmd)
+        # 3. 使用unzip -t测试ZIP文件完整性（数组参数，避免路径注入）
+        system("unzip", "-t", zip_file, out: File::NULL, err: File::NULL)
       rescue => e
         false
       end
 
       # 使用curl下载文件
       def download_with_curl(url, output_path)
-        # 简化的curl命令，避免特殊字符问题
-        cmd = "curl -L -o '#{output_path}' '#{url}'"
-        system(cmd)
+        # 数组参数形式，避免 URL/路径中的 shell 元字符注入
+        system("curl", "-L", "-o", output_path, url)
       rescue => e
         false
       end
@@ -537,9 +535,8 @@ module Pindo
       # 解压Gradle分发包
       def extract_gradle_distribution(zip_file, extract_dir, gradle_version)
         begin
-          # 使用unzip命令解压
-          extract_cmd = "cd '#{File.dirname(extract_dir)}' && unzip -q '#{zip_file}'"
-          if system(extract_cmd)
+          # 使用unzip命令解压（数组参数 + chdir，避免路径注入）
+          if system("unzip", "-q", zip_file, chdir: File.dirname(extract_dir))
             # 设置执行权限
             gradle_script = File.join(extract_dir, "bin/gradle")
             if File.exist?(gradle_script)
@@ -577,11 +574,8 @@ module Pindo
 
       # 使用官方Gradle命令生成wrapper
       def generate_gradle_wrapper_official(project_path, gradle_version)
-        Dir.chdir(project_path) do
-          # 使用gradle wrapper命令
-          cmd = "gradle wrapper"
-          system(cmd)
-        end
+        # 数组参数 + chdir，避免 shell 解析
+        system("gradle", "wrapper", chdir: project_path)
       rescue => e
         false
       end

data/lib/pindo/module/cert/cert_helper.rb

@@ -165,9 +165,9 @@ module Pindo
         puts "找到 #{identity_ids.size} 个证书:"
         puts identity_ids
 
-        # 删除证书
+        # 删除证书（数组参数形式，避免 identity_id 拼接进 shell）
         identity_ids.each do |identity_id|
-          system "security delete-certificate -Z #{identity_id}"
+          system("security", "delete-certificate", "-Z", identity_id)
         end
 
         # 清理 Provisioning Profiles