GitHub/ipsw
1
0
Fork 0
mirror of https://github.com/blacktop/ipsw.git synced 2026-05-08 12:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ipsw diff cmd if user tries to compare 2 IPSWs for 2 different device types

Browse Source
This commit is contained in:
blacktop
2023-04-12 19:07:02 -06:00
parent 8a1365fc16
commit 753a14a88e
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/diff/diff.go
+16
View File
@@ -277,6 +277,16 @@ func (d *Diff) parseKernelcache() error {
}
for kmodel := range d.Old.Info.Plists.GetKernelCaches() {
if _, ok := d.Old.Info.Plists.GetKernelCaches()[kmodel]; !ok {
return fmt.Errorf("failed to find kernelcache for %s in 'Old' IPSW: `ipsw diff` expects you to compare 2 versions of the same IPSW device type", kmodel)
} else if len(d.Old.Info.Plists.GetKernelCaches()[kmodel]) == 0 {
return fmt.Errorf("failed to find kernelcache for %s in 'Old' IPSW", kmodel)
}
if _, ok := d.New.Info.Plists.GetKernelCaches()[kmodel]; !ok {
return fmt.Errorf("failed to find kernelcache for %s in 'New' IPSW: `ipsw diff` expects you to compare 2 versions of the same IPSW device type", kmodel)
} else if len(d.New.Info.Plists.GetKernelCaches()[kmodel]) == 0 {
return fmt.Errorf("failed to find kernelcache for %s in 'New' IPSW", kmodel)
}
kcache1 := d.Old.Info.Plists.GetKernelCaches()[kmodel][0]
kcache2 := d.New.Info.Plists.GetKernelCaches()[kmodel][0]
d.Old.Kernel.Path = filepath.Join(d.Old.Folder, d.Old.Info.GetKernelCacheFileName(kcache1))
@@ -344,10 +354,16 @@ func (d *Diff) parseDSC() error {
if err != nil {
return fmt.Errorf("failed to get DSC paths in %s: %v", d.Old.MountPath, err)
}
if len(oldDSCes) == 0 {
return fmt.Errorf("no DSCs found in 'Old' IPSW mount %s", d.Old.MountPath)
}
newDSCes, err := dyld.GetDscPathsInMount(d.New.MountPath)
if err != nil {
return fmt.Errorf("failed to get DSC paths in %s: %v", d.New.MountPath, err)
}
if len(newDSCes) == 0 {
return fmt.Errorf("no DSCs found in 'New' IPSW mount %s", d.New.MountPath)
}
dscOLD, err := dyld.Open(oldDSCes[0])
if err != nil {