diff --git a/api/server/routes/daemon/routes.go b/api/server/routes/daemon/routes.go index 290cda9f6e..1d5ebfa0f8 100644 --- a/api/server/routes/daemon/routes.go +++ b/api/server/routes/daemon/routes.go @@ -5,9 +5,10 @@ import ( "net/http" "runtime" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api" "github.com/blacktop/ipsw/api/types" - "github.com/gin-gonic/gin" ) // AddRoutes adds the download routes to the router diff --git a/api/server/routes/devicelist/routes.go b/api/server/routes/devicelist/routes.go index 0c2460892a..3bcea3d108 100644 --- a/api/server/routes/devicelist/routes.go +++ b/api/server/routes/devicelist/routes.go @@ -5,9 +5,10 @@ import ( "net/http" "sort" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/pkg/xcode" - "github.com/gin-gonic/gin" ) // swagger:response diff --git a/api/server/routes/diff/routes.go b/api/server/routes/diff/routes.go index 8af7746fe3..0b99367667 100644 --- a/api/server/routes/diff/routes.go +++ b/api/server/routes/diff/routes.go @@ -8,8 +8,9 @@ import ( "path/filepath" "github.com/aymanbagabas/go-udiff" - "github.com/blacktop/ipsw/api/types" "github.com/gin-gonic/gin" + + "github.com/blacktop/ipsw/api/types" ) // swagger:parameters postDiffFiles postDiffBlobs diff --git a/api/server/routes/download/download.go b/api/server/routes/download/download.go index 5d1a82b0d6..52e43e698a 100644 --- a/api/server/routes/download/download.go +++ b/api/server/routes/download/download.go @@ -3,9 +3,10 @@ package download import ( "net/http" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/commands/download/ipsw" - "github.com/gin-gonic/gin" ) func downloadIPSW(c *gin.Context) { diff --git a/api/server/routes/dsc/dsc.go b/api/server/routes/dsc/dsc.go index 1ec78ea05d..3f2ecf5a10 100644 --- a/api/server/routes/dsc/dsc.go +++ b/api/server/routes/dsc/dsc.go @@ -11,12 +11,13 @@ import ( "strings" "github.com/blacktop/go-macho" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" cmd "github.com/blacktop/ipsw/internal/commands/dsc" "github.com/blacktop/ipsw/internal/demangle" "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/pkg/dyld" - "github.com/gin-gonic/gin" ) // swagger:parameters postDscAddrToOff diff --git a/api/server/routes/extract/extract.go b/api/server/routes/extract/extract.go index a31f04a7dc..207ae6d7e4 100644 --- a/api/server/routes/extract/extract.go +++ b/api/server/routes/extract/extract.go @@ -5,9 +5,10 @@ import ( "net/http" "path/filepath" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/utils" - "github.com/gin-gonic/gin" ) // The extract response message diff --git a/api/server/routes/idev/idev.go b/api/server/routes/idev/idev.go index f578f6cc68..88d826d26b 100644 --- a/api/server/routes/idev/idev.go +++ b/api/server/routes/idev/idev.go @@ -7,13 +7,14 @@ import ( "net/http" "time" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/amfi" "github.com/blacktop/ipsw/pkg/usb/heartbeat" "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/gin-gonic/gin" ) // swagger:response idevInfoResponse diff --git a/api/server/routes/info/info.go b/api/server/routes/info/info.go index 878770c1a5..b97852150b 100644 --- a/api/server/routes/info/info.go +++ b/api/server/routes/info/info.go @@ -5,10 +5,11 @@ import ( "net/http" "strconv" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/pkg/info" - "github.com/gin-gonic/gin" ) // swagger:response diff --git a/api/server/routes/ipsw/ipsw.go b/api/server/routes/ipsw/ipsw.go index 92098e1d01..5ca2bdd236 100644 --- a/api/server/routes/ipsw/ipsw.go +++ b/api/server/routes/ipsw/ipsw.go @@ -14,13 +14,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/commands/ent" "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" "github.com/blacktop/ipsw/pkg/info" - "github.com/gin-gonic/gin" ) // swagger:model diff --git a/api/server/routes/kernel/kernel.go b/api/server/routes/kernel/kernel.go index f6b9655c6c..6bcec6b5ba 100644 --- a/api/server/routes/kernel/kernel.go +++ b/api/server/routes/kernel/kernel.go @@ -4,9 +4,10 @@ import ( "net/http" "github.com/blacktop/go-macho" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/pkg/kernelcache" - "github.com/gin-gonic/gin" ) // swagger:response kernelKextsResponse diff --git a/api/server/routes/macho/macho.go b/api/server/routes/macho/macho.go index b778cfa4b5..b8585f2e9e 100644 --- a/api/server/routes/macho/macho.go +++ b/api/server/routes/macho/macho.go @@ -5,8 +5,9 @@ import ( "strings" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/api/types" "github.com/gin-gonic/gin" + + "github.com/blacktop/ipsw/api/types" ) // Info is the struct for the macho info route parameters diff --git a/api/server/routes/mount/mount.go b/api/server/routes/mount/mount.go index 3d0e46cb59..afc5c158b2 100644 --- a/api/server/routes/mount/mount.go +++ b/api/server/routes/mount/mount.go @@ -7,10 +7,11 @@ import ( "path/filepath" "slices" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/commands/mount" "github.com/blacktop/ipsw/pkg/info" - "github.com/gin-gonic/gin" ) // swagger:response diff --git a/api/server/routes/routes.go b/api/server/routes/routes.go index c165fcea80..8489954d4c 100644 --- a/api/server/routes/routes.go +++ b/api/server/routes/routes.go @@ -2,6 +2,8 @@ package routes import ( + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/server/routes/daemon" "github.com/blacktop/ipsw/api/server/routes/devicelist" "github.com/blacktop/ipsw/api/server/routes/diff" @@ -14,7 +16,6 @@ import ( "github.com/blacktop/ipsw/api/server/routes/kernel" "github.com/blacktop/ipsw/api/server/routes/macho" "github.com/blacktop/ipsw/api/server/routes/mount" - "github.com/gin-gonic/gin" ) // Add adds the command routes to the router diff --git a/api/server/routes/syms/syms.go b/api/server/routes/syms/syms.go index ccfdac2832..925480c160 100644 --- a/api/server/routes/syms/syms.go +++ b/api/server/routes/syms/syms.go @@ -6,12 +6,13 @@ import ( "net/http" "path/filepath" + "github.com/gin-gonic/gin" + "github.com/spf13/cast" + "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/db" "github.com/blacktop/ipsw/internal/model" "github.com/blacktop/ipsw/internal/syms" - "github.com/gin-gonic/gin" - "github.com/spf13/cast" ) // swagger:response diff --git a/api/server/server.go b/api/server/server.go index 564f80ccb1..ed6a58660e 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -32,13 +32,14 @@ import ( "time" "github.com/apex/log" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api" "github.com/blacktop/ipsw/api/server/routes" "github.com/blacktop/ipsw/api/server/routes/aea" "github.com/blacktop/ipsw/api/server/routes/syms" "github.com/blacktop/ipsw/api/types" "github.com/blacktop/ipsw/internal/db" - "github.com/gin-gonic/gin" ) // Config is the server config diff --git a/cmd/ipsw/cmd/appstore/appstore_bundle_cap_add.go b/cmd/ipsw/cmd/appstore/appstore_bundle_cap_add.go index da85d67903..512e66ef53 100644 --- a/cmd/ipsw/cmd/appstore/appstore_bundle_cap_add.go +++ b/cmd/ipsw/cmd/appstore/appstore_bundle_cap_add.go @@ -28,10 +28,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_bundle_ls.go b/cmd/ipsw/cmd/appstore/appstore_bundle_ls.go index 6a1c7be2cc..b2441cd498 100644 --- a/cmd/ipsw/cmd/appstore/appstore_bundle_ls.go +++ b/cmd/ipsw/cmd/appstore/appstore_bundle_ls.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_cert_add.go b/cmd/ipsw/cmd/appstore/appstore_cert_add.go index 4e2e75a339..738635368b 100644 --- a/cmd/ipsw/cmd/appstore/appstore_cert_add.go +++ b/cmd/ipsw/cmd/appstore/appstore_cert_add.go @@ -27,10 +27,11 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_cert_ls.go b/cmd/ipsw/cmd/appstore/appstore_cert_ls.go index 414b49a605..39f5211c86 100644 --- a/cmd/ipsw/cmd/appstore/appstore_cert_ls.go +++ b/cmd/ipsw/cmd/appstore/appstore_cert_ls.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_cert_rm.go b/cmd/ipsw/cmd/appstore/appstore_cert_rm.go index fa338b3c4f..c93f3d79d6 100644 --- a/cmd/ipsw/cmd/appstore/appstore_cert_rm.go +++ b/cmd/ipsw/cmd/appstore/appstore_cert_rm.go @@ -28,10 +28,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_device_ls.go b/cmd/ipsw/cmd/appstore/appstore_device_ls.go index 14f56a3f7d..fde4cffcae 100644 --- a/cmd/ipsw/cmd/appstore/appstore_device_ls.go +++ b/cmd/ipsw/cmd/appstore/appstore_device_ls.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_device_mod.go b/cmd/ipsw/cmd/appstore/appstore_device_mod.go index d63cc53c74..48c8784547 100644 --- a/cmd/ipsw/cmd/appstore/appstore_device_mod.go +++ b/cmd/ipsw/cmd/appstore/appstore_device_mod.go @@ -28,11 +28,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_device_reg.go b/cmd/ipsw/cmd/appstore/appstore_device_reg.go index a23468f75b..b99f01043a 100644 --- a/cmd/ipsw/cmd/appstore/appstore_device_reg.go +++ b/cmd/ipsw/cmd/appstore/appstore_device_reg.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_profile_create.go b/cmd/ipsw/cmd/appstore/appstore_profile_create.go index 031d0d72cb..edf67c3111 100644 --- a/cmd/ipsw/cmd/appstore/appstore_profile_create.go +++ b/cmd/ipsw/cmd/appstore/appstore_profile_create.go @@ -30,11 +30,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_profile_ls.go b/cmd/ipsw/cmd/appstore/appstore_profile_ls.go index 2e81c32248..045815643c 100644 --- a/cmd/ipsw/cmd/appstore/appstore_profile_ls.go +++ b/cmd/ipsw/cmd/appstore/appstore_profile_ls.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_profile_renew.go b/cmd/ipsw/cmd/appstore/appstore_profile_renew.go index 96ad1b36cd..fb484a6ae8 100644 --- a/cmd/ipsw/cmd/appstore/appstore_profile_renew.go +++ b/cmd/ipsw/cmd/appstore/appstore_profile_renew.go @@ -30,11 +30,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_profile_rm.go b/cmd/ipsw/cmd/appstore/appstore_profile_rm.go index 0782626d3b..d19d952446 100644 --- a/cmd/ipsw/cmd/appstore/appstore_profile_rm.go +++ b/cmd/ipsw/cmd/appstore/appstore_profile_rm.go @@ -28,10 +28,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/appstore" ) func init() { diff --git a/cmd/ipsw/cmd/appstore/appstore_token.go b/cmd/ipsw/cmd/appstore/appstore_token.go index 03b917bfb6..3e69ebec33 100644 --- a/cmd/ipsw/cmd/appstore/appstore_token.go +++ b/cmd/ipsw/cmd/appstore/appstore_token.go @@ -26,10 +26,11 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/appstore" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/appstore" ) // ASTokenCmd represents the appstore token command diff --git a/cmd/ipsw/cmd/apsctl.go b/cmd/ipsw/cmd/apsctl.go index 6d9a547c90..38960ca3cb 100644 --- a/cmd/ipsw/cmd/apsctl.go +++ b/cmd/ipsw/cmd/apsctl.go @@ -26,8 +26,9 @@ package cmd import ( "fmt" - "github.com/blacktop/ipsw/internal/apsd" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/apsd" ) func init() { diff --git a/cmd/ipsw/cmd/car.go b/cmd/ipsw/cmd/car.go index a212211ca6..d7db43ce83 100644 --- a/cmd/ipsw/cmd/car.go +++ b/cmd/ipsw/cmd/car.go @@ -26,9 +26,10 @@ import ( "os" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/car" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/car" ) func init() { diff --git a/cmd/ipsw/cmd/class_dump.go b/cmd/ipsw/cmd/class_dump.go index 2dfd1ae6bb..b15e4df8c7 100644 --- a/cmd/ipsw/cmd/class_dump.go +++ b/cmd/ipsw/cmd/class_dump.go @@ -29,16 +29,16 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/apex/log" - "github.com/alecthomas/chroma/v2/styles" + "github.com/apex/log" "github.com/blacktop/go-macho" - mcmd "github.com/blacktop/ipsw/internal/commands/macho" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + mcmd "github.com/blacktop/ipsw/internal/commands/macho" + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/pkg/dyld" ) func getImages(dscPath string) []string { diff --git a/cmd/ipsw/cmd/device_info.go b/cmd/ipsw/cmd/device_info.go index 458e53fde8..8f173a1c64 100644 --- a/cmd/ipsw/cmd/device_info.go +++ b/cmd/ipsw/cmd/device_info.go @@ -26,9 +26,10 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/info" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/info" ) func init() { diff --git a/cmd/ipsw/cmd/device_list.go b/cmd/ipsw/cmd/device_list.go index e657d934f6..6d9a152459 100644 --- a/cmd/ipsw/cmd/device_list.go +++ b/cmd/ipsw/cmd/device_list.go @@ -27,9 +27,10 @@ import ( "strconv" "strings" - "github.com/blacktop/ipsw/pkg/xcode" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/pkg/xcode" ) func init() { diff --git a/cmd/ipsw/cmd/device_list_gen.go b/cmd/ipsw/cmd/device_list_gen.go index 6a7923aead..f3984a996f 100644 --- a/cmd/ipsw/cmd/device_list_gen.go +++ b/cmd/ipsw/cmd/device_list_gen.go @@ -24,8 +24,9 @@ THE SOFTWARE. package cmd import ( - "github.com/blacktop/ipsw/pkg/xcode" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/pkg/xcode" ) // deviceListGenCmd represents the deviceListGen command diff --git a/cmd/ipsw/cmd/device_tree.go b/cmd/ipsw/cmd/device_tree.go index 369d44c26b..606fc667bc 100644 --- a/cmd/ipsw/cmd/device_tree.go +++ b/cmd/ipsw/cmd/device_tree.go @@ -27,17 +27,15 @@ import ( "fmt" "os" - // "sort" - "github.com/apex/log" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/devicetree" - "github.com/pkg/errors" - - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/diff.go b/cmd/ipsw/cmd/diff.go index e39b06a99c..db05c66148 100644 --- a/cmd/ipsw/cmd/diff.go +++ b/cmd/ipsw/cmd/diff.go @@ -29,9 +29,10 @@ import ( "github.com/MakeNowJust/heredoc/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/diff" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/diff" ) func init() { diff --git a/cmd/ipsw/cmd/download/download.go b/cmd/ipsw/cmd/download/download.go index 516b86fe84..a8e75bc1f3 100644 --- a/cmd/ipsw/cmd/download/download.go +++ b/cmd/ipsw/cmd/download/download.go @@ -26,9 +26,10 @@ import ( "path" "strings" - "github.com/blacktop/ipsw/internal/download" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) type downloadFlags struct { diff --git a/cmd/ipsw/cmd/download/download_appledb.go b/cmd/ipsw/cmd/download/download_appledb.go index ce4f391039..9a6ab4d78a 100644 --- a/cmd/ipsw/cmd/download/download_appledb.go +++ b/cmd/ipsw/cmd/download/download_appledb.go @@ -33,12 +33,13 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/extract" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/extract" + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) var supportedOSes = []string{"audioOS", "bridgeOS", "iOS", "iPadOS", "iPodOS", "macOS", "tvOS", "watchOS", "visionOS"} diff --git a/cmd/ipsw/cmd/download/download_dev.go b/cmd/ipsw/cmd/download/download_dev.go index 6966e61286..ae89780a5c 100644 --- a/cmd/ipsw/cmd/download/download_dev.go +++ b/cmd/ipsw/cmd/download/download_dev.go @@ -37,10 +37,10 @@ import ( "github.com/apex/log" "github.com/caarlos0/ctrlc" "github.com/fatih/color" - - "github.com/blacktop/ipsw/internal/download" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_git.go b/cmd/ipsw/cmd/download/download_git.go index 06d8d66296..bb71036cfb 100644 --- a/cmd/ipsw/cmd/download/download_git.go +++ b/cmd/ipsw/cmd/download/download_git.go @@ -31,10 +31,11 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_ipa.go b/cmd/ipsw/cmd/download/download_ipa.go index 2e9bb52cfb..e7b8695348 100644 --- a/cmd/ipsw/cmd/download/download_ipa.go +++ b/cmd/ipsw/cmd/download/download_ipa.go @@ -31,11 +31,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" "github.com/fatih/color" - "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_ipsw.go b/cmd/ipsw/cmd/download/download_ipsw.go index d8255f8976..0742134a89 100644 --- a/cmd/ipsw/cmd/download/download_ipsw.go +++ b/cmd/ipsw/cmd/download/download_ipsw.go @@ -31,15 +31,16 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" + "github.com/fatih/color" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/commands/img4" "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/info" - "github.com/fatih/color" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_kdk.go b/cmd/ipsw/cmd/download/download_kdk.go index c521e2dbf9..2f3eb2e1bd 100644 --- a/cmd/ipsw/cmd/download/download_kdk.go +++ b/cmd/ipsw/cmd/download/download_kdk.go @@ -31,11 +31,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_keys.go b/cmd/ipsw/cmd/download/download_keys.go index 045c14de5f..b5a5e89927 100644 --- a/cmd/ipsw/cmd/download/download_keys.go +++ b/cmd/ipsw/cmd/download/download_keys.go @@ -28,10 +28,11 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_macos.go b/cmd/ipsw/cmd/download/download_macos.go index 6175750370..be7709cd2d 100644 --- a/cmd/ipsw/cmd/download/download_macos.go +++ b/cmd/ipsw/cmd/download/download_macos.go @@ -28,10 +28,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_ota.go b/cmd/ipsw/cmd/download/download_ota.go index a9f87219d8..4b7afb7702 100644 --- a/cmd/ipsw/cmd/download/download_ota.go +++ b/cmd/ipsw/cmd/download/download_ota.go @@ -31,15 +31,16 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/extract" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/dustin/go-humanize" "github.com/fatih/color" semver "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/extract" + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) var otaDlCmdPlatforms = []string{ diff --git a/cmd/ipsw/cmd/download/download_rss.go b/cmd/ipsw/cmd/download/download_rss.go index 73059c0e53..954f575ed7 100644 --- a/cmd/ipsw/cmd/download/download_rss.go +++ b/cmd/ipsw/cmd/download/download_rss.go @@ -29,12 +29,13 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/gen2brain/beeep" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_tss.go b/cmd/ipsw/cmd/download/download_tss.go index 062b97c454..5bc6dd54de 100644 --- a/cmd/ipsw/cmd/download/download_tss.go +++ b/cmd/ipsw/cmd/download/download_tss.go @@ -27,11 +27,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/tss" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/tss" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_wiki.go b/cmd/ipsw/cmd/download/download_wiki.go index abf995d794..a2010e9b94 100644 --- a/cmd/ipsw/cmd/download/download_wiki.go +++ b/cmd/ipsw/cmd/download/download_wiki.go @@ -32,14 +32,15 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" + "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/plist" - "github.com/fatih/color" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/download/download_xcode.go b/cmd/ipsw/cmd/download/download_xcode.go index be9549b99b..d1f0d9b7f1 100644 --- a/cmd/ipsw/cmd/download/download_xcode.go +++ b/cmd/ipsw/cmd/download/download_xcode.go @@ -29,11 +29,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld.go b/cmd/ipsw/cmd/dyld/dyld.go index 6156183f27..a75cf3dc9a 100644 --- a/cmd/ipsw/cmd/dyld/dyld.go +++ b/cmd/ipsw/cmd/dyld/dyld.go @@ -24,10 +24,11 @@ package dyld import ( "path/filepath" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) var symAddrColor = color.New(color.Faint).SprintfFunc() diff --git a/cmd/ipsw/cmd/dyld/dyld_a2f.go b/cmd/ipsw/cmd/dyld/dyld_a2f.go index a221607957..7f4dc02e40 100644 --- a/cmd/ipsw/cmd/dyld/dyld_a2f.go +++ b/cmd/ipsw/cmd/dyld/dyld_a2f.go @@ -29,12 +29,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_a2o.go b/cmd/ipsw/cmd/dyld/dyld_a2o.go index 689951035b..e2a3218187 100644 --- a/cmd/ipsw/cmd/dyld/dyld_a2o.go +++ b/cmd/ipsw/cmd/dyld/dyld_a2o.go @@ -27,13 +27,14 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_a2s.go b/cmd/ipsw/cmd/dyld/dyld_a2s.go index 0498adf0f9..b515f747c5 100644 --- a/cmd/ipsw/cmd/dyld/dyld_a2s.go +++ b/cmd/ipsw/cmd/dyld/dyld_a2s.go @@ -27,12 +27,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_disass.go b/cmd/ipsw/cmd/dyld/dyld_disass.go index e0ff63d016..d6a6f470e3 100644 --- a/cmd/ipsw/cmd/dyld/dyld_disass.go +++ b/cmd/ipsw/cmd/dyld/dyld_disass.go @@ -28,12 +28,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/disass" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/disass" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_dump.go b/cmd/ipsw/cmd/dyld/dyld_dump.go index 5eb9c72dc9..a5a7ee4169 100644 --- a/cmd/ipsw/cmd/dyld/dyld_dump.go +++ b/cmd/ipsw/cmd/dyld/dyld_dump.go @@ -31,12 +31,13 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_emu.go b/cmd/ipsw/cmd/dyld/dyld_emu.go index 25167a1b22..7bbf5a8659 100644 --- a/cmd/ipsw/cmd/dyld/dyld_emu.go +++ b/cmd/ipsw/cmd/dyld/dyld_emu.go @@ -29,12 +29,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" - "github.com/blacktop/ipsw/pkg/emu" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" + "github.com/blacktop/ipsw/pkg/emu" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_extract.go b/cmd/ipsw/cmd/dyld/dyld_extract.go index b09901df3c..d9bc7ce7b4 100644 --- a/cmd/ipsw/cmd/dyld/dyld_extract.go +++ b/cmd/ipsw/cmd/dyld/dyld_extract.go @@ -32,13 +32,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/fixupchains" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + + "github.com/blacktop/ipsw/pkg/dyld" ) func rebaseMachO(dsc *dyld.File, machoPath string) error { diff --git a/cmd/ipsw/cmd/dyld/dyld_ida.go b/cmd/ipsw/cmd/dyld/dyld_ida.go index 96aab4d865..12cefa0ae9 100644 --- a/cmd/ipsw/cmd/dyld/dyld_ida.go +++ b/cmd/ipsw/cmd/dyld/dyld_ida.go @@ -30,15 +30,16 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/ida" - "github.com/blacktop/ipsw/internal/commands/ida/dscu" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/ida" + "github.com/blacktop/ipsw/internal/commands/ida/dscu" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func removeExtension(filename string) string { diff --git a/cmd/ipsw/cmd/dyld/dyld_image.go b/cmd/ipsw/cmd/dyld/dyld_image.go index f1755ca7f9..f5762aaee4 100644 --- a/cmd/ipsw/cmd/dyld/dyld_image.go +++ b/cmd/ipsw/cmd/dyld/dyld_image.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_imports.go b/cmd/ipsw/cmd/dyld/dyld_imports.go index a7e4dbd21c..c622c1c347 100644 --- a/cmd/ipsw/cmd/dyld/dyld_imports.go +++ b/cmd/ipsw/cmd/dyld/dyld_imports.go @@ -29,13 +29,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/search" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/search" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_info.go b/cmd/ipsw/cmd/dyld/dyld_info.go index 0d6903da58..ef108fdbc8 100644 --- a/cmd/ipsw/cmd/dyld/dyld_info.go +++ b/cmd/ipsw/cmd/dyld/dyld_info.go @@ -35,14 +35,15 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" "github.com/blacktop/go-macho" - dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/fullsailor/pkcs7" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { @@ -352,7 +353,7 @@ var dyldInfoCmd = &cobra.Command{ out, err := utils.GitDiff( strings.Join(dout1, "\n")+"\n", strings.Join(dout2, "\n")+"\n", - &utils.GitDiffConfig{Color:viper.GetBool("color") && !viper.GetBool("no-color"), Tool: viper.GetString("diff-tool")}) + &utils.GitDiffConfig{Color: viper.GetBool("color") && !viper.GetBool("no-color"), Tool: viper.GetString("diff-tool")}) if err != nil { return err } diff --git a/cmd/ipsw/cmd/dyld/dyld_macho.go b/cmd/ipsw/cmd/dyld/dyld_macho.go index ce22712b27..c1777a2454 100644 --- a/cmd/ipsw/cmd/dyld/dyld_macho.go +++ b/cmd/ipsw/cmd/dyld/dyld_macho.go @@ -34,14 +34,15 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho/pkg/fixupchains" - mcmd "github.com/blacktop/ipsw/internal/commands/macho" - "github.com/blacktop/ipsw/internal/demangle" - swift "github.com/blacktop/ipsw/internal/swift" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + mcmd "github.com/blacktop/ipsw/internal/commands/macho" + "github.com/blacktop/ipsw/internal/demangle" + swift "github.com/blacktop/ipsw/internal/swift" + "github.com/blacktop/ipsw/pkg/dyld" ) const ( diff --git a/cmd/ipsw/cmd/dyld/dyld_mg.go b/cmd/ipsw/cmd/dyld/dyld_mg.go index a545c188f8..6d00de274f 100644 --- a/cmd/ipsw/cmd/dyld/dyld_mg.go +++ b/cmd/ipsw/cmd/dyld/dyld_mg.go @@ -33,12 +33,13 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) var mgLookup map[string]MG diff --git a/cmd/ipsw/cmd/dyld/dyld_o2a.go b/cmd/ipsw/cmd/dyld/dyld_o2a.go index 90f454f920..7a6de47230 100644 --- a/cmd/ipsw/cmd/dyld/dyld_o2a.go +++ b/cmd/ipsw/cmd/dyld/dyld_o2a.go @@ -27,13 +27,14 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_objc.go b/cmd/ipsw/cmd/dyld/dyld_objc.go index 8f12607239..259fb34b73 100644 --- a/cmd/ipsw/cmd/dyld/dyld_objc.go +++ b/cmd/ipsw/cmd/dyld/dyld_objc.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_objc_class.go b/cmd/ipsw/cmd/dyld/dyld_objc_class.go index ac1efe2c95..1dab4f989d 100644 --- a/cmd/ipsw/cmd/dyld/dyld_objc_class.go +++ b/cmd/ipsw/cmd/dyld/dyld_objc_class.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_objc_proto.go b/cmd/ipsw/cmd/dyld/dyld_objc_proto.go index 803183001a..dd36448cb8 100644 --- a/cmd/ipsw/cmd/dyld/dyld_objc_proto.go +++ b/cmd/ipsw/cmd/dyld/dyld_objc_proto.go @@ -30,11 +30,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_objc_sel.go b/cmd/ipsw/cmd/dyld/dyld_objc_sel.go index 183c2b53a8..dc2aeb3325 100644 --- a/cmd/ipsw/cmd/dyld/dyld_objc_sel.go +++ b/cmd/ipsw/cmd/dyld/dyld_objc_sel.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_patches.go b/cmd/ipsw/cmd/dyld/dyld_patches.go index 44b6850689..eb244305e3 100644 --- a/cmd/ipsw/cmd/dyld/dyld_patches.go +++ b/cmd/ipsw/cmd/dyld/dyld_patches.go @@ -30,11 +30,12 @@ import ( "text/tabwriter" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_search.go b/cmd/ipsw/cmd/dyld/dyld_search.go index aabf9a4447..e628cec031 100644 --- a/cmd/ipsw/cmd/dyld/dyld_search.go +++ b/cmd/ipsw/cmd/dyld/dyld_search.go @@ -30,10 +30,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_search_objc.go b/cmd/ipsw/cmd/dyld/dyld_search_objc.go index 9a64a4b566..6f105884b3 100644 --- a/cmd/ipsw/cmd/dyld/dyld_search_objc.go +++ b/cmd/ipsw/cmd/dyld/dyld_search_objc.go @@ -30,13 +30,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types/objc" - swift "github.com/blacktop/ipsw/internal/swift" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + swift "github.com/blacktop/ipsw/internal/swift" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func recurseProtocols(re *regexp.Regexp, proto objc.Protocol, depth int) (bool, string, int) { diff --git a/cmd/ipsw/cmd/dyld/dyld_search_swift.go b/cmd/ipsw/cmd/dyld/dyld_search_swift.go index aefc44161a..5d1db0522b 100644 --- a/cmd/ipsw/cmd/dyld/dyld_search_swift.go +++ b/cmd/ipsw/cmd/dyld/dyld_search_swift.go @@ -30,11 +30,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types/swift" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_slide.go b/cmd/ipsw/cmd/dyld/dyld_slide.go index fea1e0a24a..8c17aa6a40 100644 --- a/cmd/ipsw/cmd/dyld/dyld_slide.go +++ b/cmd/ipsw/cmd/dyld/dyld_slide.go @@ -28,11 +28,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_split.go b/cmd/ipsw/cmd/dyld/dyld_split.go index 56b4903dd1..9b4d79dd72 100644 --- a/cmd/ipsw/cmd/dyld/dyld_split.go +++ b/cmd/ipsw/cmd/dyld/dyld_split.go @@ -10,12 +10,13 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" semver "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_str.go b/cmd/ipsw/cmd/dyld/dyld_str.go index 4de5511a44..a164fca0b4 100644 --- a/cmd/ipsw/cmd/dyld/dyld_str.go +++ b/cmd/ipsw/cmd/dyld/dyld_str.go @@ -30,12 +30,13 @@ import ( "strings" "github.com/apex/log" - dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_stubs.go b/cmd/ipsw/cmd/dyld/dyld_stubs.go index 4a598458f4..d04d3143b4 100644 --- a/cmd/ipsw/cmd/dyld/dyld_stubs.go +++ b/cmd/ipsw/cmd/dyld/dyld_stubs.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_swift.go b/cmd/ipsw/cmd/dyld/dyld_swift.go index 38a10e45ad..32974c428b 100644 --- a/cmd/ipsw/cmd/dyld/dyld_swift.go +++ b/cmd/ipsw/cmd/dyld/dyld_swift.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_symaddr.go b/cmd/ipsw/cmd/dyld/dyld_symaddr.go index 0a3ae127ba..88e8f03363 100644 --- a/cmd/ipsw/cmd/dyld/dyld_symaddr.go +++ b/cmd/ipsw/cmd/dyld/dyld_symaddr.go @@ -29,13 +29,14 @@ import ( "path/filepath" "github.com/apex/log" - dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + dscCmd "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_tbd.go b/cmd/ipsw/cmd/dyld/dyld_tbd.go index 12f1e048c8..79ca8ad842 100644 --- a/cmd/ipsw/cmd/dyld/dyld_tbd.go +++ b/cmd/ipsw/cmd/dyld/dyld_tbd.go @@ -28,11 +28,12 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_webkit.go b/cmd/ipsw/cmd/dyld/dyld_webkit.go index 0218500043..18337c9679 100644 --- a/cmd/ipsw/cmd/dyld/dyld_webkit.go +++ b/cmd/ipsw/cmd/dyld/dyld_webkit.go @@ -29,15 +29,16 @@ import ( "strings" "github.com/apex/log" - dcsCmd "github.com/blacktop/ipsw/internal/commands/dsc" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" semver "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + dcsCmd "github.com/blacktop/ipsw/internal/commands/dsc" + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/dyld/dyld_xref.go b/cmd/ipsw/cmd/dyld/dyld_xref.go index ea276aa770..b9c4e6c877 100644 --- a/cmd/ipsw/cmd/dyld/dyld_xref.go +++ b/cmd/ipsw/cmd/dyld/dyld_xref.go @@ -27,12 +27,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/disass" - "github.com/blacktop/ipsw/pkg/dyld" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/disass" + "github.com/blacktop/ipsw/pkg/dyld" ) func init() { diff --git a/cmd/ipsw/cmd/ent.go b/cmd/ipsw/cmd/ent.go index ba6fff6bfc..9e0dd7f2b1 100644 --- a/cmd/ipsw/cmd/ent.go +++ b/cmd/ipsw/cmd/ent.go @@ -38,13 +38,14 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/commands/ent" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/info" "github.com/fatih/color" "github.com/sergi/go-diff/diffmatchpatch" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/ent" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/info" ) var colorBin = color.New(color.Bold, color.FgHiMagenta).SprintFunc() diff --git a/cmd/ipsw/cmd/extract.go b/cmd/ipsw/cmd/extract.go index a2d6d200bd..db544a49af 100644 --- a/cmd/ipsw/cmd/extract.go +++ b/cmd/ipsw/cmd/extract.go @@ -26,10 +26,11 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/extract" - "github.com/blacktop/ipsw/internal/utils" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/extract" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/frida/frida_objc.go b/cmd/ipsw/cmd/frida/frida_objc.go index dc10f49f02..0f8fed93fb 100644 --- a/cmd/ipsw/cmd/frida/frida_objc.go +++ b/cmd/ipsw/cmd/frida/frida_objc.go @@ -35,14 +35,15 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/cmd/ipsw/cmd/frida/types" - "github.com/blacktop/ipsw/internal/utils" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/frida/frida-go/frida" "github.com/mitchellh/mapstructure" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/cmd/ipsw/cmd/frida/types" + "github.com/blacktop/ipsw/internal/utils" ) var ( diff --git a/cmd/ipsw/cmd/fw/aea.go b/cmd/ipsw/cmd/fw/aea.go index f2baed331f..67bc3182fd 100644 --- a/cmd/ipsw/cmd/fw/aea.go +++ b/cmd/ipsw/cmd/fw/aea.go @@ -32,11 +32,12 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/aea" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/aea" ) func init() { diff --git a/cmd/ipsw/cmd/fw/aop.go b/cmd/ipsw/cmd/fw/aop.go index d8ba9fb765..2a94985422 100644 --- a/cmd/ipsw/cmd/fw/aop.go +++ b/cmd/ipsw/cmd/fw/aop.go @@ -30,12 +30,13 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/bundle" "github.com/blacktop/ipsw/pkg/img4" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) // NOTE: diff --git a/cmd/ipsw/cmd/fw/cam.go b/cmd/ipsw/cmd/fw/cam.go index cd97e80215..1ea136e557 100644 --- a/cmd/ipsw/cmd/fw/cam.go +++ b/cmd/ipsw/cmd/fw/cam.go @@ -30,11 +30,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img4" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) // NOTE: diff --git a/cmd/ipsw/cmd/fw/dcp.go b/cmd/ipsw/cmd/fw/dcp.go index ce6cec4a1b..1314fa024e 100644 --- a/cmd/ipsw/cmd/fw/dcp.go +++ b/cmd/ipsw/cmd/fw/dcp.go @@ -30,12 +30,13 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/bundle" "github.com/blacktop/ipsw/pkg/img4" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) // NOTE: diff --git a/cmd/ipsw/cmd/fw/exc.go b/cmd/ipsw/cmd/fw/exc.go index ca59dc3375..d01ca2e831 100644 --- a/cmd/ipsw/cmd/fw/exc.go +++ b/cmd/ipsw/cmd/fw/exc.go @@ -26,11 +26,12 @@ import ( "path/filepath" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" + fwcmd "github.com/blacktop/ipsw/internal/commands/fw" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/bundle" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) // NOTE: diff --git a/cmd/ipsw/cmd/fw/gpu.go b/cmd/ipsw/cmd/fw/gpu.go index c12a24f3f6..140fa51973 100644 --- a/cmd/ipsw/cmd/fw/gpu.go +++ b/cmd/ipsw/cmd/fw/gpu.go @@ -26,11 +26,12 @@ import ( "path/filepath" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/commands/extract" fwcmd "github.com/blacktop/ipsw/internal/commands/fw" "github.com/blacktop/ipsw/internal/magic" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/fw/iboot.go b/cmd/ipsw/cmd/fw/iboot.go index 2c749edb52..82736aeb0f 100644 --- a/cmd/ipsw/cmd/fw/iboot.go +++ b/cmd/ipsw/cmd/fw/iboot.go @@ -31,12 +31,12 @@ import ( "strings" "github.com/apex/log" - // lzfse "github.com/blacktop/go-lzfse" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/lzfse" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/lzfse" ) func init() { diff --git a/cmd/ipsw/cmd/fw/sep.go b/cmd/ipsw/cmd/fw/sep.go index ea4d2b016f..61cd91f9f9 100644 --- a/cmd/ipsw/cmd/fw/sep.go +++ b/cmd/ipsw/cmd/fw/sep.go @@ -26,11 +26,12 @@ import ( "path/filepath" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" + fwcmd "github.com/blacktop/ipsw/internal/commands/fw" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/sep" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) // NOTE: diff --git a/cmd/ipsw/cmd/ia.go b/cmd/ipsw/cmd/ia.go index 0fe404cb48..5bd6b54c9a 100644 --- a/cmd/ipsw/cmd/ia.go +++ b/cmd/ipsw/cmd/ia.go @@ -33,8 +33,9 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_cat.go b/cmd/ipsw/cmd/idev/idev_afc_cat.go index 640019e286..d41713afca 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_cat.go +++ b/cmd/ipsw/cmd/idev/idev_afc_cat.go @@ -27,11 +27,12 @@ import ( "os" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_ls.go b/cmd/ipsw/cmd/idev/idev_afc_ls.go index 802d638d70..68f11ef9fa 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_ls.go +++ b/cmd/ipsw/cmd/idev/idev_afc_ls.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_mkdir.go b/cmd/ipsw/cmd/idev/idev_afc_mkdir.go index 1539dda15f..7507fbcbf8 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_mkdir.go +++ b/cmd/ipsw/cmd/idev/idev_afc_mkdir.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_pull.go b/cmd/ipsw/cmd/idev/idev_afc_pull.go index f448937680..31c2228df2 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_pull.go +++ b/cmd/ipsw/cmd/idev/idev_afc_pull.go @@ -26,11 +26,12 @@ import ( "os" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_push.go b/cmd/ipsw/cmd/idev/idev_afc_push.go index ac5be3dc32..9c1a653ac1 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_push.go +++ b/cmd/ipsw/cmd/idev/idev_afc_push.go @@ -26,11 +26,12 @@ import ( "os" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_rm.go b/cmd/ipsw/cmd/idev/idev_afc_rm.go index 54fa82108d..1cf733110d 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_rm.go +++ b/cmd/ipsw/cmd/idev/idev_afc_rm.go @@ -26,11 +26,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_afc_tree.go b/cmd/ipsw/cmd/idev/idev_afc_tree.go index 2ff899d010..60b6cf1724 100644 --- a/cmd/ipsw/cmd/idev/idev_afc_tree.go +++ b/cmd/ipsw/cmd/idev/idev_afc_tree.go @@ -27,12 +27,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/dustin/go-humanize" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/afc" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_amfi_dev.go b/cmd/ipsw/cmd/idev/idev_amfi_dev.go index e9d5a6e037..2180806546 100644 --- a/cmd/ipsw/cmd/idev/idev_amfi_dev.go +++ b/cmd/ipsw/cmd/idev/idev_amfi_dev.go @@ -27,12 +27,13 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/amfi" - "github.com/blacktop/ipsw/pkg/usb/heartbeat" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/amfi" + "github.com/blacktop/ipsw/pkg/usb/heartbeat" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_apps_install.go b/cmd/ipsw/cmd/idev/idev_apps_install.go index 7dac4bf9f0..16fa4996e2 100644 --- a/cmd/ipsw/cmd/idev/idev_apps_install.go +++ b/cmd/ipsw/cmd/idev/idev_apps_install.go @@ -26,13 +26,14 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/apps" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/apps" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_apps_ls.go b/cmd/ipsw/cmd/idev/idev_apps_ls.go index 99ff21133f..6da1ecce72 100644 --- a/cmd/ipsw/cmd/idev/idev_apps_ls.go +++ b/cmd/ipsw/cmd/idev/idev_apps_ls.go @@ -28,11 +28,12 @@ import ( "text/tabwriter" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/apps" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/apps" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_apps_uninstall.go b/cmd/ipsw/cmd/idev/idev_apps_uninstall.go index 526931439c..bb5be66ae7 100644 --- a/cmd/ipsw/cmd/idev/idev_apps_uninstall.go +++ b/cmd/ipsw/cmd/idev/idev_apps_uninstall.go @@ -25,13 +25,14 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/apps" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/apps" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_comp.go b/cmd/ipsw/cmd/idev/idev_comp.go index e6e46a3be7..1a8d3d55f2 100644 --- a/cmd/ipsw/cmd/idev/idev_comp.go +++ b/cmd/ipsw/cmd/idev/idev_comp.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/companion" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/companion" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_crash_clear.go b/cmd/ipsw/cmd/idev/idev_crash_clear.go index cff8c402ce..f4b7e8c509 100644 --- a/cmd/ipsw/cmd/idev/idev_crash_clear.go +++ b/cmd/ipsw/cmd/idev/idev_crash_clear.go @@ -27,11 +27,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/crashlog" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/crashlog" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_crash_ls.go b/cmd/ipsw/cmd/idev/idev_crash_ls.go index e98ae0fd16..559ef23638 100644 --- a/cmd/ipsw/cmd/idev/idev_crash_ls.go +++ b/cmd/ipsw/cmd/idev/idev_crash_ls.go @@ -27,11 +27,12 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/crashlog" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/crashlog" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_crash_pull.go b/cmd/ipsw/cmd/idev/idev_crash_pull.go index 906a7e208f..e147ccc705 100644 --- a/cmd/ipsw/cmd/idev/idev_crash_pull.go +++ b/cmd/ipsw/cmd/idev/idev_crash_pull.go @@ -30,12 +30,13 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/crashlog" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/crashlog" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_bat.go b/cmd/ipsw/cmd/idev/idev_diag_bat.go index fec239fd4d..00f5b3e03e 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_bat.go +++ b/cmd/ipsw/cmd/idev/idev_diag_bat.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_info.go b/cmd/ipsw/cmd/idev/idev_diag_info.go index b4348117bb..3e3236d364 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_info.go +++ b/cmd/ipsw/cmd/idev/idev_diag_info.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_ioreg.go b/cmd/ipsw/cmd/idev/idev_diag_ioreg.go index 0b1983b29d..941ca6496d 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_ioreg.go +++ b/cmd/ipsw/cmd/idev/idev_diag_ioreg.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_mg.go b/cmd/ipsw/cmd/idev/idev_diag_mg.go index 286edf3218..11476b9762 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_mg.go +++ b/cmd/ipsw/cmd/idev/idev_diag_mg.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_restart.go b/cmd/ipsw/cmd/idev/idev_diag_restart.go index c4b1553ef4..5dc17f2f1b 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_restart.go +++ b/cmd/ipsw/cmd/idev/idev_diag_restart.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_shutdown.go b/cmd/ipsw/cmd/idev/idev_diag_shutdown.go index b055c76d09..ed10b5b3a8 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_shutdown.go +++ b/cmd/ipsw/cmd/idev/idev_diag_shutdown.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_diag_sleep.go b/cmd/ipsw/cmd/idev/idev_diag_sleep.go index 7cd560b507..c92ad96fdc 100644 --- a/cmd/ipsw/cmd/idev/idev_diag_sleep.go +++ b/cmd/ipsw/cmd/idev/idev_diag_sleep.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/diagnostics" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/diagnostics" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_fsyms.go b/cmd/ipsw/cmd/idev/idev_fsyms.go index a5ebfcedd6..cefe7467a5 100644 --- a/cmd/ipsw/cmd/idev/idev_fsyms.go +++ b/cmd/ipsw/cmd/idev/idev_fsyms.go @@ -28,12 +28,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/fetchsymbols" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/fetchsymbols" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_lookup.go b/cmd/ipsw/cmd/idev/idev_img_lookup.go index 4e47829bb4..408ef0beff 100644 --- a/cmd/ipsw/cmd/idev/idev_img_lookup.go +++ b/cmd/ipsw/cmd/idev/idev_img_lookup.go @@ -27,11 +27,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mount" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mount" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_ls.go b/cmd/ipsw/cmd/idev/idev_img_ls.go index ba88ca60d2..4b6a91e83f 100644 --- a/cmd/ipsw/cmd/idev/idev_img_ls.go +++ b/cmd/ipsw/cmd/idev/idev_img_ls.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mount" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mount" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_mount.go b/cmd/ipsw/cmd/idev/idev_img_mount.go index db1f90467f..c51af677c1 100644 --- a/cmd/ipsw/cmd/idev/idev_img_mount.go +++ b/cmd/ipsw/cmd/idev/idev_img_mount.go @@ -31,15 +31,16 @@ import ( "time" "github.com/apex/log" + "github.com/fatih/color" + semver "github.com/hashicorp/go-version" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/plist" "github.com/blacktop/ipsw/pkg/tss" "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/blacktop/ipsw/pkg/usb/mount" - "github.com/fatih/color" - semver "github.com/hashicorp/go-version" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_nonce.go b/cmd/ipsw/cmd/idev/idev_img_nonce.go index 9b90ed6629..3b48a2f20c 100644 --- a/cmd/ipsw/cmd/idev/idev_img_nonce.go +++ b/cmd/ipsw/cmd/idev/idev_img_nonce.go @@ -34,13 +34,14 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mount" "github.com/boombuler/barcode" "github.com/boombuler/barcode/qr" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mount" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_sign.go b/cmd/ipsw/cmd/idev/idev_img_sign.go index b40a5f1bea..a23ffd0607 100644 --- a/cmd/ipsw/cmd/idev/idev_img_sign.go +++ b/cmd/ipsw/cmd/idev/idev_img_sign.go @@ -30,12 +30,13 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/plist" - "github.com/blacktop/ipsw/pkg/tss" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/plist" + "github.com/blacktop/ipsw/pkg/tss" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_img_unmount.go b/cmd/ipsw/cmd/idev/idev_img_unmount.go index d97aafcb72..dca9a039fe 100644 --- a/cmd/ipsw/cmd/idev/idev_img_unmount.go +++ b/cmd/ipsw/cmd/idev/idev_img_unmount.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mount" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mount" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_list.go b/cmd/ipsw/cmd/idev/idev_list.go index d7b239b7c2..b033de22e7 100644 --- a/cmd/ipsw/cmd/idev/idev_list.go +++ b/cmd/ipsw/cmd/idev/idev_list.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/usb" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/usb" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_loc_clear.go b/cmd/ipsw/cmd/idev/idev_loc_clear.go index d085f33f43..3e5675c49b 100644 --- a/cmd/ipsw/cmd/idev/idev_loc_clear.go +++ b/cmd/ipsw/cmd/idev/idev_loc_clear.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/simulatelocation" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/simulatelocation" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_loc_play.go b/cmd/ipsw/cmd/idev/idev_loc_play.go index 6d78c21011..b648c82411 100644 --- a/cmd/ipsw/cmd/idev/idev_loc_play.go +++ b/cmd/ipsw/cmd/idev/idev_loc_play.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/simulatelocation" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/simulatelocation" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_loc_set.go b/cmd/ipsw/cmd/idev/idev_loc_set.go index 93bd3ddb25..444102624f 100644 --- a/cmd/ipsw/cmd/idev/idev_loc_set.go +++ b/cmd/ipsw/cmd/idev/idev_loc_set.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/simulatelocation" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/simulatelocation" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_noti.go b/cmd/ipsw/cmd/idev/idev_noti.go index 177406b555..a321e01432 100644 --- a/cmd/ipsw/cmd/idev/idev_noti.go +++ b/cmd/ipsw/cmd/idev/idev_noti.go @@ -27,12 +27,13 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/notification" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/notification" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_pcap.go b/cmd/ipsw/cmd/idev/idev_pcap.go index be59a51e97..847654a51c 100644 --- a/cmd/ipsw/cmd/idev/idev_pcap.go +++ b/cmd/ipsw/cmd/idev/idev_pcap.go @@ -32,13 +32,14 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/blacktop/ipsw/pkg/usb/pcap" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" + "github.com/blacktop/ipsw/pkg/usb/pcap" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_cloud.go b/cmd/ipsw/cmd/idev/idev_prof_cloud.go index 8c6d2b322f..db6e7722dd 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_cloud.go +++ b/cmd/ipsw/cmd/idev/idev_prof_cloud.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_install.go b/cmd/ipsw/cmd/idev/idev_prof_install.go index d89692c4cf..d88111d8ac 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_install.go +++ b/cmd/ipsw/cmd/idev/idev_prof_install.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_ls.go b/cmd/ipsw/cmd/idev/idev_prof_ls.go index d2567fd6f8..f973404caa 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_ls.go +++ b/cmd/ipsw/cmd/idev/idev_prof_ls.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_rm.go b/cmd/ipsw/cmd/idev/idev_prof_rm.go index 941dbc0afa..ca31436548 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_rm.go +++ b/cmd/ipsw/cmd/idev/idev_prof_rm.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_upload.go b/cmd/ipsw/cmd/idev/idev_prof_upload.go index 7ee82c563f..e6c4334456 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_upload.go +++ b/cmd/ipsw/cmd/idev/idev_prof_upload.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prof_wifi.go b/cmd/ipsw/cmd/idev/idev_prof_wifi.go index acb37c1455..b2875f6369 100644 --- a/cmd/ipsw/cmd/idev/idev_prof_wifi.go +++ b/cmd/ipsw/cmd/idev/idev_prof_wifi.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/mcinstall" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/mcinstall" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prov_clear.go b/cmd/ipsw/cmd/idev/idev_prov_clear.go index 4f377eb93e..c7c363759a 100644 --- a/cmd/ipsw/cmd/idev/idev_prov_clear.go +++ b/cmd/ipsw/cmd/idev/idev_prov_clear.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/misagent" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/misagent" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prov_dump.go b/cmd/ipsw/cmd/idev/idev_prov_dump.go index e866f64282..ae2a4c0e24 100644 --- a/cmd/ipsw/cmd/idev/idev_prov_dump.go +++ b/cmd/ipsw/cmd/idev/idev_prov_dump.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/misagent" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/misagent" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prov_install.go b/cmd/ipsw/cmd/idev/idev_prov_install.go index e153264dbc..fdac69afc5 100644 --- a/cmd/ipsw/cmd/idev/idev_prov_install.go +++ b/cmd/ipsw/cmd/idev/idev_prov_install.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/misagent" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/misagent" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prov_ls.go b/cmd/ipsw/cmd/idev/idev_prov_ls.go index b691441cb4..7eef54c94a 100644 --- a/cmd/ipsw/cmd/idev/idev_prov_ls.go +++ b/cmd/ipsw/cmd/idev/idev_prov_ls.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/misagent" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/misagent" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_prov_rm.go b/cmd/ipsw/cmd/idev/idev_prov_rm.go index 039910e580..7a36124eb2 100644 --- a/cmd/ipsw/cmd/idev/idev_prov_rm.go +++ b/cmd/ipsw/cmd/idev/idev_prov_rm.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/misagent" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/misagent" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_proxy.go b/cmd/ipsw/cmd/idev/idev_proxy.go index 0208a60948..813e9e5ea6 100644 --- a/cmd/ipsw/cmd/idev/idev_proxy.go +++ b/cmd/ipsw/cmd/idev/idev_proxy.go @@ -29,11 +29,12 @@ import ( "syscall" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/forward" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/forward" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_ps.go b/cmd/ipsw/cmd/idev/idev_ps.go index 1c97a024a1..9f779a96fc 100644 --- a/cmd/ipsw/cmd/idev/idev_ps.go +++ b/cmd/ipsw/cmd/idev/idev_ps.go @@ -29,11 +29,12 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/ostrace" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/ostrace" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_restore_enter.go b/cmd/ipsw/cmd/idev/idev_restore_enter.go index 96b024bf40..c582278c79 100644 --- a/cmd/ipsw/cmd/idev/idev_restore_enter.go +++ b/cmd/ipsw/cmd/idev/idev_restore_enter.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_restore_exit.go b/cmd/ipsw/cmd/idev/idev_restore_exit.go index 8569d77c4e..a265283917 100644 --- a/cmd/ipsw/cmd/idev/idev_restore_exit.go +++ b/cmd/ipsw/cmd/idev/idev_restore_exit.go @@ -27,10 +27,11 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/usb/irecv" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/usb/irecv" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_screen.go b/cmd/ipsw/cmd/idev/idev_screen.go index d8d51a2536..7c27d9b41c 100644 --- a/cmd/ipsw/cmd/idev/idev_screen.go +++ b/cmd/ipsw/cmd/idev/idev_screen.go @@ -28,12 +28,13 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/blacktop/ipsw/pkg/usb/screenshot" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" + "github.com/blacktop/ipsw/pkg/usb/screenshot" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_springb_icon.go b/cmd/ipsw/cmd/idev/idev_springb_icon.go index 9c127be53d..a3edf4dcda 100644 --- a/cmd/ipsw/cmd/idev/idev_springb_icon.go +++ b/cmd/ipsw/cmd/idev/idev_springb_icon.go @@ -27,12 +27,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/blacktop/ipsw/pkg/usb/springboard" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" + "github.com/blacktop/ipsw/pkg/usb/springboard" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_springb_orient.go b/cmd/ipsw/cmd/idev/idev_springb_orient.go index 0333b919c4..29c5b93084 100644 --- a/cmd/ipsw/cmd/idev/idev_springb_orient.go +++ b/cmd/ipsw/cmd/idev/idev_springb_orient.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/springboard" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/springboard" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_springb_wallpaper.go b/cmd/ipsw/cmd/idev/idev_springb_wallpaper.go index f23a5a7c51..291d80aab3 100644 --- a/cmd/ipsw/cmd/idev/idev_springb_wallpaper.go +++ b/cmd/ipsw/cmd/idev/idev_springb_wallpaper.go @@ -27,12 +27,13 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/blacktop/ipsw/pkg/usb/springboard" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" + "github.com/blacktop/ipsw/pkg/usb/springboard" ) func init() { diff --git a/cmd/ipsw/cmd/idev/idev_syslog.go b/cmd/ipsw/cmd/idev/idev_syslog.go index 17d4ef56bb..e232e1ce06 100644 --- a/cmd/ipsw/cmd/idev/idev_syslog.go +++ b/cmd/ipsw/cmd/idev/idev_syslog.go @@ -33,12 +33,13 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/syslog" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/syslog" ) var loc *time.Location diff --git a/cmd/ipsw/cmd/idev/idev_wifi.go b/cmd/ipsw/cmd/idev/idev_wifi.go index 5d727adb47..9c4b9fee1a 100644 --- a/cmd/ipsw/cmd/idev/idev_wifi.go +++ b/cmd/ipsw/cmd/idev/idev_wifi.go @@ -25,11 +25,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) func init() { diff --git a/cmd/ipsw/cmd/img4/img4_dec.go b/cmd/ipsw/cmd/img4/img4_dec.go index 57d2b5a169..6a08efdd43 100644 --- a/cmd/ipsw/cmd/img4/img4_dec.go +++ b/cmd/ipsw/cmd/img4/img4_dec.go @@ -28,11 +28,12 @@ import ( "path/filepath" "github.com/apex/log" - icmd "github.com/blacktop/ipsw/internal/commands/img4" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + icmd "github.com/blacktop/ipsw/internal/commands/img4" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/img4/img4_extract.go b/cmd/ipsw/cmd/img4/img4_extract.go index 4e905686fd..aacb95a30d 100644 --- a/cmd/ipsw/cmd/img4/img4_extract.go +++ b/cmd/ipsw/cmd/img4/img4_extract.go @@ -26,11 +26,12 @@ import ( "path/filepath" "github.com/apex/log" - icmd "github.com/blacktop/ipsw/internal/commands/img4" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + icmd "github.com/blacktop/ipsw/internal/commands/img4" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/img4/img4_img3.go b/cmd/ipsw/cmd/img4/img4_img3.go index 9a54bbda02..d77d4c9abe 100644 --- a/cmd/ipsw/cmd/img4/img4_img3.go +++ b/cmd/ipsw/cmd/img4/img4_img3.go @@ -25,10 +25,11 @@ import ( "path/filepath" "github.com/apex/log" - icmd "github.com/blacktop/ipsw/internal/commands/img4" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + icmd "github.com/blacktop/ipsw/internal/commands/img4" ) func init() { diff --git a/cmd/ipsw/cmd/img4/img4_kbag.go b/cmd/ipsw/cmd/img4/img4_kbag.go index e7f8b14e92..2de98ce952 100644 --- a/cmd/ipsw/cmd/img4/img4_kbag.go +++ b/cmd/ipsw/cmd/img4/img4_kbag.go @@ -28,10 +28,11 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/img4" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/img4" ) func init() { diff --git a/cmd/ipsw/cmd/info.go b/cmd/ipsw/cmd/info.go index 334457071e..0a77071685 100644 --- a/cmd/ipsw/cmd/info.go +++ b/cmd/ipsw/cmd/info.go @@ -31,11 +31,12 @@ import ( "text/tabwriter" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/pkg/info" "github.com/dustin/go-humanize" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/pkg/info" ) func init() { diff --git a/cmd/ipsw/cmd/jsonschema.go b/cmd/ipsw/cmd/jsonschema.go index c8c693f685..3ae28a4ce7 100644 --- a/cmd/ipsw/cmd/jsonschema.go +++ b/cmd/ipsw/cmd/jsonschema.go @@ -28,10 +28,11 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/config" "github.com/invopop/jsonschema" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/config" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_ctf.go b/cmd/ipsw/cmd/kernel/kernel_ctf.go index 5e13a49c49..c0a3bf5dea 100644 --- a/cmd/ipsw/cmd/kernel/kernel_ctf.go +++ b/cmd/ipsw/cmd/kernel/kernel_ctf.go @@ -32,12 +32,13 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/ctf" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/ctf" + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_dec.go b/cmd/ipsw/cmd/kernel/kernel_dec.go index 8f72dcf395..bf5a93f123 100644 --- a/cmd/ipsw/cmd/kernel/kernel_dec.go +++ b/cmd/ipsw/cmd/kernel/kernel_dec.go @@ -27,11 +27,12 @@ import ( "path/filepath" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/img4" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/img4" + "github.com/blacktop/ipsw/pkg/kernelcache" ) func isImg4(kcpath string) bool { diff --git a/cmd/ipsw/cmd/kernel/kernel_dwarf.go b/cmd/ipsw/cmd/kernel/kernel_dwarf.go index b17a0acdfe..b3e0427365 100644 --- a/cmd/ipsw/cmd/kernel/kernel_dwarf.go +++ b/cmd/ipsw/cmd/kernel/kernel_dwarf.go @@ -31,12 +31,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/dwarf" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" - "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/dwarf" + "github.com/blacktop/ipsw/internal/utils" ) const dSymMachoPath = ".dSYM/Contents/Resources/DWARF" diff --git a/cmd/ipsw/cmd/kernel/kernel_extract.go b/cmd/ipsw/cmd/kernel/kernel_extract.go index 96bfe8f667..308155a560 100644 --- a/cmd/ipsw/cmd/kernel/kernel_extract.go +++ b/cmd/ipsw/cmd/kernel/kernel_extract.go @@ -29,11 +29,12 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/fixupchains" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_ida.go b/cmd/ipsw/cmd/kernel/kernel_ida.go index 8ad5caa3a0..da6b8d4c75 100644 --- a/cmd/ipsw/cmd/kernel/kernel_ida.go +++ b/cmd/ipsw/cmd/kernel/kernel_ida.go @@ -31,13 +31,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/internal/commands/ida" - "github.com/blacktop/ipsw/internal/utils" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/ida" + "github.com/blacktop/ipsw/internal/utils" ) const ( diff --git a/cmd/ipsw/cmd/kernel/kernel_info.go b/cmd/ipsw/cmd/kernel/kernel_info.go index 8eb6c1dd88..8f6df3e54f 100644 --- a/cmd/ipsw/cmd/kernel/kernel_info.go +++ b/cmd/ipsw/cmd/kernel/kernel_info.go @@ -34,11 +34,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" ) var symAddrColor = color.New(color.Faint).SprintfFunc() diff --git a/cmd/ipsw/cmd/kernel/kernel_kexts.go b/cmd/ipsw/cmd/kernel/kernel_kexts.go index 2dd923d280..f1ed647fc5 100644 --- a/cmd/ipsw/cmd/kernel/kernel_kexts.go +++ b/cmd/ipsw/cmd/kernel/kernel_kexts.go @@ -27,11 +27,12 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_kmutil_create.go b/cmd/ipsw/cmd/kernel/kernel_kmutil_create.go index 8bd2f74979..1795be4172 100644 --- a/cmd/ipsw/cmd/kernel/kernel_kmutil_create.go +++ b/cmd/ipsw/cmd/kernel/kernel_kmutil_create.go @@ -31,11 +31,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_kmutil_inspect.go b/cmd/ipsw/cmd/kernel/kernel_kmutil_inspect.go index 201cc0a618..79a470bbca 100644 --- a/cmd/ipsw/cmd/kernel/kernel_kmutil_inspect.go +++ b/cmd/ipsw/cmd/kernel/kernel_kmutil_inspect.go @@ -30,11 +30,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_mach.go b/cmd/ipsw/cmd/kernel/kernel_mach.go index 35040661aa..ff646bbdd7 100644 --- a/cmd/ipsw/cmd/kernel/kernel_mach.go +++ b/cmd/ipsw/cmd/kernel/kernel_mach.go @@ -30,10 +30,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_mig.go b/cmd/ipsw/cmd/kernel/kernel_mig.go index 4d844fe7d4..200b9b0caa 100644 --- a/cmd/ipsw/cmd/kernel/kernel_mig.go +++ b/cmd/ipsw/cmd/kernel/kernel_mig.go @@ -29,10 +29,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_symbolicate.go b/cmd/ipsw/cmd/kernel/kernel_symbolicate.go index d2c69ae44e..28f586e538 100644 --- a/cmd/ipsw/cmd/kernel/kernel_symbolicate.go +++ b/cmd/ipsw/cmd/kernel/kernel_symbolicate.go @@ -31,12 +31,13 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/signature" "github.com/fatih/color" "github.com/invopop/jsonschema" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/signature" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_syscall.go b/cmd/ipsw/cmd/kernel/kernel_syscall.go index 0aa19ab289..755353ca95 100644 --- a/cmd/ipsw/cmd/kernel/kernel_syscall.go +++ b/cmd/ipsw/cmd/kernel/kernel_syscall.go @@ -29,10 +29,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/kernel/kernel_version.go b/cmd/ipsw/cmd/kernel/kernel_version.go index ba129afc80..07aeaaabe6 100644 --- a/cmd/ipsw/cmd/kernel/kernel_version.go +++ b/cmd/ipsw/cmd/kernel/kernel_version.go @@ -28,10 +28,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/kernelcache" ) func init() { diff --git a/cmd/ipsw/cmd/key_list_gen.go b/cmd/ipsw/cmd/key_list_gen.go index 01cc1b7521..6057826b57 100644 --- a/cmd/ipsw/cmd/key_list_gen.go +++ b/cmd/ipsw/cmd/key_list_gen.go @@ -26,8 +26,9 @@ import ( "os" "path/filepath" - "github.com/blacktop/ipsw/internal/download" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/download" ) // keyListGenCmd represents the key-list-gen command diff --git a/cmd/ipsw/cmd/lsbom.go b/cmd/ipsw/cmd/lsbom.go index 18cf58edeb..ce1de600aa 100644 --- a/cmd/ipsw/cmd/lsbom.go +++ b/cmd/ipsw/cmd/lsbom.go @@ -29,9 +29,10 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/bom" "github.com/dustin/go-humanize" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/pkg/bom" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_a2o.go b/cmd/ipsw/cmd/macho/macho_a2o.go index 48a57fe03d..1fddaa182d 100644 --- a/cmd/ipsw/cmd/macho/macho_a2o.go +++ b/cmd/ipsw/cmd/macho/macho_a2o.go @@ -29,10 +29,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_a2s.go b/cmd/ipsw/cmd/macho/macho_a2s.go index 69fca45a9a..908c33a74d 100644 --- a/cmd/ipsw/cmd/macho/macho_a2s.go +++ b/cmd/ipsw/cmd/macho/macho_a2s.go @@ -30,11 +30,12 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_disass.go b/cmd/ipsw/cmd/macho/macho_disass.go index 56f3aa6d28..acafc93015 100644 --- a/cmd/ipsw/cmd/macho/macho_disass.go +++ b/cmd/ipsw/cmd/macho/macho_disass.go @@ -33,13 +33,14 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/pkg/disass" "github.com/caarlos0/ctrlc" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/pkg/disass" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_dump.go b/cmd/ipsw/cmd/macho/macho_dump.go index ed96a71cdc..3eb9c72d1d 100644 --- a/cmd/ipsw/cmd/macho/macho_dump.go +++ b/cmd/ipsw/cmd/macho/macho_dump.go @@ -34,10 +34,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_info.go b/cmd/ipsw/cmd/macho/macho_info.go index 356ac2692f..2df9bc0642 100644 --- a/cmd/ipsw/cmd/macho/macho_info.go +++ b/cmd/ipsw/cmd/macho/macho_info.go @@ -43,6 +43,13 @@ import ( cstypes "github.com/blacktop/go-macho/pkg/codesign/types" "github.com/blacktop/go-macho/pkg/fixupchains" "github.com/blacktop/go-macho/types" + "github.com/fatih/color" + "github.com/fullsailor/pkcs7" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/spf13/viper" + "golang.org/x/exp/slices" + "github.com/blacktop/ipsw/internal/certs" mcmd "github.com/blacktop/ipsw/internal/commands/macho" "github.com/blacktop/ipsw/internal/demangle" @@ -50,12 +57,6 @@ import ( swift "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/plist" - "github.com/fatih/color" - "github.com/fullsailor/pkcs7" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "github.com/spf13/viper" - "golang.org/x/exp/slices" ) var symAddrColor = color.New(color.Faint).SprintfFunc() diff --git a/cmd/ipsw/cmd/macho/macho_o2a.go b/cmd/ipsw/cmd/macho/macho_o2a.go index c6646152c9..f579838134 100644 --- a/cmd/ipsw/cmd/macho/macho_o2a.go +++ b/cmd/ipsw/cmd/macho/macho_o2a.go @@ -29,10 +29,11 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/macho/macho_patch_add.go b/cmd/ipsw/cmd/macho/macho_patch_add.go index 06234338f5..8ea9c310ff 100644 --- a/cmd/ipsw/cmd/macho/macho_patch_add.go +++ b/cmd/ipsw/cmd/macho/macho_patch_add.go @@ -31,14 +31,15 @@ import ( "github.com/MakeNowJust/heredoc/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - mcmd "github.com/blacktop/ipsw/internal/commands/macho" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/plist" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + mcmd "github.com/blacktop/ipsw/internal/commands/macho" + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/plist" ) var supportedAddLCs = []string{ diff --git a/cmd/ipsw/cmd/macho/macho_patch_mod.go b/cmd/ipsw/cmd/macho/macho_patch_mod.go index 1c3daf681a..492ac504fc 100644 --- a/cmd/ipsw/cmd/macho/macho_patch_mod.go +++ b/cmd/ipsw/cmd/macho/macho_patch_mod.go @@ -31,14 +31,15 @@ import ( "github.com/MakeNowJust/heredoc/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - mcmd "github.com/blacktop/ipsw/internal/commands/macho" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/plist" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + mcmd "github.com/blacktop/ipsw/internal/commands/macho" + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/plist" ) var supportedModLCs = []string{ diff --git a/cmd/ipsw/cmd/macho/macho_patch_rm.go b/cmd/ipsw/cmd/macho/macho_patch_rm.go index c2fab65748..e2e53d7cb9 100644 --- a/cmd/ipsw/cmd/macho/macho_patch_rm.go +++ b/cmd/ipsw/cmd/macho/macho_patch_rm.go @@ -31,14 +31,15 @@ import ( "github.com/MakeNowJust/heredoc/v2" "github.com/apex/log" "github.com/blacktop/go-macho" - mcmd "github.com/blacktop/ipsw/internal/commands/macho" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/plist" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + mcmd "github.com/blacktop/ipsw/internal/commands/macho" + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/plist" ) var supportedRmLCs = []string{ diff --git a/cmd/ipsw/cmd/macho/macho_search.go b/cmd/ipsw/cmd/macho/macho_search.go index e4cdc5b491..85506b1c03 100644 --- a/cmd/ipsw/cmd/macho/macho_search.go +++ b/cmd/ipsw/cmd/macho/macho_search.go @@ -32,13 +32,14 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/codesign/types" "github.com/blacktop/go-macho/types/objc" - "github.com/blacktop/ipsw/internal/search" - swift "github.com/blacktop/ipsw/internal/swift" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/search" + swift "github.com/blacktop/ipsw/internal/swift" + "github.com/blacktop/ipsw/internal/utils" ) var colorAddr = color.New(color.Faint).SprintfFunc() diff --git a/cmd/ipsw/cmd/macho/macho_sign.go b/cmd/ipsw/cmd/macho/macho_sign.go index c65f10c42c..3fcbd2c840 100644 --- a/cmd/ipsw/cmd/macho/macho_sign.go +++ b/cmd/ipsw/cmd/macho/macho_sign.go @@ -33,6 +33,10 @@ import ( "github.com/apex/log" mcs "github.com/blacktop/go-macho/pkg/codesign" cstypes "github.com/blacktop/go-macho/pkg/codesign/types" + "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/codesign" ents "github.com/blacktop/ipsw/internal/codesign/entitlements" "github.com/blacktop/ipsw/internal/codesign/resources" @@ -40,9 +44,6 @@ import ( "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/plist" - "github.com/fatih/color" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/mdevs.go b/cmd/ipsw/cmd/mdevs.go index 51cf340021..7da9122031 100644 --- a/cmd/ipsw/cmd/mdevs.go +++ b/cmd/ipsw/cmd/mdevs.go @@ -33,10 +33,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" + "github.com/spf13/cobra" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" "github.com/blacktop/ipsw/pkg/info" - "github.com/spf13/cobra" ) type typeDecl struct { diff --git a/cmd/ipsw/cmd/mount.go b/cmd/ipsw/cmd/mount.go index c39023a5b0..48d9d240cc 100644 --- a/cmd/ipsw/cmd/mount.go +++ b/cmd/ipsw/cmd/mount.go @@ -29,9 +29,10 @@ import ( "syscall" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/blacktop/ipsw/internal/commands/mount" "github.com/blacktop/ipsw/internal/utils" - "github.com/spf13/cobra" ) var mountCmdSubCmds = []string{"fs", "sys", "app", "exc"} diff --git a/cmd/ipsw/cmd/objc.go b/cmd/ipsw/cmd/objc.go index 985df1f8c8..829dedf1a8 100644 --- a/cmd/ipsw/cmd/objc.go +++ b/cmd/ipsw/cmd/objc.go @@ -28,8 +28,9 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/objc" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/objc" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_extract.go b/cmd/ipsw/cmd/ota/ota_extract.go index 1a13a6579d..b9cce39196 100644 --- a/cmd/ipsw/cmd/ota/ota_extract.go +++ b/cmd/ipsw/cmd/ota/ota_extract.go @@ -30,13 +30,14 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" + "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/dyld" "github.com/blacktop/ipsw/pkg/kernelcache" "github.com/blacktop/ipsw/pkg/ota" - "github.com/fatih/color" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_info.go b/cmd/ipsw/cmd/ota/ota_info.go index 0e502ca369..730c394e35 100644 --- a/cmd/ipsw/cmd/ota/ota_info.go +++ b/cmd/ipsw/cmd/ota/ota_info.go @@ -26,10 +26,11 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/ota" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/ota" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_ls.go b/cmd/ipsw/cmd/ota/ota_ls.go index b2b4d5009d..643df96baa 100644 --- a/cmd/ipsw/cmd/ota/ota_ls.go +++ b/cmd/ipsw/cmd/ota/ota_ls.go @@ -30,11 +30,12 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/ota" "github.com/dustin/go-humanize" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/ota" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_patch_bxdiff.go b/cmd/ipsw/cmd/ota/ota_patch_bxdiff.go index dfd64ceaad..a93b2ccb02 100644 --- a/cmd/ipsw/cmd/ota/ota_patch_bxdiff.go +++ b/cmd/ipsw/cmd/ota/ota_patch_bxdiff.go @@ -28,10 +28,11 @@ import ( "regexp" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/info" - "github.com/blacktop/ipsw/pkg/ota/bxdiff50" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/pkg/info" + "github.com/blacktop/ipsw/pkg/ota/bxdiff50" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_patch_rsr.go b/cmd/ipsw/cmd/ota/ota_patch_rsr.go index a0c37b7953..3421490148 100644 --- a/cmd/ipsw/cmd/ota/ota_patch_rsr.go +++ b/cmd/ipsw/cmd/ota/ota_patch_rsr.go @@ -32,12 +32,13 @@ import ( "regexp" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/info" - "github.com/blacktop/ipsw/pkg/ota/ridiff" semver "github.com/hashicorp/go-version" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/info" + "github.com/blacktop/ipsw/pkg/ota/ridiff" ) func init() { diff --git a/cmd/ipsw/cmd/ota/ota_payload.go b/cmd/ipsw/cmd/ota/ota_payload.go index 962a4d014b..87abdb5811 100644 --- a/cmd/ipsw/cmd/ota/ota_payload.go +++ b/cmd/ipsw/cmd/ota/ota_payload.go @@ -34,14 +34,15 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/pkg/ota" - "github.com/blacktop/ipsw/pkg/ota/pbzx" - "github.com/blacktop/ipsw/pkg/ota/yaa" "github.com/dustin/go-humanize" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/pkg/ota" + "github.com/blacktop/ipsw/pkg/ota/pbzx" + "github.com/blacktop/ipsw/pkg/ota/yaa" ) func init() { diff --git a/cmd/ipsw/cmd/pbzx.go b/cmd/ipsw/cmd/pbzx.go index da824ba170..fbfb01a990 100644 --- a/cmd/ipsw/cmd/pbzx.go +++ b/cmd/ipsw/cmd/pbzx.go @@ -30,10 +30,11 @@ import ( "runtime" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/magic" - "github.com/blacktop/ipsw/pkg/ota/pbzx" "github.com/dustin/go-humanize" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/magic" + "github.com/blacktop/ipsw/pkg/ota/pbzx" ) func init() { diff --git a/cmd/ipsw/cmd/pl.go b/cmd/ipsw/cmd/pl.go index bdf5ad2279..ead1644e9b 100644 --- a/cmd/ipsw/cmd/pl.go +++ b/cmd/ipsw/cmd/pl.go @@ -36,10 +36,11 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" "github.com/fsnotify/fsnotify" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" ) var cache map[string]string diff --git a/cmd/ipsw/cmd/pongo.go b/cmd/ipsw/cmd/pongo.go index 67519b98df..f9c3563676 100644 --- a/cmd/ipsw/cmd/pongo.go +++ b/cmd/ipsw/cmd/pongo.go @@ -35,14 +35,15 @@ import ( "time" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/spf13/viper" + icmd "github.com/blacktop/ipsw/internal/commands/img4" "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img4" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/usb/pongo" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/root.go b/cmd/ipsw/cmd/root.go index 9ef1227cff..b53855249e 100644 --- a/cmd/ipsw/cmd/root.go +++ b/cmd/ipsw/cmd/root.go @@ -29,6 +29,9 @@ import ( "github.com/apex/log" clihander "github.com/apex/log/handlers/cli" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/cmd/ipsw/cmd/appstore" "github.com/blacktop/ipsw/cmd/ipsw/cmd/download" "github.com/blacktop/ipsw/cmd/ipsw/cmd/dyld" @@ -41,8 +44,6 @@ import ( "github.com/blacktop/ipsw/cmd/ipsw/cmd/ota" "github.com/blacktop/ipsw/cmd/ipsw/cmd/sb" "github.com/blacktop/ipsw/cmd/ipsw/cmd/ssh" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) var ( diff --git a/cmd/ipsw/cmd/sb/sb_diff.go b/cmd/ipsw/cmd/sb/sb_diff.go index 159334681e..a796ab4b4d 100644 --- a/cmd/ipsw/cmd/sb/sb_diff.go +++ b/cmd/ipsw/cmd/sb/sb_diff.go @@ -34,12 +34,13 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/aea" - "github.com/blacktop/ipsw/pkg/info" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/aea" + "github.com/blacktop/ipsw/pkg/info" ) func init() { diff --git a/cmd/ipsw/cmd/ssh/ssh_debugserver.go b/cmd/ipsw/cmd/ssh/ssh_debugserver.go index c01b635efa..29636adb42 100644 --- a/cmd/ipsw/cmd/ssh/ssh_debugserver.go +++ b/cmd/ipsw/cmd/ssh/ssh_debugserver.go @@ -31,11 +31,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/ssh" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/ssh" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/ssh/ssh_shsh.go b/cmd/ipsw/cmd/ssh/ssh_shsh.go index cf10919aa4..3a938537b9 100644 --- a/cmd/ipsw/cmd/ssh/ssh_shsh.go +++ b/cmd/ipsw/cmd/ssh/ssh_shsh.go @@ -26,11 +26,12 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/ssh" - "github.com/blacktop/ipsw/pkg/shsh" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/ssh" + "github.com/blacktop/ipsw/pkg/shsh" ) func init() { diff --git a/cmd/ipsw/cmd/swift_dump.go b/cmd/ipsw/cmd/swift_dump.go index 3fe2ed9edc..3296df9572 100644 --- a/cmd/ipsw/cmd/swift_dump.go +++ b/cmd/ipsw/cmd/swift_dump.go @@ -31,14 +31,15 @@ import ( "github.com/alecthomas/chroma/v2/styles" "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/spf13/viper" + mcmd "github.com/blacktop/ipsw/internal/commands/macho" "github.com/blacktop/ipsw/internal/demangle" "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/pkg/dyld" - "github.com/fatih/color" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/symbolicate.go b/cmd/ipsw/cmd/symbolicate.go index b0c2d78ef8..4c0be250ff 100644 --- a/cmd/ipsw/cmd/symbolicate.go +++ b/cmd/ipsw/cmd/symbolicate.go @@ -32,13 +32,14 @@ import ( "github.com/MakeNowJust/heredoc/v2" "github.com/apex/log" + "github.com/fatih/color" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/blacktop/ipsw/internal/demangle" "github.com/blacktop/ipsw/pkg/crashlog" "github.com/blacktop/ipsw/pkg/dyld" "github.com/blacktop/ipsw/pkg/info" - "github.com/fatih/color" - "github.com/spf13/cobra" - "github.com/spf13/viper" ) func init() { diff --git a/cmd/ipsw/cmd/update.go b/cmd/ipsw/cmd/update.go index 34fee9d3c8..8414b816ce 100644 --- a/cmd/ipsw/cmd/update.go +++ b/cmd/ipsw/cmd/update.go @@ -32,11 +32,12 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/download" - "github.com/blacktop/ipsw/internal/utils" "github.com/dustin/go-humanize" "github.com/hashicorp/go-version" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/download" + "github.com/blacktop/ipsw/internal/utils" ) func init() { diff --git a/cmd/ipsw/cmd/updatedb.go b/cmd/ipsw/cmd/updatedb.go index 18d5b12efd..19eb6b6079 100644 --- a/cmd/ipsw/cmd/updatedb.go +++ b/cmd/ipsw/cmd/updatedb.go @@ -31,10 +31,11 @@ import ( "strings" "github.com/apex/log" + "github.com/spf13/cobra" + "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/ota/types" - "github.com/spf13/cobra" ) func init() { diff --git a/cmd/ipsw/cmd/watch.go b/cmd/ipsw/cmd/watch.go index 7b97cb5146..ad14a721e6 100644 --- a/cmd/ipsw/cmd/watch.go +++ b/cmd/ipsw/cmd/watch.go @@ -30,11 +30,12 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/commands/watch" - "github.com/blacktop/ipsw/internal/download" "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/commands/watch" + "github.com/blacktop/ipsw/internal/download" ) var colorHeader = color.New(color.Bold, color.FgHiBlue).SprintFunc() diff --git a/cmd/ipswd/cmd/start.go b/cmd/ipswd/cmd/start.go index 3ce04ede02..261c9383a5 100644 --- a/cmd/ipswd/cmd/start.go +++ b/cmd/ipswd/cmd/start.go @@ -22,9 +22,10 @@ THE SOFTWARE. package cmd import ( - "github.com/blacktop/ipsw/internal/daemon" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/blacktop/ipsw/internal/daemon" ) func init() { diff --git a/cmd/ipswd/cmd/stop.go b/cmd/ipswd/cmd/stop.go index 09a8645091..b0f4b4a61f 100644 --- a/cmd/ipswd/cmd/stop.go +++ b/cmd/ipswd/cmd/stop.go @@ -22,8 +22,9 @@ THE SOFTWARE. package cmd import ( - "github.com/blacktop/ipsw/internal/daemon" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/internal/daemon" ) func init() { diff --git a/cmd/ipswd/cmd/version.go b/cmd/ipswd/cmd/version.go index b693f95021..9161104e2b 100644 --- a/cmd/ipswd/cmd/version.go +++ b/cmd/ipswd/cmd/version.go @@ -25,8 +25,9 @@ import ( "fmt" "strings" - "github.com/blacktop/ipsw/api/types" "github.com/spf13/cobra" + + "github.com/blacktop/ipsw/api/types" ) func init() { diff --git a/internal/codesign/cms/cms.go b/internal/codesign/cms/cms.go index 04a74dae50..d5b9e84262 100644 --- a/internal/codesign/cms/cms.go +++ b/internal/codesign/cms/cms.go @@ -16,6 +16,7 @@ import ( "time" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/codesign/cms/oid" ) diff --git a/internal/codesign/codesign.go b/internal/codesign/codesign.go index 1fefeea179..0ce63caf59 100644 --- a/internal/codesign/codesign.go +++ b/internal/codesign/codesign.go @@ -5,8 +5,9 @@ import ( "fmt" "os" - "github.com/blacktop/ipsw/internal/codesign/cms" "golang.org/x/crypto/pkcs12" + + "github.com/blacktop/ipsw/internal/codesign/cms" ) type CMSConfig struct { diff --git a/internal/codesign/resources/resources.go b/internal/codesign/resources/resources.go index 186bcd23f8..7019bb2ab9 100644 --- a/internal/codesign/resources/resources.go +++ b/internal/codesign/resources/resources.go @@ -14,6 +14,7 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-plist" + pl "github.com/blacktop/ipsw/pkg/plist" ) diff --git a/internal/commands/dsc/dsc.go b/internal/commands/dsc/dsc.go index dce5344651..5c12013b75 100644 --- a/internal/commands/dsc/dsc.go +++ b/internal/commands/dsc/dsc.go @@ -12,6 +12,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/codesign" + mcmd "github.com/blacktop/ipsw/internal/commands/macho" "github.com/blacktop/ipsw/internal/commands/mount" "github.com/blacktop/ipsw/internal/utils" diff --git a/internal/commands/dwarf/dwarf.go b/internal/commands/dwarf/dwarf.go index 6bb065e38d..f179e1e87f 100644 --- a/internal/commands/dwarf/dwarf.go +++ b/internal/commands/dwarf/dwarf.go @@ -7,6 +7,7 @@ import ( dwf "github.com/blacktop/go-dwarf" "github.com/blacktop/go-macho" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/commands/ent/ent.go b/internal/commands/ent/ent.go index a3b05e019b..81b78cc7f9 100644 --- a/internal/commands/ent/ent.go +++ b/internal/commands/ent/ent.go @@ -17,10 +17,11 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/fatih/color" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" "github.com/blacktop/ipsw/pkg/info" - "github.com/fatih/color" ) // Entitlements is a map of entitlements diff --git a/internal/commands/extract/extract.go b/internal/commands/extract/extract.go index 86358e1c3e..f83188a909 100644 --- a/internal/commands/extract/extract.go +++ b/internal/commands/extract/extract.go @@ -20,6 +20,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + fwcmd "github.com/blacktop/ipsw/internal/commands/fw" "github.com/blacktop/ipsw/internal/download" "github.com/blacktop/ipsw/internal/magic" diff --git a/internal/commands/fw/exclave.go b/internal/commands/fw/exclave.go index 52da144881..0bbfeaba2d 100644 --- a/internal/commands/fw/exclave.go +++ b/internal/commands/fw/exclave.go @@ -10,6 +10,7 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/pkg/bundle" ) diff --git a/internal/commands/fw/gpu.go b/internal/commands/fw/gpu.go index eac8c85865..fed28822d4 100644 --- a/internal/commands/fw/gpu.go +++ b/internal/commands/fw/gpu.go @@ -8,6 +8,7 @@ import ( "path/filepath" "github.com/apex/log" + "github.com/blacktop/ipsw/internal/commands/img4" ) diff --git a/internal/commands/ida/ida.go b/internal/commands/ida/ida.go index 2e9f12e5af..7e2e875954 100644 --- a/internal/commands/ida/ida.go +++ b/internal/commands/ida/ida.go @@ -13,9 +13,10 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" + "github.com/google/uuid" + "github.com/blacktop/ipsw/internal/commands/docker" "github.com/blacktop/ipsw/internal/utils" - "github.com/google/uuid" ) const ( diff --git a/internal/commands/img4/img4.go b/internal/commands/img4/img4.go index 68a35c4c47..ace086dba7 100644 --- a/internal/commands/img4/img4.go +++ b/internal/commands/img4/img4.go @@ -11,11 +11,12 @@ import ( "path/filepath" "github.com/apex/log" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img3" "github.com/blacktop/ipsw/pkg/img4" "github.com/blacktop/ipsw/pkg/lzfse" - "github.com/pkg/errors" ) func DecryptPayload(path, output string, iv, key []byte) error { diff --git a/internal/commands/kernel/diff.go b/internal/commands/kernel/diff.go index 0b265dc0d2..1bdb253eed 100644 --- a/internal/commands/kernel/diff.go +++ b/internal/commands/kernel/diff.go @@ -5,6 +5,7 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + mcmd "github.com/blacktop/ipsw/internal/commands/macho" ) diff --git a/internal/commands/macho/diff.go b/internal/commands/macho/diff.go index 5910134ce1..0c34da72b4 100644 --- a/internal/commands/macho/diff.go +++ b/internal/commands/macho/diff.go @@ -6,6 +6,7 @@ import ( "slices" "github.com/blacktop/go-macho" + "github.com/blacktop/ipsw/internal/search" "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/commands/macho/macho.go b/internal/commands/macho/macho.go index 6fac687bf5..dc20aaeefb 100644 --- a/internal/commands/macho/macho.go +++ b/internal/commands/macho/macho.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/blacktop/go-macho" + "github.com/blacktop/ipsw/pkg/disass" ) diff --git a/internal/commands/macho/objc.go b/internal/commands/macho/objc.go index 4a65f046d0..2b43a3f63e 100644 --- a/internal/commands/macho/objc.go +++ b/internal/commands/macho/objc.go @@ -18,6 +18,7 @@ import ( "github.com/blacktop/go-macho/types" "github.com/blacktop/go-macho/types/objc" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/pkg/dyld" "github.com/blacktop/ipsw/pkg/tbd" diff --git a/internal/commands/macho/patch.go b/internal/commands/macho/patch.go index a768810f8e..048b08bc91 100644 --- a/internal/commands/macho/patch.go +++ b/internal/commands/macho/patch.go @@ -8,6 +8,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/commands/macho/swift.go b/internal/commands/macho/swift.go index 69c676d94f..e94f620c8f 100644 --- a/internal/commands/macho/swift.go +++ b/internal/commands/macho/swift.go @@ -12,6 +12,7 @@ import ( "github.com/alecthomas/chroma/v2/quick" "github.com/apex/log" "github.com/blacktop/go-macho" + "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/pkg/dyld" ) diff --git a/internal/commands/mount/mount.go b/internal/commands/mount/mount.go index e67c27637f..1beb601917 100644 --- a/internal/commands/mount/mount.go +++ b/internal/commands/mount/mount.go @@ -11,6 +11,7 @@ import ( "time" "github.com/apex/log" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" "github.com/blacktop/ipsw/pkg/info" diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index c37f4f2a99..b1f93c375c 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -5,10 +5,11 @@ import ( "fmt" "github.com/apex/log" + "github.com/gin-gonic/gin" + "github.com/blacktop/ipsw/api/server" "github.com/blacktop/ipsw/internal/config" "github.com/blacktop/ipsw/internal/db" - "github.com/gin-gonic/gin" ) // Daemon is the interface that describes an ipsw daemon. diff --git a/internal/db/memory.go b/internal/db/memory.go index 095b1bbb0d..1be113cd34 100644 --- a/internal/db/memory.go +++ b/internal/db/memory.go @@ -5,8 +5,9 @@ import ( "os" "slices" - "github.com/blacktop/ipsw/internal/model" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/model" ) // Memory is a database that stores data in memory. diff --git a/internal/db/postgres.go b/internal/db/postgres.go index 2ed065ee8c..dad8a4b2c0 100644 --- a/internal/db/postgres.go +++ b/internal/db/postgres.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" - "github.com/blacktop/ipsw/internal/model" "gorm.io/driver/postgres" "gorm.io/gorm" + + "github.com/blacktop/ipsw/internal/model" ) // Postgres is a database that stores data in a Postgres database. diff --git a/internal/db/sqlite.go b/internal/db/sqlite.go index 28d0efc243..2ba3d7e59c 100644 --- a/internal/db/sqlite.go +++ b/internal/db/sqlite.go @@ -4,10 +4,11 @@ import ( "errors" "fmt" - "github.com/blacktop/ipsw/internal/model" "github.com/glebarez/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" + + "github.com/blacktop/ipsw/internal/model" ) // Sqlite is a database that stores data in a sqlite database. diff --git a/internal/diff/diff.go b/internal/diff/diff.go index b1020d31ef..d397a6913c 100644 --- a/internal/diff/diff.go +++ b/internal/diff/diff.go @@ -17,6 +17,8 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + "golang.org/x/exp/maps" + dcmd "github.com/blacktop/ipsw/internal/commands/dsc" "github.com/blacktop/ipsw/internal/commands/dwarf" "github.com/blacktop/ipsw/internal/commands/ent" @@ -29,7 +31,6 @@ import ( "github.com/blacktop/ipsw/pkg/dyld" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/kernelcache" - "golang.org/x/exp/maps" ) type kernel struct { diff --git a/internal/diff/format.go b/internal/diff/format.go index 86c0fad900..8d39c3cae2 100644 --- a/internal/diff/format.go +++ b/internal/diff/format.go @@ -11,10 +11,11 @@ import ( "strconv" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" "github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown/ast" "github.com/gomarkdown/markdown/html" + + "github.com/blacktop/ipsw/internal/utils" ) // {{ range $index, $element := .Ents }} diff --git a/internal/download/appledb.go b/internal/download/appledb.go index dd5aa3347a..5bafee78b2 100644 --- a/internal/download/appledb.go +++ b/internal/download/appledb.go @@ -16,6 +16,7 @@ import ( "time" "github.com/apex/log" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/download/appstore.go b/internal/download/appstore.go index 21adbf37b4..468e20cd6b 100644 --- a/internal/download/appstore.go +++ b/internal/download/appstore.go @@ -18,14 +18,14 @@ import ( "strconv" "strings" - "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" - "github.com/99designs/keyring" "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" + "github.com/blacktop/go-plist" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) // CREDIT - https://github.com/majd/ipatool diff --git a/internal/download/asset_sets.go b/internal/download/asset_sets.go index 40c28eadaa..d4ebae7a28 100644 --- a/internal/download/asset_sets.go +++ b/internal/download/asset_sets.go @@ -8,8 +8,9 @@ import ( "net/http" "sort" - "github.com/blacktop/ipsw/internal/utils" "github.com/hashicorp/go-version" + + "github.com/blacktop/ipsw/internal/utils" ) const assetSetListURL = "https://gdmf.apple.com/v2/pmv" diff --git a/internal/download/dev_portal.go b/internal/download/dev_portal.go index a537496f92..651353df1b 100644 --- a/internal/download/dev_portal.go +++ b/internal/download/dev_portal.go @@ -22,7 +22,6 @@ import ( "sort" "strconv" "strings" - "time" "github.com/99designs/keyring" @@ -30,8 +29,9 @@ import ( "github.com/AlecAivazis/survey/v2/terminal" "github.com/PuerkitoBio/goquery" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) /* diff --git a/internal/download/downloader.go b/internal/download/downloader.go index c913eedcb8..96d4b9007e 100644 --- a/internal/download/downloader.go +++ b/internal/download/downloader.go @@ -16,14 +16,14 @@ import ( "syscall" "time" - // "github.com/gofrs/flock" "github.com/AlecAivazis/survey/v2" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" "github.com/pkg/errors" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" "golang.org/x/net/http/httpproxy" + + "github.com/blacktop/ipsw/internal/utils" ) // Download is a downloader object diff --git a/internal/download/iphonewiki.go b/internal/download/iphonewiki.go index 1eeaabcbac..89ca8c226c 100644 --- a/internal/download/iphonewiki.go +++ b/internal/download/iphonewiki.go @@ -14,10 +14,11 @@ import ( "time" "github.com/apex/log" + semver "github.com/hashicorp/go-version" + "github.com/blacktop/ipsw/internal/sm" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/info" - semver "github.com/hashicorp/go-version" ) const ( diff --git a/internal/download/itunes.go b/internal/download/itunes.go index a8003df69c..070a6902fb 100644 --- a/internal/download/itunes.go +++ b/internal/download/itunes.go @@ -9,9 +9,10 @@ import ( "strings" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" "github.com/hashicorp/go-version" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) const ( diff --git a/internal/download/jailbreak.go b/internal/download/jailbreak.go index 06c404076f..5d3485eb19 100644 --- a/internal/download/jailbreak.go +++ b/internal/download/jailbreak.go @@ -9,9 +9,10 @@ import ( "time" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" "github.com/hashicorp/go-version" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) // Jailbreak object diff --git a/internal/download/macos.go b/internal/download/macos.go index b0d7b806ee..3a68f36c07 100644 --- a/internal/download/macos.go +++ b/internal/download/macos.go @@ -17,10 +17,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" "github.com/dustin/go-humanize" "github.com/olekukonko/tablewriter" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) // CREDIT: https://github.com/munki/macadmin-scripts diff --git a/internal/download/oss_depreicated.go b/internal/download/oss_depreicated.go index b924560d4a..45abeb2c41 100644 --- a/internal/download/oss_depreicated.go +++ b/internal/download/oss_depreicated.go @@ -10,6 +10,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/download/ota.go b/internal/download/ota.go index 9757137fd1..4d64966752 100644 --- a/internal/download/ota.go +++ b/internal/download/ota.go @@ -20,14 +20,15 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/info" - "github.com/blacktop/ipsw/pkg/ota/types" - ilist "github.com/blacktop/ipsw/pkg/plist" "github.com/hashicorp/go-version" semver "github.com/hashicorp/go-version" "github.com/ulikunitz/xz" "golang.org/x/sync/errgroup" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/info" + "github.com/blacktop/ipsw/pkg/ota/types" + ilist "github.com/blacktop/ipsw/pkg/plist" ) const ( diff --git a/internal/download/remote.go b/internal/download/remote.go index 794af5d28a..2d27f53a2c 100644 --- a/internal/download/remote.go +++ b/internal/download/remote.go @@ -6,9 +6,10 @@ import ( "net/http" "net/url" - "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ranger" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) // RemoteConfig is the remote reader config diff --git a/internal/download/scrape.go b/internal/download/scrape.go index 8b16f021b3..339c9b6ce1 100644 --- a/internal/download/scrape.go +++ b/internal/download/scrape.go @@ -7,10 +7,11 @@ import ( "strings" "time" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/info" "github.com/gocolly/colly/v2" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/info" ) const ( diff --git a/internal/download/xcode.go b/internal/download/xcode.go index 3e7047c7cb..b7e3d4fa31 100644 --- a/internal/download/xcode.go +++ b/internal/download/xcode.go @@ -15,6 +15,7 @@ import ( "time" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/internal/search/search.go b/internal/search/search.go index 8df0eebe5a..2684756374 100644 --- a/internal/search/search.go +++ b/internal/search/search.go @@ -12,6 +12,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" + fwcmd "github.com/blacktop/ipsw/internal/commands/fw" icmd "github.com/blacktop/ipsw/internal/commands/img4" "github.com/blacktop/ipsw/internal/magic" diff --git a/internal/ssh/ssh.go b/internal/ssh/ssh.go index 4237be445b..4f234907f7 100644 --- a/internal/ssh/ssh.go +++ b/internal/ssh/ssh.go @@ -10,9 +10,10 @@ import ( "os" "path/filepath" - "github.com/blacktop/ipsw/internal/utils" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/knownhosts" + + "github.com/blacktop/ipsw/internal/utils" ) var ( diff --git a/internal/syms/syms.go b/internal/syms/syms.go index f5e5141519..11fa934cc6 100644 --- a/internal/syms/syms.go +++ b/internal/syms/syms.go @@ -8,6 +8,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/commands/dsc" "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/db" diff --git a/internal/utils/macos.go b/internal/utils/macos.go index b844c84af5..f1af9d96c0 100644 --- a/internal/utils/macos.go +++ b/internal/utils/macos.go @@ -17,9 +17,10 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" + semver "github.com/hashicorp/go-version" + "github.com/blacktop/ipsw/internal/utils/lsof" "github.com/blacktop/ipsw/pkg/aea" - semver "github.com/hashicorp/go-version" ) // Cp copies a file from src to dest diff --git a/internal/utils/usb.go b/internal/utils/usb.go index 58919c86f7..fc26487177 100644 --- a/internal/utils/usb.go +++ b/internal/utils/usb.go @@ -7,6 +7,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" "github.com/blacktop/ipsw/pkg/usb/mount" diff --git a/pkg/bundle/bundle.go b/pkg/bundle/bundle.go index 5a516e24e7..0e6d52a7cb 100644 --- a/pkg/bundle/bundle.go +++ b/pkg/bundle/bundle.go @@ -14,6 +14,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/pkg/devicetree" ) diff --git a/pkg/car/car.go b/pkg/car/car.go index 7b3b12a7c5..12835210ca 100644 --- a/pkg/car/car.go +++ b/pkg/car/car.go @@ -15,6 +15,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/bom" ) diff --git a/pkg/crashlog/ips.go b/pkg/crashlog/ips.go index 2c7533b309..17ecf9cbeb 100644 --- a/pkg/crashlog/ips.go +++ b/pkg/crashlog/ips.go @@ -21,6 +21,8 @@ import ( "github.com/blacktop/arm64-cgo/disassemble" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/fatih/color" + "github.com/blacktop/ipsw/internal/commands/dsc" "github.com/blacktop/ipsw/internal/commands/extract" "github.com/blacktop/ipsw/internal/demangle" @@ -29,7 +31,6 @@ import ( "github.com/blacktop/ipsw/internal/syms/server" "github.com/blacktop/ipsw/pkg/disass" "github.com/blacktop/ipsw/pkg/signature" - "github.com/fatih/color" ) // REFERENCES: diff --git a/pkg/devicetree/devicetree.go b/pkg/devicetree/devicetree.go index d3695abe08..75d6f94b0f 100644 --- a/pkg/devicetree/devicetree.go +++ b/pkg/devicetree/devicetree.go @@ -6,19 +6,19 @@ import ( "encoding/base64" "encoding/binary" "encoding/json" - "slices" - "time" - "fmt" "io" "math" "path/filepath" "reflect" "regexp" + "slices" "strings" + "time" "github.com/apex/log" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/pkg/devicetree/image.go b/pkg/devicetree/image.go index 8eb6a4d28f..6b71d4b28e 100644 --- a/pkg/devicetree/image.go +++ b/pkg/devicetree/image.go @@ -8,8 +8,6 @@ import ( "fmt" "io" - // lzfse "github.com/blacktop/go-lzfse" - "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img3" "github.com/blacktop/ipsw/pkg/lzfse" diff --git a/pkg/disass/disass.go b/pkg/disass/disass.go index 9f90e01494..beec25d599 100644 --- a/pkg/disass/disass.go +++ b/pkg/disass/disass.go @@ -12,6 +12,7 @@ import ( "github.com/blacktop/arm64-cgo/disassemble" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/pkg/disass/macho.go b/pkg/disass/macho.go index a06f74c079..c9eef2dcc6 100644 --- a/pkg/disass/macho.go +++ b/pkg/disass/macho.go @@ -15,10 +15,11 @@ import ( "github.com/blacktop/arm64-cgo/disassemble" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/fixupchains" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/demangle" "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/internal/utils" - "github.com/pkg/errors" ) type MachoDisass struct { diff --git a/pkg/dyld/disass.go b/pkg/dyld/disass.go index 140224ac72..eafad63030 100644 --- a/pkg/dyld/disass.go +++ b/pkg/dyld/disass.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/blacktop/arm64-cgo/disassemble" + "github.com/blacktop/ipsw/internal/demangle" "github.com/blacktop/ipsw/internal/swift" "github.com/blacktop/ipsw/pkg/disass" diff --git a/pkg/dyld/extract.go b/pkg/dyld/extract.go index 9163f11bf7..cc2e148db4 100644 --- a/pkg/dyld/extract.go +++ b/pkg/dyld/extract.go @@ -15,13 +15,14 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2/terminal" "github.com/apex/log" + "github.com/pkg/errors" + "github.com/vbauerster/mpb/v8" + "github.com/vbauerster/mpb/v8/decor" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/ota/ridiff" - "github.com/pkg/errors" - "github.com/vbauerster/mpb/v8" - "github.com/vbauerster/mpb/v8/decor" ) var ErrNoCryptex = errors.New("cryptex-system-arm64e NOT found in remote zip") diff --git a/pkg/dyld/file.go b/pkg/dyld/file.go index 0f8857e101..e25c944b71 100644 --- a/pkg/dyld/file.go +++ b/pkg/dyld/file.go @@ -15,6 +15,7 @@ import ( "github.com/blacktop/go-macho/pkg/codesign" "github.com/blacktop/go-macho/pkg/trie" mtypes "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/disass" ) diff --git a/pkg/dyld/image.go b/pkg/dyld/image.go index 462ba2884f..6b8c962564 100644 --- a/pkg/dyld/image.go +++ b/pkg/dyld/image.go @@ -17,9 +17,10 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/pkg/trie" "github.com/blacktop/go-macho/types" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/disass" - "github.com/pkg/errors" ) type rangeEntry struct { diff --git a/pkg/dyld/objc.go b/pkg/dyld/objc.go index 02048cc95a..4e001e9ba9 100644 --- a/pkg/dyld/objc.go +++ b/pkg/dyld/objc.go @@ -14,9 +14,10 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" "github.com/blacktop/go-macho/types/objc" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/disass" - "github.com/pkg/errors" ) const ( diff --git a/pkg/dyld/split.go b/pkg/dyld/split.go index 8bbcf4b6f7..3b287ba18d 100644 --- a/pkg/dyld/split.go +++ b/pkg/dyld/split.go @@ -35,8 +35,9 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" ) var xcodePaths = []string{ diff --git a/pkg/dyld/swift.go b/pkg/dyld/swift.go index b81fc9004c..4492c16e71 100644 --- a/pkg/dyld/swift.go +++ b/pkg/dyld/swift.go @@ -12,6 +12,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho/types" + iswift "github.com/blacktop/ipsw/internal/swift" ) diff --git a/pkg/dyld/symbols.go b/pkg/dyld/symbols.go index 8e566eaade..55270059cb 100644 --- a/pkg/dyld/symbols.go +++ b/pkg/dyld/symbols.go @@ -16,10 +16,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho/pkg/trie" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" "github.com/fatih/color" "github.com/pkg/errors" "golang.org/x/sync/errgroup" + + "github.com/blacktop/ipsw/internal/utils" ) // ErrNoLocals is the error for a shared cache that has no LocalSymbolsOffset diff --git a/pkg/emu/emu.go b/pkg/emu/emu.go index 0995baf5ff..2e4a47bf17 100644 --- a/pkg/emu/emu.go +++ b/pkg/emu/emu.go @@ -9,8 +9,9 @@ import ( "reflect" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/dyld" uc "github.com/unicorn-engine/unicorn/bindings/go/unicorn" + + "github.com/blacktop/ipsw/pkg/dyld" ) const ( diff --git a/pkg/emu/utils.go b/pkg/emu/utils.go index 9379fc872c..1ac8f3ee56 100644 --- a/pkg/emu/utils.go +++ b/pkg/emu/utils.go @@ -9,9 +9,10 @@ import ( "fmt" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" "github.com/spf13/cast" uc "github.com/unicorn-engine/unicorn/bindings/go/unicorn" + + "github.com/blacktop/ipsw/internal/utils" ) func (e *Emulation) SetFirstArg(data interface{}) error { diff --git a/pkg/img4/img4.go b/pkg/img4/img4.go index 4a73a7ac61..0bcc39cf27 100644 --- a/pkg/img4/img4.go +++ b/pkg/img4/img4.go @@ -13,6 +13,7 @@ import ( "regexp" "github.com/apex/log" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/info" ) diff --git a/pkg/info/db.go b/pkg/info/db.go index 8370d9dae7..15a9904188 100644 --- a/pkg/info/db.go +++ b/pkg/info/db.go @@ -9,10 +9,11 @@ import ( "strings" "github.com/apex/log" + "github.com/fatih/color" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/ota/types" "github.com/blacktop/ipsw/pkg/xcode" - "github.com/fatih/color" ) //go:embed data/ipsw_db.gz diff --git a/pkg/info/info.go b/pkg/info/info.go index b8037e849d..f7e3af6fce 100644 --- a/pkg/info/info.go +++ b/pkg/info/info.go @@ -15,11 +15,12 @@ import ( "strings" "github.com/apex/log" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/devicetree" "github.com/blacktop/ipsw/pkg/plist" "github.com/blacktop/ipsw/pkg/xcode" - "github.com/pkg/errors" ) var ( diff --git a/pkg/kernelcache/kernelcache.go b/pkg/kernelcache/kernelcache.go index 0d108e827b..92c7b610e0 100644 --- a/pkg/kernelcache/kernelcache.go +++ b/pkg/kernelcache/kernelcache.go @@ -15,15 +15,15 @@ import ( "time" "github.com/apex/log" - // lzfse "github.com/blacktop/go-lzfse" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/lzss" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img4" "github.com/blacktop/ipsw/pkg/info" "github.com/blacktop/ipsw/pkg/lzfse" - "github.com/blacktop/lzss" - "github.com/pkg/errors" ) // Im4p Kernelcache object diff --git a/pkg/kernelcache/kmutil.go b/pkg/kernelcache/kmutil.go index 6af985c69b..ef396b9cb5 100644 --- a/pkg/kernelcache/kmutil.go +++ b/pkg/kernelcache/kmutil.go @@ -10,8 +10,9 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" "github.com/dominikbraun/graph" + + "github.com/blacktop/ipsw/internal/utils" ) func InspectKM(m *macho.File, filter string, explicitOnly, asJSON bool) (string, error) { diff --git a/pkg/kernelcache/mach_trap.go b/pkg/kernelcache/mach_trap.go index 52eb14aea2..d905376ec0 100644 --- a/pkg/kernelcache/mach_trap.go +++ b/pkg/kernelcache/mach_trap.go @@ -13,8 +13,9 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/pkg/disass" "github.com/fatih/color" + + "github.com/blacktop/ipsw/pkg/disass" ) const ( diff --git a/pkg/kernelcache/mig.go b/pkg/kernelcache/mig.go index e67c833ee4..c20eaa53ec 100644 --- a/pkg/kernelcache/mig.go +++ b/pkg/kernelcache/mig.go @@ -13,6 +13,7 @@ import ( "github.com/blacktop/arm64-cgo/disassemble" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/pkg/disass" ) diff --git a/pkg/kernelcache/syscall.go b/pkg/kernelcache/syscall.go index e219ffb40b..e6759f8325 100644 --- a/pkg/kernelcache/syscall.go +++ b/pkg/kernelcache/syscall.go @@ -19,6 +19,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/download" ) diff --git a/pkg/ota/aa.go b/pkg/ota/aa.go index 2001a67eeb..c92dba14a4 100644 --- a/pkg/ota/aa.go +++ b/pkg/ota/aa.go @@ -21,6 +21,11 @@ import ( "time" "github.com/apex/log" + "github.com/dustin/go-humanize" + "golang.org/x/exp/maps" + "golang.org/x/sync/errgroup" + "golang.org/x/sys/execabs" + "github.com/blacktop/ipsw/internal/magic" "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/aea" @@ -29,10 +34,6 @@ import ( "github.com/blacktop/ipsw/pkg/ota/pbzx" "github.com/blacktop/ipsw/pkg/ota/ridiff" "github.com/blacktop/ipsw/pkg/ota/yaa" - "github.com/dustin/go-humanize" - "golang.org/x/exp/maps" - "golang.org/x/sync/errgroup" - "golang.org/x/sys/execabs" ) type File struct { diff --git a/pkg/ota/bxdiff50/bxdiff50.go b/pkg/ota/bxdiff50/bxdiff50.go index 305b458bfb..1837034587 100644 --- a/pkg/ota/bxdiff50/bxdiff50.go +++ b/pkg/ota/bxdiff50/bxdiff50.go @@ -13,6 +13,7 @@ import ( "runtime" "github.com/apex/log" + "github.com/blacktop/ipsw/pkg/ota/pbzx" ) diff --git a/pkg/ota/ota.go b/pkg/ota/ota.go index 2bcaac68fd..840d210060 100644 --- a/pkg/ota/ota.go +++ b/pkg/ota/ota.go @@ -12,15 +12,14 @@ import ( "strings" "github.com/apex/log" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/bom" - "github.com/blacktop/ipsw/pkg/ota/yaa" "github.com/dustin/go-humanize" "github.com/pkg/errors" "github.com/ulikunitz/xz" "golang.org/x/sys/execabs" - // "github.com/blacktop/xz" - // "github.com/therootcompany/xz" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/bom" + "github.com/blacktop/ipsw/pkg/ota/yaa" ) const ( diff --git a/pkg/ota/ridiff/raw.go b/pkg/ota/ridiff/raw.go index 6319e9fadc..953dd5efd0 100644 --- a/pkg/ota/ridiff/raw.go +++ b/pkg/ota/ridiff/raw.go @@ -9,8 +9,9 @@ import ( "os" "runtime" - "github.com/blacktop/ipsw/pkg/ota/pbzx" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/pkg/ota/pbzx" ) const ( diff --git a/pkg/ota/yaa/yaa.go b/pkg/ota/yaa/yaa.go index 71e3e486d9..58dcc27d02 100644 --- a/pkg/ota/yaa/yaa.go +++ b/pkg/ota/yaa/yaa.go @@ -12,8 +12,9 @@ import ( "strings" "time" - "github.com/blacktop/ipsw/pkg/bom" "github.com/dustin/go-humanize" + + "github.com/blacktop/ipsw/pkg/bom" ) const ( diff --git a/pkg/plist/build_manifest.go b/pkg/plist/build_manifest.go index f84295335b..7f4ca46256 100644 --- a/pkg/plist/build_manifest.go +++ b/pkg/plist/build_manifest.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/utils" ) diff --git a/pkg/plist/plist.go b/pkg/plist/plist.go index 5fcf1c37e9..5381fd5efa 100644 --- a/pkg/plist/plist.go +++ b/pkg/plist/plist.go @@ -11,10 +11,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/utils" - "github.com/blacktop/ipsw/pkg/ota/types" "github.com/dustin/go-humanize" "github.com/pkg/errors" + + "github.com/blacktop/ipsw/internal/utils" + "github.com/blacktop/ipsw/pkg/ota/types" ) // Plists IPSW/OTA plists object diff --git a/pkg/sep/sep.go b/pkg/sep/sep.go index b06101a8f0..73d30158ac 100644 --- a/pkg/sep/sep.go +++ b/pkg/sep/sep.go @@ -13,8 +13,9 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" - "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/lzfse-cgo" + + "github.com/blacktop/ipsw/internal/utils" ) // NOTE: https://www.blackhat.com/docs/us-16/materials/us-16-Mandt-Demystifying-The-Secure-Enclave-Processor.pdf diff --git a/pkg/shsh/shsh.go b/pkg/shsh/shsh.go index a89f0f0e6b..2ce188edb8 100644 --- a/pkg/shsh/shsh.go +++ b/pkg/shsh/shsh.go @@ -8,6 +8,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/img4" ) diff --git a/pkg/signature/signature.go b/pkg/signature/signature.go index 81a395aeb8..ac39f52b33 100644 --- a/pkg/signature/signature.go +++ b/pkg/signature/signature.go @@ -12,6 +12,7 @@ import ( "github.com/apex/log" "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/disass" "github.com/blacktop/ipsw/pkg/kernelcache" diff --git a/pkg/signature/utils.go b/pkg/signature/utils.go index 915d7045a0..c5e03bd552 100644 --- a/pkg/signature/utils.go +++ b/pkg/signature/utils.go @@ -4,8 +4,9 @@ import ( "fmt" "github.com/apex/log" - "github.com/blacktop/ipsw/pkg/kernelcache" semver "github.com/hashicorp/go-version" + + "github.com/blacktop/ipsw/pkg/kernelcache" ) func checkVersion(kv *kernelcache.Version, sigs Symbolicator) (bool, error) { diff --git a/pkg/tbd/tbd.go b/pkg/tbd/tbd.go index 700a6a86ad..e5bc16aaa2 100644 --- a/pkg/tbd/tbd.go +++ b/pkg/tbd/tbd.go @@ -9,9 +9,10 @@ import ( "github.com/blacktop/go-macho" "github.com/blacktop/go-macho/types" + "github.com/pkg/errors" + "github.com/blacktop/ipsw/internal/utils" "github.com/blacktop/ipsw/pkg/dyld" - "github.com/pkg/errors" ) var macOs32bitTargets = []string{"i386-macos"} diff --git a/pkg/tss/tss.go b/pkg/tss/tss.go index 58bfdc7606..6aa688ee86 100644 --- a/pkg/tss/tss.go +++ b/pkg/tss/tss.go @@ -13,10 +13,11 @@ import ( "github.com/apex/log" "github.com/blacktop/go-plist" - "github.com/blacktop/ipsw/internal/download" - info "github.com/blacktop/ipsw/pkg/plist" "github.com/google/uuid" "github.com/mitchellh/mapstructure" + + "github.com/blacktop/ipsw/internal/download" + info "github.com/blacktop/ipsw/pkg/plist" ) // NOTES: diff --git a/pkg/usb/apps/installation.go b/pkg/usb/apps/installation.go index d7131593f1..13af8c0391 100644 --- a/pkg/usb/apps/installation.go +++ b/pkg/usb/apps/installation.go @@ -5,10 +5,11 @@ import ( "os" "path" + "github.com/mitchellh/mapstructure" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/afc" "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/mitchellh/mapstructure" ) const ( diff --git a/pkg/usb/diagnostics/diagnostics.go b/pkg/usb/diagnostics/diagnostics.go index 03caaf1a7b..efdd8dabd3 100644 --- a/pkg/usb/diagnostics/diagnostics.go +++ b/pkg/usb/diagnostics/diagnostics.go @@ -6,9 +6,10 @@ import ( "fmt" "strings" + "github.com/fatih/color" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/fatih/color" ) const ( diff --git a/pkg/usb/lockdownd/lockdownd.go b/pkg/usb/lockdownd/lockdownd.go index 05d9f3ec89..87a3a26da1 100644 --- a/pkg/usb/lockdownd/lockdownd.go +++ b/pkg/usb/lockdownd/lockdownd.go @@ -3,8 +3,9 @@ package lockdownd import ( "fmt" - "github.com/blacktop/ipsw/pkg/usb" "github.com/fatih/color" + + "github.com/blacktop/ipsw/pkg/usb" ) const lockdownPort = 62078 diff --git a/pkg/usb/mcinstall/mcinstall.go b/pkg/usb/mcinstall/mcinstall.go index 38c79d73a1..1532016652 100644 --- a/pkg/usb/mcinstall/mcinstall.go +++ b/pkg/usb/mcinstall/mcinstall.go @@ -5,9 +5,10 @@ import ( "os" "github.com/blacktop/go-plist" + "github.com/fatih/color" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" - "github.com/fatih/color" ) const ( diff --git a/pkg/usb/misagent/misagent.go b/pkg/usb/misagent/misagent.go index d61e5024e0..54db910c5e 100644 --- a/pkg/usb/misagent/misagent.go +++ b/pkg/usb/misagent/misagent.go @@ -6,6 +6,7 @@ import ( "time" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) diff --git a/pkg/usb/notification/notification.go b/pkg/usb/notification/notification.go index 544b15428e..f2132defa5 100644 --- a/pkg/usb/notification/notification.go +++ b/pkg/usb/notification/notification.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/apex/log" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" ) diff --git a/pkg/usb/pcap/pcap.go b/pkg/usb/pcap/pcap.go index 09870f5ead..d68cc56c65 100644 --- a/pkg/usb/pcap/pcap.go +++ b/pkg/usb/pcap/pcap.go @@ -9,6 +9,7 @@ import ( "time" "github.com/blacktop/go-plist" + "github.com/blacktop/ipsw/pkg/usb" "github.com/blacktop/ipsw/pkg/usb/lockdownd" )