X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7e2bd591297679ef77fcfe6c380b3fca5aaf71f5..c5f1a9375ccc353684f738e09c77dc9fde3d80e8:/sysroot.sh?ds=sidebyside

diff --git a/sysroot.sh b/sysroot.sh
index 819d8b72..5e87c3c4 100755
--- a/sysroot.sh
+++ b/sysroot.sh
@@ -5,10 +5,23 @@ if [[ ${BASH_VERSION} != 4* ]]; then
     exit 1
 fi
 
+set -o pipefail
+set -e
+
 shopt -s extglob
 shopt -s nullglob
 
-PATH=/Library/Cydia/bin:$PATH
+for command in unlzma wget; do
+    if ! which "${command}" &>/dev/null; then
+        echo "Cannot run \`${command}\`. Please read compiling.txt." 1>&2
+        exit 1
+    fi
+done
+
+if tar --help | grep bsdtar &>/dev/null; then
+    echo "Running \`tar\` is bsdtar :(. Please read compiling.txt." 1>&2
+    exit 1
+fi
 
 rm -rf sysroot
 mkdir sysroot
@@ -19,6 +32,10 @@ distribution=tangelo
 component=main
 architecture=iphoneos-arm
 
+declare -A dpkgz
+dpkgz[gz]=gunzip
+dpkgz[lzma]=unlzma
+
 wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture}/Packages.bz2" | bzcat | {
     regex='^([^ \t]*): *(.*)'
     declare -A fields
@@ -28,8 +45,25 @@ wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture
             package=${fields[package]}
             if [[ ${package} == *(apr|apr-lib|apt7|apt7-lib|coreutils|mobilesubstrate|pcre) ]]; then
                 filename=${fields[filename]}
+
                 wget -O "${package}.deb" "${repository}${filename}"
-                dpkg-deb -x "${package}.deb" .
+                for z in lzma gz; do
+                    compressed=data.tar.${z}
+
+                    if ar -x "${package}.deb" "${compressed}" 2>/dev/null; then
+                        ${dpkgz[${z}]} "${compressed}"
+                        break
+                    fi
+                done
+
+                if ! [[ -e data.tar ]]; then
+                    echo "unable to extract package" 1>&2
+                    exit 1
+                fi
+
+                ls -la data.tar
+                tar -xf ./data.tar
+                rm -f data.tar
             fi
 
             unset fields
@@ -44,6 +78,12 @@ wget -qO- "${repository}dists/${distribution}/${component}/binary-${architecture
 
 rm -f *.deb
 
+if substrate=$(readlink usr/include/substrate.h); then
+    if [[ ${substrate} == /* ]]; then
+        ln -sf "../..${substrate}" usr/include/substrate.h
+    fi
+fi
+
 mkdir -p usr/include
 cd usr/include