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

fix something

Browse Source
This commit is contained in:
Ing 2023-12-05 23:16:40 +08:00
parent b2d5333056
commit c455cbdce1
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1881,8 +1881,6 @@ function downloadExts() {
if [ "${PRERELEASE}" = "true" ]; then if [ "${PRERELEASE}" = "true" ]; then
TAG="$(curl -skL "${PROXY}${3}/tags" | grep /refs/tags/.*\.zip | head -1 | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/')" TAG="$(curl -skL "${PROXY}${3}/tags" | grep /refs/tags/.*\.zip | head -1 | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/')"
else else
# TAG=`curl -skL "${PROXY}https://api.github.com/repos/wjz304/rr-addons/releases/latest" | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
# In the absence of authentication, the default API access count for GitHub is 60 per hour, so removing the use of api.github.com
LATESTURL="$(curl -skL -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")" LATESTURL="$(curl -skL -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")"
TAG="${LATESTURL##*/}" TAG="${LATESTURL##*/}"
fi fi
@ -2048,40 +2046,40 @@ function updateMenu() {
case "$(<${TMP_PATH}/resp)" in case "$(<${TMP_PATH}/resp)" in
a) a)
T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")"
downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/wjz304/rr-addons" "addons" "1" downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/XXXXXX/rr-addons" "addons" "1"
[ $? -eq 0 ] && updateExts "addons" "1" [ $? -eq 0 ] && updateExts "addons" "1"
T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")"
downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/wjz304/rr-modules" "modules" "1" downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/XXXXXX/rr-modules" "modules" "1"
[ $? -eq 0 ] && updateExts "modules" "1" [ $? -eq 0 ] && updateExts "modules" "1"
T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")"
downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/wjz304/rr-lkms" "rp-lkms" "1" downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/XXXXXX/rr-lkms" "rp-lkms" "1"
[ $? -eq 0 ] && updateExts "LKMs" "1" [ $? -eq 0 ] && updateExts "LKMs" "1"
T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")"
downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/wjz304/rr" "update" "0" downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/XXXXXX/rr" "update" "0"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
updateRR "RR" updateRR "RR"
;; ;;
r) r)
T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")"
downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/wjz304/rr" "update" "0" downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/XXXXXX/rr" "update" "0"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
updateRR "RR" updateRR "RR"
;; ;;
d) d)
T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")"
downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/wjz304/rr-addons" "addons" "0" downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/XXXXXX/rr-addons" "addons" "0"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
updateExts "addons" "0" updateExts "addons" "0"
;; ;;
m) m)
T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")"
downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/wjz304/rr-modules" "modules" "0" downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/XXXXXX/rr-modules" "modules" "0"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
updateExts "modules" "0" updateExts "modules" "0"
;; ;;
l) l)
T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")"
downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/wjz304/rr-lkms" "rp-lkms" "0" downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/XXXXXX/rr-lkms" "rp-lkms" "0"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
updateExts "LKMs" "0" updateExts "LKMs" "0"
;; ;;

1
files/initrd/opt/rr/model-configs/SA6400.yml
View File

@ -25,6 +25,7 @@ serial:
- "2270" - "2270"
middle: "UMR" middle: "UMR"
suffix: "alpha" suffix: "alpha"
macpre: 9009d0
dom: -1 dom: -1
dt: true dt: true
disks: 16 disks: 16

4
update-list.yml
View File

@ -1,8 +1,8 @@
remove: remove:
replace: replace:
"files/p3/bzImage-rr": "/mnt/p3/bzImage-rr"
"files/p3/initrd-rr": "/mnt/p3/initrd-rr"
"files/p1/RR_VERSION": "/mnt/p1/RR_VERSION" "files/p1/RR_VERSION": "/mnt/p1/RR_VERSION"
"files/p1/boot/grub/grub.cfg": "/mnt/p1/boot/grub/grub.cfg" "files/p1/boot/grub/grub.cfg": "/mnt/p1/boot/grub/grub.cfg"
"files/p1/EFI/BOOT/SynoBootLoader.conf": "/mnt/p1/EFI/BOOT/SynoBootLoader.conf" "files/p1/EFI/BOOT/SynoBootLoader.conf": "/mnt/p1/EFI/BOOT/SynoBootLoader.conf"
"files/p1/EFI/BOOT/SynoBootLoader.efi": "/mnt/p1/EFI/BOOT/SynoBootLoader.efi" "files/p1/EFI/BOOT/SynoBootLoader.efi": "/mnt/p1/EFI/BOOT/SynoBootLoader.efi"
"files/p3/bzImage-rr": "/mnt/p3/bzImage-rr"
"files/p3/initrd-rr": "/mnt/p3/initrd-rr"