bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CONFIG_ENV conflicts by ensuring clean updates for IP4 and IP6

Browse Source
This commit is contained in:
Whispering Wind
2025-03-24 01:01:39 +03:30
committed by GitHub
parent 64fd31744e
commit f51021555a
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/scripts/hysteria2/ip.sh
View File

@ -1,12 +1,19 @@
#!/bin/bash #!/bin/bash
source /etc/hysteria/core/scripts/path.sh source /etc/hysteria/core/scripts/path.sh
# ensure_config_env() { if [ ! -f "$CONFIG_ENV" ]; then
# if [ ! -f "$CONFIG_ENV" ]; then echo "CONFIG_ENV not found. Creating a new one..."
# echo ".configs.env not found. Creating it with default SNI=bts.com." touch "$CONFIG_ENV"
# echo "SNI=bts.com" > "$CONFIG_ENV" fi
# fi
# } update_config() {
local key=$1
local value=$2
sed -i "/^$key=/d" "$CONFIG_ENV" 2>/dev/null
echo "$key=$value" >> "$CONFIG_ENV"
}
add_ips() { add_ips() {
ipv4_address="" ipv4_address=""
@ -16,7 +23,7 @@ add_ips() {
for interface in $interfaces; do for interface in $interfaces; do
if ip addr show "$interface" > /dev/null 2>&1; then if ip addr show "$interface" > /dev/null 2>&1; then
ipv4=$(ip -o -4 addr show "$interface" | awk '{print $4}' | grep -vE '^(127\.|10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[0-1]))' | head -n 1 | cut -d/ -f1) ipv4=$(ip -o -4 addr show "$interface" | awk '{print $4}' | grep -vE '^(127\\.|10\\.|192\\.168\\.|172\\.(1[6-9]|2[0-9]|3[0-1]))' | head -n 1 | cut -d/ -f1)
if [[ -z $ipv4_address && -n $ipv4 ]]; then if [[ -z $ipv4_address && -n $ipv4 ]]; then
ipv4_address=$ipv4 ipv4_address=$ipv4
fi fi
@ -28,13 +35,11 @@ add_ips() {
fi fi
done done
sed -i '/^IP4=/d' "$CONFIG_ENV" 2>/dev/null update_config "IP4" "${ipv4_address:-}"
sed -i '/^IP6=/d' "$CONFIG_ENV" 2>/dev/null update_config "IP6" "${ipv6_address:-}"
echo -e "\nIP4=${ipv4_address:-}" >> "$CONFIG_ENV"
echo "IP6=${ipv6_address:-}" >> "$CONFIG_ENV" echo "Updated IP4=${ipv4_address:-Not Found}"
# echo "IPs have been added to $CONFIG_ENV:" echo "Updated IP6=${ipv6_address:-Not Found}"
# echo "IP4=${ipv4_address:-Not Found}"
# echo "IP6=${ipv6_address:-Not Found}"
} }
edit_ip() { edit_ip() {
@ -42,19 +47,16 @@ edit_ip() {
local new_ip=$2 local new_ip=$2
if [[ $type == "-4" ]]; then if [[ $type == "-4" ]]; then
sed -i '/^IP4=/d' "$CONFIG_ENV" 2>/dev/null update_config "IP4" "$new_ip"
echo "IP4=$new_ip" >> "$CONFIG_ENV"
echo "IP4 has been updated to $new_ip." echo "IP4 has been updated to $new_ip."
elif [[ $type == "-6" ]]; then elif [[ $type == "-6" ]]; then
sed -i '/^IP6=/d' "$CONFIG_ENV" 2>/dev/null update_config "IP6" "$new_ip"
echo "IP6=$new_ip" >> "$CONFIG_ENV"
echo "IP6 has been updated to $new_ip." echo "IP6 has been updated to $new_ip."
else else
echo "Invalid option. Use -4 for IPv4 or -6 for IPv6." echo "Invalid option. Use -4 for IPv4 or -6 for IPv6."
fi fi
} }
# ensure_config_env
case "$1" in case "$1" in
add) add)
add_ips add_ips