cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-03 12:53:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🍉 Sync 2026-10-05 00:22:14

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-10-05 00:22:14 +08:00
1 parent 6d2e4f3868
commit 48e9eb5630
18 files changed
+3077 -3028
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-passwall/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.10.4
PKG_RELEASE:=313
PKG_RELEASE:=314
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm
+3 -3
View File
@@ -79,14 +79,14 @@ local com = self.com
}
}
function onRequestError(btn, errorMessage) {
function onRequestError(btn, errorMessage, checking) {
setButtonDisabled(btn, false);
btn.value = retryText;
var app = btn.getAttribute('data-update-app');
var detailId = app === appname ? appname + '-check_btn' : '_' + app + '-check_btn';
var ckeckDetailElm = document.getElementById(detailId + '-detail');
if (app === appname) errorMessage = errorMessage ? updateFailedText : unknownErrorText;
if (app === appname && !checking) errorMessage = errorMessage ? updateFailedText : unknownErrorText;
if (errorMessage && ckeckDetailElm) {
ckeckDetailElm.textContent = errorMessage
}
@@ -117,7 +117,7 @@ local com = self.com
removePageNotice();
if (!json || json.code) {
appInfoList[app] = undefined;
onRequestError(btn, json && (json.error || updateFailedText));
onRequestError(btn, json && json.error, true);
} else {
appInfoList[app] = json;
if (json.has_update) {
luci-app-passwall/root/usr/share/passwall/luci_update.sh
+3 -7
View File
@@ -6,14 +6,10 @@ manager="$3"
force="$4"
if [ "$manager" = apk ]; then
apk add --allow-untrusted "$dir/luci-app-${CONFIG}.apk" "$dir/luci-i18n-${CONFIG}-zh-cn.apk"
extra=""
[ "$force" = 1 ] && extra="--force-reinstall --force-overwrite"
apk add --allow-untrusted $extra "$dir/luci-app-${CONFIG}.apk" "$dir/luci-i18n-${CONFIG}-zh-cn.apk"
result=$?
if [ "$result" = 0 ] && [ "$force" = 1 ]; then
apk mkndx --allow-untrusted --pkgname-spec '${name}.apk' -o "$dir/Packages.adb" \
"$dir/luci-app-${CONFIG}.apk" "$dir/luci-i18n-${CONFIG}-zh-cn.apk" &&
apk --allow-untrusted --repository "$dir/Packages.adb" fix --reinstall "luci-app-${CONFIG}" "luci-i18n-${CONFIG}-zh-cn"
result=$?
fi
else
extra=""
[ "$force" = 1 ] && extra="--force-reinstall"