1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/limesurvey_ynh.git synced 2024-09-03 19:36:32 +02:00

[fix] Multiinstall

This commit is contained in:
ljf 2017-02-07 02:00:05 +01:00
parent 507f503c03
commit 0b98afd486

View file

@ -273,23 +273,23 @@ ynh_exit_if_up_to_date () {
fi fi
} }
function log() { log() {
echo "${1}" echo "${1}"
} }
function info() { info() {
log "[INFO] ${1}" log "[INFO] ${1}"
} }
function warn() { warn() {
log "[WARN] ${1}" log "[WARN] ${1}"
} }
function err() { err() {
log "[ERR] ${1}" log "[ERR] ${1}"
} }
function to_logs() { to_logs() {
# When yunohost --verbose or bash -x # When yunohost --verbose or bash -x
if $_ISVERBOSE; then if $_ISVERBOSE; then
@ -311,6 +311,7 @@ ynh_app_dependencies (){
export dependencies=$1 export dependencies=$1
export project_url=$(ynh_read_manifest 'url') export project_url=$(ynh_read_manifest 'url')
export version=$(ynh_read_manifest 'version') export version=$(ynh_read_manifest 'version')
export dep_app=${app/__/-}
mkdir -p conf mkdir -p conf
cat > ../conf/app-ynh-deps.control.j2 << EOF cat > ../conf/app-ynh-deps.control.j2 << EOF
Section: misc Section: misc
@ -318,7 +319,7 @@ Priority: optional
Homepage: {{ project_url }} Homepage: {{ project_url }}
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Package: {{ app }}-ynh-deps Package: {{ dep_app }}-ynh-deps
Version: {{ version }} Version: {{ version }}
Depends: {{ dependencies }} Depends: {{ dependencies }}
Architecture: all Architecture: all
@ -326,8 +327,8 @@ Description: meta package for {{ app }} (YunoHost app) dependencies
This meta-package is only responsible of installing its dependencies. This meta-package is only responsible of installing its dependencies.
EOF EOF
ynh_configure app-ynh-deps.control ./$app-ynh-deps.control ynh_configure app-ynh-deps.control ./$dep_app-ynh-deps.control
ynh_package_install_from_equivs ./$app-ynh-deps.control \ ynh_package_install_from_equivs ./$dep_app-ynh-deps.control \
|| ynh_die "Unable to install dependencies" || ynh_die "Unable to install dependencies"
} }