Skip to content

Commit decd4c0

Browse files
committed
Correct the .apk filename
1 parent 431279e commit decd4c0

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

luci-app-amlogic/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
include $(TOPDIR)/rules.mk
1717

1818
PKG_NAME:=luci-app-amlogic
19-
PKG_VERSION:=3.1.286
19+
PKG_VERSION:=3.1.287
2020
PKG_RELEASE:=1
2121

2222
PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@ else
159159
[[ "${?}" -ne "0" ]] && tolog "02.05 Language pack [ ${langfile} ] download failed." "1"
160160
done
161161

162+
# The .apk filename is preceded by a tilde (~) instead of a dot (.).
163+
for file in ${TMP_CHECK_DIR}/*.apk; do
164+
[[ -f "${file}" ]] || continue
165+
base_name="$(basename "${file}")"
166+
new_name="$(echo "${base_name}" | sed -E 's/\.([a-f0-9]{7}\.apk)/~\1/')"
167+
if [[ "${base_name}" != "${new_name}" ]]; then
168+
mv -f "${file}" "${TMP_CHECK_DIR}/${new_name}" || true
169+
fi
170+
done
171+
162172
sync && sleep 2
163173
fi
164174

onekey-install.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,16 @@ download_plugin() {
116116
[[ "${?}" -ne "0" ]] && process_msg "02.04 Language pack [ ${langfile} ] download failed." "1"
117117
done
118118

119+
# The .apk filename is preceded by a tilde (~) instead of a dot (.).
120+
for file in ${tmp_dir}/*.apk; do
121+
[[ -f "${file}" ]] || continue
122+
base_name="$(basename "${file}")"
123+
new_name="$(echo "${base_name}" | sed -E 's/\.([a-f0-9]{7}\.apk)/~\1/')"
124+
if [[ "${base_name}" != "${new_name}" ]]; then
125+
mv -f "${file}" "${tmp_dir}/${new_name}" || true
126+
fi
127+
done
128+
119129
sync && sleep 2
120130
}
121131

0 commit comments

Comments
 (0)