From ad413b32e3ca16870042bd23c7bffdbedaf7bcf4 Mon Sep 17 00:00:00 2001 From: wukongdaily <2666180@gmail.com> Date: Mon, 8 Jul 2024 16:48:23 +0800 Subject: [PATCH] Update op.sh --- zero3/op.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/zero3/op.sh b/zero3/op.sh index b9245ca..a499679 100644 --- a/zero3/op.sh +++ b/zero3/op.sh @@ -112,7 +112,7 @@ install_1panel_on_openwrt() { # 安装istoreOS版本1panel install_istorepanel() { green "请务必确保您使用的是iStoreOS系统 回车或输入y来确定" - yellow "并且移除了之前安装过的通用版1panel容器(y|n)" + yellow "并且停止正在运行的istorepanel容器(y|n)" read -r answer if [ "$answer" = "y" ] || [ -z "$answer" ]; then green "先确保安装了iStore增强" @@ -139,11 +139,9 @@ install_istorepanel() { # 去除末尾的 '/docker' 部分 config_root_dir=$(dirname "$docker_root_dir") config_path="${config_root_dir}/Configs/1Panel" - green "是否将配置文件存放在下面的目录" + green "1Panel配置文件存放在下面的目录" yellow "$config_path" - cyan "请回车继续或者输入n退出" - read -r isConfig - if [ "$isConfig" = "y" ] || [ -z "$isConfig" ]; then + if [ -d "$config_path" ]; then uci set istorepanel.@main[0].config_path=$config_path uci commit istorepanel wget -qO /tmp/istorepanel.sh https://cafe.cpolar.cn/wkdaily/zero3/raw/branch/main/zero3/istorepanel.sh @@ -157,9 +155,7 @@ install_istorepanel() { cyan "http://$lan_ip:10086/entrance" green "或者跳转到上述页面, 直接打开1panel面板" else - greenline "————————————————————————————————————————————————————" - green "http://$lan_ip/cgi-bin/luci/admin/services/istorepanel" - green "跳转到上述页面,手动点击 【安装】按钮 来启用1panel" + red "安装失败,请检查1Panel配置文件的目录是否存在" fi else yellow "您选择了不安装"