|
@@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get $app domain)
|
|
|
path_url=$(ynh_app_setting_get $app path)
|
|
|
final_path=$(ynh_app_setting_get $app final_path)
|
|
|
firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree)
|
|
|
-packages=$(ynh_app_setting_get $app packages)
|
|
|
|
|
|
#=================================================
|
|
|
# ENSURE DOWNWARD COMPATIBILITY
|
|
@@ -33,16 +32,6 @@ if [ -z $final_path ]; then
|
|
|
ynh_app_setting_set $app final_path $final_path
|
|
|
fi
|
|
|
|
|
|
-if [ -z $packages ]; then
|
|
|
- if [[ $firmware_nonfree -eq 1 ]]; then
|
|
|
- packages=$nonfree_packages
|
|
|
- else
|
|
|
- packages=$free_packages
|
|
|
- fi
|
|
|
-
|
|
|
- ynh_app_setting_set $app packages $packages
|
|
|
-fi
|
|
|
-
|
|
|
#=================================================
|
|
|
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
|
|
#=================================================
|
|
@@ -87,6 +76,12 @@ ynh_add_nginx_config
|
|
|
#=================================================
|
|
|
ynh_print_info "Upgrading dependencies..."
|
|
|
|
|
|
+if [[ $firmware_nonfree -eq 1 ]]; then
|
|
|
+ packages=$nonfree_packages
|
|
|
+else
|
|
|
+ packages=$free_packages
|
|
|
+fi
|
|
|
+
|
|
|
ynh_install_app_dependencies "$pkg_dependencies" "$packages"
|
|
|
|
|
|
#=================================================
|