Skip to content

Commit 5585355

Browse files
ZenluaZenlua
committed
Update
1 parent ca51901 commit 5585355

31 files changed

Lines changed: 115 additions & 108 deletions

‎app/src/main/assets/home/bin/apexeditor‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fi
7474
[ -z "$SIGNAPX" ] && SIGNAPX='com.android.example.apex'
7575
[ -z "$PTTTYPE" ] && PTTTYPE='auto'
7676

77-
if [ "$SELECT" == 'decom' ];then
77+
if [ "$SELECT" == 'decom' ]; then
7878
echo "$more_text_4 ${INPUT##*/}"
7979
echo
8080
# giải mã apex, capex
@@ -87,11 +87,11 @@ rm -fr "$OUTPUT/$ten_file/AndroidManifest.xml"
8787
# kết thúc
8888
fi
8989

90-
if [ "$SELECT" == 'build' ];then
90+
if [ "$SELECT" == 'build' ]; then
9191
echo "$apkb_text_1 ${INPUT##*/}"
9292
echo
9393
# Kiểm tra chữ ký
94-
if [ "$(openssl rsa -in "$ETC/key/4096/$SIGNAPX.pem" -text -noout | grep -cm1 '4096 bit')" != 1 ];then
94+
if [ "$(openssl rsa -in "$ETC/key/4096/$SIGNAPX.pem" -text -noout | grep -cm1 '4096 bit')" != 1 ]; then
9595
killtree "Not a 4096-bit signature, verification failed."
9696
else
9797
echo "I: Verify signature 4096 bit success: $SIGNAPX.pem"
@@ -101,11 +101,11 @@ cp -rf "$ETC/key/$SIGNAPX.x509.pem" "$TMP/apex.key.x509.pem"
101101
avbtool extract_public_key --key "$TMP/apex.key.pem" --output "$TMP/apex.key.avbpubkey"
102102
fi
103103
# lấy api
104-
if [ "$APIREPAK" == 'auto' ];then
104+
if [ "$APIREPAK" == 'auto' ]; then
105105
API="$(grep 'api: ' "$INPUT/apex_infor.ini" | awk '{print $2}')"
106106
# tự động hạ api
107107
while true; do
108-
if [ -f "$HOME/.local/share/apktool/framework/1-$API.apk" ];then
108+
if [ -f "$HOME/.local/share/apktool/framework/1-$API.apk" ]; then
109109
break
110110
else
111111
API=$((API - 1))
@@ -123,16 +123,16 @@ fi
123123
echo "I: Build apex_payload in format: $PTTTYPE"
124124
apexer.py -f -p "$INPUT" --api $API --payload_fs_type $PTTTYPE "$OUTPUT/${INPUT##*/}.apex"
125125
# nén lại apex thành capex
126-
if [ -f "$OUTPUT/${INPUT##*/}.apex" ];then
127-
if [ "$COMPEV" == 1 ];then
126+
if [ -f "$OUTPUT/${INPUT##*/}.apex" ]; then
127+
if [ "$COMPEV" == 1 ]; then
128128
apex_compression_tool.py compress --input "$OUTPUT/${INPUT##*/}.apex" --output "$OUTPUT/${INPUT##*/}.capex"
129129
[ -f "$OUTPUT/${INPUT##*/}.capex" ] && rm -fr "$OUTPUT/${INPUT##*/}.apex" || killtree "Apex compression failed !"
130130
fi
131131
else
132132
killtree "Apex build failed !"
133133
fi
134134
# kiểm tra hoàn thành
135-
if [[ -f "$OUTPUT/${INPUT##*/}.apex" || -f "$OUTPUT/${INPUT##*/}.capex" ]];then
135+
if [[ -f "$OUTPUT/${INPUT##*/}.apex" || -f "$OUTPUT/${INPUT##*/}.capex" ]]; then
136136
[ "$DELLAPX" == 1 ] && rm -fr "$INPUT"
137137
fi
138138
# kết thúc

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ echo "$apkb_text_1 ${INPUT##*/}"
6666
echo
6767

6868
# Lọc vẫn bản
69-
if [ -d "$INPUT/resources/package_1/res/values" ] && [ "$FIRTVB" == 1 ];then
69+
if [ -d "$INPUT/resources/package_1/res/values" ] && [ "$FIRTVB" == 1 ]; then
7070
echo "$apkb_text_2"
7171
echo
7272
cp "$INPUT/.cache/hash_res.json" "$INPUT/.cache/2hash_res.json"
7373
for vvv in $(check_changes.py "$INPUT/resources/package_1/res" "$INPUT/.cache/2hash_res.json" | grep -e 'fixed:' -e 'values' | awk '{print $2}'); do
74-
if [ "$(echo "$vvv" | grep -cm1 "values-.*/")" == 1 ];then
74+
if [ "$(echo "$vvv" | grep -cm1 "values-.*/")" == 1 ]; then
7575
ten_file="$(basename "$vvv" .xml)"
7676
text_filter.py "$INPUT/resources/package_1/res/values/$ten_file.xml" "$INPUT/resources/package_1/res/$vvv" >>$INPUT/.cache/text_filter.log
7777
xml_fix.py "$INPUT/resources/package_1/res/$vvv" >>$INPUT/.cache/xml_fix.log
7878
fi
79-
if [ "$(echo "$vvv" | grep -cm1 "values/")" == 1 ];then
79+
if [ "$(echo "$vvv" | grep -cm1 "values/")" == 1 ]; then
8080
[ "$vvv" == "values/public.xml" ] || update_id.py --use-file "$INPUT/resources/package_1/res/values/public.xml" "$INPUT/resources/package_1/res/$vvv" >>$INPUT/.cache/public_log.log
8181
fi
8282
done
@@ -93,7 +93,7 @@ redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
9393
fi
9494

9595
# xây dựng smali
96-
if [ -f "$INPUT/dex/classes.dex" ] && [ -d "$INPUT/smali" ];then
96+
if [ -f "$INPUT/dex/classes.dex" ] && [ -d "$INPUT/smali" ]; then
9797
# Tạo dex
9898
for vcxs in $INPUT/smali/*; do
9999
if [ -d "$vcxs" ]; then
@@ -105,14 +105,14 @@ for vkn in "$INPUT"/dex/classes*.dex; do
105105
[ -f "$vkn" ] || continue
106106
kout="$(basename $vkn .dex)"
107107
[ -d "$INPUT/smali/$kout" ] || continue
108-
if [ -f "$INPUT/.cache/hash_$kout.json" ];then
108+
if [ -f "$INPUT/.cache/hash_$kout.json" ]; then
109109
cp -rf "$INPUT/.cache/hash_$kout.json" "$INPUT/.cache/2hash_$kout.json"
110110
dkfjff="$(check_changes.py "$INPUT/smali/$kout" "$INPUT/.cache/2hash_$kout.json")"
111111
rm -fr "$INPUT/.cache/2hash_$kout.json"
112112
else
113113
dkfjff="$(check_changes.py "$INPUT/smali/$kout" "$INPUT/.cache/hash_$kout.json" )"
114114
fi
115-
if [ -n "$dkfjff" ];then
115+
if [ -n "$dkfjff" ]; then
116116
add_fixsmali="$(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/smali/$kout'/"$2}')"
117117
[ -n "$add_fixsmali" ] && smali a --api $API -o "$INPUT/smali/$kout.dex" $add_fixsmali
118118
if [ -s "$vkn" ]; then
@@ -132,7 +132,14 @@ fi
132132
find "$INPUT" -type f -name "*.bak" -delete >/dev/null
133133

134134
# extra lib
135-
[[ -z "$XTRALIB" ]] || XTRALIB="-extractNativeLibs $XTRALIB"
135+
if [[ "$XTRALIB" ]]; then
136+
XTRALIB="-extractNativeLibs $XTRALIB"
137+
if grep -q '"\.so"' "$INPUT/uncompressed-files.json"; then
138+
[ "$XTRALIB" == "true" ] && sed -i '/\.so"/d' "$INPUT/uncompressed-files.json"
139+
else
140+
[ "$XTRALIB" == "false" ] && sed -i 's|".png",|".png",\n".so",|' "$INPUT/uncompressed-files.json"
141+
fi
142+
fi
136143

137144
# tên file
138145
tenapkkk="$(cat "$INPUT/.cache/ten_file.log")"
@@ -152,7 +159,7 @@ eval "apkeditor b -f $XTRALIB -i \"$INPUT\" -o \"$INPUT/dist/$tenapkkk\" " 2>&1
152159
mkdir -p "$OUTPUT"
153160

154161
# ký apk
155-
if [ "$SIGNAP" != 'default' ];then
162+
if [ "$SIGNAP" != 'default' ]; then
156163
echo
157164
echo "$apkb_text_6 $SIGNAP"
158165
sign -i "$INPUT/dist/$tenapkkk" -o "$OUTPUT/$tenapkkk" -k "$ETC/key/$SIGNAP.pk8" -c "$ETC/key/$SIGNAP.x509.pem"
@@ -161,7 +168,7 @@ else
161168
fi
162169

163170
# in đường dẫn lưu
164-
if [ -f "$OUTPUT/$tenapkkk" ];then
171+
if [ -f "$OUTPUT/$tenapkkk" ]; then
165172
# xoá dự án
166173
[ "$XDELF" == 1 ] && rm -fr "$INPUT"
167174
else

‎app/src/main/assets/home/bin/apkeditor_d‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,32 @@ echo
5959

6060
# chuyển đổi tệp tin
6161
typefile="$(checkapk "$INPUT")"
62-
if [ "$typefile" == "zipapk" ];then
62+
if [ "$typefile" == "zipapk" ]; then
6363
typeten="$(unzip -l -q "$INPUT" | grep -v '.*./.*.\.apk' | grep '\.apk'$ | awk '{print $4}')"
6464
unzip -q -o "$INPUT" -d "${INPUT%/*}" $typeten &>/dev/null
6565
ptpk="${INPUT%/*}/$typeten"
6666
apkskk=1
67-
elif [ "$typefile" == "apks" ];then
67+
elif [ "$typefile" == "apks" ]; then
6868
apkeditor m -f -i "$INPUT" -o "${INPUT%.*}.apk" &>/dev/null
6969
ptpk="${INPUT%.*}.apk"
7070
apkskk=1
71-
elif [ "$typefile" == "apk" ] || [ "$typefile" == "dex" ];then
71+
elif [ "$typefile" == "apk" ] || [ "$typefile" == "dex" ]; then
7272
ptpk="$INPUT"
7373
fi
7474

7575
# xác định tệp
76-
if [ -f "$ptpk" ];then
76+
if [ -f "$ptpk" ]; then
7777

7878
# check dùng giải mã smali
79-
if [ "$DECODEX" == "nodex" ] || [ "$DECODEX" == "smali" ];then
79+
if [ "$DECODEX" == "nodex" ] || [ "$DECODEX" == "smali" ]; then
8080
setkkh="-dex"
8181
else
8282
setkkh="-dex-lib $DECODEX"
8383
[ "$DEBUGA" == 1 ] && setkkh="-no-dex-debug $setkkh" || setkkh="-smali-registers $setkkh"
8484
fi
8585

8686
# decode only resources.arsc
87-
if [ "$TYPEAPK" == 'reso' ];then
87+
if [ "$TYPEAPK" == 'reso' ]; then
8888
TYPEAPK="xml"
8989
setkkh="-keep-res-path $setkkh"
9090
fi
@@ -108,7 +108,7 @@ eval "apkeditor d -f -t \"$TYPEAPK\" $setkkh -i \"$ptpk\" -o \"$Tout\" " 2>&1 |
108108
mkdir -p "$Tout/.cache"
109109

110110
# giải mã smali
111-
if [ "$DECODEX" == "smali" ];then
111+
if [ "$DECODEX" == "smali" ]; then
112112
[ "$DEBUGA" == 1 ] && hhhhfdr="--debug-info false -l" || hhhhfdr="--debug-info true"
113113
for vkn in "$Tout"/dex/classes*.dex; do
114114
[ -f "$vkn" ] || continue
@@ -123,7 +123,7 @@ if [ "$DECODEX" == "smali" ];then
123123
fi
124124

125125
# check hash res
126-
if [ -d "$Tout/resources/package_1/res" ];then
126+
if [ -d "$Tout/resources/package_1/res" ]; then
127127
check_changes.py "$Tout/resources/package_1/res" "$Tout/.cache/hash_res.json" >/dev/null
128128
fi
129129

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ echo "$apkb_text_1 ${INPUT##*/}"
6969
echo
7070

7171
# Lọc vẫn bản
72-
if [ -d "$INPUT/res/values" ] && [ "$FIRTVB" == 1 ];then
72+
if [ -d "$INPUT/res/values" ] && [ "$FIRTVB" == 1 ]; then
7373
echo "$apkb_text_2"
7474
echo
7575
cp "$INPUT/.cache/hash_res.json" "$INPUT/.cache/2hash_res.json"
7676
for vvv in $(check_changes.py "$INPUT/res" "$INPUT/.cache/2hash_res.json" | grep -e 'fixed:' -e 'values' | awk '{print $2}'); do
77-
if [ "$(echo "$vvv" | grep -cm1 "values-.*/")" == 1 ];then
77+
if [ "$(echo "$vvv" | grep -cm1 "values-.*/")" == 1 ]; then
7878
ten_file="$(basename "$vvv" .xml)"
7979
text_filter.py "$INPUT/res/values/$ten_file.xml" "$INPUT/res/$vvv" >>$INPUT/.cache/text_filter.log
8080
fi
81-
if [ "$(echo "$vvv" | grep -cm1 "values/")" == 1 ];then
81+
if [ "$(echo "$vvv" | grep -cm1 "values/")" == 1 ]; then
8282
[ "$vvv" == "values/public.xml" ] || update_id.py --use-file "$INPUT/res/values/public.xml" "$INPUT/res/$vvv" >>$INPUT/.cache/public_log.log
8383
fi
8484
done
@@ -94,7 +94,7 @@ if [ "$REDIVIS" == 1 ] && [ ! -f "$INPUT/.cache/redivision.log" ]; then
9494
redivision.py "$INPUT" > "$INPUT/.cache/redivision.log"
9595
fi
9696

97-
if [ -f "$INPUT/classes.dex" ] && [ -d "$INPUT/smali" ];then
97+
if [ -f "$INPUT/classes.dex" ] && [ -d "$INPUT/smali" ]; then
9898
# Tạo dex
9999
for vcxs in $INPUT/smali_*; do
100100
if [ -d "$vcxs" ]; then
@@ -108,14 +108,14 @@ for vkn in "$INPUT"/classes*.dex; do
108108
[ "${vkn##*/}" == "classes.dex" ] && thyedkm="smali" || thyedkm="smali_classes"
109109
kout="$(basename $vkn .dex | sed "s|classes|$thyedkm|")"
110110
[ -d "$INPUT/$kout" ] || continue
111-
if [ -f "$INPUT/.cache/hash_$kout.json" ];then
111+
if [ -f "$INPUT/.cache/hash_$kout.json" ]; then
112112
cp -rf "$INPUT/.cache/hash_$kout.json" "$INPUT/.cache/2hash_$kout.json"
113113
dkfjff="$(check_changes.py "$INPUT/$kout" "$INPUT/.cache/2hash_$kout.json")"
114114
rm -fr "$INPUT/.cache/2hash_$kout.json"
115115
else
116116
dkfjff="$(check_changes.py "$INPUT/$kout" "$INPUT/.cache/hash_$kout.json" )"
117117
fi
118-
if [ -n "$dkfjff" ];then
118+
if [ -n "$dkfjff" ]; then
119119
add_fixsmali="$(echo "$dkfjff" | grep -e "new:" -e "fixed:" | awk '{print "'$INPUT/$kout'/"$2}')"
120120
[ -n "$add_fixsmali" ] && smali a --api $API -o "$INPUT/$kout.dex" $add_fixsmali
121121
if [ -s "$vkn" ]; then
@@ -136,7 +136,7 @@ fi
136136
find "$INPUT" -type f -name "*.bak" -delete >/dev/null
137137

138138
# Nén lib.so
139-
if [ "$(grep -cm1 '\- so$' "$INPUT/apktool.yml")" == 1 ];then
139+
if [ "$(grep -cm1 '\- so$' "$INPUT/apktool.yml")" == 1 ]; then
140140
[ "$XTRALIB" == "true" ] && sed -i "/- so$/d" "$INPUT/apktool.yml"
141141
else
142142
[ "$XTRALIB" == "false" ] && sed -i "/^doNotCompress/a\- so" "$INPUT/apktool.yml"
@@ -152,19 +152,19 @@ apktool b --copy-original -f "$INPUT" || killtree "$unpack_text_3"
152152
mkdir -p "$OUTPUT"
153153

154154
# ký apk
155-
if [ "$SIGNAP" != 'default' ];then
155+
if [ "$SIGNAP" != 'default' ]; then
156156
echo
157157
echo "$apkb_text_6 $SIGNAP"
158158
sign -i "$INPUT/dist/$tenapkkk" -o "$OUTPUT/$tenapkkk" -k "$ETC/key/$SIGNAP.pk8" -c "$ETC/key/$SIGNAP.x509.pem"
159159
else
160160
# khôi phục chữ ký
161-
if [ -d "$INPUT/signatures" ];then
161+
if [ -d "$INPUT/signatures" ]; then
162162
apkeditor b -f -t sig -i "$INPUT/dist/$tenapkkk" -sig "$INPUT/signatures" -o "$OUTPUT/$tenapkkk" &> "$INPUT/.cache/restore_sign.log"
163163
fi
164164
fi
165165

166166
# in đường dẫn lưu
167-
if [ -f "$OUTPUT/$tenapkkk" ];then
167+
if [ -f "$OUTPUT/$tenapkkk" ]; then
168168
# xoá dự án
169169
[ "$XDELF" == 1 ] && rm -fr "$INPUT"
170170
else

‎app/src/main/assets/home/bin/apktool_d‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ echo
5858

5959
# chuyển đổi apk
6060
typefile="$(checkapk "$INPUT")"
61-
if [ "$typefile" == "zipapk" ];then
61+
if [ "$typefile" == "zipapk" ]; then
6262
typeten="$(unzip -l -q "$INPUT" | grep -v '.*./.*.\.apk' | grep -i '\.apk'$ | awk '{print $4}')"
6363
unzip -qo "$INPUT" -d "${INPUT%/*}" $typeten &>/dev/null
6464
ptpk="${INPUT%/*}/$typeten"
6565
apkskk=1
66-
elif [ "$typefile" == "apks" ];then
66+
elif [ "$typefile" == "apks" ]; then
6767
apkeditor m -f -i "$INPUT" -o "${INPUT%.*}.apk" &>/dev/null
6868
ptpk="${INPUT%.*}.apk"
6969
apkskk=1
70-
elif [ "$typefile" == "apk" ] || [ "$typefile" == "dex" ];then
70+
elif [ "$typefile" == "apk" ] || [ "$typefile" == "dex" ]; then
7171
ptpk="$INPUT"
7272
fi
7373

@@ -76,15 +76,15 @@ gwngfds="$(unzip -ql "$ptpk" AndroidManifest.xml | grep -cm1 'AndroidManifest.xm
7676
[ "$gwngfds" == 1 ] && apktool if "$ptpk" &>/dev/null
7777

7878
# xác định tệp
79-
if [ -f "$ptpk" ];then
79+
if [ -f "$ptpk" ]; then
8080

8181
# check dùng giải mã smali
82-
if [ "$RESAPK" == 0 ];then
82+
if [ "$RESAPK" == 0 ]; then
8383
rdex='-r'
84-
elif [ "$RESAPK" == 2 ];then
84+
elif [ "$RESAPK" == 2 ]; then
8585
rdex='--only-manifest'
8686
fi
87-
if [ "$DECODEX" == 1 ];then
87+
if [ "$DECODEX" == 1 ]; then
8888
rdex="$rdex"
8989
[ "$DEBUGA" == 1 ] && rdex="--no-debug-info $rdex"
9090
else
@@ -99,9 +99,9 @@ Tout="$OUTPUT/${Tmout##*/}"
9999
Lay_api="$(unzip -qp "$ptpk" AndroidManifest.xml > $TMP/1.xml && axmlprinter $TMP/1.xml && rm -fr $TMP/1.xml)"
100100
api1="$(echo "$Lay_api" | grep -m1 "android:compileSdkVersion=" | cut -d\" -f2)"
101101
api2="$(echo "$Lay_api" | grep -m1 "platformBuildVersionCode=" | cut -d\" -f2)"
102-
if [ -f "$HOME/.local/share/apktool/framework/1-$api1.apk" ];then
102+
if [ -f "$HOME/.local/share/apktool/framework/1-$api1.apk" ]; then
103103
ktfw="-t $api1"
104-
elif [ -f "$HOME/.local/share/apktool/framework/1-$api2.apk" ];then
104+
elif [ -f "$HOME/.local/share/apktool/framework/1-$api2.apk" ]; then
105105
ktfw="-t $api2"
106106
fi
107107

@@ -110,7 +110,7 @@ eval "apktool d --match-original $ktfw -f $rdex -o \"$Tout\" \"$ptpk\" || killtr
110110
mkdir -p "$Tout/.cache"
111111

112112
# giải mã smali
113-
if [ "$DECODEX" == 2 ];then
113+
if [ "$DECODEX" == 2 ]; then
114114
[ "$DEBUGA" == 1 ] && hhhhfdr="--debug-info false -l" || hhhhfdr="--debug-info true"
115115
for vkn in "$Tout"/classes*.dex; do
116116
[ -f "$vkn" ] || continue
@@ -126,7 +126,7 @@ if [ "$DECODEX" == 2 ];then
126126
fi
127127

128128
# check hash res
129-
if [ -d "$Tout/res" ];then
129+
if [ -d "$Tout/res" ]; then
130130
check_changes.py "$Tout/res" "$Tout/.cache/hash_res.json" >/dev/null
131131
fi
132132

‎app/src/main/assets/home/bin/checkname‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
check_name_tt1="${1%.*}"
77
check_name_tt2="${1##*.}"
8-
if [ -f "$1" ];then
8+
if [ -f "$1" ]; then
99
for i in {1..100}; do
1010
if [ ! -f "${check_name_tt1}-$i.${check_name_tt2}" ]; then
1111
echo -n "${check_name_tt1}-$i.${check_name_tt2}"

0 commit comments

Comments
 (0)