YunoHost-Apps/jitsi_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jitsi_ynh.git synced 2024-09-03 19:35:57 +02:00
Code Issues Activity Actions

Merge branch 'patch-2' of https://github.com/rosbeef/jitsi_ynh into pr/73

Browse source
This commit is contained in:
yalh76 2022-04-14 21:12:03 +02:00
commit 39cf957359
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/_common.sh
View file

@ -6,9 +6,14 @@
# dependencies used by the app # dependencies used by the app
pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap"
pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4"
pkg_extra_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless"
if [ $YNH_ARCH == "armhf" ]
then
pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless \
automake autoconf build-essential libtool git maven m4"
pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm"
fi
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS
#================================================= #=================================================

1
scripts/install
View file

@ -98,7 +98,6 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component
#================================================= #=================================================
ynh_script_progression --message="Installing dependencies..." ynh_script_progression --message="Installing dependencies..."
# install generic dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
if ! yunohost app list | grep -q "prosody" if ! yunohost app list | grep -q "prosody"

9
scripts/restore
View file

@ -89,15 +89,6 @@ ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
if [ $YNH_ARCH == "armhf" ]
then
# install arm specific depedencies to compile extra dependencies
ynh_install_app_dependencies $pkg_dependencies_arm
# install extra dependencies not present in default debian repositories
ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm"
fi
if ! yunohost app list | grep -q "prosody" if ! yunohost app list | grep -q "prosody"
then then
yunohost tools update yunohost tools update

11
scripts/upgrade
View file

@ -82,7 +82,7 @@ fi
# If max_memory doesn't exist, create it and set to default 75 mb value # If max_memory doesn't exist, create it and set to default 75 mb value
if [ -z "$max_memory" ]; then if [ -z "$max_memory" ]; then
max_memory=75 max_memory=200
ynh_app_setting_set --app=$app --key=max_memory --value=$max_memory ynh_app_setting_set --app=$app --key=max_memory --value=$max_memory
fi fi
@ -145,15 +145,6 @@ ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
if [ $YNH_ARCH == "armhf" ]
then
# install arm specific depedencies to compile extra dependencies
ynh_install_app_dependencies $pkg_dependencies_arm
# install extra dependencies not present in default debian repositories
ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm"
fi
if ! yunohost app list | grep -q "prosody" if ! yunohost app list | grep -q "prosody"
then then
yunohost tools update yunohost tools update