1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/roundcube_ynh.git synced 2024-09-03 20:16:28 +02:00

[fix] revert second last commit

This commit is contained in:
magikcypress 2017-06-03 15:33:12 +02:00
parent 80fc602a11
commit 98fb8a979e
No known key found for this signature in database
GPG key ID: 3B3C7CD61957AC9A
3 changed files with 2 additions and 51 deletions

View file

@ -341,47 +341,4 @@ ynh_backup_before_upgrade () { # Backup the current version of the app, restore
else # Si le backup a échoué else # Si le backup a échoué
ynh_die "Backup failed, the upgrade process was aborted." ynh_die "Backup failed, the upgrade process was aborted."
fi fi
}
# Define and install dependencies with a equivs control file
# This helper can/should only be called once per app
#
# usage: ynh_install_app_dependencies dep [dep [...]]
# | arg: dep - the package name to install in dependence
ynh_install_app_dependencies () {
dependencies=$@
manifest_path="../manifest.json"
if [ ! -e "$manifest_path" ]; then
manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place
fi
version=$(sudo grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file.
dep_app=${app//_/-} # Replace all '_' by '-'
if ynh_package_is_installed "${dep_app}-ynh-deps"; then
echo "A package named ${dep_app}-ynh-deps is already installed" >&2
else
cat > ./${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build
Section: misc
Priority: optional
Package: ${dep_app}-ynh-deps
Version: ${version}
Depends: ${dependencies// /, }
Architecture: all
Description: Fake package for ${app} (YunoHost app) dependencies
This meta-package is only responsible of installing its dependencies.
EOF
ynh_package_install_from_equivs ./${dep_app}-ynh-deps.control \
|| ynh_die "Unable to install dependencies" # Install the fake package and its dependencies
ynh_app_setting_set $app apt_dependencies $dependencies
fi
}
# Remove fake package and its dependencies
#
# Dependencies will removed only if no other package need them.
#
# usage: ynh_remove_app_dependencies
ynh_remove_app_dependencies () {
dep_app=${app//_/-} # Replace all '_' by '-'
ynh_package_autoremove ${dep_app}-ynh-deps # Remove the fake package and its dependencies if they not still used.
} }

View file

@ -42,10 +42,7 @@ grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
} }
# Install dependencies # Install dependencies
ynh_install_app_dependencies php5-cli php5-common php5-intl php5-json \ ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control
php5-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 \
php-net-smtp php-net-socket php-crypt-gpg \
php-net-ldap2 php-net-ldap3
# Create system user dedicace for this app # Create system user dedicace for this app
ynh_system_user_create $app ynh_system_user_create $app

View file

@ -43,10 +43,7 @@ grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
} }
# Install dependencies # Install dependencies
ynh_install_app_dependencies php5-cli php5-common php5-intl php5-json \ ynh_package_install_from_equivs ../conf/${DEPS_PKG_NAME}.control
php5-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 \
php-net-smtp php-net-socket php-crypt-gpg \
php-net-ldap2 php-net-ldap3
# Create system user dedicace for this app # Create system user dedicace for this app
ynh_system_user_create $app ynh_system_user_create $app