diff --git a/cattools.sh b/cattools.sh index 4e1d0ae..d2f50e6 100644 --- a/cattools.sh +++ b/cattools.sh @@ -4,7 +4,7 @@ DEFAULT_IP="192.168.1.4" RELEASE="/etc/catwrt_release" BACKUP_FILE="/etc/catwrt_opkg_list_installed" API_URL="https://api.miaoer.xyz/api/v2/snippets/catwrt/update" -BASE_URL="https://fastly.jsdelivr.net/gh/miaoermua/cattools@main/repo" +BASE_URL="https://mirror.ghproxy.com/https://raw.githubusercontent.com/miaoermua/cattools/main/repo" AMD64_EFI_SYSUP="https://raw.githubusercontent.com/miaoermua/cattools/main/sysupgrade/amd64/sysup_efi" AMD64_BIOS_SYSUP="https://raw.githubusercontent.com/miaoermua/cattools/main/sysupgrade/amd64/sysup_bios" MT7621_SYSUP="https://raw.githubusercontent.com/miaoermua/cattools/main/sysupgrade/mt7621/" @@ -672,8 +672,8 @@ apply_repo() { ;; mt7621) case "$version" in - v22.12) REPO_URL="$BASE_URL/mt7621" ;; - v24.9) REPO_URL="$BASE_URL/pr/v24.9/mt7621" ;; + v22.12) REPO_URL="$BASE_URL/history/v22.12/mt7621" ;; + v24.9) REPO_URL="$BASE_URL/mt7621" ;; *) echo "Unknown mt7621 version: $version" && exit 1 ;; esac ;; @@ -686,8 +686,7 @@ apply_repo() { echo "本人不对所有软件进行保证,我们没有提供第三方商业服务,使用风险需要自行承担。" echo "你需要同意 CatWrt 软件源用户协议,请确认是否继续。 (10 秒内按 [Ctrl]+[C] 取消操作)" - if { [ "$arch" == "mt7621" ] && [ "$version" == "v24.9" ]; } || \ - { [ "$arch" == "mt798x" ] && [ "$version" == "v24.3" ]; } || \ + if { [ "$arch" == "mt798x" ] && [ "$version" == "v24.3" ]; } || \ { [ "$arch" == "rkarm" ] && [ "$version" == "v24.1" ]; }; then echo "你目前使用的 BETA 版本,只能临时搭建的镜像站软件源,请注意关注 CatWrt 的更新情况,避免软件源失效!" diff --git a/repo/history/v22.12/mt7621/cfnetlify.conf b/repo/history/v22.12/mt7621/cfnetlify.conf new file mode 100644 index 0000000..baee3c5 --- /dev/null +++ b/repo/history/v22.12/mt7621/cfnetlify.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://cfnetlify.catwrt.eu.org/history/v22.12/targets/ramips/mt7621/packages +src/gz openwrt_base https://cfnetlify.catwrt.eu.org/history/v22.12/mipsel_24kc/base +src/gz openwrt_luci https://cfnetlify.catwrt.eu.org/history/v22.12/mipsel_24kc/luci +src/gz openwrt_packages https://cfnetlify.catwrt.eu.org/history/v22.12/mipsel_24kc/packages +src/gz openwrt_routing https://cfnetlify.catwrt.eu.org/history/v22.12/mipsel_24kc/routing +src/gz openwrt_telephony https://cfnetlify.catwrt.eu.org/history/v22.12/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/history/v22.12/mt7621/cfvercel.conf b/repo/history/v22.12/mt7621/cfvercel.conf new file mode 100644 index 0000000..2636073 --- /dev/null +++ b/repo/history/v22.12/mt7621/cfvercel.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://cfvercel.catwrt.eu.org/targets/ramips/mt7621/packages +src/gz openwrt_base https://cfvercel.catwrt.eu.org/mipsel_24kc/base +src/gz openwrt_luci https://cfvercel.catwrt.eu.org/mipsel_24kc/luci +src/gz openwrt_packages https://cfvercel.catwrt.eu.org/mipsel_24kc/packages +src/gz openwrt_routing https://cfvercel.catwrt.eu.org/mipsel_24kc/routing +src/gz openwrt_telephony https://cfvercel.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/history/v22.12/mt7621/distfeeds.conf b/repo/history/v22.12/mt7621/distfeeds.conf new file mode 100644 index 0000000..0dad44a --- /dev/null +++ b/repo/history/v22.12/mt7621/distfeeds.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://repo.miaoer.xyz/history/v22.12/targets/ramips/mt7621/packages +src/gz openwrt_base https://repo.miaoer.xyz/history/v22.12/history/v22.12/mipsel_24kc/base +src/gz openwrt_luci https://repo.miaoer.xyz/history/v22.12/history/v22.12/mipsel_24kc/luci +src/gz openwrt_packages https://repo.miaoer.xyz/history/v22.12/history/v22.12/mipsel_24kc/packages +src/gz openwrt_routing https://repo.miaoer.xyz/history/v22.12/history/v22.12/mipsel_24kc/routing +src/gz openwrt_telephony https://repo.miaoer.xyz/history/v22.12/history/v22.12/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/history/v22.12/mt7621/github.conf b/repo/history/v22.12/mt7621/github.conf new file mode 100644 index 0000000..8fa538d --- /dev/null +++ b/repo/history/v22.12/mt7621/github.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://github.catwrt.eu.org/history/v22.12/targets/ramips/mt7621/packages +src/gz openwrt_base https://github.catwrt.eu.org/history/v22.12/mipsel_24kc/base +src/gz openwrt_luci https://github.catwrt.eu.org/history/v22.12/mipsel_24kc/luci +src/gz openwrt_packages https://github.catwrt.eu.org/history/v22.12/mipsel_24kc/packages +src/gz openwrt_routing https://github.catwrt.eu.org/history/v22.12/mipsel_24kc/routing +src/gz openwrt_telephony https://github.catwrt.eu.org/history/v22.12/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/history/v22.12/mt7621/netlify.conf b/repo/history/v22.12/mt7621/netlify.conf new file mode 100644 index 0000000..31fb622 --- /dev/null +++ b/repo/history/v22.12/mt7621/netlify.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://netlify.catwrt.eu.org/history/v22.12/targets/ramips/mt7621/packages +src/gz openwrt_base https://netlify.catwrt.eu.org/history/v22.12/mipsel_24kc/base +src/gz openwrt_luci https://netlify.catwrt.eu.org/history/v22.12/mipsel_24kc/luci +src/gz openwrt_packages https://netlify.catwrt.eu.org/history/v22.12/mipsel_24kc/packages +src/gz openwrt_routing https://netlify.catwrt.eu.org/history/v22.12/mipsel_24kc/routing +src/gz openwrt_telephony https://netlify.catwrt.eu.org/history/v22.12/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/history/v22.12/mt7621/vercel.conf b/repo/history/v22.12/mt7621/vercel.conf new file mode 100644 index 0000000..3f0ea12 --- /dev/null +++ b/repo/history/v22.12/mt7621/vercel.conf @@ -0,0 +1,6 @@ +src/gz openwrt_core https://vercel.catwrt.eu.org/history/v22.12/targets/ramips/mt7621/packages +src/gz openwrt_base https://vercel.catwrt.eu.org/history/v22.12/mipsel_24kc/base +src/gz openwrt_luci https://vercel.catwrt.eu.org/history/v22.12/mipsel_24kc/luci +src/gz openwrt_packages https://vercel.catwrt.eu.org/history/v22.12/mipsel_24kc/packages +src/gz openwrt_routing https://vercel.catwrt.eu.org/history/v22.12/mipsel_24kc/routing +src/gz openwrt_telephony https://vercel.catwrt.eu.org/history/v22.12/mipsel_24kc/telephony \ No newline at end of file diff --git a/repo/mt7621/cfnetlify.conf b/repo/mt7621/cfnetlify.conf index cf8cc38..a4bcda1 100644 --- a/repo/mt7621/cfnetlify.conf +++ b/repo/mt7621/cfnetlify.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://cfnetlify.catwrt.eu.org/targets/ramips/mt7621/packages -src/gz openwrt_base https://cfnetlify.catwrt.eu.org/mipsel_24kc/base -src/gz openwrt_luci https://cfnetlify.catwrt.eu.org/mipsel_24kc/luci -src/gz openwrt_packages https://cfnetlify.catwrt.eu.org/mipsel_24kc/packages -src/gz openwrt_routing https://cfnetlify.catwrt.eu.org/mipsel_24kc/routing -src/gz openwrt_telephony https://cfnetlify.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://cfnetlify.catwrt.eu.org/targets/mt7621/packages +src/gz openwrt_base https://cfnetlify.catwrt.eu.org/mt7621/base +src/gz openwrt_luci https://cfnetlify.catwrt.eu.org/mt7621/luci +src/gz openwrt_packages https://cfnetlify.catwrt.eu.org/mt7621/packages +src/gz openwrt_routing https://cfnetlify.catwrt.eu.org/mt7621/routing +src/gz openwrt_telephony https://cfnetlify.catwrt.eu.org/mt7621/telephony \ No newline at end of file diff --git a/repo/mt7621/cfvercel.conf b/repo/mt7621/cfvercel.conf index 2636073..165e845 100644 --- a/repo/mt7621/cfvercel.conf +++ b/repo/mt7621/cfvercel.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://cfvercel.catwrt.eu.org/targets/ramips/mt7621/packages -src/gz openwrt_base https://cfvercel.catwrt.eu.org/mipsel_24kc/base -src/gz openwrt_luci https://cfvercel.catwrt.eu.org/mipsel_24kc/luci -src/gz openwrt_packages https://cfvercel.catwrt.eu.org/mipsel_24kc/packages -src/gz openwrt_routing https://cfvercel.catwrt.eu.org/mipsel_24kc/routing -src/gz openwrt_telephony https://cfvercel.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://cfvercel.catwrt.eu.org/targets/mt7621/packages +src/gz openwrt_base https://cfvercel.catwrt.eu.org/mt7621/base +src/gz openwrt_luci https://cfvercel.catwrt.eu.org/mt7621/luci +src/gz openwrt_packages https://cfvercel.catwrt.eu.org/mt7621/packages +src/gz openwrt_routing https://cfvercel.catwrt.eu.org/mt7621/routing +src/gz openwrt_telephony https://cfvercel.catwrt.eu.org/mt7621/telephony \ No newline at end of file diff --git a/repo/mt7621/distfeeds.conf b/repo/mt7621/distfeeds.conf index 4f320bf..d2b2bfe 100644 --- a/repo/mt7621/distfeeds.conf +++ b/repo/mt7621/distfeeds.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://repo.miaoer.xyz/targets/ramips/mt7621/packages -src/gz openwrt_base https://repo.miaoer.xyz/mipsel_24kc/base -src/gz openwrt_luci https://repo.miaoer.xyz/mipsel_24kc/luci -src/gz openwrt_packages https://repo.miaoer.xyz/mipsel_24kc/packages -src/gz openwrt_routing https://repo.miaoer.xyz/mipsel_24kc/routing -src/gz openwrt_telephony https://repo.miaoer.xyz/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://repo.miaoer.xyz/targets/mt7621/packages +src/gz openwrt_base https://repo.miaoer.xyz/mt7621/base +src/gz openwrt_luci https://repo.miaoer.xyz/mt7621/luci +src/gz openwrt_packages https://repo.miaoer.xyz/mt7621/packages +src/gz openwrt_routing https://repo.miaoer.xyz/mt7621/routing +src/gz openwrt_telephony https://repo.miaoer.xyz/mt7621/telephony \ No newline at end of file diff --git a/repo/mt7621/github.conf b/repo/mt7621/github.conf index 465cc20..0790c48 100644 --- a/repo/mt7621/github.conf +++ b/repo/mt7621/github.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://github.catwrt.eu.org/targets/ramips/mt7621/packages -src/gz openwrt_base https://github.catwrt.eu.org/mipsel_24kc/base -src/gz openwrt_luci https://github.catwrt.eu.org/mipsel_24kc/luci -src/gz openwrt_packages https://github.catwrt.eu.org/mipsel_24kc/packages -src/gz openwrt_routing https://github.catwrt.eu.org/mipsel_24kc/routing -src/gz openwrt_telephony https://github.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://github.catwrt.eu.org/targets/mt7621/packages +src/gz openwrt_base https://github.catwrt.eu.org/mt7621/base +src/gz openwrt_luci https://github.catwrt.eu.org/mt7621/luci +src/gz openwrt_packages https://github.catwrt.eu.org/mt7621/packages +src/gz openwrt_routing https://github.catwrt.eu.org/mt7621/routing +src/gz openwrt_telephony https://github.catwrt.eu.org/mt7621/telephony \ No newline at end of file diff --git a/repo/mt7621/netlify.conf b/repo/mt7621/netlify.conf index 70705f9..df747b3 100644 --- a/repo/mt7621/netlify.conf +++ b/repo/mt7621/netlify.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://netlify.catwrt.eu.org/targets/ramips/mt7621/packages -src/gz openwrt_base https://netlify.catwrt.eu.org/mipsel_24kc/base -src/gz openwrt_luci https://netlify.catwrt.eu.org/mipsel_24kc/luci -src/gz openwrt_packages https://netlify.catwrt.eu.org/mipsel_24kc/packages -src/gz openwrt_routing https://netlify.catwrt.eu.org/mipsel_24kc/routing -src/gz openwrt_telephony https://netlify.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://netlify.catwrt.eu.org/targets/mt7621/packages +src/gz openwrt_base https://netlify.catwrt.eu.org/mt7621/base +src/gz openwrt_luci https://netlify.catwrt.eu.org/mt7621/luci +src/gz openwrt_packages https://netlify.catwrt.eu.org/mt7621/packages +src/gz openwrt_routing https://netlify.catwrt.eu.org/mt7621/routing +src/gz openwrt_telephony https://netlify.catwrt.eu.org/mt7621/telephony \ No newline at end of file diff --git a/repo/mt7621/vercel.conf b/repo/mt7621/vercel.conf index 9bf5179..2f21ade 100644 --- a/repo/mt7621/vercel.conf +++ b/repo/mt7621/vercel.conf @@ -1,6 +1,6 @@ -src/gz openwrt_core https://vercel.catwrt.eu.org/targets/ramips/mt7621/packages -src/gz openwrt_base https://vercel.catwrt.eu.org/mipsel_24kc/base -src/gz openwrt_luci https://vercel.catwrt.eu.org/mipsel_24kc/luci -src/gz openwrt_packages https://vercel.catwrt.eu.org/mipsel_24kc/packages -src/gz openwrt_routing https://vercel.catwrt.eu.org/mipsel_24kc/routing -src/gz openwrt_telephony https://vercel.catwrt.eu.org/mipsel_24kc/telephony \ No newline at end of file +src/gz openwrt_core https://vercel.catwrt.eu.org/targets/mt7621/packages +src/gz openwrt_base https://vercel.catwrt.eu.org/mt7621/base +src/gz openwrt_luci https://vercel.catwrt.eu.org/mt7621/luci +src/gz openwrt_packages https://vercel.catwrt.eu.org/mt7621/packages +src/gz openwrt_routing https://vercel.catwrt.eu.org/mt7621/routing +src/gz openwrt_telephony https://vercel.catwrt.eu.org/mt7621/telephony \ No newline at end of file diff --git a/repo/pr/v24.9/mt7621/netlify.conf b/repo/pr/v24.9/mt7621/netlify.conf deleted file mode 100644 index 4aa40af..0000000 --- a/repo/pr/v24.9/mt7621/netlify.conf +++ /dev/null @@ -1,6 +0,0 @@ -src/gz openwrt_core https://deploy-preview-41--catwrt.netlify.app/targets/mt7621/packages -src/gz openwrt_base https://deploy-preview-41--catwrt.netlify.app/mt7621/base -src/gz openwrt_luci https://deploy-preview-41--catwrt.netlify.app/mt7621/luci -src/gz openwrt_packages https://deploy-preview-41--catwrt.netlify.app/mt7621/packages -src/gz openwrt_routing https://deploy-preview-41--catwrt.netlify.app/mt7621/routing -src/gz openwrt_telephony https://deploy-preview-41--catwrt.netlify.app/mt7621/telephony diff --git a/repo/pr/v24.9/mt7621/vercel.conf b/repo/pr/v24.9/mt7621/vercel.conf deleted file mode 100644 index 887236a..0000000 --- a/repo/pr/v24.9/mt7621/vercel.conf +++ /dev/null @@ -1,6 +0,0 @@ -src/gz openwrt_core https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/targets/mt7621/packages -src/gz openwrt_base https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/mt7621/base -src/gz openwrt_luci https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/mt7621/luci -src/gz openwrt_packages https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/mt7621/packages -src/gz openwrt_routing https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/mt7621/routing -src/gz openwrt_telephony https://catwrt-git-v249mt7621-miaoermuas-projects.vercel.app/mt7621/telephony