xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ttyd error & change passwall -> passwall2

This commit is contained in:
xopenwrt 2023-12-11 15:30:26 +08:00 committed by GitHub
parent 38dae82f82
commit 224f4c341c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configs/x86_64-X
View File

@ -122,7 +122,7 @@ CONFIG_PACKAGE_luci-app-nfs=y
CONFIG_PACKAGE_luci-app-npc=y CONFIG_PACKAGE_luci-app-npc=y
CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-openclash=y
CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-onliner=y
CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-passwall2=y
CONFIG_PACKAGE_luci-app-pptp-server=y CONFIG_PACKAGE_luci-app-pptp-server=y
CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-qbittorrent=y
# CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set # CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set

2
Configs/x86_64-Y
View File

@ -13,7 +13,7 @@ CONFIG_PACKAGE_luci-theme-argon-mod=y
CONFIG_PACKAGE_luci-theme-neobird=y CONFIG_PACKAGE_luci-theme-neobird=y
CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-edge=y
# passwall # passwall
CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-passwall2=y
# Adguard Home # Adguard Home
CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_adguardhome=y CONFIG_PACKAGE_adguardhome=y

2
Configs/x86_64-Z
View File

@ -18,7 +18,7 @@ CONFIG_PACKAGE_luci-theme-edge=y
CONFIG_PACKAGE_luci-theme-argon-mod=y CONFIG_PACKAGE_luci-theme-argon-mod=y
CONFIG_PACKAGE_luci-theme-neobird=y CONFIG_PACKAGE_luci-theme-neobird=y
# passwall # passwall
CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-passwall2=y
# Adguard Home # Adguard Home
CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_adguardhome=y CONFIG_PACKAGE_adguardhome=y

5
Scripts/AutoBuild_DiyScript.sh
View File

@ -66,7 +66,7 @@ then
fi fi
exit 0 exit 0
EOF EOF
sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config # sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config
# sed -i 's/luci-theme-bootstrap/luci-theme-argon-mod/g' feeds/luci/collections/luci/Makefile # sed -i 's/luci-theme-bootstrap/luci-theme-argon-mod/g' feeds/luci/collections/luci/Makefile
# sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon-mod"' $(PKG_Finder d package default-settings)/files/zzz-default-settings # sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon-mod"' $(PKG_Finder d package default-settings)/files/zzz-default-settings
@ -115,6 +115,7 @@ EOF
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
AddPackage git passwall-luci openwrt-passwall xiaorouji main AddPackage git passwall-luci openwrt-passwall xiaorouji main
AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
AddPackage git other luci-app-dockerman lisaac master AddPackage git other luci-app-dockerman lisaac master
rm -rf packages/lean/autocore # May Can Delete rm -rf packages/lean/autocore # May Can Delete
AddPackage git lean autocore-modify xopenwrt master AddPackage git lean autocore-modify xopenwrt master
@ -128,7 +129,7 @@ EOF
esac esac
;; ;;
immortalwrt/immortalwrt*) immortalwrt/immortalwrt*)
sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config # sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config
;; ;;
esac esac
} }