diff --git a/files/initrd/opt/rr/lang/rr.pot b/files/initrd/opt/rr/lang/rr.pot index 6ae7f60e..05b88a71 100644 --- a/files/initrd/opt/rr/lang/rr.pot +++ b/files/initrd/opt/rr/lang/rr.pot @@ -1169,19 +1169,19 @@ msgid "" msgstr "" #: menu.sh:2069 -msgid "Upload update.zip will update RR.\\n" +msgid "Upload update*.zip will update RR.\\n" msgstr "" #: menu.sh:2070 -msgid "Upload addons.zip will update Addons.\\n" +msgid "Upload addons*.zip will update Addons.\\n" msgstr "" #: menu.sh:2071 -msgid "Upload modules.zip will update Modules.\\n" +msgid "Upload modules*.zip will update Modules.\\n" msgstr "" #: menu.sh:2072 -msgid "Upload rp-lkms.zip will update LKMs.\\n" +msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "" #: menu.sh:2121 diff --git a/files/initrd/opt/rr/lang/zh_CN.po b/files/initrd/opt/rr/lang/zh_CN.po index effefa6f..0d5cec60 100644 --- a/files/initrd/opt/rr/lang/zh_CN.po +++ b/files/initrd/opt/rr/lang/zh_CN.po @@ -1185,20 +1185,20 @@ msgid "" msgstr "请保持附件名称与 github 上附件名称一致.\\n" #: menu.sh:2069 -msgid "Upload update.zip will update RR.\\n" -msgstr "上传 update.zip 将更新 RR.\\n" +msgid "Upload update*.zip will update RR.\\n" +msgstr "上传 update*.zip 将更新 RR.\\n" #: menu.sh:2070 -msgid "Upload addons.zip will update Addons.\\n" -msgstr "上传 addons.zip 将更新 插件.\\n" +msgid "Upload addons*.zip will update Addons.\\n" +msgstr "上传 addons*.zip 将更新 插件.\\n" #: menu.sh:2071 -msgid "Upload modules.zip will update Modules.\\n" -msgstr "上传 modules.zip 将更新 模块.\\n" +msgid "Upload modules*.zip will update Modules.\\n" +msgstr "上传 modules*.zip 将更新 模块.\\n" #: menu.sh:2072 -msgid "Upload rp-lkms.zip will update LKMs.\\n" -msgstr "上传 rp-lkms.zip 将更新 LKMs.\\n" +msgid "Upload rp-lkms*.zip will update LKMs.\\n" +msgstr "上传 rp-lkms*.zip 将更新 LKMs.\\n" #: menu.sh:2121 msgid "This person is very lazy and hasn't written anything." diff --git a/files/initrd/opt/rr/lang/zh_HK.po b/files/initrd/opt/rr/lang/zh_HK.po index 0441a938..509889ad 100644 --- a/files/initrd/opt/rr/lang/zh_HK.po +++ b/files/initrd/opt/rr/lang/zh_HK.po @@ -1185,20 +1185,20 @@ msgid "" msgstr "請保持附件名稱與 github 上附件名稱一致.\\n" #: menu.sh:2069 -msgid "Upload update.zip will update RR.\\n" -msgstr "上傳 update.zip 将更新 RR.\\n" +msgid "Upload update*.zip will update RR.\\n" +msgstr "上傳 update*.zip 将更新 RR.\\n" #: menu.sh:2070 -msgid "Upload addons.zip will update Addons.\\n" -msgstr "上傳 addons.zip 将更新 挿件.\\n" +msgid "Upload addons*.zip will update Addons.\\n" +msgstr "上傳 addons*.zip 将更新 挿件.\\n" #: menu.sh:2071 -msgid "Upload modules.zip will update Modules.\\n" -msgstr "上傳 modules.zip 将更新 模塊.\\n" +msgid "Upload modules*.zip will update Modules.\\n" +msgstr "上傳 modules*.zip 将更新 模塊.\\n" #: menu.sh:2072 -msgid "Upload rp-lkms.zip will update LKMs.\\n" -msgstr "上傳 rp-lkms.zip 将更新 LKMs.\\n" +msgid "Upload rp-lkms*.zip will update LKMs.\\n" +msgstr "上傳 rp-lkms*.zip 将更新 LKMs.\\n" #: menu.sh:2121 msgid "This person is very lazy and hasn't written anything." diff --git a/files/initrd/opt/rr/lang/zh_TW.po b/files/initrd/opt/rr/lang/zh_TW.po index ada639c7..66aafb75 100644 --- a/files/initrd/opt/rr/lang/zh_TW.po +++ b/files/initrd/opt/rr/lang/zh_TW.po @@ -1188,20 +1188,20 @@ msgid "" msgstr "請保持附件名稱與 Github 上的附件名稱一致。\\n" #: menu.sh:2069 -msgid "Upload update.zip will update RR.\\n" -msgstr "上傳 update.zip 將更新 RR。\\n" +msgid "Upload update*.zip will update RR.\\n" +msgstr "上傳 update*.zip 將更新 RR。\\n" #: menu.sh:2070 -msgid "Upload addons.zip will update Addons.\\n" -msgstr "上傳 addons.zip 將更新增益集。\\n" +msgid "Upload addons*.zip will update Addons.\\n" +msgstr "上傳 addons*.zip 將更新增益集。\\n" #: menu.sh:2071 -msgid "Upload modules.zip will update Modules.\\n" -msgstr "上傳 modules.zip 將更新模組。\\n" +msgid "Upload modules*.zip will update Modules.\\n" +msgstr "上傳 modules*.zip 將更新模組。\\n" #: menu.sh:2072 -msgid "Upload rp-lkms.zip will update LKMs.\\n" -msgstr "上傳 rp-lkms.zip 將更新 LKMs。\\n" +msgid "Upload rp-lkms*.zip will update LKMs.\\n" +msgstr "上傳 rp-lkms*.zip 將更新 LKMs。\\n" #: menu.sh:2121 msgid "This person is very lazy and hasn't written anything." diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index c61caf7f..b4211676 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -2093,13 +2093,13 @@ function updateMenu() { fi MSG="" MSG+="$(TEXT "Please keep the attachment name consistent with the attachment name on Github.\n")" - MSG+="$(TEXT "Upload update.zip will update RR.\n")" - MSG+="$(TEXT "Upload addons.zip will update Addons.\n")" - MSG+="$(TEXT "Upload modules.zip will update Modules.\n")" - MSG+="$(TEXT "Upload rp-lkms.zip will update LKMs.\n")" + MSG+="$(TEXT "Upload update*.zip will update RR.\n")" + MSG+="$(TEXT "Upload addons*.zip will update Addons.\n")" + MSG+="$(TEXT "Upload modules*.zip will update Modules.\n")" + MSG+="$(TEXT "Upload rp-lkms*.zip will update LKMs.\n")" DIALOG --title "$(TEXT "Update")" \ --msgbox "${MSG}" 0 0 - EXTS=("update.zip" "addons.zip" "modules.zip" "rp-lkms.zip") + EXTS=(update*.zip addons*.zip modules*.zip rp-lkms*.zip) TMP_UP_PATH="${TMP_PATH}/users" USER_FILE="" rm -rf "${TMP_UP_PATH}" @@ -2108,7 +2108,7 @@ function updateMenu() { rz -be -B 536870912 for F in $(ls -A); do for I in ${EXTS[@]}; do - [[ "${I}" == "${F}" ]] && USER_FILE="${F}" + [[ "${F}" = ${I} ]] && USER_FILE="${F}" done break done @@ -2117,15 +2117,21 @@ function updateMenu() { DIALOG --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 else - rm -f "${TMP_PATH}/${USER_FILE}" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/${USER_FILE}" - if [ "${USER_FILE}" = "update.zip" ]; then + if [[ "${USER_FILE}" = update*.zip ]]; then + rm -f "${TMP_PATH}/update.zip" + mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/update.zip" updateRR "RR" - elif [ "${USER_FILE}" = "addons.zip" ]; then + elif [[ "${USER_FILE}" = addons*.zip ]]; then + rm -f "${TMP_PATH}/addons.zip" + mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/addons.zip" updateExts "addons" "0" - elif [ "${USER_FILE}" = "modules.zip" ]; then + elif [[ "${USER_FILE}" = modules*.zip ]]; then + rm -f "${TMP_PATH}/modules.zip" + mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/modules.zip" updateExts "modules" "0" - elif [ "${USER_FILE}" = "rp-lkms.zip" ]; then + elif [[ "${USER_FILE}" = rp-lkms*.zip ]]; then + rm -f "${TMP_PATH}/rp-lkms.zip" + mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/rp-lkms.zip" updateExts "LKMs" "0" else DIALOG --title "$(TEXT "Update")" \ diff --git a/guide.md b/guide.md index 785d0022..dd844ae4 100644 --- a/guide.md +++ b/guide.md @@ -1,7 +1,7 @@ # ENV: -* ### 常用工具: - * telnet 工具 putty (下载: https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html) +* ### 常用工具: + * telnet 工具 putty (下载: https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html) * ssh 工具 FinalShell (下载: https://www.hostbuf.com/t/988.html) * sftp 工具 WinSCP (下载: https://winscp.net/eng/index.php) * 文本编辑工具 Notepad3 (下载: https://github.com/rizonesoft/Notepad3/releases)