YunoHost-Apps/collabora_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/collabora_ynh.git synced 2024-09-03 18:16:25 +02:00
Code Issues Activity Actions

Merge pull request #33 from YunoHost-Apps/use-install-extra-helper

Browse source 
Fix linter, use proper helper to install deps from custom deb repository
This commit is contained in:
Alexandre Aubin 2020-10-14 13:57:30 +02:00 committed by GitHub
commit 78ac9ad816
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
manifest.json
View file

@ -6,7 +6,7 @@
"en": "A LibreOffice-based online office suite with collaborative editing", "en": "A LibreOffice-based online office suite with collaborative editing",
"fr": "Une suite office en ligne et collaborative, basée sur LibreOffice" "fr": "Une suite office en ligne et collaborative, basée sur LibreOffice"
}, },
"version": "4.0.0~ynh1", "version": "4.0.0~ynh2",
"url": "https://www.libreoffice.org/download/libreoffice-online/", "url": "https://www.libreoffice.org/download/libreoffice-online/",
"license": "MPL-2.0", "license": "MPL-2.0",
"maintainer": { "maintainer": {
@ -15,7 +15,7 @@
"url": "https://collaboraoffice.com" "url": "https://collaboraoffice.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 3.5" "yunohost": ">= 3.8.1"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [
@ -32,9 +32,7 @@
}, },
"example": "example.com" "example": "example.com"
}, },
{
{
"name": "password", "name": "password",
"type": "password", "type": "password",
"ask": { "ask": {
@ -42,9 +40,9 @@
"fr": "Choisissez un mot de passe pour l'administration de Collabora" "fr": "Choisissez un mot de passe pour l'administration de Collabora"
}, },
"example": "password" "example": "password"
}, },
{ {
"name": "nextcloud_domain", "name": "nextcloud_domain",
"type": "string", "type": "string",
"ask": { "ask": {
@ -53,10 +51,10 @@
}, },
"example": "example.com", "example": "example.com",
"default": "" "default": ""
} }
] ]
} }
} }

13
scripts/install
View file

@ -63,18 +63,11 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#=============================================== #===============================================
# ADD COLLABORA REPOSITORY # ADD COLLABORA REPOSITORY
#=============================================== #===============================================
ynh_print_info --message="Add Collabora repository..."
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D
DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
echo "deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./" | tee -a /etc/apt/sources.list.d/collabora.list
#=================================================
# INSTALL DEPENDENCIES
#=================================================
ynh_print_info --message="Installing dependencies..." ynh_print_info --message="Installing dependencies..."
ynh_install_app_dependencies $pkg_dependencies DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D"
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION

12
scripts/restore
View file

@ -51,19 +51,11 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#=============================================== #===============================================
# ADD COLLABORA REPOSITORY # ADD COLLABORA REPOSITORY
#=============================================== #===============================================
ynh_print_info --message="Add Collabora repository..." ynh_print_info --message="Installing dependencies..."
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D
DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .) DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
echo "deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./" | tee -a /etc/apt/sources.list.d/collabora.list
#================================================= ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D"
# REINSTALL DEPENDENCIES
#=================================================
ynh_print_info --message="Reinstalling dependencies..."
# Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# RESTORE CONFIGURATION # RESTORE CONFIGURATION

13
scripts/upgrade
View file

@ -74,21 +74,14 @@ ynh_print_info --message="Upgrading nginx web server configuration..."
# Create a dedicated nginx config # Create a dedicated nginx config
ynh_add_nginx_config ynh_add_nginx_config
#===============================================
# ADD COLLABORA REPOSITORY
#===============================================
ynh_print_info --message="Add Collabora repository..."
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D
DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
echo "deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./" | tee -a /etc/apt/sources.list.d/collabora.list
#================================================= #=================================================
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================
ynh_print_info --message="Upgrading dependencies..." ynh_print_info --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies DEBIAN_VERSION_NUMBER=$(cat /etc/debian_version | head -n 1 | cut -f1 -d .)
ynh_install_extra_app_dependencies --repo="deb https://collaboraoffice.com/repos/CollaboraOnline/CODE-debian${DEBIAN_VERSION_NUMBER} ./ " --package="$pkg_dependencies" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0C54D189F4BA284D"
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE