Skip to content

fix: PassWall/PassWall2 install deps check and i18n lazy download #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HouJia wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: PassWall/PassWall2 install deps check and i18n lazy download #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcd7abf
fix: stabilize PassWall2 install dependency flow
HouJia May 7, 2026
23476e2
fix: gate PassWall dependencies with install-state checks
HouJia May 7, 2026
fa81bbb
refactor: keep LANG_IPK variable with lazy assignment
HouJia May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions passwall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,31 @@ need_cmd() {
command -v "$1" >/dev/null 2>&1 || die "缺少命令: $1"
}

pkg_installed() {
pkg="$1"
opkg status "$pkg" 2>/dev/null | grep -q '^Status: install '
}

install_if_missing_from_dir() {
pkg="$1"
dir="$2"

if pkg_installed "$pkg"; then
log "依赖检查: $pkg 已安装，跳过"
return 0
fi

log "依赖检查: $pkg 未安装，开始下载并安装"
ipk_path="$(download_pkg_from_dir "$pkg" "$dir")" || die "下载 $pkg 失败，请检查 ${dir} 构建是否完整，或稍后重试。"

if opkg install "$ipk_path"; then
log "依赖安装: $pkg 安装完成"
return 0
fi

die "$pkg 安装失败，请执行 opkg update 后重试，或检查第三方源冲突。"
}

refresh_luci() {
rm -rf /tmp/luci-* /tmp/.luci* /tmp/etc/config/ucitrack /var/run/luci-indexcache 2>/dev/null || true
if [ -x /etc/init.d/rpcd ]; then
Expand Down Expand Up @@ -154,10 +179,13 @@ OLD_VER="$(opkg status luci-app-passwall 2>/dev/null | sed -n 's/^Version: //p'
log "当前已安装版本: ${OLD_VER:-not installed}"
log "按接近手动 IPK 的方式安装 / 更新 PassWall"

install_if_missing_from_dir chinadns-ng passwall_packages
install_if_missing_from_dir dns2socks passwall_packages

MAIN_IPK="$(download_pkg_from_dir luci-app-passwall passwall_luci)" || die "下载 luci-app-passwall 失败，请检查当前系统版本/架构是否存在对应构建，或稍后重试。"
LANG_IPK="$(download_pkg_from_dir luci-i18n-passwall-zh-cn passwall_luci)" || die "下载 luci-i18n-passwall-zh-cn 失败，请稍后重试。"
LANG_IPK=""

if ! opkg install "$MAIN_IPK" "$LANG_IPK"; then
if ! opkg install "$MAIN_IPK"; then
cat >&2 <<EOF
[ERROR] PassWall 安装失败。
可能原因：
Expand All @@ -174,6 +202,30 @@ EOF
exit 1
fi

log "主包安装: luci-app-passwall 安装完成，开始检查中文语言包状态"
if opkg files luci-app-passwall 2>/dev/null | grep -q 'passwall\.zh-cn\.lmo'; then
log "语言包检查: 主包已内置 zh-cn，跳过独立安装 luci-i18n-passwall-zh-cn"
elif pkg_installed luci-i18n-passwall-zh-cn; then
log "语言包检查: luci-i18n-passwall-zh-cn 已安装，跳过"
else
log "语言包检查: luci-i18n-passwall-zh-cn 未安装，开始下载并安装"
[ -n "$LANG_IPK" ] || LANG_IPK="$(download_pkg_from_dir luci-i18n-passwall-zh-cn passwall_luci)" || die "下载 luci-i18n-passwall-zh-cn 失败，请稍后重试。"
if ! opkg install "$LANG_IPK"; then
cat >&2 <<EOF
[ERROR] PassWall 中文语言包安装失败。
可能原因：
1. 当前发布包存在文件冲突（主包已内置中文）
2. 当前网络下载异常导致语言包损坏

建议排查：
- 优先确认主包是否已内置中文（一般刷新 LuCI 后可直接显示中文）
- 如需强制安装语言包，可先手动卸载冲突文件后再重试
EOF
exit 1
fi
log "语言包安装: luci-i18n-passwall-zh-cn 安装完成"
fi

NEW_VER="$(opkg status luci-app-passwall 2>/dev/null | sed -n 's/^Version: //p' | head -n1 || true)"
log "安装后版本: ${NEW_VER:-unknown}"

Expand Down
57 changes: 54 additions & 3 deletions passwall2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,31 @@ need_cmd() {
command -v "$1" >/dev/null 2>&1 || die "缺少命令: $1"
}

pkg_installed() {
pkg="$1"
opkg status "$pkg" 2>/dev/null | grep -q '^Status: install '
}

install_if_missing_from_dir() {
pkg="$1"
dir="$2"

if pkg_installed "$pkg"; then
log "依赖检查: $pkg 已安装，跳过"
return 0
fi

log "依赖检查: $pkg 未安装，开始下载并安装"
ipk_path="$(download_pkg_from_dir "$pkg" "$dir")" || die "下载 $pkg 失败，请检查 ${dir} 构建是否完整，或稍后重试。"

if opkg install "$ipk_path"; then
log "依赖安装: $pkg 安装完成"
return 0
fi

die "$pkg 安装失败，请执行 opkg update 后重试，或检查第三方源冲突。"
}

refresh_luci() {
rm -rf /tmp/luci-* /tmp/.luci* /tmp/etc/config/ucitrack /var/run/luci-indexcache 2>/dev/null || true
if [ -x /etc/init.d/rpcd ]; then
Expand Down Expand Up @@ -154,15 +179,18 @@ OLD_VER="$(opkg status luci-app-passwall2 2>/dev/null | sed -n 's/^Version: //p'
log "当前已安装版本: ${OLD_VER:-not installed}"
log "按接近手动 IPK 的方式安装 / 更新 PassWall2"

install_if_missing_from_dir tcping passwall_packages
install_if_missing_from_dir geoview passwall_packages

MAIN_IPK="$(download_pkg_from_dir luci-app-passwall2 passwall2)" || die "下载 luci-app-passwall2 失败，请检查当前系统版本/架构是否存在对应构建，或稍后重试。"
LANG_IPK="$(download_pkg_from_dir luci-i18n-passwall2-zh-cn passwall2)" || die "下载 luci-i18n-passwall2-zh-cn 失败，请稍后重试。"
LANG_IPK=""

if ! opkg install "$MAIN_IPK" "$LANG_IPK"; then
if ! opkg install "$MAIN_IPK"; then
cat >&2 <<EOF
[ERROR] PassWall2 安装失败。
可能原因：
1. 当前固件版本与 PassWall2 预编译包不匹配
2. 当前架构缺少对应依赖包，或软件源中没有兼容构建
2. 当前架构缺少对应构建，或主包与依赖版本不一致
3. 第三方固件重写了软件源，导致依赖解析异常

建议排查：
Expand All @@ -174,6 +202,29 @@ EOF
exit 1
fi

log "主包安装: luci-app-passwall2 安装完成，开始检查中文语言包状态"
if opkg files luci-app-passwall2 2>/dev/null | grep -q 'passwall2\.zh-cn\.lmo'; then
log "语言包检查: 主包已内置 zh-cn，跳过独立安装 luci-i18n-passwall2-zh-cn"
elif pkg_installed luci-i18n-passwall2-zh-cn; then
log "语言包检查: luci-i18n-passwall2-zh-cn 已安装，跳过"
else
[ -n "$LANG_IPK" ] || LANG_IPK="$(download_pkg_from_dir luci-i18n-passwall2-zh-cn passwall2)" || die "下载 luci-i18n-passwall2-zh-cn 失败，请稍后重试。"
if ! opkg install "$LANG_IPK"; then
cat >&2 <<EOF
[ERROR] PassWall2 中文语言包安装失败。
可能原因：
1. 当前发布包存在文件冲突（主包已内置中文）
2. 当前网络下载异常导致语言包损坏

建议排查：
- 优先确认主包是否已内置中文（一般刷新 LuCI 后可直接显示中文）
- 如需强制安装语言包，可先手动卸载冲突文件后再重试
EOF
exit 1
fi
log "语言包安装: luci-i18n-passwall2-zh-cn 安装完成"
fi

NEW_VER="$(opkg status luci-app-passwall2 2>/dev/null | sed -n 's/^Version: //p' | head -n1 || true)"
log "安装后版本: ${NEW_VER:-unknown}"

Expand Down