pindo 5.18.20 → 5.19.2

data/lib/pindo/module/xcode/ipa_resign_helper.rb

@@ -86,10 +86,10 @@ module Pindo
                 tmp_dir = File.join(ipa_dir, tmp_time)
                 FileUtils.mkdir(tmp_dir) unless File.exist?(tmp_dir)
 
-                # 解压 IPA
-                command = "unzip -q \"#{resign_ipa_full_name}\" -d #{tmp_dir}"
-                puts command
-                system command
+                # 解压 IPA（数组参数避免注入；失败立即报错，不静默继续）
+                unless system("unzip", "-q", resign_ipa_full_name, "-d", tmp_dir)
+                    raise Informative, "IPA 解压失败: #{resign_ipa_full_name}"
+                end
 
                 payload_path = File.join(tmp_dir, "Payload")
                 if File.exist?(payload_path)
@@ -129,14 +129,13 @@ module Pindo
                 # 修改 Info.plist 中的 Bundle ID
                 modify_ipa_info_plist(modify_content_path: modify_content_path, bundle_id: new_bundle_id)
 
-                # 重新打包 IPA
-                current_dir = Dir.pwd
+                # 重新打包 IPA（数组参数 + chdir，避免 shell；* 由 Ruby 展开；失败立即报错）
                 if File.exist?(payload_path)
-                    Dir.chdir(tmp_dir)
-                    command = "zip -qry \"#{resign_ipa_full_name}\" * "
-                    puts command
-                    system command
-                    Dir.chdir(current_dir)
+                    # 排除点文件，对齐原 shell `*` 语义（避免把 .DS_Store 等打进 IPA 根目录）
+                    entries = Dir.children(tmp_dir).reject { |e| e.start_with?('.') }
+                    unless system("zip", "-qry", resign_ipa_full_name, *entries, chdir: tmp_dir)
+                        raise Informative, "IPA 重新打包失败: #{resign_ipa_full_name}"
+                    end
                 end
 
                 # 清理临时目录
@@ -160,24 +159,21 @@ module Pindo
 
                 # 确保 PlistBuddy 可用
                 unless File.exist?("/usr/local/bin/PlistBuddy")
-                    command = 'ln -s /usr/libexec/PlistBuddy /usr/local/bin/PlistBuddy'
-                    system command
+                    system("ln", "-s", "/usr/libexec/PlistBuddy", "/usr/local/bin/PlistBuddy")
                 end
 
-                # 读取旧的 Bundle ID
-                old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' + main_info_plist
-                puts old_bundle_id_command
+                # 读取旧的 Bundle ID（数组参数，避免路径拼接进 shell）
                 old_bundle_id = ""
-                IO.popen(old_bundle_id_command) { |f| old_bundle_id = f.gets }
-                old_bundle_id = old_bundle_id.strip
+                IO.popen(["/usr/local/bin/PlistBuddy", "-c", "Print :CFBundleIdentifier", main_info_plist]) { |f| old_bundle_id = f.gets }
+                old_bundle_id = old_bundle_id.to_s.strip
                 puts "旧 Bundle ID: #{old_bundle_id}"
 
-                # 修改主应用的 Bundle ID
+                # 修改主应用的 Bundle ID（失败立即报错）
                 new_main_bundle_id = bundle_id
 
-                exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_main_bundle_id + '" ' + main_info_plist
-                puts exchange_bundleid_command
-                system exchange_bundleid_command
+                unless system("/usr/local/bin/PlistBuddy", "-c", "Set :CFBundleIdentifier #{new_main_bundle_id}", main_info_plist)
+                    raise Informative, "修改主应用 Bundle ID 失败: #{main_info_plist}"
+                end
 
                 # 如果 Bundle ID 发生变化，更新 URL Schemes
                 if old_bundle_id != new_main_bundle_id
@@ -193,10 +189,8 @@ module Pindo
                         appex_path = File.join(plugin_path, file)
                         tmp_info_plist = File.join(appex_path, "Info.plist")
 
-                        old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' + tmp_info_plist
-                        puts old_bundle_id_command
                         old_plugin_bundle_id = ""
-                        IO.popen(old_bundle_id_command) { |f| old_plugin_bundle_id = f.gets }
+                        IO.popen(["/usr/local/bin/PlistBuddy", "-c", "Print :CFBundleIdentifier", tmp_info_plist]) { |f| old_plugin_bundle_id = f.gets }
                         puts "old_bundle_id = #{old_plugin_bundle_id}"
 
                         # 根据插件类型修改 Bundle ID
@@ -219,9 +213,9 @@ module Pindo
                 plugin_types.each do |suffix|
                     if old_bundle_id.include?(suffix)
                         new_plugin_bundle_id = new_base_bundle_id + suffix
-                        exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' + plist_path
-                        puts exchange_bundleid_command
-                        system exchange_bundleid_command
+                        unless system("/usr/local/bin/PlistBuddy", "-c", "Set :CFBundleIdentifier #{new_plugin_bundle_id}", plist_path)
+                            puts "  ⚠ 修改插件 Bundle ID 失败: #{plist_path}"
+                        end
                         break
                     end
                 end
@@ -322,49 +316,26 @@ module Pindo
                 puts "  旧 Scheme: #{old_scheme} (基于 #{old_bundle_id})"
                 puts "  新 Scheme: #{new_scheme} (基于 #{new_bundle_id})"
 
-                # 将 binary plist 转换为 XML 格式
-                convert_command = "plutil -convert xml1 \"#{plist_path}\" 2>/dev/null"
-                unless system(convert_command)
+                # 将 binary plist 转换为 XML 格式（数组参数，避免 plist_path 拼接进 shell）
+                unless system("plutil", "-convert", "xml1", plist_path, err: File::NULL)
                     puts "  ✗ 转换 plist 为 XML 失败"
                     return
                 end
 
-                # 检查文件中是否存在旧的 scheme
-                check_command = "grep -q \"#{old_scheme}\" \"#{plist_path}\""
-                scheme_exists = system(check_command)
-
-                unless scheme_exists
+                # 用 Ruby 文件操作做字面量替换，彻底规避 sed/grep 的 shell 注入
+                content = File.read(plist_path)
+                unless content.include?(old_scheme)
                     puts "  ✓ 没有找到需要更新的 URL Scheme"
-                    # 转换回 binary 格式
-                    convert_back_command = "plutil -convert binary1 \"#{plist_path}\" 2>/dev/null"
-                    system(convert_back_command)
+                    system("plutil", "-convert", "binary1", plist_path, err: File::NULL)
                     return
                 end
 
-                # 使用 sed 进行全文替换
-                # 使用临时文件避免 sed -i 在不同系统上的兼容性问题
-                temp_file = "#{plist_path}.tmp"
-                sed_command = "sed 's/#{old_scheme}/#{new_scheme}/g' \"#{plist_path}\" > \"#{temp_file}\" && mv \"#{temp_file}\" \"#{plist_path}\""
+                replace_count = content.scan(old_scheme).size
+                File.write(plist_path, content.gsub(old_scheme, new_scheme))
 
-                if system(sed_command)
-                    # 统计替换次数
-                    count_command = "grep -o \"#{new_scheme}\" \"#{plist_path}\" | wc -l"
-                    replace_count = `#{count_command}`.strip.to_i
-
-                    # 转换回 binary 格式
-                    convert_back_command = "plutil -convert binary1 \"#{plist_path}\" 2>/dev/null"
-                    system(convert_back_command)
-
-                    puts "  ✓ 已替换 #{replace_count} 处 URL Scheme: #{old_scheme} → #{new_scheme}"
-                else
-                    puts "  ✗ 替换 URL Scheme 失败"
-                    # 清理临时文件
-                    FileUtils.rm_f(temp_file) if File.exist?(temp_file)
-
-                    # 转换回 binary 格式（即使失败也要转回）
-                    convert_back_command = "plutil -convert binary1 \"#{plist_path}\" 2>/dev/null"
-                    system(convert_back_command)
-                end
+                # 转换回 binary 格式
+                system("plutil", "-convert", "binary1", plist_path, err: File::NULL)
+                puts "  ✓ 已替换 #{replace_count} 处 URL Scheme: #{old_scheme} → #{new_scheme}"
             end
 
         end

data/lib/pindo/options/groups/unity_options.rb

@@ -51,7 +51,7 @@ module Pindo
             env_name: 'PINDO_KILL_UNITY',
             default_value: false,
             optional: true,
-            example: 'pindo unity autobuild --kill-unity'
+            example: 'pindo unity autobuild --kill_unity'
           )
         }
       end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.18.20"
+  VERSION = "5.19.2"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.18.20
+  version: 5.19.2
 platform: ruby
 authors:
 - wade