Update scripts

1. Update build.py to use f-strings
2. Directly append busybox binaries to update-binary
3. Remove b64xz

scripts/update_binary.sh

@@ -1,34 +1,37 @@
-# EX_ARM, EX_X86, BB_ARM, and BB_X86 should be generated in build.py
+#!/sbin/sh
+X86_CNT=__X86_CNT__
 extract_bb() {
-  EXBIN=$BBDIR/b64xz; BBBIN=$BBDIR/busybox
-  touch $EXBIN; touch $BBBIN; chmod 755 $EXBIN $BBBIN
-  echo -ne $EX_ARM > $EXBIN
-  if $EXBIN --test 2>/dev/null; then
-    echo $BB_ARM | $EXBIN > $BBBIN
-  else
-    echo -ne $EX_X86 > $EXBIN
-    echo $BB_X86 | $EXBIN > $BBBIN
-  fi
-  rm $EXBIN
+  case `uname -m` in
+    x*) dd if="$0" of="$BBBIN" bs=1024 skip=1 count=$X86_CNT ;;
+    *)  dd if="$0" of="$BBBIN" bs=1024 skip=$(($X86_CNT + 1));;
+  esac
+  chmod 755 "$BBBIN"
 }
 setup_bb() {
-  BBDIR=$TMPDIR/bin; mkdir -p $BBDIR 2>/dev/null
+  BBDIR=$TMPDIR/bin
+  BBBIN=$BBDIR/busybox
+  mkdir -p $BBDIR 2>/dev/null
   extract_bb
   $BBBIN --install -s $BBDIR
   export PATH=$BBDIR:$PATH
 }
 case "$1" in
-  "extract")
-    [ -z "$2" ] && BBDIR=. || BBDIR="$2"
+  "extract"|"-x")
+    [ -z "$2" ] && BBBIN=./busybox || BBBIN="$2"
     extract_bb
     ;;
-  "indep")
-    TMPDIR=.; setup_bb; shift
+  "indep"|"sh")
+    TMPDIR=.;setup_bb;shift
     exec /system/bin/sh "$@"
     ;;
   *)
-    export TMPDIR=/dev/tmp; rm -rf $TMPDIR 2>/dev/null; setup_bb
-    export INSTALLER=$TMPDIR/install; mkdir -p $INSTALLER; unzip -o "$3" -d $INSTALLER >&2
+    export TMPDIR=/dev/tmp
+    rm -rf $TMPDIR 2>/dev/null
+    setup_bb
+    export INSTALLER=$TMPDIR/install
+    mkdir -p $INSTALLER
+    unzip -o "$3" -d $INSTALLER >&2
     exec sh $INSTALLER/META-INF/com/google/android/updater-script "$@"
     ;;
 esac
+exit