yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-12-08 21:19:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新 menu.sh 脚本的条件判断，支持在无参数情况下执行

Browse Source
This commit is contained in:
Ing 2025-09-26 23:23:18 +08:00
parent 262559fa06
commit a1734d9a76
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/data.yml vendored
View File

@ -65,7 +65,7 @@ jobs:
sudo losetup -P "${LOOPX}" "rr/rr.img" sudo losetup -P "${LOOPX}" "rr/rr.img"
rm -rf "/tmp/mnt/p3" rm -rf "/tmp/mnt/p3"
mkdir -p "/tmp/mnt/p3" mkdir -p "/tmp/mnt/p3"
mount "${LOOPX}p3" "/tmp/mnt/p3" sudo mount "${LOOPX}p3" "/tmp/mnt/p3"
unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd" unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
sudo apt update sudo apt update

2
.github/workflows/issues.yml vendored
View File

@ -193,7 +193,7 @@ jobs:
echo "Building..." echo "Building..."
{ {
echo ". include/functions.sh" echo ". menu.sh"
[ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale" [ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
[ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips" [ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
[ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\"" [ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""

3
files/initrd/opt/rr/menu.sh
View File

@ -4067,8 +4067,9 @@ function notepadMenu() {
############################################################################### ###############################################################################
############################################################################### ###############################################################################
if [ $# -ge 1 ]; then if [ ! "$(basename -- "${0}")" = "$(basename -- "${BASH_SOURCE[0]}")" ] || [ $# -gt 0 ]; then
"$@" "$@"
cleanup_lock
else else
if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then
DIALOG --title "$(TEXT "Main menu")" \ DIALOG --title "$(TEXT "Main menu")" \

2
scripts/func.py
View File

@ -197,7 +197,7 @@ def getpats(workpath, jsonpath, xlsxpath):
continue continue
V = __fullversion(f"{S['build_ver']}-{S['build_num']}-{S['nano']}") V = __fullversion(f"{S['build_ver']}-{S['build_num']}-{S['nano']}")
if V not in pats[M]: if V not in pats[M]:
reqPat = session.head(S['files'][0]['url'].split('?')[0], timeout=10, verify=False) reqPat = session.head(S['files'][0]['url'].split('?')[0].replace("global.synologydownload.com", "global.download.synology.com"), timeout=10, verify=False)
if reqPat.status_code == 403: if reqPat.status_code == 403:
continue continue
pats[M][V] = { pats[M][V] = {