|
|
@@ -59,14 +59,6 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
|
|
|
# Register (book) web path
|
|
|
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
|
|
|
|
|
|
-# If we're on armbian, force $firmware_nonfree
|
|
|
-# because armbian-firmware conflicts with the non-free packages ...
|
|
|
-if dpkg --list | grep -q armbian-firmware; then
|
|
|
- echo "You are running Armbian and non-free firmware are known to conflict with armbian-firwmare. " >&2
|
|
|
- firmware_nonfree=0
|
|
|
- echo "Variable firmware_non_free has been forced to 'no'" >&2
|
|
|
-fi
|
|
|
-
|
|
|
if [ $firmware_nonfree = "no" ]; then
|
|
|
firmware_nonfree=0
|
|
|
elif [ $firmware_nonfree = "yes" ]; then
|
|
|
@@ -121,19 +113,10 @@ export DEBIAN_FRONTEND=noninteractive
|
|
|
# Packaged USB Wireless Device firmwares
|
|
|
# Based on https://wiki.debian.org/WiFi#USB_Devices
|
|
|
if [[ $firmware_nonfree -eq 1 ]]; then
|
|
|
- # check if non-free is set on sources.list
|
|
|
- if ! grep -q non-free /etc/apt/sources.list ; then
|
|
|
- sed '/debian/{s/main/& non-free/}' -i /etc/apt/sources.list
|
|
|
- fi
|
|
|
- packages=$nonfree_packages
|
|
|
+ check_armbian_nonfree_conflict
|
|
|
+ ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="$nonfree_firmware_packages"
|
|
|
else
|
|
|
- packages=$free_packages
|
|
|
- # Extract from http://packages.trisquel.info/toutatis-updates/open-ath9k-htc-firmware
|
|
|
- # https://www.fsf.org/news/ryf-certification-thinkpenguin-usb-with-atheros-chip
|
|
|
- # https://wiki.debian.org/ath9k_htc/open_firmware
|
|
|
- mkdir -p /lib/firmware
|
|
|
- install -b -o root -g root -m 0644 ../conf/firmware_htc-7010.fw /lib/firmware/htc_7010.fw
|
|
|
- install -b -o root -g root -m 0644 ../conf/firmware_htc-9271.fw /lib/firmware/htc_9271.fw
|
|
|
+ pkg_dependencies="$pkg_dependencies $free_firmware_packages"
|
|
|
fi
|
|
|
|
|
|
#=================================================
|
|
|
@@ -141,7 +124,7 @@ fi
|
|
|
#=================================================
|
|
|
ynh_script_progression --message="Installing dependencies"
|
|
|
|
|
|
-ynh_install_app_dependencies "$pkg_dependencies" "$packages"
|
|
|
+ynh_install_app_dependencies "$pkg_dependencies"
|
|
|
|
|
|
#=================================================
|
|
|
# CREATE DEDICATED USER
|
|
|
@@ -181,6 +164,7 @@ if [[ ! -v ip6_net ]]; then # if ip6_net not set
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
+hot_reload_usb_wifi_cards
|
|
|
wifi_device=$(bash ../conf/iw_devices | awk -F\| '{ print $1 }')
|
|
|
|
|
|
ynh_app_setting_set --app=$app --key=multissid --value=1
|
|
|
@@ -263,8 +247,8 @@ ynh_replace_string --match_string="^DAEMON_CONF=$" --replace_string="&/etc/hosta
|
|
|
# isnt used ... instead the service is "pure systemd" ...
|
|
|
echo "DAEMON_CONF=/etc/hostapd/hostapd.conf" > /etc/default/hostapd
|
|
|
|
|
|
-# Fix sources
|
|
|
-ynh_replace_string --match_string="__PATH__" --replace_string="${path_url}" --target_file="$final_path/config.php"
|
|
|
+# Apply configuration
|
|
|
+ynh_add_config --template="config.php.tpl" --destination="$final_path/config.php"
|
|
|
|
|
|
# Set default inits
|
|
|
# The boot order of these services are important, so they are disabled by default
|
|
|
@@ -279,7 +263,6 @@ systemctl unmask hostapd # On some system e.g. RPi, for some reason hostapd is m
|
|
|
ynh_script_progression --message="Storing the config file checksum..."
|
|
|
|
|
|
# Calculate and store the config file checksum into the app settings
|
|
|
-ynh_store_file_checksum --file="$final_path/config.php"
|
|
|
ynh_store_file_checksum --file="/etc/init.d/hostapd"
|
|
|
|
|
|
#=================================================
|
