Fix a crash in NewTag and remove "I am shit" flag.

[cydia.git] / Library / firmware.sh

diff --git a/Library/firmware.sh b/Library/firmware.sh
index 4f41bfdce5abd882cdda2a24576bb4deb1217e07..6dcb4a21806246ed6a0b04b8709651246abbbf78 100755 (executable)
--- a/Library/firmware.sh
+++ b/Library/firmware.sh
@@ -8,7 +8,7 @@ shopt -s nullglob
 version=$(sw_vers -productVersion)
 cpu=$(uname -p)
 
 version=$(sw_vers -productVersion)
 cpu=$(uname -p)
 

-if [[ ${cpu} == arm ]]; then
+if [[ ${cpu} == arm || ${cpu} == arm64 ]]; then

     data=/var/lib/dpkg
     model=hw.machine
     arch=iphoneos-arm
     data=/var/lib/dpkg
     model=hw.machine
     arch=iphoneos-arm


@@ -41,6 +41,7 @@ Installed-Size: 0
 Architecture: ${arch}
 Version: ${version}
 Description: ${description}
 Architecture: ${arch}
 Version: ${version}
 Description: ${description}

+Maintainer: Jay Freeman (saurik) <saurik@saurik.com>

 Tag: role::cydia
 EOF
 
 Tag: role::cydia
 EOF
 


@@ -49,6 +50,12 @@ EOF
 }
 # }}}
 
 }
 # }}}
 

+before=$(stat -c '%i-%Y' status)
+
+output=$(mktemp status-tmp.XXXXXX)
+xxxxxx=${output##status-tmp.}
+rm -f status-tmp.!("${xxxxxx}")
+

 {
 
 # Delete Old Packages {{{
 {
 
 # Delete Old Packages {{{


@@ -87,7 +94,7 @@ EOF
     fi
 # }}}
 
     fi
 # }}}
 

-    if [[ ${cpu} == arm ]]; then
+    if [[ ${cpu} == arm || ${cpu} == arm64 ]]; then

         pseudo "firmware" "${version}" "almost impressive Apple frameworks" "iOS Firmware"
 
         while [[ 1 ]]; do
         pseudo "firmware" "${version}" "almost impressive Apple frameworks" "iOS Firmware"
 
         while [[ 1 ]]; do


@@ -101,19 +108,22 @@ EOF
         echo "${gssc}" | sed -re '
             /^    [^ ]* = [0-9.]*;$/ ! d;
             s/^    ([^ ]*) = ([0-9.]*);$/\1 \2/;
         echo "${gssc}" | sed -re '
             /^    [^ ]* = [0-9.]*;$/ ! d;
             s/^    ([^ ]*) = ([0-9.]*);$/\1 \2/;

-            s/([A-Z])/-\L\1/g; s/^"([^ ]*)"/\1/;
+            s/([A-Z])/-\L\1/g;
+            s/^"([^ ]*)"/\1/;

             s/^-//;
             / 0$/ d;
             s/^-//;
             / 0$/ d;

-        ' | while read -r name value; do
-            pseudo "gsc.${name}" "${value}" "virtual GraphicsServices dependency"
-
-            if [[ ${name} == ipad ]]; then
-                pseudo "gsc.wildcat" "${value}" "virtual virtual GraphicsServices dependency"
-            fi
-        done
+        ' | while read -r name value; do case "${name}" in
+            (ipad) for name in ipad wildcat; do
+                pseudo "gsc.${name}" "${value}" "this device has a very large screen" "iPad"
+            done;;
+
+            (*)
+                pseudo "gsc.${name}" "${value}" "virtual GraphicsServices dependency"
+            ;;
+        esac; done

     fi
 
     fi
 

-    if [[ ${cpu} == arm ]]; then
+    if [[ ${cpu} == arm || ${cpu} == arm64 ]]; then

         os=ios
     else
         os=macosx
         os=ios
     else
         os=macosx


@@ -130,14 +140,18 @@ EOF
 
     pseudo "cy+kernel.$(lower <<<$(sysctl -n kern.ostype))" "$(sysctl -n kern.osrelease)" "virtual kernel dependency"
 
 
     pseudo "cy+kernel.$(lower <<<$(sysctl -n kern.ostype))" "$(sysctl -n kern.osrelease)" "virtual kernel dependency"
 

-} >"${status}"_
+    pseudo "cy+lib.corefoundation" "$(/usr/libexec/cydia/cfversion)" "virtual corefoundation dependency"
+
+} >"${output}"

 
 

-mv -f "${status}"{_,}
+# XXX: this is a poor replacement for flock
+test "${before}" = "$(stat -c '%i-%Y' status)"
+mv -f "${output}" "${status}"

 
 

-if [[ ${cpu} == arm ]]; then
+if [[ ${cpu} == arm || ${cpu} == arm64 ]]; then

     if [[ ! -h /User && -d /User ]]; then
         cp -afT /User /var/mobile
     fi && rm -rf /User && ln -s "/var/mobile" /User
 
     if [[ ! -h /User && -d /User ]]; then
         cp -afT /User /var/mobile
     fi && rm -rf /User && ln -s "/var/mobile" /User
 

-    echo 4 >/var/lib/cydia/firmware.ver
+    echo 6 >/var/lib/cydia/firmware.ver

 fi
 fi