Merge pull request #36 from YunoHost-Apps/testing

Testing
2024-09-03 19:56:27 +02:00 · 2024-06-01 22:23:04 +02:00 · 2024-06-01 22:23:04 +02:00 · 21cf6982d1
commit 21cf6982d1
parent 405228e9b8 049b4e832e
12 changed files with 276 additions and 230 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,7 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
--- a/README.md
+++ b/README.md
@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Overleaf is an open-source online real-time collaborative LaTeX editor.


-**Shipped version:** 2024.04.09~ynh1
+**Shipped version:** 2024.05.31~ynh1

 ## Screenshots

--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,48 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Overleaf para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg)
+
+[![Instalar Overleaf con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=overleaf)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarOverleaf rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Overleaf is an open-source online real-time collaborative LaTeX editor.
+
+
+**Versión actual:** 2024.05.31~ynh1
+
+## Capturas
+
+![Captura de Overleaf](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://www.overleaf.com>
+- Documentación usuario oficial: <https://www.overleaf.com/learn>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/overleaf/overleaf>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/overleaf>
+- Reportar un error: <https://github.com/YunoHost-Apps/overleaf_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/overleaf_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/overleaf_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade overleaf -u https://github.com/YunoHost-Apps/overleaf_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_eu.md
+++ b/README_eu.md
@ -19,7 +19,7 @@ EZ editatu eskuz.
 Overleaf is an open-source online real-time collaborative LaTeX editor.


-**Paketatutako bertsioa:** 2024.04.09~ynh1
+**Paketatutako bertsioa:** 2024.05.31~ynh1

 ## Pantaila-argazkiak

--- a/README_fr.md
+++ b/README_fr.md
@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Overleaf est un éditeur LaTeX collaboratif en ligne et en temps réel open source.


-**Version incluse :** 2024.04.09~ynh1
+**Version incluse :** 2024.05.31~ynh1

 ## Captures d’écran

--- a/README_gl.md
+++ b/README_gl.md
@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Overleaf is an open-source online real-time collaborative LaTeX editor.


-**Versión proporcionada:** 2024.04.09~ynh1
+**Versión proporcionada:** 2024.05.31~ynh1

 ## Capturas de pantalla

--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -3,7 +3,7 @@
 请勿手动编辑。
 -->

-# YunoHost 的 Overleaf
+# YunoHost 上的 Overleaf

 [![集成程度](https://dash.yunohost.org/integration/overleaf.svg)](https://dash.yunohost.org/appci/app/overleaf) ![工作状态](https://ci-apps.yunohost.org/ci/badges/overleaf.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/overleaf.maintain.svg)

@ -19,7 +19,7 @@
 Overleaf is an open-source online real-time collaborative LaTeX editor.


-**分发版本：** 2024.04.09~ynh1
+**分发版本：** 2024.05.31~ynh1

 ## 截图

--- a/manifest.toml
+++ b/manifest.toml
@ -7,7 +7,7 @@ name = "Overleaf"
 description.en = "Online real-time collaborative LaTeX editor"
 description.fr = "Éditeur LaTeX collaboratif en ligne et en temps réel"

-version = "2024.04.09~ynh1"
+version = "2024.05.31~ynh1"

 maintainers = []

@ -51,8 +51,8 @@ ram.runtime = "3G"
 [resources]
    [resources.sources]
        [resources.sources.main]
-        url = "https://github.com/overleaf/overleaf/archive/568044ee48a20bdb930f9f140f17227d19cb1219.tar.gz"
-        sha256 = "61e2602c76f8c8a635656d99db6725c802261e383411d71095cf9710149567f6"
+        url = "https://github.com/overleaf/overleaf/archive/f89ee54fdc96c9cef942d8963ed0949bce77a5d3.tar.gz"
+        sha256 = "8b98259048bd10790adff8e364f9916c84c45209db8ec0f745481a0cd2d7b367"
        autoupdate.strategy = "latest_github_commit"

    [resources.system_user]
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -1,20 +1,17 @@
-#!/bin/bash
-
-#=================================================
 # COMMON VARIABLES
 #=================================================

-nodejs_version=18.20.2
+nodejs_version="18.20.2"
+YNH_DEFAULT_MONGO_VERSION=6.0

 #=================================================
 # PERSONAL HELPERS
 #=================================================

 #=================================================
-# EXPERIMENTAL HELPERS
+# FUTURE OFFICIAL HELPERS
 #=================================================

-readonly YNH_DEFAULT_MONGO_VERSION=5.0
 # Declare the actual MongoDB version to use: 4.4; 5.0; 6.0
 # A packager willing to use another version of MongoDB can override the variable into its _common.sh.
 YNH_MONGO_VERSION=${YNH_MONGO_VERSION:-$YNH_DEFAULT_MONGO_VERSION}
@ -103,7 +100,7 @@ ynh_mongo_exec() {
 			database=""
 		fi

-        mongo --quiet $user $password $authenticationdatabase $host $port <<EOF
+		mongosh --quiet --username $user --password $password --authenticationDatabase $authenticationdatabase --host $host --port $port <<EOF
 $database
 ${command}
 quit()
@ -117,7 +114,7 @@ EOF
 			database=""
 		fi

-        mongo --quiet $database $user $password $authenticationdatabase $host $port --eval="$command"
+		mongosh --quiet $database --username $user --password $password --authenticationDatabase $authenticationdatabase --host $host --port $port --eval="$command"
 	fi
 }

@ -326,9 +323,9 @@ ynh_install_mongo() {
 	ynh_handle_getopts_args "$@"
 	mongo_version="${mongo_version:-$YNH_MONGO_VERSION}"

-    ynh_print_info --message="Installing MongoDB Community Edition..."
-    local mongo_debian_release=bullseye #$(ynh_get_debian_release)
+	debian=$(lsb_release --codename --short)

+	ynh_print_info --message="Installing MongoDB Community Edition..."
  if [[ $(cat /proc/cpuinfo) != *"avx"* && "$mongo_version" != "4.4" ]]; then
    ynh_print_warn --message="Installing Mongo 4.4 as $mongo_version is not compatible with your CPU (see https://docs.mongodb.com/manual/administration/production-notes/#x86_64)."
    mongo_version="4.4"
@ -337,14 +334,15 @@ ynh_install_mongo() {
    ynh_print_warn --message="Switched to Buster install as Mongo 4.4 is not compatible with $mongo_debian_release."
    mongo_debian_release=buster
  fi
-
-    ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org-server mongodb-org-shell mongodb-database-tools" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
+	ynh_install_extra_app_dependencies \
+		--repo="deb http://repo.mongodb.org/apt/debian $debian/mongodb-org/$mongo_version main" \
+		--package="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" \
+		--key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
 	mongodb_servicename=mongod

 	# Make sure MongoDB is started and enabled
 	systemctl enable $mongodb_servicename --quiet
 	systemctl daemon-reload --quiet
-
 	ynh_systemd_action --service_name=$mongodb_servicename --action=restart --line_match="aiting for connections" --log_path="/var/log/mongodb/$mongodb_servicename.log"

 	# Integrate MongoDB service in YunoHost
@ -373,7 +371,3 @@ ynh_remove_mongo() {
 		ynh_secure_remove --file="/var/log/mongodb"
 	fi
 }
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
--- a/scripts/install
+++ b/scripts/install
@ -132,9 +132,11 @@ cp "$install_dir/build/server-ce/config/custom-environment-variables.json" "$ins

 ynh_secure_remove --file="$install_dir/build"

-ynh_script_progression --message="Building app..."
+ynh_script_progression --message="Building app... This may take a LOT of time depending of your CPU" --weight=25
 pushd "$install_dir/live"
 	ynh_use_nodejs
+	ynh_exec_warn_less npm cache clean --force
+	ynh_exec_warn_less npm install
   	ynh_exec_warn_less npm ci
 popd

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -153,6 +153,7 @@ cp "$install_dir/build/server-ce/config/custom-environment-variables.json" "$ins
 ynh_script_progression --message="Building app... This may take a LOT of time depending of your CPU" --weight=25
 pushd "$install_dir/live"
 	ynh_use_nodejs
+	ynh_exec_warn_less npm cache clean --force
    ynh_exec_warn_less npm install
   	ynh_exec_warn_less npm ci
 popd
--- a/tests.toml
+++ b/tests.toml
@ -2,4 +2,4 @@ test_format = 1.0

 [default]

-test_upgrade_from.c5e7ec1.name = "Overleaf 4.x"
+test_upgrade_from.405228e.name = "2024-04-09"