diff --git a/deploy/zd-host.sh b/deploy/zd-host.sh index 52778c8..91fd15a 100644 --- a/deploy/zd-host.sh +++ b/deploy/zd-host.sh @@ -18,8 +18,10 @@ VER="${1:?用法: deploy/zd-host.sh }" TAG="homedash:ui-${VER}" STAMP="$(date +%Y%m%d%H%M%S)" -[ -n "$HOST" ] || { echo "!! 请指定目标机:NAVI_HOST=user@host bash $0 ..." >&2; exit 2; } HOST="${NAVI_HOST:-}" # 必填:NAVI_HOST=user@host(仓库不预置任何真实地址) + +# 必填校验要在赋值之后(set -u 下提前引用会直接 unbound variable) +[ -n "$HOST" ] || { echo "!! 请指定目标机:NAVI_HOST=user@host bash $0 <版本>" >&2; exit 2; } SSH_PASS="${NAVI_SSH_PASS:-}" DATA_DIR="${NAVI_DATA_DIR:-/vol1/docker/navi-data}" CERT_DIR="${NAVI_CERT_DIR:-/vol1/docker/cert}" diff --git a/deploy/zd.sh b/deploy/zd.sh index 35a4097..b6a48f4 100755 --- a/deploy/zd.sh +++ b/deploy/zd.sh @@ -25,8 +25,10 @@ VER="${1:?用法: deploy/zd.sh }" TAG="homedash:ui-${VER}" STAMP="$(date +%Y%m%d%H%M%S)" -[ -n "$HOST" ] || { echo "!! 请指定目标机:NAVI_HOST=user@host bash $0 ..." >&2; exit 2; } HOST="${NAVI_HOST:-}" # 必填:NAVI_HOST=user@host + +# 必填校验要在赋值之后(set -u 下提前引用会直接 unbound variable) +[ -n "$HOST" ] || { echo "!! 请指定目标机:NAVI_HOST=user@host bash $0 <版本>" >&2; exit 2; } SSH_PASS="${NAVI_SSH_PASS:-}" UPSTREAM_HOST="${NAVI_UPSTREAM_HOST:-dashy.example.com}" PORTAL_CONF="${NAVI_PORTAL_CONF:-/vol1/docker/portal/nginx/nginx.conf}"