YunoHost-Apps/adguardhome_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/adguardhome_ynh.git synced 2024-09-03 18:06:23 +02:00
Code Issues Activity Actions

Revert "rework process_ips()"

Browse source 
This reverts commit 1d5e520b73.
This commit is contained in:
OniriCorpe 2023-12-28 01:09:39 +01:00
parent 1a86052659
commit 2e5a03320f
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/_common.sh
View file

@ -60,7 +60,6 @@ process_ips(){
# used to process the IPs to put in the AGH's config file # used to process the IPs to put in the AGH's config file
local ips="$1" local ips="$1"
if [ "$2" == "install" ]; then local install=true; fi
for i in $(seq "$(echo "$ips" | wc -w)" -1 1); do for i in $(seq "$(echo "$ips" | wc -w)" -1 1); do
ip=$(echo "$ips" | awk "{print \$$i}") ip=$(echo "$ips" | awk "{print \$$i}")
@ -70,14 +69,8 @@ process_ips(){
if is_public_ip "$ip" && [ "$open_port_53" == "false" ] ; then if is_public_ip "$ip" && [ "$open_port_53" == "false" ] ; then
break break
else else
# special case for installation, as a dash is required before an IP ips="$ip"
if $install; then break
ips="- $ip"
break
else
ips="$ip"
break
fi
fi fi
fi fi
done done

8
scripts/install
View file

@ -80,11 +80,11 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
# put the network interface in a dedicated dnsmasq config # put the network interface in a dedicated dnsmasq config
configure_network_interface_dnsmasq configure_network_interface_dnsmasq
# get IPv4 for the AGH config file (special argument "install" at the end to get a starting "- " by IP) # get IPv4 for the AGH config file (with a starting "- ")
ipv4_addr=$(echo "- " "$(process_ips "$(ip -4 route get 1.2.3.4 2> /dev/null | head -n1 | head -n1)" install)") ipv4_addr=$(echo "- " "$(process_ips "$(ip -4 route get 1.2.3.4 2> /dev/null | head -n1 | head -n1)")")
# get IPv6 for the AGH config file (special argument "install" at the end to get a starting "- " by IP) # get IPv6 for the AGH config file (with a starting "- ")
ipv6_addr=$(echo "- " "$(process_ips "$(ip -6 route get ::1.2.3.4 2> /dev/null | head -n1)" install)") ipv6_addr=$(echo "- " "$(process_ips "$(ip -6 route get ::1.2.3.4 2> /dev/null | head -n1)")")
password=$(python3 -c "import bcrypt; print(bcrypt.hashpw(b\"$password\", bcrypt.gensalt(rounds=10)).decode())") password=$(python3 -c "import bcrypt; print(bcrypt.hashpw(b\"$password\", bcrypt.gensalt(rounds=10)).decode())")
ynh_app_setting_set --app="$app" --key=password --value="$password" ynh_app_setting_set --app="$app" --key=password --value="$password"