Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-04 07:38:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

updater: Fix find base package after ZIP unpack

Browse Source
This commit is contained in:
remittor
2025-12-25 14:54:49 +03:00
parent ecf49f1be8
commit d14f26a8cb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zapret/update-pkg.sh
View File

@@ -383,15 +383,19 @@ if [ "$opt_update" != "" ]; then
echo "------ Downloaded packages:" echo "------ Downloaded packages:"
echo "$ZAP_PKG_LIST" echo "$ZAP_PKG_LIST"
echo "------" echo "------"
if [ "$PKG_MGR" != "apk" ]; then
ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret2_*.${ZAP_PKG_EXT}" | head -n 1 ) ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret2_*.${ZAP_PKG_EXT}" | head -n 1 )
ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-*.${ZAP_PKG_EXT}" | head -n 1 ) else
ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret2-[0-9]*.?*.${ZAP_PKG_EXT}" | head -n 1 )
fi
ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-zapret2*.${ZAP_PKG_EXT}" | head -n 1 )
if [ ! -f "$ZAP_PKG_BASE_FN" ]; then if [ ! -f "$ZAP_PKG_BASE_FN" ]; then
echo "ERROR: File \"zapret2_*.${ZAP_PKG_EXT}\" not found!" echo "ERROR: File \"zapret2*.${ZAP_PKG_EXT}\" not found!"
return 231 return 231
fi fi
echo "ZAP_PKG_BASE_FN = $ZAP_PKG_BASE_FN" echo "ZAP_PKG_BASE_FN = $ZAP_PKG_BASE_FN"
if [ ! -f "$ZAP_PKG_LUCI_FN" ]; then if [ ! -f "$ZAP_PKG_LUCI_FN" ]; then
echo "ERROR: File \"luci-app-*.${ZAP_PKG_EXT}\" not found!" echo "ERROR: File \"luci-app-zapret2*.${ZAP_PKG_EXT}\" not found!"
return 232 return 232
fi fi
echo "ZAP_PKG_LUCI_FN = $ZAP_PKG_LUCI_FN" echo "ZAP_PKG_LUCI_FN = $ZAP_PKG_LUCI_FN"