Implemented --bootstrap and renamed to Cydia.

diff --git a/Cydia.mm b/Cydia.mm
index d552e220993a8325ce484d97bae36f5c10727916..af4397beaa25b0cf2190c607ab8f65f60b17fa76 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -172,6 +172,8 @@ static const int PulseInterval_ = 50000;
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 

+bool bootstrap_ = false;
+

 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
 static NSDate *now_;
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
 static NSDate *now_;


@@ -1771,6 +1773,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) dealloc;
 
 
 - (void) dealloc;
 

+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+

 - (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
 - (void) setContentView:(UIView *)view;
 - (void) resetView;
 - (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
 - (void) setContentView:(UIView *)view;
 - (void) resetView;


@@ -1802,7 +1806,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) dealloc {
     [view_ release];
 
 - (void) dealloc {
     [view_ release];

-    [background_ release];
+    if (background_ != nil)
+        [background_ release];

     [transition_ release];
     [overlay_ release];
     [navbar_ release];
     [transition_ release];
     [overlay_ release];
     [navbar_ release];


@@ -1812,6 +1817,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 

+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (bootstrap_ && from == overlay_ && to == view_)
+        exit(0);
+}
+

 - (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
     if ((self = [super initWithFrame:frame]) != nil) {
         delegate_ = delegate;
 - (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
     if ((self = [super initWithFrame:frame]) != nil) {
         delegate_ = delegate;


@@ -1822,15 +1832,21 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         CGColor white(space, 1.0, 1.0, 1.0, 1.0);
         CGColor clear(space, 0.0, 0.0, 0.0, 0.0);
 
         CGColor white(space, 1.0, 1.0, 1.0, 1.0);
         CGColor clear(space, 0.0, 0.0, 0.0, 0.0);
 

-        background_ = [[UIView alloc] initWithFrame:[self bounds]];
-        [background_ setBackgroundColor:black];
-        [self addSubview:background_];
-

         transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
         transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];

-        [self addSubview:transition_];
+        [transition_ setDelegate:self];

 
         overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
 
         overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 

+        if (bootstrap_)
+            [overlay_ setBackgroundColor:black];
+        else {
+            background_ = [[UIView alloc] initWithFrame:[self bounds]];
+            [background_ setBackgroundColor:black];
+            [self addSubview:background_];
+        }
+
+        [self addSubview:transition_];
+

         CGSize navsize = [UINavigationBar defaultSize];
         CGRect navrect = {{0, 0}, navsize};
 
         CGSize navsize = [UINavigationBar defaultSize];
         CGRect navrect = {{0, 0}, navsize};
 


@@ -3175,6 +3191,22 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     ];
 }
 
     ];
 }
 

+- (void) bootstrap_ {
+    [database_ update];
+    [database_ upgrade];
+    [database_ prepare];
+    [database_ perform];
+}
+
+- (void) bootstrap {
+    [progress_
+        detachNewThreadSelector:@selector(bootstrap_)
+        toTarget:self
+        withObject:nil
+        title:@"Bootstrap Install..."
+    ];
+}
+

 - (void) update {
     [progress_
         detachNewThreadSelector:@selector(update)
 - (void) update {
     [progress_
         detachNewThreadSelector:@selector(update)


@@ -3277,7 +3309,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     confirm_ = nil;
     restart_ = false;
 
     confirm_ = nil;
     restart_ = false;
 

-    _trace();

     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
 


@@ -3292,7 +3323,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [progress_ setContentView:underlay_];
 
     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
     [progress_ setContentView:underlay_];
 
     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];

-    [underlay_ addSubview:overlay_];
+
+    if (!bootstrap_)
+        [underlay_ addSubview:overlay_];

 
     transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
 
     transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48


@@ -3425,57 +3458,47 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [buttonbar_ showSelectionForButton:1];
     [transition_ transition:0 toView:featured_];
 
     [buttonbar_ showSelectionForButton:1];
     [transition_ transition:0 toView:featured_];
 

-    _trace();

     [overlay_ addSubview:buttonbar_];
 
     [overlay_ addSubview:buttonbar_];
 

-    _trace();

     [UIKeyboard initImplementationNow];
 
     [UIKeyboard initImplementationNow];
 

-    _trace();

     CGRect edtrect = [overlay_ bounds];
     edtrect.origin.y += navsize.height;
     edtrect.size.height -= navsize.height;
 
     CGRect edtrect = [overlay_ bounds];
     edtrect.origin.y += navsize.height;
     edtrect.size.height -= navsize.height;
 

-    _trace();

     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
 
     CGSize keysize = [UIKeyboard defaultSize];
     CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
 

-    _trace();

     database_ = [[Database alloc] init];
     [database_ setDelegate:progress_];
 
     database_ = [[Database alloc] init];
     [database_ setDelegate:progress_];
 

-    _trace();

     install_ = [[InstallView alloc] initWithFrame:[transition_ bounds]];
     [install_ setDelegate:self];
 
     install_ = [[InstallView alloc] initWithFrame:[transition_ bounds]];
     [install_ setDelegate:self];
 

-    _trace();

     changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
     [changes_ setDelegate:self];
 
     changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
     [changes_ setDelegate:self];
 

-    _trace();

     manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
     [manage_ setDelegate:self];
 
     manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
     [manage_ setDelegate:self];
 

-    _trace();

     search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
     [search_ setDelegate:self];
 
     search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
     [search_ setDelegate:self];
 

-    _trace();

     [self reloadData:NO];
     [self reloadData:NO];

-    _trace();
-    [progress_ resetView];

 
 

-    _trace();

     Package *package([database_ packageWithName:@"cydia"]);
     NSString *application = package == nil ? @"Cydia" : [NSString stringWithFormat:@"Cydia/%@", [package installed]];
     WebView *webview = [webview_ webView];
     [webview setApplicationNameForUserAgent:application];
 
     Package *package([database_ packageWithName:@"cydia"]);
     NSString *application = package == nil ? @"Cydia" : [NSString stringWithFormat:@"Cydia/%@", [package installed]];
     WebView *webview = [webview_ webView];
     [webview setApplicationNameForUserAgent:application];
 

-    _trace();

     url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
     [self loadNews];
     url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
     [self loadNews];

-    _trace();
+
+    [progress_ resetView];
+
+    if (bootstrap_)
+        [self bootstrap];

 }
 
 - (void) showKeyboard:(BOOL)show {
 }
 
 - (void) showKeyboard:(BOOL)show {


@@ -3543,6 +3566,8 @@ int main(int argc, char *argv[]) {
     if (nl[0].n_type != N_UNDF)
         *(int *) nl[0].n_value = 0;
 
     if (nl[0].n_type != N_UNDF)
         *(int *) nl[0].n_value = 0;
 

+    bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+

     setuid(0);
     setgid(0);
 
     setuid(0);
     setgid(0);
 

diff --git a/data/Cydia b/data/Cydia
deleted file mode 100755 (executable)
index 8103de3..0000000
--- a/data/Cydia
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-scp -p saurik@carrier.saurik.com:menes/cydia/Cydia Packager
-./Packager

diff --git a/data/Info.plist b/data/Info.plist
index c496c4cd75aa93b8373b42a718f0096e44d51d98..2490ace7dc30d13a9389462ad1384caae6d41ba5 100644 (file)
--- a/data/Info.plist
+++ b/data/Info.plist
@@ -7,7 +7,7 @@
     <string>en</string>
 
     <key>CFBundleExecutable</key>
     <string>en</string>
 
     <key>CFBundleExecutable</key>

-    <string>Packager</string>
+    <string>Cydia</string>

 
     <key>CFBundleIdentifier</key>
     <string>com.saurik.Cydia</string>
 
     <key>CFBundleIdentifier</key>
     <string>com.saurik.Cydia</string>


@@ -16,7 +16,7 @@
     <string>6.0</string>
 
     <key>CFBundleName</key>
     <string>6.0</string>
 
     <key>CFBundleName</key>

-    <string>Packager</string>
+    <string>Cydia</string>

 
     <key>CFBundlePackageType</key>
     <string>APPL</string>
 
     <key>CFBundlePackageType</key>
     <string>APPL</string>

diff --git a/data/Test b/data/Test
new file mode 100755 (executable)
index 0000000..41a0134
--- /dev/null
+++ b/data/Test
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+cd "$(dirname "$0")"
+scp -p saurik@carrier.saurik.com:menes/cydia/Cydia 
+chmod +s Cydia
+su -c ./Cydia mobile