xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化脚本

This commit is contained in:
Hyy2001X 2021-05-19 09:23:12 +08:00
parent 27e1eeb168
commit 0a0ebd0321
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Scripts/AutoBuild_Tools.sh
View File

@ -3,7 +3,7 @@
# AutoBuild Module by Hyy2001 # AutoBuild Module by Hyy2001
# AutoBuild_Tools for Openwrt # AutoBuild_Tools for Openwrt
Version=V1.3 Version=V1.3.1
AutoBuild_Tools() { AutoBuild_Tools() {
while : while :
@ -174,7 +174,7 @@ AutoExpand_Core() {
echo "警告: 本次操作将把硬盘: '${Choosed_Disk}' 格式化为 'ext4' 格式,请提前做好数据备份工作!" echo "警告: 本次操作将把硬盘: '${Choosed_Disk}' 格式化为 'ext4' 格式,请提前做好数据备份工作!"
echo "注意: 操作开始后请不要中断任务或进行其他操作,否则可能导致设备数据丢失!" echo "注意: 操作开始后请不要中断任务或进行其他操作,否则可能导致设备数据丢失!"
read -p "是否继续本次操作?[Y/n]:" Choose read -p "是否继续本次操作?[Y/n]:" Choose
[[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]] && sleep 3 && echo "" || { [[ "${Choose}" == [Yy] ]] && sleep 3 && echo "" || {
sleep 3 sleep 3
echo "用户已取消操作." echo "用户已取消操作."
break break
@ -213,7 +213,7 @@ AutoExpand_Core() {
umount -l /mnt/bak umount -l /mnt/bak
echo -e "操作结束,外接硬盘: '${Choosed_Disk}' 已挂载到 '/'.\n" echo -e "操作结束,外接硬盘: '${Choosed_Disk}' 已挂载到 '/'.\n"
read -p "挂载完成后需要重启生效,是否立即重启路由器?[Y/n]:" Choose read -p "挂载完成后需要重启生效,是否立即重启路由器?[Y/n]:" Choose
[[ ${Choose} == Y ]] || [[ ${Choose} == y ]] && { [[ ${Choose} == [Yy] ]] && {
sleep 3 && echo -e "\n正在重启路由器,请耐心等待 ..." sleep 3 && echo -e "\n正在重启路由器,请耐心等待 ..."
sync sync
reboot reboot
@ -362,7 +362,7 @@ do
echo "4. 列出固件信息" echo "4. 列出固件信息"
echo "5. 清除固件下载缓存" echo "5. 清除固件下载缓存"
echo "6. 更改 Github API 地址" echo "6. 更改 Github API 地址"
echo "7. 指定 x86 设备下载 UEFI/Legacy 引导的固件" [[ "${DEFAULT_Device}" == x86_64 ]] && echo "7. 指定 x86 设备下载 UEFI/Legacy 引导的固件"
echo -e "\nx. 更新 [AutoUpdate] 脚本" echo -e "\nx. 更新 [AutoUpdate] 脚本"
echo -e "q. 返回\n" echo -e "q. 返回\n"
read -p "请从上方选择一个操作:" Choose read -p "请从上方选择一个操作:" Choose
@ -537,4 +537,5 @@ Samba_Disk_List="${Samba_Temp}/Disk_List"
Samba_UCI_List="${Samba_Temp}/UCI_List" Samba_UCI_List="${Samba_Temp}/UCI_List"
[ ! -d "${Samba_Temp}" ] && mkdir -p "${Samba_Temp}" [ ! -d "${Samba_Temp}" ] && mkdir -p "${Samba_Temp}"
Github_Raw="https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master" Github_Raw="https://raw.githubusercontent.com/Hyy2001X/AutoBuild-Actions/master"
[ -f /etc/openwrt_info ] && source /etc/openwrt_info
AutoBuild_Tools AutoBuild_Tools

4
Scripts/AutoUpdate.sh
View File

@ -72,7 +72,7 @@ Install_Pkg() {
} || { } || {
TIME && read -p "未安装[${PKG_NAME}],是否执行安装?[Y/n]:" Choose TIME && read -p "未安装[${PKG_NAME}],是否执行安装?[Y/n]:" Choose
} }
if [[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]];then if [[ "${Choose}" == [Yy] ]];then
TIME "开始安装[${PKG_NAME}],请耐心等待...\n" TIME "开始安装[${PKG_NAME}],请耐心等待...\n"
opkg update > /dev/null 2>&1 opkg update > /dev/null 2>&1
opkg install ${PKG_NAME} opkg install ${PKG_NAME}
@ -350,7 +350,7 @@ if [[ ! "${Force_Update}" == 1 ]];then
if [[ "${CURRENT_Version}" == "${CLOUD_Version}" ]];then if [[ "${CURRENT_Version}" == "${CLOUD_Version}" ]];then
[[ "${AutoUpdate_Mode}" == 1 ]] && exit 0 [[ "${AutoUpdate_Mode}" == 1 ]] && exit 0
TIME && read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose TIME && read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose
[[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]] && { [[ "${Choose}" == [Yy] ]] && {
TIME g "开始强制更新固件..." TIME g "开始强制更新固件..."
} || { } || {
TIME y "已取消强制更新,退出更新程序..." TIME y "已取消强制更新,退出更新程序..."