Drastic, sweeping modifications to support iPhone 1.2.0/2.0.

git-svn-id: http://svn.telesphoreo.org/trunk@199 514c082c-b64e-11dc-b46d-3d985efe055d

1 files changed, 16 insertions, 10 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index a1fa41e14..17c6d597a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,6 +4,7 @@ shopt -s extglob nullglob
 
 export PKG_BASE=$(realpath "$(dirname "$0")")
 export PKG_BOOT=${PKG_BASE}/Packager
+export PKG_TARG=arm-apple-darwin
 
 rm -rf "${PKG_BOOT}"
 svn export "${PKG_BASE}/over" "${PKG_BOOT}"
@@ -14,24 +15,26 @@ chmod +s "${PKG_BOOT}/usr/libexec/cydia_"/{godmode,symlink}
 
 mkdir -p "${PKG_BOOT}/var/lib/dpkg/info"
 
-PKG_REQS=(adv-cmds base bash coreutils cydia gawk grep inetutils less libarmfp modmyifone nano network-cmds saurik sed shell-cmds system-cmds unzip zip)
+PKG_REQS=(adv-cmds base bash coreutils cydia gawk grep inetutils iphonesurge less libarmfp modmyifone nano network-cmds rsync saurik sed shell-cmds system-cmds unzip zip)
 
 cd "${PKG_BASE}/data"
-PKG_REQS=($(find -L "${PKG_REQS[@]}" | while read -r line; do realpath "${line}"; done | grep "/home/saurik/telesphoreo/data/[^/]*$" | sed -e 's/.*\///' | sort -u))
+PKG_REQS=($(find -L "${PKG_REQS[@]}" | while read -r line; do realpath "${line}"; done | grep "/apl/tel/data/[^/]*$" | sed -e 's/.*\///' | sort -u))
 
 for PKG_NAME in "${PKG_REQS[@]}"; do
     PKG_NAME=${PKG_NAME%/_metadata/priority}
     PKG_NAME=${PKG_NAME##*/}
+    source "${PKG_BASE}/helper.sh"
 
-    export PKG_DEST=${PKG_BASE}/dest/${PKG_NAME}
+    rm -rf "${PKG_BASE}/temp"
+    dpkg -x "${PKG_BASE}/debs/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_darwin-arm.deb" "${PKG_BASE}/temp"
 
     echo "merging ${PKG_NAME}..."
-    cp -a "${PKG_DEST}"/* "${PKG_BOOT}"
+    cp -a "${PKG_BASE}/temp"/* "${PKG_BOOT}"
 
     "${PKG_BASE}/control.sh" "${PKG_NAME}" available >>"${PKG_BOOT}/var/lib/dpkg/available"
     "${PKG_BASE}/control.sh" "${PKG_NAME}" status >>"${PKG_BOOT}/var/lib/dpkg/status"
 
-    (cd "${PKG_DEST}"; find | sed -e '
+    (cd "${PKG_BASE}/temp"; find | sed -e '
         s/^\.\///
         s/^/\//
     ') >"${PKG_BOOT}/var/lib/dpkg/info/${PKG_NAME}.list"
@@ -39,11 +42,8 @@ done
 
 cd "${PKG_BOOT}"
 
-rm -f ../Packager.xml
-find * -type l -print -o -name "terminfo" -prune | while read -r link; do
-    echo "<array><string>Exec</string><string>/usr/libexec/cydia_/symlink $(readlink "${link}") /${link}</string></array>"
-    rm -f "${link}"
-done >>../Packager.xml
+rm -f ../Packager.tgz
+tar -zcvf ../Packager.tgz *
 
 cp -a bin/bash usr/libexec/cydia_
 cp -a bin/chmod usr/libexec/cydia_
@@ -64,6 +64,12 @@ cp -a usr/lib/libintl.8.0.2.dylib usr/libexec/cydia_
 cp -a usr/lib/libncurses.5.dylib usr/libexec/cydia_
 cp -a usr/lib/libreadline.5.2.dylib usr/libexec/cydia_
 
+rm -f ../Packager.xml
+find * -type l -print -o -name "terminfo" -prune | while read -r link; do
+    echo "<array><string>Exec</string><string>/usr/libexec/cydia_/symlink $(readlink "${link}") /${link}</string></array>"
+    rm -f "${link}"
+done >>../Packager.xml
+
 rm -f ../Packager.zip
 zip -qry ../Packager.zip *
 rm -rf "${PKG_BOOT}"