Autres/RaspAP
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-05-18 20:22:31 +02:00
Code Issues Releases Wiki Activity

Fix line break to Unix

Browse Source
This commit is contained in:
Christian Zeitnitz 2021-03-16 22:04:40 +01:00
parent a34485225f
commit fd487a9824
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installers/common.sh
View File

@ -26,7 +26,7 @@ readonly raspap_adblock="/etc/dnsmasq.d/090_adblock.conf"
readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf" readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf"
readonly raspap_network="$raspap_dir/networking/" readonly raspap_network="$raspap_dir/networking/"
readonly rulesv4="/etc/iptables/rules.v4" readonly rulesv4="/etc/iptables/rules.v4"
readonly raspap_client_scripts="/usr/local/sbin" # readonly raspap_client_scripts="/usr/local/sbin"
readonly notracking_url="https://raw.githubusercontent.com/notracking/hosts-blocklists/master/" readonly notracking_url="https://raw.githubusercontent.com/notracking/hosts-blocklists/master/"
webroot_dir="/var/www/html" webroot_dir="/var/www/html"
git_source_url="https://github.com/$repo" # $repo from install.raspap.com git_source_url="https://github.com/$repo" # $repo from install.raspap.com
@ -51,7 +51,7 @@ function _install_raspap() {
_configure_networking _configure_networking
_prompt_install_adblock _prompt_install_adblock
_prompt_install_openvpn _prompt_install_openvpn
_install_features _install_features
_patch_system_files _patch_system_files
_install_complete _install_complete
} }
@ -63,10 +63,10 @@ function _install_features() {
f=$(basename $feature) f=$(basename $feature)
func="_${f%.*}" func="_${f%.*}"
if declare -f -F $func > /dev/null; then if declare -f -F $func > /dev/null; then
_install_log "Installing $func" _install_log "Installing $func"
$func || _install_status 1 "Not able to install feature ($func)" $func || _install_status 1 "Not able to install feature ($func)"
else else
_install_status 1 "Install file $f is missing install function $func" _install_status 1 "Install file $f is missing install function $func"
fi fi
done done
} }

4
installers/install_feature_clients.sh
View File

@ -25,8 +25,8 @@ function _install_feature_clients() {
# Move scripts # Move scripts
sudo cp "$webroot_dir/config/client_config/"*.sh "$raspap_clients_scripts/" || _install_status 1 "Unable to move client scripts ($name)" sudo cp "$webroot_dir/config/client_config/"*.sh "$raspap_clients_scripts/" || _install_status 1 "Unable to move client scripts ($name)"
sudo chmod a+rx "$raspap_clients_scripts/"*.sh || _install_status 1 "Unable to chmod client scripts ($name)" sudo chmod a+rx "$raspap_clients_scripts/"*.sh || _install_status 1 "Unable to chmod client scripts ($name)"
# wget $raspap_clients_operator_table -o "$raspap_clients_scripts/"mcc-mnc-table.csv || _install_status 1 "Unable to wget operator table ($name)" # wget $raspap_clients_operator_table -o "$raspap_clients_scripts/"mcc-mnc-table.csv || _install_status 1 "Unable to wget operator table ($name)"
sudo cp "$webroot_dir/config/client_config/mcc-mnc-table.csv" "$raspap_clients_scripts/" || _install_status 1 "Unable to move client data ($name)" sudo cp "$webroot_dir/config/client_config/mcc-mnc-table.csv" "$raspap_clients_scripts/" || _install_status 1 "Unable to move client data ($name)"
# wvdial settings # wvdial settings
sudo cp "$webroot_dir/config/client_config/wvdial.conf" "/etc/" || _install_status 1 "Unable to install client configuration ($name)" sudo cp "$webroot_dir/config/client_config/wvdial.conf" "/etc/" || _install_status 1 "Unable to install client configuration ($name)"
sudo cp "$webroot_dir/config/client_config/interfaces" "/etc/network/interfaces" || _install_status 1 "Unable to install interface settings ($name)" sudo cp "$webroot_dir/config/client_config/interfaces" "/etc/network/interfaces" || _install_status 1 "Unable to install interface settings ($name)"