diff --git a/scripts/_common.sh b/scripts/_common.sh index aef3b5d..78cde13 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ # COMMON VARIABLES #================================================= -dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick acl tar smbclient" +pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-imagick acl tar smbclient" #================================================= # COMMON HELPERS @@ -89,9 +89,9 @@ is_url_handled() { # But the old one can't be removed unless it's not used. See below. # # If you have some dependencies for your app, it's possible to change the fake debian package which manages them. -# You have to fill the $dependencies variable, and then a new fake package will be created and installed, +# You have to fill the $pkg_dependencies variable, and then a new fake package will be created and installed, # and the old one will be removed. -# If you don't have a $dependencies variable, the helper can't know what the app dependencies are. +# If you don't have a $pkg_dependencies variable, the helper can't know what the app dependencies are. # # The app settings.yml will be modified as follows: # - finalpath will be changed according to the new name (but only if the existing $final_path contains the old app name) @@ -272,9 +272,9 @@ ynh_handle_app_migration () { # CHANGE THE FAKE DEPENDENCIES PACKAGE #================================================= - # Check if a variable $dependencies exists + # Check if a variable $pkg_dependencies exists # If this variable doesn't exist, this part shall be managed in the upgrade script. - if [ -n "${dependencies:-}" ] + if [ -n "${pkg_dependencies:-}" ] then # Define the name of the package local old_package_name="${old_app//_/-}-ynh-deps" @@ -284,7 +284,7 @@ ynh_handle_app_migration () { then # Install a new fake package app=$new_app - ynh_install_app_dependencies $dependencies + ynh_install_app_dependencies $pkg_dependencies # Then remove the old one app=$old_app ynh_remove_app_dependencies diff --git a/scripts/install b/scripts/install index cc62a9a..2eb6baa 100755 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ ynh_app_setting_set $app user_home $user_home # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies $dependencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index 7e66256..6bc4987 100755 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini" #================================================= # Define and install dependencies -ynh_install_app_dependencies $dependencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE CRON FILE diff --git a/scripts/upgrade b/scripts/upgrade index 99e5db8..6692a38 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -141,7 +141,7 @@ ynh_add_fpm_config # UPGRADE DEPENDENCIES #================================================= -ynh_install_app_dependencies $dependencies +ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE