Rename IsReachable to CyteIsReachable, in CyteKit.

[cydia.git] / Sources.mm

diff --git a/Sources.mm b/Sources.mm
index 6073622baeb76bb2fa2f9ac22db18d73c34357ea..a156ee2f404e1e73aa09cfeafff15d91f8e6d908 100644 (file)
--- a/Sources.mm
+++ b/Sources.mm
@@ -1,63 +1,46 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
 /* Cydia - iPhone UIKit Front-End for Debian APT

- * Copyright (C) 2008-2011  Jay Freeman (saurik)
+ * Copyright (C) 2008-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cydia is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cydia is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cydia.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

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

-#include <CydiaSubstrate/CydiaSubstrate.h>
-#include <CyteKit/UCPlatform.h>
+#include <Menes/ObjectHandle.h>

 
 #include <cstdio>
 
 
 #include <cstdio>
 

+#include "Sources.h"
+

 extern _H<NSMutableDictionary> Sources_;
 extern _H<NSMutableDictionary> Sources_;

-extern _H<NSString> System_;
-extern bool Changed_;

 
 void CydiaWriteSources() {
 
 void CydiaWriteSources() {

-    FILE *file(fopen("/etc/apt/sources.list.d/cydia.list", "w"));
+    unlink(SOURCES_LIST);
+    FILE *file(fopen(SOURCES_LIST, "w"));

     _assert(file != NULL);
 
     _assert(file != NULL);
 

-    NSString *distribution(@"ios");
-    if (System_ != nil)
-        distribution = [distribution stringByAppendingString:[NSString stringWithFormat:@"/%@", (id) System_]];
-
-    fprintf(file, "deb http://apt.saurik.com/ %s main\n", [distribution UTF8String]);
+    fprintf(file, "deb http://apt.saurik.com/ ios/%.2f main\n", kCFCoreFoundationVersionNumber);

 
     for (NSString *key in [Sources_ allKeys]) {
 
     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]);


@@ -76,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) {