From 8a0fba8efceb4d57278659f818ae8f8069af20d2 Mon Sep 17 00:00:00 2001 From: OPPEN321 Date: Wed, 24 Sep 2025 11:02:34 +0800 Subject: [PATCH] Update 01-prepare_package.sh --- scripts/01-prepare_package.sh | 99 +++++++++++++++++------------------ 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/scripts/01-prepare_package.sh b/scripts/01-prepare_package.sh index b6f3517..f698870 100644 --- a/scripts/01-prepare_package.sh +++ b/scripts/01-prepare_package.sh @@ -1,30 +1,30 @@ #!/bin/bash -e # autocore -git clone https://$github/sbwml/autocore-arm -b openwrt-24.10 package/system/autocore +git clone https://github.com/sbwml/autocore-arm -b openwrt-24.10 package/system/autocore # golang 1.25 rm -rf feeds/packages/lang/golang -git clone https://$github/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang +git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang # node - prebuilt rm -rf feeds/packages/lang/node -git clone https://$github/sbwml/feeds_packages_lang_node-prebuilt feeds/packages/lang/node -b packages-24.10 +git clone https://github.com/sbwml/feeds_packages_lang_node-prebuilt feeds/packages/lang/node -b packages-24.10 # default settings -git clone https://$github/zhiern/default-settings package/new/default-settings -b openwrt-24.10 +git clone https://github.com/BlueStack-Sky/default-settings package/new/default-settings -b openwrt-24.10 # linkease -git clone https://$github/zhiern/package_new_linkease package/new/linkease +git clone https://github.com/sbwml/package_new_istore package/new/linkease # luci-app-quickfile -git clone https://$github/sbwml/luci-app-quickfile package/new/quickfile +git clone https://github.com/sbwml/luci-app-quickfile package/new/quickfile # luci-app-airplay2 -git clone https://$github/sbwml/luci-app-airplay2 package/new/airplay2 +git clone https://github.com/sbwml/luci-app-airplay2 package/new/airplay2 # luci-app-webdav -git clone https://$github/sbwml/luci-app-webdav package/new/luci-app-webdav +git clone https://github.com/sbwml/luci-app-webdav package/new/luci-app-webdav # ddns - fix boot sed -i '/boot()/,+2d' feeds/packages/net/ddns-scripts/files/etc/init.d/ddns @@ -34,33 +34,31 @@ sed -i 's/stderr 1/stderr 0/g' feeds/packages/net/nlbwmon/files/nlbwmon.init # UPnP rm -rf feeds/{packages/net/miniupnpd,luci/applications/luci-app-upnp} -git clone https://$gitea/zhao/miniupnpd feeds/packages/net/miniupnpd -b v2.3.9 -git clone https://$gitea/zhao/luci-app-upnp feeds/luci/applications/luci-app-upnp -b openwrt-24.10 +git clone https://git.kejizero.online/zhao/miniupnpd feeds/packages/net/miniupnpd -b v2.3.9 +git clone https://git.kejizero.online/zhao/luci-app-upnp feeds/luci/applications/luci-app-upnp -b openwrt-24.10 # Docker rm -rf feeds/luci/applications/luci-app-dockerman -git clone https://$gitea/zhao/luci-app-dockerman -b openwrt-24.10 feeds/luci/applications/luci-app-dockerman +git clone https://git.kejizero.online/zhao/luci-app-dockerman -b openwrt-24.10 feeds/luci/applications/luci-app-dockerman rm -rf feeds/packages/utils/{docker,dockerd,containerd,runc} -git clone https://$github/sbwml/packages_utils_docker feeds/packages/utils/docker -git clone https://$github/sbwml/packages_utils_dockerd feeds/packages/utils/dockerd -git clone https://$github/sbwml/packages_utils_containerd feeds/packages/utils/containerd -git clone https://$github/sbwml/packages_utils_runc feeds/packages/utils/runc +git clone https://github.com/sbwml/packages_utils_docker feeds/packages/utils/docker +git clone https://github.com/sbwml/packages_utils_dockerd feeds/packages/utils/dockerd +git clone https://github.com/sbwml/packages_utils_containerd feeds/packages/utils/containerd +git clone https://github.com/sbwml/packages_utils_runc feeds/packages/utils/runc # Use nginx instead of uhttpd -if [ "$web_server" = "nginx" ]; then - sed -i 's/+uhttpd /+luci-nginx /g' feeds/luci/collections/luci/Makefile - sed -i 's/+uhttpd-mod-ubus //' feeds/luci/collections/luci/Makefile - sed -i 's/+uhttpd /+luci-nginx /g' feeds/luci/collections/luci-light/Makefile - sed -i "s/+luci /+luci-nginx /g" feeds/luci/collections/luci-ssl-openssl/Makefile - sed -i "s/+luci /+luci-nginx /g" feeds/luci/collections/luci-ssl/Makefile - sed -i 's/+uhttpd +uhttpd-mod-ubus /+luci-nginx /g' feeds/packages/net/wg-installer/Makefile - sed -i '/uhttpd-mod-ubus/d' feeds/luci/collections/luci-light/Makefile - sed -i 's/+luci-nginx \\$/+luci-nginx/' feeds/luci/collections/luci-light/Makefile -fi +sed -i 's/+uhttpd /+luci-nginx /g' feeds/luci/collections/luci/Makefile +sed -i 's/+uhttpd-mod-ubus //' feeds/luci/collections/luci/Makefile +sed -i 's/+uhttpd /+luci-nginx /g' feeds/luci/collections/luci-light/Makefile +sed -i "s/+luci /+luci-nginx /g" feeds/luci/collections/luci-ssl-openssl/Makefile +sed -i "s/+luci /+luci-nginx /g" feeds/luci/collections/luci-ssl/Makefile +sed -i 's/+uhttpd +uhttpd-mod-ubus /+luci-nginx /g' feeds/packages/net/wg-installer/Makefile +sed -i '/uhttpd-mod-ubus/d' feeds/luci/collections/luci-light/Makefile +sed -i 's/+luci-nginx \\$/+luci-nginx/' feeds/luci/collections/luci-light/Makefile # nginx - latest version rm -rf feeds/packages/net/nginx -git clone https://$github/sbwml/feeds_packages_net_nginx feeds/packages/net/nginx -b openwrt-24.10 +git clone https://github.com/sbwml/feeds_packages_net_nginx feeds/packages/net/nginx -b openwrt-24.10 sed -i 's/procd_set_param stdout 1/procd_set_param stdout 0/g;s/procd_set_param stderr 1/procd_set_param stderr 0/g' feeds/packages/net/nginx/files/nginx.init # nginx - ubus @@ -68,13 +66,12 @@ sed -i 's/ubus_parallel_req 2/ubus_parallel_req 6/g' feeds/packages/net/nginx/fi sed -i '/ubus_parallel_req/a\ ubus_script_timeout 300;' feeds/packages/net/nginx/files-luci-support/60_nginx-luci-support # nginx - config -curl -s $mirror/openwrt/nginx/luci.locations > feeds/packages/net/nginx/files-luci-support/luci.locations -curl -s $mirror/openwrt/nginx/uci.conf.template > feeds/packages/net/nginx-util/files/uci.conf.template +cp -rf ../OpenBox/doc/nginx/luci.locations ./feeds/packages/net/nginx/files-luci-support/ +cp -rf ../OpenBox/doc/nginx/uci.conf.template ./feeds/packages/net/nginx-util/files/ # opkg mkdir -p package/system/opkg/patches -curl -s $mirror/openwrt/patch/opkg/900-opkg-download-disable-hsts.patch > package/system/opkg/patches/900-opkg-download-disable-hsts.patch -curl -s $mirror/openwrt/patch/opkg/901-libopkg-opkg_install-copy-conffiles-to-the-system-co.patch > package/system/opkg/patches/901-libopkg-opkg_install-copy-conffiles-to-the-system-co.patch +cp -rf ../OpenBox/opkg/* ./package/system/opkg/patches/ # uwsgi - fix timeout sed -i '$a cgi-timeout = 600' feeds/packages/net/uwsgi/files-luci-support/luci-*.ini @@ -101,18 +98,18 @@ sed -i 's/env conf_inc/env conf_inc enable/g' feeds/packages/net/frp/files/frpc. sed -i "s/'conf_inc:list(string)'/& \\\\/" feeds/packages/net/frp/files/frpc.init sed -i "/conf_inc:list/a\\\t\t\'enable:bool:0\'" feeds/packages/net/frp/files/frpc.init sed -i '/procd_open_instance/i\\t\[ "$enable" -ne 1 \] \&\& return 1\n' feeds/packages/net/frp/files/frpc.init -curl -s $mirror/openwrt/patch/luci/applications/luci-app-frpc/001-luci-app-frpc-hide-token.patch | patch -p1 -curl -s $mirror/openwrt/patch/luci/applications/luci-app-frpc/002-luci-app-frpc-add-enable-flag.patch | patch -p1 +patch -p1 < ../OpenBox/luci/applications/luci-app-frpc/001-luci-app-frpc-hide-token.patch +patch -p1 < ../OpenBox/luci/applications/luci-app-frpc/002-luci-app-frpc-add-enable-flag.patch # natmap sed -i 's/log_stdout:bool:1/log_stdout:bool:0/g;s/log_stderr:bool:1/log_stderr:bool:0/g' feeds/packages/net/natmap/files/natmap.init pushd feeds/luci - curl -s $mirror/openwrt/patch/luci/applications/luci-app-natmap/0001-luci-app-natmap-add-default-STUN-server-lists.patch | patch -p1 +cat ../OpenBox/luci/applications/luci-app-natmap/0001-luci-app-natmap-add-default-STUN-server-lists.patch | patch -p1 popd # samba4 - bump version rm -rf feeds/packages/net/samba4 -git clone https://$github/sbwml/feeds_packages_net_samba4 feeds/packages/net/samba4 +git clone https://github.com/sbwml/feeds_packages_net_samba4 feeds/packages/net/samba4 # enable multi-channel sed -i '/workgroup/a \\n\t## enable multi-channel' feeds/packages/net/samba4/files/smb.conf.template sed -i '/enable multi-channel/a \\tserver multi channel support = yes' feeds/packages/net/samba4/files/smb.conf.template @@ -130,35 +127,35 @@ sed -i 's/0666/0644/g;s/0777/0755/g' feeds/packages/net/samba4/files/smb.conf.te # aria2 & ariaNG rm -rf feeds/packages/net/ariang rm -rf feeds/luci/applications/luci-app-aria2 -git clone https://$github/sbwml/ariang-nginx package/new/ariang-nginx +git clone https://github.com/sbwml/ariang-nginx package/new/ariang-nginx rm -rf feeds/packages/net/aria2 -git clone https://$github/sbwml/feeds_packages_net_aria2 -b 22.03 feeds/packages/net/aria2 +git clone https://github.com/sbwml/feeds_packages_net_aria2 -b 22.03 feeds/packages/net/aria2 # airconnect -git clone https://$github/sbwml/luci-app-airconnect package/new/airconnect --depth=1 +git clone https://github.com/sbwml/luci-app-airconnect package/new/airconnect --depth=1 # netkit-ftp -git clone https://$github/sbwml/package_new_ftp package/new/ftp +git clone https://github.com/sbwml/package_new_ftp package/new/ftp # SSRP & Passwall rm -rf feeds/packages/net/{xray-core,v2ray-core,v2ray-geodata,sing-box} -git clone https://$github/sbwml/openwrt_helloworld package/new/helloworld -b v5 +git clone https://github.com/BlueStack-Sky/openwrt_helloworld package/new/helloworld -b v5 # openlist -git clone https://$github/sbwml/luci-app-openlist2 package/new/openlist --depth=1 +git clone https://github.com/sbwml/luci-app-openlist2 package/new/openlist --depth=1 # qBittorrent -git clone https://$github/sbwml/luci-app-qbittorrent package/new/qbittorrent --depth=1 +git clone https://github.com/sbwml/luci-app-qbittorrent package/new/qbittorrent --depth=1 # unblockneteasemusic -git clone https://$github/UnblockNeteaseMusic/luci-app-unblockneteasemusic package/new/luci-app-unblockneteasemusic --depth=1 +git clone https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic package/new/luci-app-unblockneteasemusic --depth=1 sed -i 's/解除网易云音乐播放限制/网易云音乐解锁/g' package/new/luci-app-unblockneteasemusic/root/usr/share/luci/menu.d/luci-app-unblockneteasemusic.json # Mosdns -git clone https://$github/sbwml/luci-app-mosdns -b v5 package/new/mosdns --depth=1 +git clone https://github.com/sbwml/luci-app-mosdns -b v5 package/new/mosdns --depth=1 # OpenAppFilter -git clone https://$github/sbwml/OpenAppFilter --depth=1 package/new/OpenAppFilter -b v6 +git clone https://github.com/sbwml/OpenAppFilter --depth=1 package/new/OpenAppFilter -b v6 # iperf3 sed -i "s/D_GNU_SOURCE/D_GNU_SOURCE -funroll-loops/g" feeds/packages/net/iperf3/Makefile @@ -168,7 +165,7 @@ sed -i 's/services/network/g' feeds/luci/applications/luci-app-nlbwmon/root/usr/ sed -i 's/services/network/g' feeds/luci/applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw/config.js # mentohust -git clone https://$github/sbwml/luci-app-mentohust package/new/mentohust +git clone https://github.com/sbwml/luci-app-mentohust package/new/mentohust # luci-compat - fix translation sed -i 's/<%:Up%>/<%:Move up%>/g' feeds/luci/modules/luci-compat/luasrc/view/cbi/tblsection.htm @@ -181,22 +178,22 @@ sed -i 's,frp 客户端,Frp 客户端,g' feeds/luci/applications/luci-app-frpc/p # luci-app-sqm rm -rf feeds/luci/applications/luci-app-sqm -git clone https://$gitea/zhao/luci-app-sqm feeds/luci/applications/luci-app-sqm +git clone https://git.kejizero.online/zhao/luci-app-sqm feeds/luci/applications/luci-app-sqm # unzip rm -rf feeds/packages/utils/unzip -git clone https://$github/sbwml/feeds_packages_utils_unzip feeds/packages/utils/unzip +git clone https://github.com/sbwml/feeds_packages_utils_unzip feeds/packages/utils/unzip # lucky -git clone https://$github/gdy666/luci-app-lucky.git package/new/lucky +git clone https://github.com/gdy666/luci-app-lucky.git package/new/lucky # custom packages rm -rf feeds/packages/utils/coremark -git clone https://$github/sbwml/openwrt_pkgs package/new/custom --depth=1 +git clone https://github.com/sbwml/openwrt_pkgs package/new/custom --depth=1 rm -rf package/new/custom/luci-app-adguardhome # adguardhome -git clone https://$gitea/zhao/luci-app-adguardhome package/new/luci-app-adguardhome +git clone https://git.kejizero.online/zhao/luci-app-adguardhome package/new/luci-app-adguardhome # argon -git clone https://$github/zhiern/luci-theme-argon package/new/luci-theme-argon +git clone https://github.com/BlueStack-Sky/luci-theme-argon package/new/luci-theme-argon