frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename _install_mobile_clients, clarify messages

Browse Source
This commit is contained in:
billz 2023-11-16 15:18:20 +00:00
parent e6a90e728f
commit 7782956917
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
installers/common.sh
View File

@ -57,7 +57,7 @@ function _install_raspap() {
_configure_networking
_prompt_install_adblock
_prompt_install_openvpn
_install_mobile_clients
_install_extra_features
_prompt_install_wireguard
_prompt_install_vpn_providers
_patch_system_files
@ -79,24 +79,6 @@ function _update_raspap() {
_install_complete
}
# search for optional installation files names install_feature_*.sh
function _install_mobile_clients() {
if [ "$insiders" == 1 ]; then
_install_log "Installing support for mobile data clients"
for feature in $(ls $webroot_dir/installers/install_feature_*.sh) ; do
source $feature
f=$(basename $feature)
func="_${f%.*}"
if declare -f -F $func > /dev/null; then
echo "Installing $func"
$func || _install_status 1 "Unable to install feature ($func)"
else
_install_status 1 "Install file $f is missing install function $func"
fi
done
fi
}
# Prompts user to set installation options
function _config_installation() {
if [ "$upgrade" == 1 ]; then
@ -866,6 +848,23 @@ function _optimize_php() {
fi
}
# search for optional installation files names install_feature_*.sh
function _install_extra_features() {
if [ "$insiders" == 1 ]; then
_install_log "Installing additional features (Insiders)"
for feature in $(ls $webroot_dir/installers/install_feature_*.sh) ; do
source $feature
f=$(basename $feature)
func="_${f%.*}"
if declare -f -F $func > /dev/null; then
$func || _install_status 1 "Unable to install feature ($func)"
else
_install_status 1 "Install file $f is missing install function $func"
fi
done
fi
}
function _install_complete() {
_install_log "Installation completed"
if [ "$repo" == "RaspAP/raspap-insiders" ]; then