Permalink
Browse files

think for yourself, question authority

  • Loading branch information...
FireCore, LLC
FireCore, LLC committed Feb 2, 2011
1 parent 338d147 commit 3660578037dfa09e1851ebd66a65bf85a1dd5313
View
@@ -14,9 +14,9 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="29"/>
<integer value="630"/>
- <integer value="372"/>
<integer value="584"/>
- <integer value="764"/>
+ <integer value="770"/>
+ <integer value="372"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1413,7 +1413,7 @@
<string key="NSClassName">NSFontManager</string>
</object>
<object class="NSCustomView" id="603157072">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1422,7 +1422,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{306, 82}, {98, 17}}</string>
<reference key="NSSuperview" ref="603157072"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="99314572">
<int key="NSCellFlags">68288064</int>
@@ -1459,7 +1458,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{90, 82}, {79, 17}}</string>
<reference key="NSSuperview" ref="603157072"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="398376766">
<int key="NSCellFlags">68288064</int>
@@ -1476,7 +1474,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{296, 107}, {117, 113}}</string>
<reference key="NSSuperview" ref="603157072"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="873271656">
<int key="NSCellFlags">-2080244224</int>
@@ -1501,7 +1498,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{72, 107}, {117, 113}}</string>
<reference key="NSSuperview" ref="603157072"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="826826450">
<int key="NSCellFlags">67239424</int>
@@ -1523,8 +1519,6 @@
</object>
</object>
<string key="NSFrameSize">{502, 286}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="867445732">
@@ -1877,7 +1871,7 @@
<object class="NSButton" id="634087851">
<reference key="NSNextResponder" ref="784097789"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{178, 154}, {139, 32}}</string>
+ <string key="NSFrame">{{177, 160}, {139, 32}}</string>
<reference key="NSSuperview" ref="784097789"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1068911896">
@@ -1923,7 +1917,7 @@
<object class="NSButtonCell" key="NSCell" id="263526914">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Start Countdown</string>
+ <string key="NSContents">Enter DFU</string>
<reference key="NSSupport" ref="1037303427"/>
<reference key="NSControlView" ref="930133940"/>
<int key="NSButtonFlags">-2038284033</int>
@@ -1943,7 +1937,7 @@
<object class="NSTextFieldCell" key="NSCell" id="871744638">
<int key="NSCellFlags">-1805517311</int>
<int key="NSCellFlags2">272662528</int>
- <string key="NSContents">go aes dec d6e992912f27c60d82f2800e4f9a4d53d1e91dc90359d7a1fb256f619449e28c6746a574dd8f1420a9f801a6e48aee75</string>
+ <string key="NSContents">go aes dec </string>
<reference key="NSSupport" ref="1037303427"/>
<reference key="NSControlView" ref="778090739"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -1958,7 +1952,7 @@
</object>
<object class="NSTextField" id="862394612">
<reference key="NSNextResponder" ref="784097789"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{142, 143}, {220, 17}}</string>
<reference key="NSSuperview" ref="784097789"/>
<bool key="NSEnabled">YES</bool>
@@ -1974,7 +1968,7 @@
</object>
<object class="NSTextField" id="663071707">
<reference key="NSNextResponder" ref="784097789"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{364, 143}, {38, 17}}</string>
<reference key="NSSuperview" ref="784097789"/>
<bool key="NSEnabled">YES</bool>
@@ -2959,20 +2953,28 @@
<int key="connectionID">776</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">startCountdown:</string>
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">countdownField</string>
<reference key="source" ref="976324537"/>
- <reference key="destination" ref="930133940"/>
+ <reference key="destination" ref="663071707"/>
</object>
- <int key="connectionID">785</int>
+ <int key="connectionID">787</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">countdownField</string>
+ <string key="label">otherWindow</string>
<reference key="source" ref="976324537"/>
- <reference key="destination" ref="663071707"/>
+ <reference key="destination" ref="499787355"/>
</object>
- <int key="connectionID">787</int>
+ <int key="connectionID">806</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">dfuMode:</string>
+ <reference key="source" ref="976324537"/>
+ <reference key="destination" ref="930133940"/>
+ </object>
+ <int key="connectionID">807</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -4383,11 +4385,11 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="778090739"/>
- <reference ref="634087851"/>
<reference ref="866039869"/>
<reference ref="862394612"/>
<reference ref="663071707"/>
<reference ref="930133940"/>
+ <reference ref="634087851"/>
</object>
<reference key="parent" ref="499787355"/>
</object>
@@ -5063,7 +5065,7 @@
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCjgAAwsIAAA</bytes>
</object>
- <string>{{408, 633}, {231, 203}}</string>
+ <string>{{507, 677}, {231, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{23, 794}, {245, 183}}</string>
@@ -5157,14 +5159,14 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{370, 553}, {519, 202}}</string>
+ <string>{{379, 557}, {519, 202}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{370, 553}, {519, 202}}</string>
+ <string>{{379, 557}, {519, 202}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwyoAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDMgAAwz4AAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5200,7 +5202,7 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{452, 109}, {196, 203}}</string>
+ <string>{{609, 677}, {196, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{145, 474}, {199, 203}}</string>
@@ -5228,11 +5230,18 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">787</int>
+ <int key="maxID">807</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSApplication</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">NSApplication+SystemVersion.h</string>
+ </object>
+ </object>
<object class="IBPartialClassDescription">
<string key="className">SPButton</string>
<string key="superclassName">NSButton</string>
@@ -5273,6 +5282,7 @@
<string>fixScript:</string>
<string>itunesRestore:</string>
<string>keydumpPrep:</string>
+ <string>poison:</string>
<string>processOne:</string>
<string>sendCommand:</string>
<string>startCountdown:</string>
@@ -5290,6 +5300,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -5302,6 +5313,7 @@
<string>fixScript:</string>
<string>itunesRestore:</string>
<string>keydumpPrep:</string>
+ <string>poison:</string>
<string>processOne:</string>
<string>sendCommand:</string>
<string>startCountdown:</string>
@@ -5333,6 +5345,10 @@
<string key="name">keydumpPrep:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo">
+ <string key="name">poison:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo">
<string key="name">processOne:</string>
<string key="candidateClassName">id</string>
@@ -5366,6 +5382,7 @@
<string>firstView</string>
<string>instructionField</string>
<string>instructionImage</string>
+ <string>otherWindow</string>
<string>secondView</string>
<string>window</string>
</object>
@@ -5382,6 +5399,7 @@
<string>NSView</string>
<string>NSTextField</string>
<string>NSImageView</string>
+ <string>NSWindow</string>
<string>NSView</string>
<string>NSWindow</string>
</object>
@@ -5401,6 +5419,7 @@
<string>firstView</string>
<string>instructionField</string>
<string>instructionImage</string>
+ <string>otherWindow</string>
<string>secondView</string>
<string>window</string>
</object>
@@ -5450,6 +5469,10 @@
<string key="name">instructionImage</string>
<string key="candidateClassName">NSImageView</string>
</object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">otherWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
<object class="IBToOneOutletInfo">
<string key="name">secondView</string>
<string key="candidateClassName">NSView</string>
View
@@ -65,7 +65,7 @@
- (NSDictionary *)fwDictionary;
- (NSString *)localBundlePath;
-
+- (BOOL)is4point3;
@end
/*
View
@@ -120,30 +120,76 @@ - (NSString *)outputName
return [[self bundleName] stringByAppendingString:@"_SP_Restore.ipsw"];
}
-- (NSString *)ramdiskSize
+- (NSString *)oldramdiskSize
{
if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5148c"])
{
return @"24676576";
} else if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5153d"]){
return @"24676576";
+ } else if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5166b"]) {
+ return @"24676576";
+ } else {
+ return @"16541920";
+ }
+}
+
+- (NSString *)ramdiskSize
+{
+ if ([self is4point3])
+ {
+ return @"24676576";
} else {
- return @"16541920"; }
+ return @"16541920";
+ }
+}
+
+- (BOOL)is4point3
+{
+ NSString *clippedPath = [[self bundleName] substringToIndex:14];
+ if ([clippedPath isEqualToString:@"AppleTV2,1_4.3"])
+ {
+ return YES;
+ } else {
+ return NO;
+ }
+ return NO;
}
- (NSDictionary *)extraPatch
{
+ if ([self is4point3])
+ {
+ NSDictionary *thePatch = [NSDictionary dictionaryWithObjectsAndKeys:[[NSBundle mainBundle] pathForResource:@"status" ofType:@"patch" inDirectory:@"patches"], @"Patch", @"private/var/lib/dpkg/status", @"Target", @"7945d79f0dad7c3397b930877ba92ec4", @"md5", nil];
+ NSLog(@"extraPatch: %@", thePatch);
+ return thePatch;
+ }
+}
+
+- (NSDictionary *)oldextraPatch
+{
+
+ NSString *clippedPath = [[self bundleName] substringToIndex:14];
+ NSLog(@"clippedPath: %@", clippedPath);
+
+ if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5166b"])
+ {
+ NSDictionary *thePatch = [NSDictionary dictionaryWithObjectsAndKeys:[[NSBundle mainBundle] pathForResource:@"status" ofType:@"patch" inDirectory:@"patches"], @"Patch", @"private/var/lib/dpkg/status", @"Target", @"7945d79f0dad7c3397b930877ba92ec4", @"md5", nil];
+ //NSLog(@"extraPatch: %@", thePatch);
+ return thePatch;
+ }
+
if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5148c"])
{
NSDictionary *thePatch = [NSDictionary dictionaryWithObjectsAndKeys:[[NSBundle mainBundle] pathForResource:@"status" ofType:@"patch" inDirectory:@"patches"], @"Patch", @"private/var/lib/dpkg/status", @"Target", @"7945d79f0dad7c3397b930877ba92ec4", @"md5", nil];
- NSLog(@"extraPatch: %@", thePatch);
+ //NSLog(@"extraPatch: %@", thePatch);
return thePatch;
}
if ([[self bundleName] isEqualToString:@"AppleTV2,1_4.3_8F5153d"])
{
NSDictionary *thePatch = [NSDictionary dictionaryWithObjectsAndKeys:[[NSBundle mainBundle] pathForResource:@"status" ofType:@"patch" inDirectory:@"patches"], @"Patch", @"private/var/lib/dpkg/status", @"Target", @"7945d79f0dad7c3397b930877ba92ec4", @"md5", nil];
- NSLog(@"extraPatch: %@", thePatch);
+ //NSLog(@"extraPatch: %@", thePatch);
return thePatch;
}
@@ -0,0 +1,11 @@
+#import <Cocoa/Cocoa.h>
+
+@interface NSApplication (SystemVersion)
+
+- (void)getSystemVersionMajor:(unsigned *)major
+ minor:(unsigned *)minor
+ bugFix:(unsigned *)bugFix;
+
+@end
+
+
Oops, something went wrong.

0 comments on commit 3660578

Please sign in to comment.