Don't rely on null-terminated name in PackageFind.

[cydia.git] / sysroot.sh

diff --git a/sysroot.sh b/sysroot.sh
index c32440a45443c965449c4d7de42fe3b646b99d52..5e5a9cab58032761afe0d12e82837b93133dc5b9 100755 (executable)
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -62,27 +62,37 @@ function extract() {
 
 declare -A urls
 
-wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture}/Packages.bz2" | bzcat | {
-    regex='^([^ \t]*): *(.*)'
-    declare -A fields
-
-    while IFS= read -r line; do
-        if [[ ${line} == '' ]]; then
-            package=${fields[package]}
-            if [[ ${package} == *(apr|apr-lib|apt7|apt7-lib|coreutils|mobilesubstrate|pcre) ]]; then
-                filename=${fields[filename]}
-                urls[${package}]=${repository}${filename}
+urls[apr]=http://apt.saurik.com/debs/apr_1.3.3-4_iphoneos-arm.deb
+urls[apr-lib]=http://apt.saurik.com/debs/apr-lib_1.3.3-2_iphoneos-arm.deb
+urls[apt7]=http://apt.saurik.com/debs/apt7_0.7.25.3-6_iphoneos-arm.deb
+urls[apt7-lib]=http://apt.saurik.com/debs/apt7-lib_0.7.25.3-9_iphoneos-arm.deb
+urls[coreutils]=http://apt.saurik.com/debs/coreutils_7.4-11_iphoneos-arm.deb
+urls[mobilesubstrate]=http://apt.saurik.com/debs/mobilesubstrate_0.9.3367-1_iphoneos-arm.deb
+urls[pcre]=http://apt.saurik.com/debs/pcre_7.9-3_iphoneos-arm.deb
+
+if [[ 0 ]]; then
+    wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture}/Packages.bz2" | bzcat | {
+        regex='^([^ \t]*): *(.*)'
+        declare -A fields
+
+        while IFS= read -r line; do
+            if [[ ${line} == '' ]]; then
+                package=${fields[package]}
+                if [[ -n ${urls[${package}]} ]]; then
+                    filename=${fields[filename]}
+                    urls[${package}]=${repository}${filename}
+                fi
+
+                unset fields
+                declare -A fields
+            elif [[ ${line} =~ ${regex} ]]; then
+                name=${BASH_REMATCH[1],,}
+                value=${BASH_REMATCH[2]}
+                fields[${name}]=${value}
             fi
-
-            unset fields
-            declare -A fields
-        elif [[ ${line} =~ ${regex} ]]; then
-            name=${BASH_REMATCH[1],,}
-            value=${BASH_REMATCH[2]}
-            fields[${name}]=${value}
-        fi
-    done
-}
+        done
+    }
+fi
 
 for package in "${!urls[@]}"; do
     extract "${package}" "${urls[${package}]}"
@@ -101,12 +111,12 @@ cd usr/include
 
 mkdir CoreFoundation
 wget -O CoreFoundation/CFBundlePriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFBundlePriv.h?txt"
-wget -O CoreFoundation/CFPriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFPriv.h?txt"
 wget -O CoreFoundation/CFUniChar.h "http://www.opensource.apple.com/source/CF/CF-550/CFUniChar.h?txt"
 
 if true; then
     mkdir -p WebCore
     wget -O WebCore/WebCoreThread.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/wak/WebCoreThread.h?txt'
+    wget -O WebCore/WebEvent.h 'http://www.opensource.apple.com/source/WebCore/WebCore-658.28/platform/iphone/WebEvent.h?txt'
 else
     wget -O WebCore.tgz http://www.opensource.apple.com/tarballs/WebCore/WebCore-658.28.tar.gz
     tar -zx --transform 's@^[^/]*/@WebCore.d/@' -f WebCore.tgz