适配最新的协议检查机制
This commit is contained in:
@@ -186,6 +186,42 @@ update_config() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_eula() {
|
||||||
|
# 首先计算当前EULA的MD5值
|
||||||
|
current_md5=$(md5sum ${INSTALL_DIR}/repo/EULA.md | awk '{print $1}')
|
||||||
|
|
||||||
|
# 首先计算当前隐私条款文件的哈希值
|
||||||
|
current_md5_privacy=$(md5sum ${INSTALL_DIR}/repo/PRIVACY.md | awk '{print $1}')
|
||||||
|
|
||||||
|
# 检查eula.confirmed文件是否存在
|
||||||
|
if [[ -f repo/elua.confirmed ]]; then
|
||||||
|
# 如果存在则检查其中包含的md5与current_md5是否一致
|
||||||
|
confirmed_md5=$(cat ${INSTALL_DIR}/repo/elua.confirmed)
|
||||||
|
else
|
||||||
|
confirmed_md5=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查privacy.confirmed文件是否存在
|
||||||
|
if [[ -f repo/privacy ]]; then
|
||||||
|
# 如果存在则检查其中包含的md5与current_md5是否一致
|
||||||
|
confirmed_md5_privacy=$(cat ${INSTALL_DIR}/repo/privacy.confirmed)
|
||||||
|
else
|
||||||
|
confirmed_md5_privacy=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 如果EULA或隐私条款有更新,提示用户重新确认
|
||||||
|
if [[ $current_md5 != $confirmed_md5 || $current_md5_privacy != $confirmed_md5_privacy ]]; then
|
||||||
|
whiptail --title "📜 使用协议更新" --yesno "检测到麦麦Bot EULA或隐私条款已更新。\nhttps://github.com/SengokuCola/MaiMBot/blob/main/EULA.md\nhttps://github.com/SengokuCola/MaiMBot/blob/main/PRIVACY.md\n\n您是否同意上述协议? \n\n " 12 70
|
||||||
|
if [[ $? -eq 0 ]]; then
|
||||||
|
echo $current_md5 > ${INSTALL_DIR}/repo/elua.confirmed
|
||||||
|
echo $current_md5_privacy > ${INSTALL_DIR}/repo/privacy.confirmed
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
# ----------- 主安装流程 -----------
|
# ----------- 主安装流程 -----------
|
||||||
run_installation() {
|
run_installation() {
|
||||||
# 1/6: 检测是否安装 whiptail
|
# 1/6: 检测是否安装 whiptail
|
||||||
@@ -195,7 +231,7 @@ run_installation() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# 协议确认
|
# 协议确认
|
||||||
if ! (whiptail --title "ℹ️ [1/6] 使用协议" --yes-button "我同意" --no-button "我拒绝" --yesno "使用麦麦Bot及此脚本前请先阅读ELUA协议\nhttps://github.com/SengokuCola/MaiMBot/blob/main/EULA.md\n\n您是否同意此协议?" 12 70); then
|
if ! (whiptail --title "ℹ️ [1/6] 使用协议" --yes-button "我同意" --no-button "我拒绝" --yesno "使用麦麦Bot及此脚本前请先阅读ELUA协议及隐私协议\nhttps://github.com/SengokuCola/MaiMBot/blob/main/EULA.md\nhttps://github.com/SengokuCola/MaiMBot/blob/main/PRIVACY.md\n\n您是否同意上述协议?" 12 70); then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -355,7 +391,15 @@ run_installation() {
|
|||||||
pip install -r repo/requirements.txt
|
pip install -r repo/requirements.txt
|
||||||
|
|
||||||
echo -e "${GREEN}同意协议...${RESET}"
|
echo -e "${GREEN}同意协议...${RESET}"
|
||||||
touch repo/elua.confirmed
|
|
||||||
|
# 首先计算当前EULA的MD5值
|
||||||
|
current_md5=$(md5sum repo/EULA.md | awk '{print $1}')
|
||||||
|
|
||||||
|
# 首先计算当前隐私条款文件的哈希值
|
||||||
|
current_md5_privacy=$(md5sum repo/PRIVACY.md | awk '{print $1}')
|
||||||
|
|
||||||
|
echo $current_md5 > repo/elua.confirmed
|
||||||
|
echo $current_md5_privacy > repo/privacy.confirmed
|
||||||
|
|
||||||
echo -e "${GREEN}创建系统服务...${RESET}"
|
echo -e "${GREEN}创建系统服务...${RESET}"
|
||||||
cat > /etc/systemd/system/${SERVICE_NAME}.service <<EOF
|
cat > /etc/systemd/system/${SERVICE_NAME}.service <<EOF
|
||||||
@@ -408,9 +452,10 @@ EOF
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# 如果已安装显示菜单
|
# 如果已安装显示菜单,并检查协议是否更新
|
||||||
if check_installed; then
|
if check_installed; then
|
||||||
load_install_info
|
load_install_info
|
||||||
|
check_eula
|
||||||
show_menu
|
show_menu
|
||||||
else
|
else
|
||||||
run_installation
|
run_installation
|
||||||
|
|||||||
Reference in New Issue
Block a user