Move some of our clearly shared code into CyteKit.

[cydia.git] / Sources.mm

diff --git a/Sources.mm b/Sources.mm
index 4cc2f9e927d43db7ef8d867c5422e681a7e787ff..a156ee2f404e1e73aa09cfeafff15d91f8e6d908 100644 (file)
--- a/Sources.mm
+++ b/Sources.mm
@@ -19,24 +19,28 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include <Foundation/Foundation.h>
 #include <Menes/ObjectHandle.h>
 #include <Foundation/Foundation.h>
 #include <Menes/ObjectHandle.h>

-#include <CyteKit/UCPlatform.h>

 
 #include <cstdio>
 
 #include "Sources.h"
 
 extern _H<NSMutableDictionary> Sources_;
 
 #include <cstdio>
 
 #include "Sources.h"
 
 extern _H<NSMutableDictionary> Sources_;

-extern bool Changed_;

 
 void CydiaWriteSources() {
 
 void CydiaWriteSources() {

+    unlink(SOURCES_LIST);

     FILE *file(fopen(SOURCES_LIST, "w"));
     _assert(file != NULL);
 
     fprintf(file, "deb http://apt.saurik.com/ ios/%.2f main\n", kCFCoreFoundationVersionNumber);
 
     for (NSString *key in [Sources_ allKeys]) {
     FILE *file(fopen(SOURCES_LIST, "w"));
     _assert(file != NULL);
 
     fprintf(file, "deb http://apt.saurik.com/ ios/%.2f main\n", kCFCoreFoundationVersionNumber);
 
     for (NSString *key in [Sources_ allKeys]) {

+        if ([key hasPrefix:@"deb:http:"] && [Sources_ objectForKey:[NSString stringWithFormat:@"deb:https:%s", [key UTF8String] + 9]])
+            continue;
+

         NSDictionary *source([Sources_ objectForKey:key]);
 
         NSArray *sections([source objectForKey:@"Sections"] ?: [NSArray array]);
         NSDictionary *source([Sources_ objectForKey:key]);
 
         NSArray *sections([source objectForKey:@"Sections"] ?: [NSArray array]);


@@ -55,7 +59,6 @@ void CydiaWriteSources() {
 
 void CydiaAddSource(NSDictionary *source) {
     [Sources_ setObject:source forKey:[NSString stringWithFormat:@"%@:%@:%@", [source objectForKey:@"Type"], [source objectForKey:@"URI"], [source objectForKey:@"Distribution"]]];
 
 void CydiaAddSource(NSDictionary *source) {
     [Sources_ setObject:source forKey:[NSString stringWithFormat:@"%@:%@:%@", [source objectForKey:@"Type"], [source objectForKey:@"URI"], [source objectForKey:@"Distribution"]]];

-    Changed_ = true;

 }
 
 void CydiaAddSource(NSString *href, NSString *distribution, NSArray *sections) {
 }
 
 void CydiaAddSource(NSString *href, NSString *distribution, NSArray *sections) {