diff --git a/.github/workflows/data.yml b/.github/workflows/data.yml index a6d5b2d0..04c4c70f 100644 --- a/.github/workflows/data.yml +++ b/.github/workflows/data.yml @@ -65,7 +65,7 @@ jobs: sudo losetup -P "${LOOPX}" "rr/rr.img" rm -rf "/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" sudo apt update diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 620f1429..aad87e8a 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -193,7 +193,7 @@ jobs: echo "Building..." { - echo ". include/functions.sh" + echo ". menu.sh" [ -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.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\"" diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index 02c59fb2..9140d3f1 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -4067,8 +4067,9 @@ function notepadMenu() { ############################################################################### ############################################################################### -if [ $# -ge 1 ]; then +if [ ! "$(basename -- "${0}")" = "$(basename -- "${BASH_SOURCE[0]}")" ] || [ $# -gt 0 ]; then "$@" + cleanup_lock else if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then DIALOG --title "$(TEXT "Main menu")" \ diff --git a/scripts/func.py b/scripts/func.py index 6b1b26c6..9d3551f1 100644 --- a/scripts/func.py +++ b/scripts/func.py @@ -197,7 +197,7 @@ def getpats(workpath, jsonpath, xlsxpath): continue V = __fullversion(f"{S['build_ver']}-{S['build_num']}-{S['nano']}") 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: continue pats[M][V] = {