From 4fe8641b95d55623e4cf097d935b5b4b103d5e16 Mon Sep 17 00:00:00 2001
From: lwb1978 <86697442+lwb1978@users.noreply.github.com>
Date: Sun, 15 Dec 2024 23:56:58 +0800
Subject: [PATCH] Cleaning and adjusting

---
 .github/workflows/makecfg-r68s-im.yml    |  2 +-
 .github/workflows/makecfg-x86-im.yml     |  2 +-
 .github/workflows/openwrt-r68s-im.yml    |  2 +-
 .github/workflows/openwrt-x86-im.yml     |  2 +-
 immortalwrt/diy-part2.sh                 | 10 +---
 immortalwrt/version                      |  1 +
 patch/luci-app-udpxy/po/zh_Hans/udpxy.po | 76 ------------------------
 7 files changed, 7 insertions(+), 88 deletions(-)
 delete mode 100644 patch/luci-app-udpxy/po/zh_Hans/udpxy.po

diff --git a/.github/workflows/makecfg-r68s-im.yml b/.github/workflows/makecfg-r68s-im.yml
index 5e6ad22..f3188c9 100644
--- a/.github/workflows/makecfg-r68s-im.yml
+++ b/.github/workflows/makecfg-r68s-im.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   REPO_URL: https://github.com/immortalwrt/immortalwrt.git
-  REPO_BRANCH: openwrt-24.10
+  REPO_BRANCH: master
   DEVICE_NAME: R68s-Im
   FILES: immortalwrt/files
   FEEDS_CONF: immortalwrt/feeds.conf.default
diff --git a/.github/workflows/makecfg-x86-im.yml b/.github/workflows/makecfg-x86-im.yml
index 946b21b..a5edfb8 100644
--- a/.github/workflows/makecfg-x86-im.yml
+++ b/.github/workflows/makecfg-x86-im.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   REPO_URL: https://github.com/immortalwrt/immortalwrt
-  REPO_BRANCH: openwrt-24.10
+  REPO_BRANCH: master
   DEVICE_NAME: X86-Im
   FILES: immortalwrt/files
   FEEDS_CONF: immortalwrt/feeds.conf.default
diff --git a/.github/workflows/openwrt-r68s-im.yml b/.github/workflows/openwrt-r68s-im.yml
index 8204f55..087d2d8 100644
--- a/.github/workflows/openwrt-r68s-im.yml
+++ b/.github/workflows/openwrt-r68s-im.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   REPO_URL: https://github.com/immortalwrt/immortalwrt.git
-  REPO_BRANCH: openwrt-24.10
+  REPO_BRANCH: master
   DEVICE_NAME: R68s-Im
   FILES: immortalwrt/files
   FEEDS_CONF: immortalwrt/feeds.conf.default
diff --git a/.github/workflows/openwrt-x86-im.yml b/.github/workflows/openwrt-x86-im.yml
index 7e00ca8..1521a91 100644
--- a/.github/workflows/openwrt-x86-im.yml
+++ b/.github/workflows/openwrt-x86-im.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   REPO_URL: https://github.com/immortalwrt/immortalwrt.git
-  REPO_BRANCH: openwrt-24.10
+  REPO_BRANCH: master
   DEVICE_NAME: X86-Im
   FILES: immortalwrt/files
   FEEDS_CONF: immortalwrt/feeds.conf.default
diff --git a/immortalwrt/diy-part2.sh b/immortalwrt/diy-part2.sh
index 26c0c68..3bb07fc 100755
--- a/immortalwrt/diy-part2.sh
+++ b/immortalwrt/diy-part2.sh
@@ -60,9 +60,6 @@ rm -rf feeds/packages/net/udpxy/Makefile
 cp -rf ${GITHUB_WORKSPACE}/patch/udpxy/Makefile feeds/packages/net/udpxy/
 # 修改 udpxy 菜单名称为大写
 sed -i 's#\"title\": \"udpxy\"#\"title\": \"UDPXY\"#g' feeds/luci/applications/luci-app-udpxy/root/usr/share/luci/menu.d/luci-app-udpxy.json
-# 修复 immortalwrt udpxy luci 汉化错误
-# rm -rf feeds/luci/applications/luci-app-udpxy/po
-# cp -rf ${GITHUB_WORKSPACE}/patch/luci-app-udpxy/po feeds/luci/applications/luci-app-udpxy/po
 
 # lukcy大吉
 git clone https://github.com/sirpdboy/luci-app-lucky package/lucky-packages
@@ -78,8 +75,8 @@ merge_package openwrt-24.10 https://github.com/sbwml/luci-theme-argon feeds/luci
 # git clone --depth=1 -b js https://github.com/lwb1978/luci-theme-kucat package/luci-theme-kucat
 
 # unzip
-#rm -rf feeds/packages/utils/unzip
-#git clone https://github.com/sbwml/feeds_packages_utils_unzip feeds/packages/utils/unzip
+rm -rf feeds/packages/utils/unzip
+git clone https://github.com/sbwml/feeds_packages_utils_unzip feeds/packages/utils/unzip
 
 # golang 1.23
 rm -rf feeds/packages/lang/golang
@@ -174,9 +171,6 @@ pushd feeds/packages
 	}
 popd
 
-# 修复编译时提示 freeswitch 缺少 libpcre 依赖
-#sed -i 's/+libpcre \\$/+libpcre2 \\/g' package/feeds/telephony/freeswitch/Makefile
-
 # 修正部分从第三方仓库拉取的软件 Makefile 路径问题
 find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/luci.mk/$(TOPDIR)\/feeds\/luci\/luci.mk/g' {}
 find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/lang\/golang\/golang-package.mk/$(TOPDIR)\/feeds\/packages\/lang\/golang\/golang-package.mk/g' {}
diff --git a/immortalwrt/version b/immortalwrt/version
index e69de29..f8f5e3d 100644
--- a/immortalwrt/version
+++ b/immortalwrt/version
@@ -0,0 +1 @@
+24.10-SNAPSHOT
diff --git a/patch/luci-app-udpxy/po/zh_Hans/udpxy.po b/patch/luci-app-udpxy/po/zh_Hans/udpxy.po
deleted file mode 100644
index 67a77d9..0000000
--- a/patch/luci-app-udpxy/po/zh_Hans/udpxy.po
+++ /dev/null
@@ -1,76 +0,0 @@
-msgid ""
-msgstr ""
-"openwrt/luciapplicationsudpxy/zh_Hans/>\n"
-"Language: zh_Hans\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5-dev\n"
-
-msgid "HTTP Listen interface"
-msgstr "监听绑定 IP/接口"
-
-msgid "Buffer message amount"
-msgstr "缓冲区消息量"
-
-msgid "-1 is all."
-msgstr "-1 表示全部。"
-
-msgid "Ingress buffer size"
-msgstr "缓冲区大小"
-
-msgid "Unit: bytes, Kb, Mb; Max 2097152 bytes"
-msgstr "单位：字节，Kb，Mb；最大 2097152 字节"
-
-msgid "Buffer time limit"
-msgstr "缓冲时间限制"
-
-msgid "-1 is unlimited."
-msgstr "-1 表示无限制。"
-
-msgid "Default"
-msgstr "默认"
-
-msgid "Enabled"
-msgstr "已启用"
-
-msgid "Grant UCI access for luci-app-udpxy"
-msgstr "授予UCI访问luci-app-udpxy的权限"
-
-msgid "Log file"
-msgstr "日志文件"
-
-msgid "Client amount upper limit"
-msgstr "最大客户端数量"
-
-msgid "Renew multicast subscription periodicity"
-msgstr "组播订阅续订周期"
-
-msgid "Unit: seconds; 0 is skip."
-msgstr "单位：秒；0 表示不续订。"
-
-msgid "Nice increment"
-msgstr "优先级增量"
-
-msgid "Port"
-msgstr "端口"
-
-msgid "Respawn"
-msgstr "刷新"
-
-msgid "Multicast subscribe source interface"
-msgstr "组播源 IP/接口"
-
-msgid "Client statistics"
-msgstr "客户端状态信息"
-
-msgid "Verbose logging"
-msgstr "记录详细日志"
-
-msgid "udpxy"
-msgstr "UDPXY"
-
-msgid ""
-"udpxy is an IPTV stream relay, a UDP-to-HTTP multicast traffic relay daemon "
-"which forwards multicast UDP streams to HTTP clients."
-msgstr "udpxy 是 UDP 到 HTTP 的组播流量中继守护程序，它将组播 UDP 流转发到 HTTP 客户端。"