|
@@ -58,14 +58,10 @@ ynh_script_progression --message="Restoring the app main directory..."
|
|
|
ynh_restore_file --origin_path="$final_path"
|
|
|
|
|
|
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
|
|
|
check_armbian_nonfree_conflict
|
|
|
- packages=$nonfree_firmware_packages
|
|
|
+ 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_firmware_packages
|
|
|
+ pkg_dependencies="$pkg_dependencies $free_firmware_packages"
|
|
|
fi
|
|
|
|
|
|
ynh_restore_file --origin_path="/etc/sudoers.d/${app}_ynh"
|
|
@@ -118,7 +114,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
|
|
ynh_script_progression --message="Reinstalling dependencies..."
|
|
|
|
|
|
# Define and install dependencies
|
|
|
-ynh_install_app_dependencies "$pkg_dependencies" "$packages"
|
|
|
+ynh_install_app_dependencies "$pkg_dependencies"
|
|
|
|
|
|
#=================================================
|
|
|
# RESTORE SYSTEMD
|