diff --git a/scripts/_common.sh b/scripts/_common.sh index 1254d74..965f608 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -60,7 +60,6 @@ process_ips(){ # used to process the IPs to put in the AGH's config file local ips="$1" - if [ "$2" == "install" ]; then local install=true; fi for i in $(seq "$(echo "$ips" | wc -w)" -1 1); do ip=$(echo "$ips" | awk "{print \$$i}") @@ -70,14 +69,8 @@ process_ips(){ if is_public_ip "$ip" && [ "$open_port_53" == "false" ] ; then break else - # special case for installation, as a dash is required before an IP - if $install; then - ips="- $ip" - break - else - ips="$ip" - break - fi + ips="$ip" + break fi fi done diff --git a/scripts/install b/scripts/install index 0a56e8e..aed5703 100644 --- a/scripts/install +++ b/scripts/install @@ -80,11 +80,11 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 # put the network interface in a dedicated dnsmasq config configure_network_interface_dnsmasq -# get IPv4 for the AGH config file (special argument "install" at the end to get a starting "- " by IP) -ipv4_addr=$(echo "- " "$(process_ips "$(ip -4 route get 1.2.3.4 2> /dev/null | head -n1 | head -n1)" install)") +# 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)")") -# get IPv6 for the AGH config file (special argument "install" at the end to get a starting "- " by IP) -ipv6_addr=$(echo "- " "$(process_ips "$(ip -6 route get ::1.2.3.4 2> /dev/null | head -n1)" install)") +# 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)")") 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"