From 410ba19a6527f9522709725c8cf1fc092ceb4c8c Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Fri, 29 Nov 2024 11:35:57 +0800
Subject: [PATCH] update 2024-11-29 11:35:57

---
 luci-app-fakemesh/root/usr/sbin/fakemesh |  5 +-
 v2ray-geoview/Makefile                   | 58 ++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 v2ray-geoview/Makefile

diff --git a/luci-app-fakemesh/root/usr/sbin/fakemesh b/luci-app-fakemesh/root/usr/sbin/fakemesh
index b163604e3..93449ab5c 100644
--- a/luci-app-fakemesh/root/usr/sbin/fakemesh
+++ b/luci-app-fakemesh/root/usr/sbin/fakemesh
@@ -353,7 +353,7 @@ agent_sync_config()
 
 				[ "$enabled" = "1" ] && {
 					for band in $bands; do
-						wbandstr=$(uci show wireless | grep .band=\'${band}\'$ -m1)
+						for wbandstr in $(uci show wireless | grep .band=\'${band}\'$); do
 						if test -n "$wbandstr"; then
 							radio=$(echo $wbandstr | cut -d\. -f2)
 
@@ -382,7 +382,7 @@ agent_sync_config()
 								uci set wireless.wifinet$K.ft_over_ds='1'
 								uci set wireless.wifinet$K.ft_psk_generate_local='1'
 							fi
-							if opkg list-installed | grep -q wpad-basic; then
+							if opkg list-installed 2>/dev/null | grep -q wpad-basic || apk list 2>/dev/null | grep wpad-basic | grep -q installed; then
 								:
 							else
 								uci set wireless.wifinet$K.bss_transition='1'
@@ -396,6 +396,7 @@ agent_sync_config()
 
 							K=$((K+1))
 						fi
+						done
 					done
 				}
 
diff --git a/v2ray-geoview/Makefile b/v2ray-geoview/Makefile
new file mode 100644
index 000000000..cd27bcaae
--- /dev/null
+++ b/v2ray-geoview/Makefile
@@ -0,0 +1,58 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=geoview
+PKG_VERSION:=0.0.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/snowie2000/geoview/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=f0da0db41a886d5a3ad34c0ad7d50eedc32b2e555ca42b65f7117d5cad60fc98
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=snowie2000
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
+
+GO_PKG:=github.com/snowie2000/geoview
+GO_PKG_BUILD_PKG:=github.com/snowie2000/geoview
+
+GO_PKG_LDFLAGS:=-s -w
+
+include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
+
+define geoview/templates
+  define Package/$(1)
+    TITLE:=A geofile toolkit ($(1))
+    URL:=https://github.com/snowie2000/geoview
+    SECTION:=net
+    CATEGORY:=Network
+    SUBMENU:=Web Servers/Proxies
+    DEPENDS:=$$(GO_ARCH_DEPENDS)
+  endef
+
+  define Package/$(1)/description
+  geoview is a handy tool to extract useful information from geo* files.
+
+  This package contains the $(1).
+  endef
+
+  define Package/$(1)/install
+	$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
+
+	$$(INSTALL_DIR) $$(1)/usr/bin
+	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
+  endef
+endef
+
+GEOVIEW_COMPONENTS:=geoview
+
+$(foreach component,$(GEOVIEW_COMPONENTS), \
+  $(eval $(call geoview/templates,$(component))) \
+  $(eval $(call GoBinPackage,$(component))) \
+  $(eval $(call BuildPackage,$(component))) \
+)