Skip to content

Commit 465ca1f

Browse files
ZenluaZenlua
committed
Update
1 parent 633b053 commit 465ca1f

2 files changed

Lines changed: 26 additions & 130 deletions

File tree

‎.github/workflows/addon.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ jobs:
1717

1818
- name: Build add-on
1919
run: |
20-
for vv in ./.github/addon/*; do
20+
for vv in .github/addon/*; do
2121
if [ -d "$vv" ]; then
2222
cd "$vv"
2323
7z a -t7z -y ../${vv##*/}.add
24+
cd ~
2425
fi
2526
done
2627

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

Lines changed: 24 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,31 +1174,13 @@ Generate() {
11741174
name = "type"
11751175
label = "'$super_text_2'"
11761176
value-sh = "glog typeheh"
1177-
1178-
[[group.action.params.options]]
1179-
val = "A"
1180-
title = "a_only"
1181-
1182-
[[group.action.params.options]]
1183-
val = "AB"
1184-
title = "ab"
1185-
1186-
[[group.action.params.options]]
1187-
val = "VAB"
1188-
title = "virtual_ab"
1177+
options-sh = "echo -e \"A|a_only\nAB|ab\nVAB|virtual_ab\""
11891178
11901179
[[group.action.params]]
11911180
name = "from"
11921181
label = "'$super_text_3'"
11931182
value-sh = "glog fromdjfh"
1194-
1195-
[[group.action.params.options]]
1196-
val = "raw"
1197-
title = "raw"
1198-
1199-
[[group.action.params.options]]
1200-
val = "sparse"
1201-
title = "sparse"
1183+
options-sh = "echo -e \"raw|raw\nsparse|sparse\""
12021184
12031185
[[group.action.params]]
12041186
name = "super_size"
@@ -1323,27 +1305,13 @@ Generate() {
13231305
name = "amlogic_ver"
13241306
label = "'$version_text'"
13251307
value-sh = "glog amlogic_ver v2"
1326-
1327-
[[group.action.params.options]]
1328-
val = "v2"
1329-
title = "v2"
1330-
1331-
[[group.action.params.options]]
1332-
val = "v1"
1333-
title = "v1"
1308+
options-sh = "echo -e \"v2\nv1\""
13341309
13351310
[[group.action.params]]
13361311
name = "amlogic_align"
13371312
label = "'$alignment_text'"
13381313
value-sh = "glog amlogic_align 8"
1339-
1340-
[[group.action.params.options]]
1341-
val = "4"
1342-
title = "4"
1343-
1344-
[[group.action.params.options]]
1345-
val = "8"
1346-
title = "8 (Android 11+)"
1314+
options-sh = "echo -e \"4|4\n8|8 (Android 11+)\""
13471315
13481316
[[group.action.params]]
13491317
name = "FOLDER"
@@ -1505,30 +1473,7 @@ Utilities() {
15051473
depend-on = "IMAGES"
15061474
depend-value = "(erofs),(ext),(f2fs)"
15071475
depend-mode = "show"
1508-
1509-
[[group.action.params.options]]
1510-
val = "raw"
1511-
title = "File.img (raw)"
1512-
1513-
[[group.action.params.options]]
1514-
val = "sparse"
1515-
title = "File.img (sparse)"
1516-
1517-
[[group.action.params.options]]
1518-
val = "zstd"
1519-
title = "File.img.zstd"
1520-
1521-
[[group.action.params.options]]
1522-
val = "zst"
1523-
title = "File.img.zst"
1524-
1525-
[[group.action.params.options]]
1526-
val = "dat"
1527-
title = "File.new.dat"
1528-
1529-
[[group.action.params.options]]
1530-
val = "br"
1531-
title = "File.new.dat.br"
1476+
options-sh = "echo -e \"raw|File.img (raw)\nsparse|File.img (sparse)\nzstd|File.img.zstd\nzst|File.img.zst\ndat|File.new.dat\nbr|File.new.dat.br\""
15321477
15331478
[[group.action.params]]
15341479
name = "nen_br"
@@ -1584,7 +1529,7 @@ Utilities() {
15841529
config-sh = "'$ETC'/tool-tree.bash Generate"
15851530
handler = """
15861531
if [ "$menu_id" == "v1" ]; then
1587-
[ "$(glog hide_show_generate)" == 1 ] && slog hide_show_generate 0 || slog hide_show_generate 1
1532+
[ "$(glog hide_show_generate)" == 1 ] && slog hide_show_generate 0 || slog hide_show_generate 1
15881533
fi
15891534
"""
15901535
@@ -1673,7 +1618,7 @@ Utilities() {
16731618
slog nen_br "$nen_br"
16741619
slog cboxksbhd "$cboxk"
16751620
for vinput in $IMAGES; do
1676-
cover_img -i "$PTSD/$vinput" -o "$PTSD/out" -c $format_img -l $nen_br -d $cboxk
1621+
cover_img -i "$PTSD/$vinput" -o "$PTSD/out" -c $format_img -l $nen_br -d $cboxk
16771622
done
16781623
echo "'$save_text' $PTSD/out"
16791624
echo
@@ -1691,46 +1636,7 @@ Utilities() {
16911636
label = "'$option_text'"
16921637
value-sh = "glog format_img raw"
16931638
required = true
1694-
1695-
[[group.action.params.options]]
1696-
val = "raw"
1697-
title = "File.img (raw)"
1698-
1699-
[[group.action.params.options]]
1700-
val = "sparse"
1701-
title = "File.img (sparse)"
1702-
1703-
[[group.action.params.options]]
1704-
val = "zstd"
1705-
title = "File.img.zstd"
1706-
1707-
[[group.action.params.options]]
1708-
val = "zst"
1709-
title = "File.img.zst"
1710-
1711-
[[group.action.params.options]]
1712-
val = "lzma"
1713-
title = "File.img.lzma"
1714-
1715-
[[group.action.params.options]]
1716-
val = "lz4"
1717-
title = "File.img.lz4"
1718-
1719-
[[group.action.params.options]]
1720-
val = "xz"
1721-
title = "File.img.xz"
1722-
1723-
[[group.action.params.options]]
1724-
val = "gz"
1725-
title = "File.img.gz"
1726-
1727-
[[group.action.params.options]]
1728-
val = "dat"
1729-
title = "File.new.dat"
1730-
1731-
[[group.action.params.options]]
1732-
val = "br"
1733-
title = "File.new.dat.br"
1639+
options-sh = "echo -e \"raw|File.img (raw)\nsparse|File.img (sparse)\nzstd|File.img.zstd\nzst|File.img.zst\ndat|File.new.dat\nbr|File.new.dat.br\nlzma|File.img.lzma\nlz4|File.img.lz4\nxz|File.img.xz\ngz|File.img.gz\""
17341640
17351641
[[group.action.params]]
17361642
name = "nen_br"
@@ -1752,7 +1658,7 @@ Utilities() {
17521658
options-sh = "findfile 1 $PTSD"
17531659
required = true
17541660
multiple = true
1755-
'
1661+
'
17561662

17571663
if [ "$(glog hide_show_patch_rom 1)" == 1 ] && [ -f "$AON/patch_rom/addon.prop" ]; then
17581664
dirvad="$AON/patch_rom"
@@ -1794,11 +1700,11 @@ Utilities() {
17941700

17951701
Apex() {
17961702
if [ "$(glog hide_show_apex)" == 1 ]; then
1797-
echo "[[group]]"
1798-
show_apkset
1703+
echo "[[group]]"
1704+
show_apkset
17991705
else
1800-
desc_apkd="$path_text: $(glog PTAD | sed "s|$SDCARD_PATH|\/sdcard|")"
1801-
desc_apkd1="$projects_text: $PTAH"
1706+
desc_apkd="$path_text: $(glog PTAD | sed "s|$SDCARD_PATH|\/sdcard|")"
1707+
desc_apkd1="$projects_text: $PTAH"
18021708
fi
18031709

18041710
echo '
@@ -1888,11 +1794,11 @@ Utiliapk() {
18881794
[ -d $PTAD/out ] && mkdir -p $PTAD/out &>/dev/null &
18891795

18901796
if [ "$(glog hide_show2 1)" == 1 ]; then
1891-
echo "[[group]]"
1892-
show_apkset
1797+
echo "[[group]]"
1798+
show_apkset
18931799
else
1894-
desc_apks="$path_text: $(glog PTAD | sed "s|$SDCARD_PATH|\/sdcard|")"
1895-
desc_apks1="$projects_text: $PTAH"
1800+
desc_apks="$path_text: $(glog PTAD | sed "s|$SDCARD_PATH|\/sdcard|")"
1801+
desc_apks1="$projects_text: $PTAH"
18961802
fi
18971803

18981804
echo '
@@ -1911,12 +1817,12 @@ Utiliapk() {
19111817
slog mutiresk "$mutiresk"
19121818
IFS=$'"'\n'"'
19131819
for vapk in $FILE; do
1914-
if [ "$tooldecom" == "apkeditor" ]; then
1915-
apkeditor_d -i "$PTAD/$vapk" -t "$type_apk" -b "$xoa_debug_info" -d "$dexlib" -o "$APK/$PTAH"
1916-
else
1917-
apktool_d -i "$PTAD/$vapk" -r "$mutiresk" -b "$xoa_debug_info" -d "$dexlibk" -o "$APK/$PTAH"
1918-
fi
1919-
echo
1820+
if [ "$tooldecom" == "apkeditor" ]; then
1821+
apkeditor_d -i "$PTAD/$vapk" -t "$type_apk" -b "$xoa_debug_info" -d "$dexlib" -o "$APK/$PTAH"
1822+
else
1823+
apktool_d -i "$PTAD/$vapk" -r "$mutiresk" -b "$xoa_debug_info" -d "$dexlibk" -o "$APK/$PTAH"
1824+
fi
1825+
echo
19201826
done
19211827
echo "'$save_text' $APK/$PTAH"
19221828
echo
@@ -1948,18 +1854,7 @@ Utiliapk() {
19481854
depend-on = "tooldecom"
19491855
depend-value = "apktool"
19501856
depend-mode = "hide"
1951-
1952-
[[group.action.params.options]]
1953-
val = "raw"
1954-
title = "'$decom_apk_text_3'"
1955-
1956-
[[group.action.params.options]]
1957-
val = "xml"
1958-
title = "'$default_text'"
1959-
1960-
[[group.action.params.options]]
1961-
val = "reso"
1962-
title = "'$decom_apk_text_10'"
1857+
options-sh = "echo -e \"raw|'$decom_apk_text_3'\nxml|'$default_text'\nreso|'$decom_apk_text_10'\""
19631858
19641859
[[group.action.params]]
19651860
name = "dexlibk"

0 commit comments

Comments
 (0)