add poweroff/reboot

This commit is contained in:
Ing 2023-07-09 11:54:43 +08:00
parent bf721cbb50
commit f18ba3e1a9
6 changed files with 175 additions and 103 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-07 17:21+0800\n"
"POT-Creation-Date: 2023-07-09 11:51+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -223,7 +223,7 @@ msgstr ""
msgid "Choose the model"
msgstr ""
#: menu.sh:154 menu.sh:1766
#: menu.sh:154 menu.sh:1765
msgid "Choose a product version"
msgstr ""
@ -251,7 +251,7 @@ msgstr ""
msgid "Reconfiguring Synoinfo, Addons and Modules"
msgstr ""
#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1634
#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633
msgid "Choose a option"
msgstr ""
@ -275,14 +275,14 @@ msgstr ""
msgid "Upload a external addon"
msgstr ""
#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1641
#: menu.sh:1789
#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640
#: menu.sh:1788 menu.sh:1852
msgid "Exit"
msgstr ""
#: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326
#: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374
#: menu.sh:377 menu.sh:1768
#: menu.sh:377 menu.sh:1767
msgid "Addons"
msgstr ""
@ -306,7 +306,7 @@ msgstr ""
msgid "Select addon to remove"
msgstr ""
#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1703
#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702
msgid "This feature is only available when accessed via web/ssh."
msgstr ""
@ -314,7 +314,7 @@ msgstr ""
msgid "Please upload the *.addons file."
msgstr ""
#: menu.sh:364 menu.sh:517 menu.sh:1730 menu.sh:1744
#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743
msgid "Not a valid file, please try again!"
msgstr ""
@ -331,7 +331,7 @@ msgid "File format not recognized!"
msgstr ""
#: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469
#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1769
#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768
msgid "Modules"
msgstr ""
@ -608,7 +608,7 @@ msgstr ""
msgid "Addon %s not found!"
msgstr ""
#: menu.sh:953 menu.sh:1838
#: menu.sh:953 menu.sh:1837
msgid "Cleaning"
msgstr ""
@ -691,7 +691,7 @@ msgstr ""
msgid "Advanced"
msgstr ""
#: menu.sh:998 menu.sh:1792
#: menu.sh:998 menu.sh:1791
msgid "Choose the option"
msgstr ""
@ -899,7 +899,7 @@ msgstr ""
msgid "Config changed, would you like to rebuild the loader?"
msgstr ""
#: menu.sh:1461 menu.sh:1783
#: menu.sh:1461 menu.sh:1782
msgid "Choose a language"
msgstr ""
@ -911,8 +911,8 @@ msgstr ""
msgid "Choice a keymap"
msgstr ""
#: menu.sh:1505 menu.sh:1538 menu.sh:1589 menu.sh:1646 menu.sh:1654
#: menu.sh:1662 menu.sh:1670
#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653
#: menu.sh:1661 menu.sh:1669
msgid "Update %s"
msgstr ""
@ -936,7 +936,7 @@ msgstr ""
msgid "Error downloading new version"
msgstr ""
#: menu.sh:1540 menu.sh:1591
#: menu.sh:1540 menu.sh:1590
msgid "Extracting last version"
msgstr ""
@ -962,125 +962,145 @@ msgstr ""
msgid "Arpl updated with success to %s!\\nReboot?"
msgstr ""
#: menu.sh:1597
#: menu.sh:1596
msgid "Installing new %s"
msgstr ""
#: menu.sh:1625
#: menu.sh:1624
msgid "%s updated with success!"
msgstr ""
#: menu.sh:1635
#: menu.sh:1634
msgid "Update arpl"
msgstr ""
#: menu.sh:1636
#: menu.sh:1635
msgid "Update addons"
msgstr ""
#: menu.sh:1637
#: menu.sh:1636
msgid "Update modules"
msgstr ""
#: menu.sh:1638
#: menu.sh:1637
msgid "Update LKMs"
msgstr ""
#: menu.sh:1639
#: menu.sh:1638
msgid "Set proxy server"
msgstr ""
#: menu.sh:1640
#: menu.sh:1639
msgid "Local upload"
msgstr ""
#: menu.sh:1646
#: menu.sh:1645
msgid "arpl"
msgstr ""
#: menu.sh:1654
#: menu.sh:1653
msgid "addons"
msgstr ""
#: menu.sh:1662
#: menu.sh:1661
msgid "modules"
msgstr ""
#: menu.sh:1670
#: menu.sh:1669
msgid "LKMs"
msgstr ""
#: menu.sh:1680 menu.sh:1691 menu.sh:1702 menu.sh:1712 menu.sh:1729
#: menu.sh:1743
#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728
#: menu.sh:1742
msgid "Update"
msgstr ""
#: menu.sh:1681
#: menu.sh:1680
msgid "Please enter a proxy server url"
msgstr ""
#: menu.sh:1692
#: menu.sh:1691
msgid "Invalid proxy server url, continue?"
msgstr ""
#: menu.sh:1707
#: menu.sh:1706
msgid ""
"Please keep the attachment name consistent with the attachment name on "
"Github.\\n"
msgstr ""
#: menu.sh:1708
#: menu.sh:1707
msgid "Upload update.zip will update arpl.\\n"
msgstr ""
#: menu.sh:1709
#: menu.sh:1708
msgid "Upload addons.zip will update Addons.\\n"
msgstr ""
#: menu.sh:1710
#: menu.sh:1709
msgid "Upload modules.zip will update Modules.\\n"
msgstr ""
#: menu.sh:1711
#: menu.sh:1710
msgid "Upload rp-lkms.zip will update LKMs.\\n"
msgstr ""
#: menu.sh:1764
#: menu.sh:1763
msgid "Choose a model"
msgstr ""
#: menu.sh:1770
#: menu.sh:1769
msgid "Cmdline menu"
msgstr ""
#: menu.sh:1771
#: menu.sh:1770
msgid "Synoinfo menu"
msgstr ""
#: menu.sh:1774
#: menu.sh:1773
msgid "Advanced menu"
msgstr ""
#: menu.sh:1777
#: menu.sh:1776
msgid "Build the loader"
msgstr ""
#: menu.sh:1781
#: menu.sh:1780
msgid "Boot the loader"
msgstr ""
#: menu.sh:1784
#: menu.sh:1783
msgid "Choose a keymap"
msgstr ""
#: menu.sh:1786
#: menu.sh:1785
msgid "Clean disk cache"
msgstr ""
#: menu.sh:1788
#: menu.sh:1787
msgid "Update menu"
msgstr ""
#: menu.sh:1847
msgid "Choose a action"
msgstr ""
#: menu.sh:1848
msgid "Poweroff"
msgstr ""
#: menu.sh:1849
msgid "Reboot"
msgstr ""
#: menu.sh:1850
msgid "Reboot to arpl"
msgstr ""
#: menu.sh:1851
msgid "Back to shell"
msgstr ""
#: menu.sh:1877
msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu"
msgstr ""

View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: arpl-i18n\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-07 17:21+0800\n"
"PO-Revision-Date: 2023-07-07 17:22+0800\n"
"POT-Creation-Date: 2023-07-09 11:51+0800\n"
"PO-Revision-Date: 2023-07-09 11:51+0800\n"
"Last-Translator: ing <wjz304@qq.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
@ -222,7 +222,7 @@ msgstr "显示测试型号"
msgid "Choose the model"
msgstr "选择型号"
#: menu.sh:154 menu.sh:1766
#: menu.sh:154 menu.sh:1765
msgid "Choose a product version"
msgstr "选择版本"
@ -250,7 +250,7 @@ msgstr "获取线上pat数据 .."
msgid "Reconfiguring Synoinfo, Addons and Modules"
msgstr "重新配置 Syninfo, 插件和模块"
#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1634
#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633
msgid "Choose a option"
msgstr "设置"
@ -274,14 +274,14 @@ msgstr "显示所有可用插件"
msgid "Upload a external addon"
msgstr "上传外部插件"
#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1641
#: menu.sh:1789
#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640
#: menu.sh:1788 menu.sh:1852
msgid "Exit"
msgstr "退出"
#: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326
#: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374
#: menu.sh:377 menu.sh:1768
#: menu.sh:377 menu.sh:1767
msgid "Addons"
msgstr "插件"
@ -305,7 +305,7 @@ msgstr "没有要删除的用户插件"
msgid "Select addon to remove"
msgstr "选择要删除的插件"
#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1703
#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702
msgid "This feature is only available when accessed via web/ssh."
msgstr "此功能仅通过web/ssh访问时可用."
@ -313,7 +313,7 @@ msgstr "此功能仅通过web/ssh访问时可用."
msgid "Please upload the *.addons file."
msgstr "请上传 *.addons 文件."
#: menu.sh:364 menu.sh:517 menu.sh:1730 menu.sh:1744
#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743
msgid "Not a valid file, please try again!"
msgstr "不是有效的文件, 请重试!"
@ -330,7 +330,7 @@ msgid "File format not recognized!"
msgstr "文件格式无法识别!"
#: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469
#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1769
#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768
msgid "Modules"
msgstr "模块"
@ -607,7 +607,7 @@ msgstr "拷贝文件: "
msgid "Addon %s not found!"
msgstr "插件 %s 未找到!"
#: menu.sh:953 menu.sh:1838
#: menu.sh:953 menu.sh:1837
msgid "Cleaning"
msgstr "清除中"
@ -690,7 +690,7 @@ msgstr "开发者工具"
msgid "Advanced"
msgstr "高级"
#: menu.sh:998 menu.sh:1792
#: menu.sh:998 menu.sh:1791
msgid "Choose the option"
msgstr "设置"
@ -898,7 +898,7 @@ msgstr "警告"
msgid "Config changed, would you like to rebuild the loader?"
msgstr "配置已更改, 是否重新编译引导?"
#: menu.sh:1461 menu.sh:1783
#: menu.sh:1461 menu.sh:1782
msgid "Choose a language"
msgstr "选择语言"
@ -910,8 +910,8 @@ msgstr "选择布局"
msgid "Choice a keymap"
msgstr "选择键盘"
#: menu.sh:1505 menu.sh:1538 menu.sh:1589 menu.sh:1646 menu.sh:1654
#: menu.sh:1662 menu.sh:1670
#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653
#: menu.sh:1661 menu.sh:1669
msgid "Update %s"
msgstr "更新 %s"
@ -935,7 +935,7 @@ msgstr "下载新版本中"
msgid "Error downloading new version"
msgstr "下载新版本错误"
#: menu.sh:1540 menu.sh:1591
#: menu.sh:1540 menu.sh:1590
msgid "Extracting last version"
msgstr "解压新版本"
@ -961,125 +961,145 @@ msgstr "安装更新中"
msgid "Arpl updated with success to %s!\\nReboot?"
msgstr "Arpl更新成功 %s!\\n重启?"
#: menu.sh:1597
#: menu.sh:1596
msgid "Installing new %s"
msgstr "安装新 %s 中"
#: menu.sh:1625
#: menu.sh:1624
msgid "%s updated with success!"
msgstr "%s 更新成功!"
#: menu.sh:1635
#: menu.sh:1634
msgid "Update arpl"
msgstr "更新arpl"
#: menu.sh:1636
#: menu.sh:1635
msgid "Update addons"
msgstr "更新插件"
#: menu.sh:1637
#: menu.sh:1636
msgid "Update modules"
msgstr "更新模块"
#: menu.sh:1638
#: menu.sh:1637
msgid "Update LKMs"
msgstr "更新LKMs"
#: menu.sh:1639
#: menu.sh:1638
msgid "Set proxy server"
msgstr "设置代理"
#: menu.sh:1640
#: menu.sh:1639
msgid "Local upload"
msgstr "本地上传"
#: menu.sh:1646
#: menu.sh:1645
msgid "arpl"
msgstr "arpl"
#: menu.sh:1654
#: menu.sh:1653
msgid "addons"
msgstr "插件"
#: menu.sh:1662
#: menu.sh:1661
msgid "modules"
msgstr "模块"
#: menu.sh:1670
#: menu.sh:1669
msgid "LKMs"
msgstr "LKMs"
#: menu.sh:1680 menu.sh:1691 menu.sh:1702 menu.sh:1712 menu.sh:1729
#: menu.sh:1743
#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728
#: menu.sh:1742
msgid "Update"
msgstr "更新"
#: menu.sh:1681
#: menu.sh:1680
msgid "Please enter a proxy server url"
msgstr "请输入代理服务器url"
#: menu.sh:1692
#: menu.sh:1691
msgid "Invalid proxy server url, continue?"
msgstr "无效的代理服务器url,是否继续?"
#: menu.sh:1707
#: menu.sh:1706
msgid ""
"Please keep the attachment name consistent with the attachment name on "
"Github.\\n"
msgstr "请保持附件名称与 github 上附件名称一致.\\n"
#: menu.sh:1708
#: menu.sh:1707
msgid "Upload update.zip will update arpl.\\n"
msgstr "上传 update.zip 将更新 arpl.\\n"
#: menu.sh:1709
#: menu.sh:1708
msgid "Upload addons.zip will update Addons.\\n"
msgstr "上传 addons.zip 将更新 插件.\\n"
#: menu.sh:1710
#: menu.sh:1709
msgid "Upload modules.zip will update Modules.\\n"
msgstr "上传 modules.zip 将更新 模块.\\n"
#: menu.sh:1711
#: menu.sh:1710
msgid "Upload rp-lkms.zip will update LKMs.\\n"
msgstr "上传 rp-lkms.zip 将更新 LKMs.\\n"
#: menu.sh:1764
#: menu.sh:1763
msgid "Choose a model"
msgstr "选择型号"
#: menu.sh:1770
#: menu.sh:1769
msgid "Cmdline menu"
msgstr "设置Cmdline"
#: menu.sh:1771
#: menu.sh:1770
msgid "Synoinfo menu"
msgstr "设置Synoinfo"
#: menu.sh:1774
#: menu.sh:1773
msgid "Advanced menu"
msgstr "高级设置"
#: menu.sh:1777
#: menu.sh:1776
msgid "Build the loader"
msgstr "编译引导"
#: menu.sh:1781
#: menu.sh:1780
msgid "Boot the loader"
msgstr "启动"
#: menu.sh:1784
#: menu.sh:1783
msgid "Choose a keymap"
msgstr "选择键盘"
#: menu.sh:1786
#: menu.sh:1785
msgid "Clean disk cache"
msgstr "清除磁盘缓存"
#: menu.sh:1788
#: menu.sh:1787
msgid "Update menu"
msgstr "更新"
#: menu.sh:1847
msgid "Choose a action"
msgstr "选择动作"
#: menu.sh:1848
msgid "Poweroff"
msgstr "关机"
#: menu.sh:1849
msgid "Reboot"
msgstr "重启"
#: menu.sh:1850
msgid "Reboot to arpl"
msgstr "重启到arpl"
#: menu.sh:1851
msgid "Back to shell"
msgstr "退出到shell"
#: menu.sh:1877
msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu"
msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单"

View File

@ -1579,8 +1579,7 @@ function updateArpl() {
fi
done < <(readConfigMap "replace" "/tmp/update-list.yml")
dialog --backtitle "$(backtitle)" --colors --title "${T}" \
--yesno "$(printf "$(TEXT "Arpl updated with success to %s!\nReboot?")" "${TAG}")" 0 0
[ $? -ne 0 ] && continue
--msgbox "$(printf "$(TEXT "Arpl updated with success to %s!\nReboot?")" "${TAG}")" 0 0
arpl-reboot.sh config
}
@ -1842,7 +1841,35 @@ while true; do
updateMenu
;;
e)
break
NEXT="e"
while true; do
dialog --backtitle "$(backtitle)" --colors \
--default-item ${NEXT} --menu "$(TEXT "Choose a action")" 0 0 0 \
p "$(TEXT "Poweroff")" \
r "$(TEXT "Reboot")" \
c "$(TEXT "Reboot to arpl")" \
s "$(TEXT "Back to shell")" \
e "$(TEXT "Exit")" \
2>${TMP_PATH}/resp
[ $? -ne 0 ] && break
case "$(<${TMP_PATH}/resp)" in
p)
poweroff
;;
r)
reboot
;;
c)
arpl-reboot.sh config
;;
s)
break 2
;;
e)
break
;;
esac
done
;;
esac
done

View File

@ -23,7 +23,10 @@ SPACELEFT=$(df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print$4}')
echo -n "."
rm -rf "${RAMDISK_PATH}" # Force clean
mkdir -p "${RAMDISK_PATH}"
(cd "${RAMDISK_PATH}"; xz -dc <"${ORI_RDGZ_FILE}" | cpio -idm) >/dev/null 2>&1
(
cd "${RAMDISK_PATH}"
xz -dc <"${ORI_RDGZ_FILE}" | cpio -idm
) >/dev/null 2>&1
# get user data
MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
@ -40,7 +43,7 @@ PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")"
# Check if DSM buildnumber changed
. "${RAMDISK_PATH}/etc/VERSION"
if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] && \
if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] &&
([ ! "${PRODUCTVER}" = "${majorversion}.${minorversion}" ] || [ ! "${BUILDNUM}" = "${buildnumber}" ] || [ ! "${SMALLNUM}" = "${smallfixnumber}" ]); then
OLDVER="${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))"
NEWVER="${majorversion}.${minorversion}(${buildnumber}$([ ${smallfixnumber:-0} -ne 0 ] && echo "u${smallfixnumber}"))"
@ -146,14 +149,14 @@ DT="$(readModelKey "${MODEL}" "dt")"
echo -n "."
mkdir -p "${RAMDISK_PATH}/addons"
echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh"
echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh"
echo 'echo "addons.sh called with params ${@}"' >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export PLATFORM=${PLATFORM}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MODEL=${MODEL}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MLINK=${PATURL}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MCHECKSUM=${PATSUM}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export LAYOUT=${LAYOUT}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export KEYMAP=${KEYMAP}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export PLATFORM=${PLATFORM}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MODEL=${MODEL}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MLINK=${PATURL}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export MCHECKSUM=${PATSUM}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export LAYOUT=${LAYOUT}" >>"${RAMDISK_PATH}/addons/addons.sh"
echo "export KEYMAP=${KEYMAP}" >>"${RAMDISK_PATH}/addons/addons.sh"
chmod +x "${RAMDISK_PATH}/addons/addons.sh"
# Required addons: eudev, disks, wol

View File

@ -1,6 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<script language="javascript"> location.replace(`http://${location.hostname}:5000`)</script>
</head>
</html>