fix: bbr fail in archlinux; fish.py escape invalid

Signed-off-by: lxl66566 <[email protected]>

Author: lxl66566

external_scripts/bbr.sh

@@ -31,10 +31,12 @@ enable_bbr() {
     fi
 
     # 启用 BBR
-    echo "net.core.default_qdisc=fq" >> /etc/sysctl.conf
-    echo "net.ipv4.tcp_congestion_control=bbr" >> /etc/sysctl.conf
+    rm -f /etc/sysctl.d/bbr.conf
+    echo "net.core.default_qdisc=fq" >> /etc/sysctl.d/bbr.conf
+    echo "net.ipv4.tcp_congestion_control=bbr" >> /etc/sysctl.d/bbr.conf
 
     # 应用新的配置
+    modprobe tcp_bbr || true
     sysctl -p
 
     # 再次检查是否成功启用 BBR

init-script/install/__init__.py

@@ -604,14 +604,20 @@ def pre_install_caddy():
     )
 )
 
+
+def install_bbr():
+    rc_sudo(
+        f'bash {Path(__file__).parent.parent.parent / "external_scripts/bbr.sh"}',
+        check=False,
+    )
+
+
 packages_list.add(
     Package(
         "bbr",
         level=2,
         pre_install_fun=lambda: True,
-        install_fun=lambda: rc_sudo(
-            f'bash {Path(__file__).parent.parent.parent / "external_scripts/bbr.sh"}'
-        ),
+        install_fun=install_bbr,
     )
 )
 

init-script/install/fish.py

@@ -10,7 +10,7 @@
 def install_fish_on_debian():
     url = "https://download.opensuse.org/repositories/shells:/fish:/nightly:/master/Debian_10/amd64/"
     package_name = rc(
-        f"""curl {url} | grep -Po "fish_3\..*?\.deb?" | tail -1""",
+        rf"""curl {url} | grep -Po "fish_3\..*?\.deb?" | tail -1""",
         capture_output=True,
         text=True,
     ).stdout.strip()  # type: ignore