Update

Author: Zenlua

app/src/main/assets/home/bin/apkeditor_b

@@ -88,32 +88,39 @@ fi
 echo "$replag_text_2..."
 echo
 
-[ "$REDIVIS" == 1 ] && redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
+if [ "$REDIVIS" == 1 ] && [ ! -f "$INPUT/.cache/redivision.log" ]; then
+redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
+fi
 
 # Tạo dex
 for vcxs in $INPUT/smali/*; do
 if [ -d "$vcxs" ]; then
-[ -f "$INPUT/dex/${vcxs##*/}.dex" ] || echo > "$INPUT/dex/${vcxs##*/}.dex"
+[ -f "$INPUT/dex/${vcxs##*/}.dex" ] || touch "$INPUT/dex/${vcxs##*/}.dex"
 fi
 done
 
 # xây dựng smali
 if [ -f "$INPUT/dex/classes.dex" ] && [ -d "$INPUT/smali" ];then
+API="$(dexupdater -g "$INPUT/dex/classes.dex" -printApi 2>/dev/null | awk '/API/ {print $2}')"
 for vkn in "$INPUT"/dex/classes*.dex; do
     [ -f "$vkn" ] || continue
     kout="$(basename $vkn .dex)"
     if [ -f "$INPUT/.cache/hash_$kout.json" ];then
     cp -rf "$INPUT/.cache/hash_$kout.json" "$INPUT/.cache/2hash_$kout.json"
     dkfjff="$(check_changes.py "$INPUT/smali/$kout" "$INPUT/.cache/2hash_$kout.json")"
     rm -fr "$INPUT/.cache/2hash_$kout.json"
+    else
+    dkfjff="$(check_changes.py "$INPUT/smali/$kout" "$INPUT/.cache/hash_$kout.json" )"
     fi
     if [ -n "$dkfjff" ];then
-    API=$(dexupdater -g "$vkn" -printApi | awk '/API/ {print $2}')
-    smali a --api $API -o "$INPUT/smali/$kout.dex" $(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/smali/$kout'/"$2}')
-    dexupdater -g "$vkn" -e "$INPUT/smali/$kout.dex" -o "$INPUT/${kout}_s.dex" -api $API -delete $(echo "$dkfjff" | grep "deleted:" | awk '{print $2}' | sed "s|\.smali||g") > "$INPUT/.cache/build_$kout.log"
-        if [ -f "$INPUT/${kout}_s.dex" ];then
-        mv "$INPUT/${kout}_s.dex" "$vkn"
-        rm -fr "$INPUT/smali/$kout.dex"
+    add_fixsmali="$(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/smali/$kout'/"$2}')"
+    [ -n "$add_fixsmali" ] && smali a --api $API -o "$INPUT/smali/$kout.dex" $add_fixsmali
+        if [ -s "$vkn" ]; then
+            dexupdater -g "$vkn" -e "$INPUT/smali/$kout.dex" -o "$INPUT/${kout}_s.dex" -api $API -delete $(echo "$dkfjff" | grep "deleted:" | awk '{print $2}' | sed "s|\.smali||g") > "$INPUT/.cache/build_$kout.log"
+            [ -f "$INPUT/${kout}_s.dex" ] && mv "$INPUT/${kout}_s.dex" "$vkn" || killtree "Dex update error: $kout"
+            rm -fr "$INPUT/smali/$kout.dex"
+        else
+            mv "$INPUT/smali/$kout.dex" "$vkn"
         fi
     fi
 done
@@ -136,7 +143,7 @@ eval "apkeditor b -f $XTRALIB -i \"$INPUT\" -o \"$INPUT/dist/$tenapkkk\" " 2>&1
     -e '/Delete:/d' \
     -e '/Saved to:/d' \
     -e 's|I: \[BUILD\] ||' \
-    -e 's/^[0-9]+\.[0-9]+[[:space:]]+/I: /'
+    -e 's/^[0-9:.]+[[:space:]]+/I: /'
 
 # khôi phục thư mục
 [ -e "$INPUT/smali_bak" ] && mv "$INPUT/smali_bak" "$INPUT/smali"

app/src/main/assets/home/bin/apktool_b

@@ -89,17 +89,21 @@ fi
 
 echo "$replag_text_2..."
 echo
-[ "$REDIVIS" == 1 ] && redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
+
+if [ "$REDIVIS" == 1 ] && [ ! -f "$INPUT/.cache/redivision.log" ]; then
+redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
+fi
 
 # Tạo dex
 for vcxs in $INPUT/smali_*; do
 if [ -d "$vcxs" ]; then
 ksbdhch="$(echo ${vcxs##*/} | sed 's|smali_||')"
-[ -f "$INPUT/$ksbdhch.dex" ] || echo > "$INPUT/$ksbdhch.dex"
+[ -f "$INPUT/$ksbdhch.dex" ] || touch "$INPUT/$ksbdhch.dex"
 fi
 done
 
 if [ -f "$INPUT/classes.dex" ] && [ -d "$INPUT/smali" ];then
+API=$(dexupdater -g "$INPUT/classes.dex" -printApi 2>/dev/null | awk '/API/ {print $2}')
 for vkn in "$INPUT"/classes*.dex; do
     [ -f "$vkn" ] || continue
     [ "${vkn##*/}" == "classes.dex" ] && thyedkm="smali" || thyedkm="smali_classes"
@@ -108,14 +112,18 @@ for vkn in "$INPUT"/classes*.dex; do
     cp -rf "$INPUT/.cache/hash_$kout.json" "$INPUT/.cache/2hash_$kout.json"
     dkfjff="$(check_changes.py "$INPUT/$kout" "$INPUT/.cache/2hash_$kout.json")"
     rm -fr "$INPUT/.cache/2hash_$kout.json"
+    else
+    dkfjff="$(check_changes.py "$INPUT/$kout" "$INPUT/.cache/hash_$kout.json" )"
     fi
     if [ -n "$dkfjff" ];then
-    API=$(dexupdater -g "$vkn" -printApi | awk '/API/ {print $2}')
-    smali a --api $API -o "$INPUT/$kout.dex" $(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/$kout'/"$2}')
-    dexupdater -g "$vkn" -e "$INPUT/$kout.dex" -o "$INPUT/${kout}_s.dex" -api $API -delete $(echo "$dkfjff" | grep "deleted:" | awk '{print $2}' | sed "s|\.smali||g") > "$INPUT/.cache/build_$kout.log"
-        if [ -f "$INPUT/${kout}_s.dex" ];then
-        mv "$INPUT/${kout}_s.dex" "$vkn"
-        rm -fr "$INPUT/$kout.dex"
+    add_fixsmali="$(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/$kout'/"$2}')"
+    [ -n "$add_fixsmali" ] && smali a --api $API -o "$INPUT/$kout.dex" $add_fixsmali
+        if [ -s "$vkn" ]; then
+            dexupdater -g "$vkn" -e "$INPUT/$kout.dex" -o "$INPUT/${kout}_s.dex" -api $API -delete $(echo "$dkfjff" | grep "deleted:" | awk '{print $2}' | sed "s|\.smali||g") > "$INPUT/.cache/build_$kout.log"
+            [ -f "$INPUT/${kout}_s.dex" ] && mv "$INPUT/${kout}_s.dex" "$vkn" || killtree "Dex update error: $kout"
+            rm -fr "$INPUT/$kout.dex"
+        else
+            mv "$INPUT/$kout.dex" "$vkn"
         fi
     fi
 done