Skip to content

Commit 5244125

Browse files
committed
Update
1 parent 2f3bc54 commit 5244125

2 files changed

Lines changed: 23 additions & 43 deletions

File tree

app/src/main/assets/home/etc/start-early.bash

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ fi
2323

2424
(
2525
if checkonline; then
26+
2627
# Thông báo cập nhật
2728
link_url="https://api.github.com/repos/Zenlua/Tool-Tree/releases"
2829
if [ "$(unzip -qp "$PATH_APK" assets/beta 2>/dev/null)" == 1 ]; then
@@ -34,25 +35,34 @@ if checkonline; then
3435
fi
3536

3637
websum="$(echo "$websums" | jq -r .assets[0].digest | cut -d: -f2)"
37-
websize="$(echo "$websums" | jq -r '.assets[0].size')"
38+
websize="$(echo "$websums" | jq -r '.assets[0].size' | coverbyte)"
3839
filesum="$(checksum "$PATH_APK")"
40+
name_apk="$(echo "$websums" | jq -r .name)"
41+
url_dowload="$(echo "$websums" | jq -r ".assets[0].browser_download_url")"
3942

43+
echo "Name: $name_apk"
4044
echo "Tag: $tagname"
4145
echo "Sum online: $websum"
4246
echo "Sum apk: $filesum"
4347
echo "Size: $websize"
48+
echo "Url: $url_dowload"
4449

4550
if [[ "${PACKAGE_VERSION_NAME//./}" == "$tagname" ]]; then
46-
if [[ "$websum" != "$filesum" ]] && [[ "$websum" ]]; then
47-
if [ ! -f $TEMP/update ] && [ -n "$tagname" ]; then
48-
showtoast "$update_text_6"
51+
if [[ "$websum" == "$filesum" ]] && [[ "$websum" ]]; then
52+
rm -fr $TEMP/size $TEMP/update
53+
else
54+
if [ -n "$tagname" ]; then
55+
echo "$url_dowload" > $TEMP/update
56+
echo "$websize" > $TEMP/size
4957
fi
5058
fi
5159
else
52-
if [ ! -f $TEMP/update ] && [ -n "$tagname" ]; then
53-
showtoast "$update_text_6"
60+
if [ -n "$tagname" ]; then
61+
echo "$url_dowload" > $TEMP/update
62+
echo "$websize" > $TEMP/size
5463
fi
5564
fi
65+
[ -f $TEMP/update ] && showtoast "$update_text_6"
5666
fi
5767
) &
5868

app/src/main/assets/home/etc/tool-tree.bash

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -610,35 +610,10 @@ Info() {
610610
}
611611

612612
Update() {
613-
# Thông báo cập nhật
614-
link_url="https://api.github.com/repos/Zenlua/Tool-Tree/releases"
615-
if checkonline; then
616-
if [ "$(unzip -qp "$PATH_APK" assets/beta 2>/dev/null)" == 1 ]; then
617-
websums="$(xem $link_url/tags/beta 2>/dev/null)"
618-
tagname="${PACKAGE_VERSION_NAME//./}"
619-
else
620-
websums="$(xem $link_url/latest 2>/dev/null)"
621-
tagname="$(echo "$websums" | jq -r .tag_name | sed -e 's|\.||g' -e 's|V||')"
622-
fi
623-
websum="$(echo "$websums" | jq -r .assets[0].digest | cut -d: -f2)"
624-
filesum="$(checksum "$PATH_APK" 2>/dev/null)"
625-
websize="$(echo "$websums" | jq -r '.assets[0].size')"
626-
name_apk="$(echo "$websums" | jq -r .name)"
627-
url_dowload="$(echo "$websums" | jq -r ".assets[0].browser_download_url")"
628-
text_desc_size="$sizes_text: $(coverbyte $websize 2>/dev/null)"
629-
if [[ ${PACKAGE_VERSION_NAME//./} == $tagname ]]; then
630-
if [[ "$websum" != "$filesum" ]] && [[ "$websum" ]]; then
631-
if [[ "$tagname" ]]; then
632-
show_update=1
633-
fi
634-
fi
635-
else
636-
if [ -n "$tagname" ]; then
637-
show_update=1
638-
fi
639-
fi
613+
if [ -f $TEMP/update ]; then
614+
url_dowload="$(cat $TEMP/update 2>/dev/null)"
615+
show_update=1
640616
fi
641-
642617
echo '
643618
[[group]]
644619
[[group.page]]
@@ -655,27 +630,22 @@ Update() {
655630
[[group]]
656631
[[group.action]]
657632
title = "'$update_text'"
658-
desc = "'$text_desc_size'"
633+
desc = "'$sizes_text': '$(cat $TEMP/size 2>/dev/null)'"
659634
icon = "'`urlpng update`'"
660635
warn = "'$use_network_text'"
661636
support = "echo '$show_update'"
662637
script = """
663638
echo "'$update_text_2'"
664-
if [[ "'$websum'" == "$(checksum "$TMP/Tool-Tree.apk")" ]]; then
639+
if [[ -f "$TMP/Tool-Tree.apk" ]]; then
665640
openfile "$TMP/Tool-Tree.apk"
666641
exit
667642
fi
668643
echo
669-
if [[ "'$websum'" != "'$filesum'" ]] || [[ "'$show_update'" == 1 ]]; then
644+
if [[ "'$show_update'" == 1 ]]; then
670645
echo "'$update_text_3'"
671646
echo
672647
taive "'$url_dowload'" "$TMP/Tool-Tree.apk" 2>&1
673-
if [[ "'$websum'" == "$(checksum "$TMP/Tool-Tree.apk")" ]]; then
674-
cp -rf "$TMP/Tool-Tree.apk" "$SDCARD_PATH/Download/'$name_apk'.apk"
675-
echo
676-
echo "'$save_text' $SDCARD_PATH/Download/'$name_apk'.apk"
677-
openfile "$TMP/Tool-Tree.apk"
678-
fi
648+
[ -f "$TMP/Tool-Tree.apk" ] && openfile "$TMP/Tool-Tree.apk"
679649
else
680650
echo "'$update_text_4'"
681651
fi

0 commit comments

Comments
 (0)