Skip to content

Commit 1f89098

Browse files
ZenluaZenlua
committed
Upload file
1 parent c572a60 commit 1f89098

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

‎.github/workflows/android.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
./.github/modun.sh
4949
chmod +x ./gradlew
5050
./gradlew assembleRelease --daemon -x lint -x test
51-
if [ "$UPAPK" == 'true' ];then
5251
VER=$(grep -m1 'versionName ' pio/build.gradle | cut -d'"' -f2)
5352
echo "Tool-Tree $VER"
5453
echo "VER=$VER" >> $GITHUB_ENV
@@ -69,7 +68,6 @@ jobs:
6968
-d chat_id="$CHAT_ID" -d parse_mode="HTML" \
7069
--data-urlencode text="$chat_tg"
7170
fi
72-
fi
7371
7472
- name: Upload APK
7573
uses: actions/upload-artifact@v4
@@ -86,6 +84,15 @@ jobs:
8684
files: Up/*
8785
body_path: "change.txt"
8886

87+
- name: DEV APK
88+
uses: softprops/action-gh-release@v2
89+
with:
90+
name: "Tool-Tree ${{ env.VER }} DEV"
91+
tag_name: "V${{ env.VER }}"
92+
files: Up/*
93+
prerelease: true
94+
body_path: "change.txt"
95+
8996
build-debug:
9097
runs-on: ubuntu-latest
9198
steps:

‎pio/src/main/assets/home/bin/findfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,14 @@ case "$1" in
158158
;;
159159

160160
file)
161-
for f in $(ls -1d $3); do
161+
for f in $(ls -1d * | grep -E "($3)$"); do
162162
[[ -s "$f" && -f "$f" ]] || continue
163163
echo "$f"
164164
done
165165
;;
166166

167167
files)
168-
for f in $(ls -1d $3); do
168+
for f in $(ls -1d * | grep -E "($3)$"); do
169169
[[ -s "$f" && -f "$f" ]] || continue
170170
info=$(checkapk "$f")
171171
echo "$f|$f ($info)"

‎pio/src/main/assets/home/etc/tool-tree.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ checktime
771771
<param name="payload_switch" value-sh="glog payload_switch" label="'$payload_text_3'" type="switch" />
772772
<param name="payload_super_size" required="true" value-sh="glog payload_super_size 11" label="'$sizes_text'" desc="'$default_text': 11GB, '$payload_text_4'" type="number"/>
773773
<param name="payload_super_group" required="true" value-sh="glog payload_super_group qti_dynamic_partitions" label="'$super_text_5'" desc="'$super_text_6', '$payload_text_4'"/>
774-
<param name="sign_payload" label="'$sign_text'" options-sh="findfile file $ETC/key/2048 '"'*.pem'"' | sed '"'s|.pem||'"'" value-sh="glog sign_payload testkey"/>
774+
<param name="sign_payload" label="'$sign_text'" options-sh="findfile file $ETC/key/2048 pem | sed '"'s|.pem||'"'" value-sh="glog sign_payload testkey"/>
775775
<param name="IMAGES" desc="'$payload_text_2'" options-sh="findfile 11 $PTSD" required="true" multiple="true"/>
776776
<set>
777777
slog sign_payload "$sign_payload"
@@ -796,7 +796,7 @@ checktime
796796
<option value="4">4</option>
797797
<option value="8">8 (Android 11+)</option>
798798
</param>
799-
<param name="FOLDER" desc="'$builds_text_1'" options-sh="findfile file $PTSD '"'*/platform.conf'"' | sed '"'s|/platform\.conf||'"' " required="true" multiple="true"/>
799+
<param name="FOLDER" desc="'$builds_text_1'" options-sh="findfile file $PTSD '"'platform.conf'"' | sed '"'s|/platform\.conf||'"' " required="true" multiple="true"/>
800800
<set>
801801
slog amlogic_boolbox "$amlogic_boolbox"
802802
slog amlogic_ver "$amlogic_ver"
@@ -1024,7 +1024,7 @@ checktime
10241024
<action icon="'`urlpng build`'" desc="'$desc_apk1'">
10251025
<title>'$build_text'</title>
10261026
<param name="xoatm" label="'$deleted_project_text'" type="bool" value-sh="glog xoatm 0" />
1027-
<param name="sign" value-sh="glog sign default" option-sh="findfile file $ETC/key '"'*.pk8'"' | sed '"'s|.pk8||'"'" label="'$sign_text'"/>
1027+
<param name="sign" value-sh="glog sign default" option-sh="findfile file $ETC/key pk8 | sed '"'s|.pk8||'"' " label="'$sign_text'"/>
10281028
<param name="sstring" label="'$build_apk_text_1'" type="switch" value-sh="glog sstring 1"/>
10291029
<param name="redivdd" label="'$decom_apk_text_14'" type="switch" value-sh="glog redivdd"/>
10301030
<param name="copysign" label="'$decom_apk_text_13'" type="switch" value-sh="glog copysign"/>
@@ -1080,7 +1080,7 @@ checktime
10801080
<action icon="'`urlpng build`'" desc="'$desc_apkd1'">
10811081
<title>'$build_text'</title>
10821082
<param name="gobo_apex" value-sh="glog gobo_apex" label="'$deleted_project_text'" type="checkbox" />
1083-
<param name="SIGNS" value-sh="glog signs_apex com.android.example.apex" options-sh="findfile file $ETC/key/4096 '"'*.pem'"' | sed '"'s|.pem||'"' " label="'$sign_text'" />
1083+
<param name="SIGNS" value-sh="glog signs_apex com.android.example.apex" options-sh="findfile file $ETC/key/4096 pem | sed '"'s|.pem||'"' " label="'$sign_text'" />
10841084
<param name="APIs" label="API" value-sh="glog apis_apex auto" options-sh="echo -e '"'auto|$default_text\n30\n31\n32\n33\n34\n35\n36'"' " />
10851085
<param name="nen_apex" value-sh="glog nen_apex" label="'$apex_text_1'" type="switch" />
10861086
<param name="payload_type" label="'$super_text_2'" value-sh="glog payload_type auto" options-sh="echo -e '"'auto|$default_text\next4\nerofs\nf2fs'"' " />
@@ -1146,7 +1146,7 @@ checktime
11461146
<action icon="'`urlpng build`'" desc="'$desc_apks1'">
11471147
<title>'$build_text'</title>
11481148
<param name="xoatm" label="'$deleted_project_text'" type="bool" value-sh="glog xoatm 0" />
1149-
<param name="sign" value-sh="glog sign default" option-sh="findfile file $ETC/key '"'*.pk8'"' | sed '"'s|.pk8||'"'" label="'$sign_text'"/>
1149+
<param name="sign" value-sh="glog sign default" option-sh="findfile file $ETC/key pk8 | sed '"'s|.pk8||'"'" label="'$sign_text'"/>
11501150
<param name="sstring" label="'$build_apk_text_1'" type="switch" value-sh="glog sstring 1"/>
11511151
<param name="redivdd" label="'$decom_apk_text_14'" type="switch" value-sh="glog redivdd"/>
11521152
<param name="comlib" label="'$addlang_text_2'" desc="'$addlang_text_3'" value-sh="glog comlib" option-sh="echo -e '"'manifest|$default_text\ntrue|$on_text\nfalse|$off_text'"'"/>

‎pio/src/main/assets/module/ZADD/add_features/index.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ slog framework_switch "$framework_switch"
2727
<title>Sign boot</title>
2828
<desc>Sign AVB 1.0 boot, vendor_boot</desc>
2929
<param name="NAME" label="'$name_text'" value-sh="glog name_boot_key boot" type="text" placeholder="boot"/>
30-
<param name="SIGN" value-sh="glog sign_boot_key testkey" label="'$sign_text'" options-sh="findfile file $ETC/key '"'*.x509.pem'"' | sed '"'s|.x509.pem||'"' "/>
30+
<param name="SIGN" value-sh="glog sign_boot_key testkey" label="'$sign_text'" options-sh="findfile file $ETC/key x509.pem | sed '"'s|.x509.pem||'"' "/>
3131
<param name="FILE" desc="'$input_text' .img, '$folder_text' '$PTSD'" options-sh="cd $PTSD; ls *.img | grep boot" label="'$select_text'" required="true"/>
3232
<set>
3333
slog name_boot_key "$NAME"
@@ -45,7 +45,7 @@ echo "'$save_text': $PTSD/out/$FILE"
4545
<title>Protoc</title>
4646
<desc>'$protoc_text'</desc>
4747
<param name="LIST" label="'$select_text'" options-sh="echo -e '"'Xml\nJson'"' "/>
48-
<param name="FILE" desc="'$input_text' .pb .json .xml, '$folder_text' '$PTSD'" multiple="true" options-sh="findfile file $PTSD '"'*.pb *.json *.xml'"' " required="true"/>
48+
<param name="FILE" desc="'$input_text' .pb .json .xml, '$folder_text' '$PTSD'" multiple="true" options-sh="findfile file $PTSD pb|json|xml" required="true"/>
4949
<set>
5050
for vvc in $FILE; do
5151
if [ $(file $PTSD/$vvc | grep -cm1 "data") == 1 ];then
@@ -73,7 +73,7 @@ done
7373
<group><action>
7474
<title>Mi Thermal</title>
7575
<desc>'$mi_thermal_text'</desc>
76-
<param name="FILE" desc="'$input_text' .conf, .txt, '$folder_text' '$PTSD'" multiple="true" options-sh="findfile file $PTSD '"'*.conf *.txt'"' " required="true"/>
76+
<param name="FILE" desc="'$input_text' .conf, .txt '$folder_text' '$PTSD'" multiple="true" options-sh="findfile file $PTSD conf|txt" required="true"/>
7777
<set>
7878
for vvc in $FILE; do
7979
if [ $(file $PTSD/$vvc | grep -cm1 "data") == 1 ];then
@@ -90,7 +90,7 @@ done
9090
<group><action>
9191
<title>Unpack splitapp</title>
9292
<desc>'$splitapp_desc_text'</desc>
93-
<param name="FILE" label="'$select_text'" desc="'$input_text' .APP, '$folder_text' '$PTSD'" options-sh="findfile file $PTSD '"'*.app *.APP'"' " required="true"/>
93+
<param name="FILE" label="'$select_text'" desc="'$input_text' .APP, '$folder_text' '$PTSD'" options-sh="findfile file $PTSD app|APP" required="true"/>
9494
<set>
9595
if [ -f "$FILE" ];then
9696
splitapp.py -f "$FILE" -o $PTSD/out
@@ -105,7 +105,7 @@ fi
105105
<action>
106106
<title>Unpack pac</title>
107107
<desc>'$pac_desc_text'</desc>
108-
<param name="FILE" label="'$select_text'" desc="'$input_text' .pac, '$folder_text' '$PTSD'" options-sh="findfile file $PTSD '"'*.pac'"' " required="true"/>
108+
<param name="FILE" label="'$select_text'" desc="'$input_text' .pac, '$folder_text' '$PTSD'" options-sh="findfile file $PTSD pac" required="true"/>
109109
<set>
110110
if [ -f "$FILE" ];then
111111
unpac.py extract -d $PTSD/out "$FILE"

‎pio/src/main/assets/module/ZAPK/apk_utilities/index.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ xml_print '
1212
<action shell="hidden" reload="true">
1313
<title>'$clean_text_1'</title>
1414
<summary>'$clean_text_2' '"$path_clean"'</summary>
15-
<param name="project" label="'$select_text_1'" options-sh="findfile file $APK/$PTAH '"'*/apktool.yml */archive-info.json'"' | sed -e '"'s|/apktool.yml||'"' -e '"'s|/archive-info.json||'"' " value-sh="glog project_apk_clean" required="true" />
15+
<param name="project" label="'$select_text_1'" options-sh="findfile file $APK/$PTAH '"'/apktool.yml|/archive-info.json'"' | sed -e '"'s|/apktool.yml||'"' -e '"'s|/archive-info.json||'"' " value-sh="glog project_apk_clean" required="true" />
1616
<set>slog project_apk_clean "$project"</set>
1717
</action>
1818
</group>

0 commit comments

Comments
 (0)