更新时允许 root 拉取 hypernode 目录,并覆盖不一致的控制台文件。
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+9
-1
@@ -53,6 +53,10 @@ repo_ready() {
|
|||||||
[[ -f "${1}/app/main.py" && -f "${1}/requirements.txt" && -f "${1}/deploy/manage.sh" ]]
|
[[ -f "${1}/app/main.py" && -f "${1}/requirements.txt" && -f "${1}/deploy/manage.sh" ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
git_in_install() {
|
||||||
|
git -c safe.directory="${INSTALL_ROOT}" -C "${INSTALL_ROOT}" "$@"
|
||||||
|
}
|
||||||
|
|
||||||
require_root() {
|
require_root() {
|
||||||
if [[ "$(id -u)" -ne 0 ]]; then
|
if [[ "$(id -u)" -ne 0 ]]; then
|
||||||
echo "请使用 root 执行。可以先 sudo -i,再运行安装命令。" >&2
|
echo "请使用 root 执行。可以先 sudo -i,再运行安装命令。" >&2
|
||||||
@@ -262,7 +266,11 @@ cmd_update() {
|
|||||||
log "更新程序"
|
log "更新程序"
|
||||||
install_packages
|
install_packages
|
||||||
if [[ -d "${INSTALL_ROOT}/.git" ]]; then
|
if [[ -d "${INSTALL_ROOT}/.git" ]]; then
|
||||||
git -C "${INSTALL_ROOT}" pull --ff-only origin "${GIT_BRANCH}"
|
if ! git_in_install diff --quiet -- web; then
|
||||||
|
log "控制台文件与仓库不一致,按仓库版本覆盖 web/"
|
||||||
|
git_in_install checkout -- web
|
||||||
|
fi
|
||||||
|
git_in_install pull --ff-only origin "${GIT_BRANCH}"
|
||||||
else
|
else
|
||||||
ensure_install_tree
|
ensure_install_tree
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user