Skip to content

Commit

Permalink
Support EXTRA_PROXY_CLIENT, refine IPv6 preffer
Browse files Browse the repository at this point in the history
  • Loading branch information
EkkoG committed Sep 24, 2023
1 parent 7757d13 commit d31cd6c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,18 +167,18 @@ sed -i '/CONFIG_VHDX_IMAGES/ c\# CONFIG_VHDX_IMAGES is not set' .config
# base packages
all_packages="luci luci-compat luci-lib-ipkg luci-i18n-opkg-zh-cn -dnsmasq dnsmasq-full luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn openssl-util"

if [ "$PROXY_CLIENT" = "openclash" ]; then
if [ "$PROXY_CLIENT" = "openclash" ] || [[ "$EXTRA_PROXY_CLIENT" =~ "openclash" ]]; then
# openclash
all_packages="$all_packages luci-app-openclash clash-meta-for-openclash"

mkdir -p files/etc/openclash/config
wget --user-agent='clash' $CLASH_CONFIG_URL -O files/etc/openclash/config/config.yaml

elif [ "$PROXY_CLIENT" = "passwall" ]; then
all_packages="$all_packages luci-app-passwall luci-i18n-passwall-zh-cn"
elif [ "$PROXY_CLIENT" = "passwall" ] || [[ "$EXTRA_PROXY_CLIENT" =~ "passwall" ]]; then
all_packages="$all_packages luci-i18n-passwall-zh-cn"

elif [ "$PROXY_CLIENT" = "daed" ]; then
all_packages="$all_packages v2ray-geoip v2ray-geosite daed-geoip daed-geosite luci-app-daed"
elif [ "$PROXY_CLIENT" = "daed" ] || [[ "$EXTRA_PROXY_CLIENT" =~ "daed" ]]; then
all_packages="$all_packages daed-geoip daed-geosite luci-app-daed"
fi

# printenv | grep 'CONFIG_', export all config
Expand Down
2 changes: 1 addition & 1 deletion files/etc/uci-defaults/99-ipv6
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [ $DISABLE_PREFFER_IPV6 = 1 ]; then
fi

uci batch << EOF

delete network.globals.ula_prefix
del dhcp.lan
set dhcp.lan=dhcp
set dhcp.lan.interface='lan'
Expand Down

0 comments on commit d31cd6c

Please sign in to comment.