diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index a7a9fdd9..becebbc5 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.6.4 +v4.6.5 \ No newline at end of file diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index d7af0615..093aea28 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -11,7 +11,6 @@ import ( "os" "path/filepath" "strconv" - "strings" "time" "github.com/pkg/errors" @@ -475,15 +474,7 @@ func (dev *IOSDevice) StopPcap() string { func (dev *IOSDevice) Install(appPath string, opts *InstallOptions) (err error) { for i := 0; i <= opts.RetryTime; i++ { - err = builtin.RunCommandWithCallback("ideviceinstaller", []string{"-u", dev.UDID, "-i", appPath}, func(line string) bool { - if strings.Contains(line, "Complete") { - return true - } - if strings.Contains(line, "90%") { - return true - } - return false - }) + err = builtin.RunCommand("go-ios", "install", "--path="+appPath, "--udid="+dev.UDID) if err == nil { return nil } @@ -492,15 +483,7 @@ func (dev *IOSDevice) Install(appPath string, opts *InstallOptions) (err error) } func (dev *IOSDevice) Uninstall(bundleId string) error { - return builtin.RunCommandWithCallback("ideviceinstaller", []string{"-u", dev.UDID, "-U", bundleId}, func(line string) bool { - if strings.Contains(line, "Complete") { - return true - } - if strings.Contains(line, "90%") { - return true - } - return false - }) + return builtin.RunCommand("go-ios", "uninstall", bundleId, "--udid="+dev.UDID) } func (dev *IOSDevice) forward(localPort, remotePort int) error {