Merge pull request #1561 from RaspAP/fix/installer-options

Update install option vars, use indirect expansion
This commit is contained in:
Bill Zimmerman 2024-04-01 17:07:04 +02:00 committed by GitHub
commit 9fc38ffd0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -344,11 +344,11 @@ function _install_lighttpd_configs() {
function _prompt_install_features() { function _prompt_install_features() {
readonly features=( readonly features=(
"Ad blocking:Install Ad blocking and enable list management:adblock:_install_adblock" "Ad blocking:Install Ad blocking and enable list management:adblock_option:_install_adblock"
"OpenVPN:Install OpenVPN and enable client configuration:ovpn:_install_openvpn" "OpenVPN:Install OpenVPN and enable client configuration:ovpn_option:_install_openvpn"
"RestAPI:Install and enable RestAPI:restapi:_install_restapi" "RestAPI:Install and enable RestAPI:restapi_option:_install_restapi"
"WireGuard:Install WireGuard and enable VPN tunnel configuration:wg:_install_wireguard" "WireGuard:Install WireGuard and enable VPN tunnel configuration:wg_option:_install_wireguard"
"VPN provider:Enable VPN provider client configuration:pv:_install_provider" "VPN provider:Enable VPN provider client configuration:pv_option:_install_provider"
) )
for feature in "${features[@]}"; do for feature in "${features[@]}"; do
IFS=':' read -r -a feature_details <<< "$feature" IFS=':' read -r -a feature_details <<< "$feature"
@ -371,7 +371,7 @@ function _prompt_install_feature() {
else else
$function $function
fi fi
elif [ "${opt}_option" == 1 ]; then elif [ "${!opt}" == 1 ]; then
$function $function
else else
echo "(Skipped)" echo "(Skipped)"