Provide more guarantees against merge catastrophe.

[cydia.git] / sysroot.sh

diff --git a/sysroot.sh b/sysroot.sh
index 55b65cab9dfacc2321963fc0de54533f052aac74..286070701a3d2ef4592282e71ce26f002b4c02f6 100755 (executable)
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -23,6 +23,8 @@ if tar --help | grep bsdtar &>/dev/null; then
     exit 1
 fi
 
+xcode=$(xcodebuild -sdk macosx -version Path)
+
 rm -rf sysroot
 mkdir sysroot
 cd sysroot
@@ -62,12 +64,9 @@ function extract() {
 
 declare -A urls
 
-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-7_iphoneos-arm.deb
 urls[apt7-lib]=http://apt.saurik.com/debs/apt7-lib_0.7.25.3-12_iphoneos-arm.deb
 urls[coreutils]=http://apt.saurik.com/debs/coreutils_7.4-11_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 | {
@@ -135,14 +134,14 @@ else
 fi
 
 for framework in ApplicationServices CoreServices IOKit IOSurface JavaScriptCore WebKit; do
-    ln -s /System/Library/Frameworks/"${framework}".framework/Headers "${framework}"
+    ln -s "${xcode}"/System/Library/Frameworks/"${framework}".framework/Headers "${framework}"
 done
 
 for framework in /System/Library/Frameworks/CoreServices.framework/Frameworks/*.framework; do
     name=${framework}
     name=${name%.framework}
     name=${name##*/}
-    ln -s "${framework}/Headers" "${name}"
+    ln -s "${xcode}/${framework}/Headers" "${name}"
 done
 
 mkdir -p Cocoa