Compare commits

...

3 Commits

Author SHA1 Message Date
github-actions[bot]
1b4ee3b623 update 2025-05-12 22:25:27 2025-05-12 22:25:27 +08:00
github-actions[bot]
89ed0fe0b3 update 2025-05-12 21:47:59 2025-05-12 21:47:59 +08:00
Ing
2a4eb4996d 修复 getpats4mv 函数中的 checksum 获取逻辑,确保在缺失时返回默认值 '0' * 32 2025-05-12 21:46:04 +08:00
11 changed files with 687 additions and 687 deletions

View File

@ -1 +1 @@
25.5.4
25.5.5

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -8,7 +8,7 @@
# shellcheck disable=SC2034
RR_VERSION="25.5.4"
RR_VERSION="25.5.5"
RR_RELEASE=""
RR_TITLE="RR v${RR_VERSION}"

View File

@ -234,7 +234,7 @@ def getpats4mv(model, version):
if V not in pats:
pats[V] = {
'url': data['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0],
'sum': data['info']['system']['detail'][0]['items'][0]['files'][0]['checksum']
'sum': data['info']['system']['detail'][0]['items'][0]['files'][0].get('checksum', '0' * 32)
}
from_ver = min(I['build'] for I in data['info']['pubVers'])
@ -256,7 +256,7 @@ def getpats4mv(model, version):
if V not in pats:
pats[V] = {
'url': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0],
'sum': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['checksum']
'sum': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0].get('checksum', '0' * 32)
}
for J in I['versions']:
@ -276,7 +276,7 @@ def getpats4mv(model, version):
continue
pats[V] = {
'url': S['files'][0]['url'].split('?')[0],
'sum': S['files'][0]['checksum']
'sum': S['files'][0].get('checksum', '0' * 32)
}
except Exception as e:
# click.echo(f"Error: {e}")

View File

@ -1401,7 +1401,7 @@ function extractDsmFiles() {
fi
printf "$(TEXT "Checking hash of %s:")" "${PAT_FILE}"
if [ "$(md5sum "${PAT_PATH}" | awk '{print $1}')" != "${PATSUM}" ]; then
if [ "00000000000000000000000000000000" != "${PATSUM}" ] && [ "$(md5sum "${PAT_PATH}" | awk '{print $1}')" != "${PATSUM}" ]; then
rm -f "${PAT_PATH}"
echo -e "$(TEXT "md5 hash of pat not match, Please reget pat data from the version menu and try again!")" >"${LOG_FILE}"
return 1

View File

@ -1 +1 @@
25.5.4
25.5.5

View File

@ -151,7 +151,7 @@ def getpats(workpath, jsonpath, xlsxpath):
if V not in pats[M]:
pats[M][V] = {
'url': data['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0],
'sum': data['info']['system']['detail'][0]['items'][0]['files'][0]['checksum']
'sum': data['info']['system']['detail'][0]['items'][0]['files'][0].get('checksum', '0' * 32)
}
from_ver = min(I['build'] for I in data['info']['pubVers'])
@ -177,7 +177,7 @@ def getpats(workpath, jsonpath, xlsxpath):
if V not in pats[M]:
pats[M][V] = {
'url': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['url'].split('?')[0],
'sum': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0]['checksum']
'sum': dataTmp['info']['system']['detail'][0]['items'][0]['files'][0].get('checksum', '0' * 32)
}
for J in I['versions']:
@ -202,7 +202,7 @@ def getpats(workpath, jsonpath, xlsxpath):
continue
pats[M][V] = {
'url': S['files'][0]['url'].split('?')[0],
'sum': S['files'][0]['checksum']
'sum': S['files'][0].get('checksum', '0' * 32)
}
if jsonpath: