Merge pull request #1 from YunoHost-Apps/testing

Testing

README.md

@@ -3,15 +3,15 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->
 
-# open web calendar for YunoHost
+# Open Web Calendar for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/open-web-calendar.svg)](https://dash.yunohost.org/appci/app/open-web-calendar) ![Working status](https://ci-apps.yunohost.org/ci/badges/open-web-calendar.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/open-web-calendar.maintain.svg)
 
-[![Install open web calendar with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=open-web-calendar)
+[![Install Open Web Calendar with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=open-web-calendar)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install open web calendar quickly and simply on a YunoHost server.
+> *This package allows you to install Open Web Calendar quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
@@ -24,7 +24,7 @@ Embed a highly customizable web calendar into your website using ICal source lin
 
 ## Screenshots
 
-![Screenshot of open web calendar](./doc/screenshots/example.jpg)
+![Screenshot of Open Web Calendar](./doc/screenshots/screenshot.png)
 
 ## Documentation and resources
 

README_fr.md

@@ -3,15 +3,15 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->
 
-# open web calendar pour YunoHost
+# Open Web Calendar pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/open-web-calendar.svg)](https://dash.yunohost.org/appci/app/open-web-calendar) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/open-web-calendar.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/open-web-calendar.maintain.svg)
 
-[![Installer open web calendar avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=open-web-calendar)
+[![Installer Open Web Calendar avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=open-web-calendar)
 
 *[Read this readme in english.](./README.md)*
 
-> *Ce package vous permet d’installer open web calendar rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d’installer Open Web Calendar rapidement et simplement sur un serveur YunoHost.
 Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
 
 ## Vue d’ensemble
@@ -24,7 +24,7 @@ Intégrez un calendrier Web hautement personnalisable dans votre site Web à l'a
 
 ## Captures d’écran
 
-![Capture d’écran de open web calendar](./doc/screenshots/example.jpg)
+![Capture d’écran de Open Web Calendar](./doc/screenshots/screenshot.png)
 
 ## Documentations et ressources
 

manifest.toml

@@ -3,7 +3,7 @@
 packaging_format = 2
 
 id = "open-web-calendar"
-name = "open web calendar"
+name = "Open Web Calendar"
 description.en = "Embed a web calendar into your own website"
 description.fr = "Intégrez un calendrier Web à votre propre site Web"
 
@@ -20,7 +20,7 @@ code = "https://github.com/niccokunzmann/open-web-calendar/"
 [integration]
 yunohost = ">= 11.2"
 architectures = "all"
-multi_instance = true
+multi_instance = false
 
 ldap = false
 

scripts/change_url

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-## this script is only run if actual change to domain/path is detected, if you're here either $domain or $path changed
-## new location is available via $domain and $path (or $new_domain and $new_path variables if you want to be explicit)
-## old values are available via, you guessed it, $old_domain and $old_path
-
 #=================================================
 # GENERIC STARTING
 #=================================================
@@ -27,7 +23,6 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
-# this will most likely adjust NGINX config correctly
 ynh_change_url_nginx_config
 
 #=================================================

scripts/config

@@ -1,12 +1,4 @@
 #!/bin/bash
-# In simple cases, you don't need a config script.
-
-# With a simple config_panel.toml, you can write in the app settings, in the
-# upstream config file or replace complete files (logo ...) and restart services.
-
-# The config scripts allows you to go further, to handle specific cases
-# (validation of several interdependent fields, specific getter/setter for a value,
-# display dynamic informations or choices, pre-loading of config type .cube... ).
 
 #=================================================
 # GENERIC STARTING

scripts/install

@@ -31,12 +31,12 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-yunohost service add "$app" --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add "$app" --description="Customizable web calendar" --log="/var/log/$app/$app.log"
 
 #=================================================
 # BUILDING OPEN WEB CALENDAR
 #=================================================
-ynh_script_progression --message="Building $app..."
+ynh_script_progression --message="Building $app..." --weight=5
 
 pushd "$install_dir"
 	python3 -m venv venv

scripts/restore

@@ -29,7 +29,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable "$app.service" --quiet
 
-yunohost service add "$app" --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add "$app" --description="Customizable web calendar" --log="/var/log/$app/$app.log"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -21,7 +21,6 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-
 ynh_script_progression --message="Upgrading source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from manifest.toml
@@ -38,7 +37,18 @@ ynh_add_nginx_config
 
 ynh_add_systemd_config
 
-yunohost service add "$app" --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add "$app" --description="Customizable web calendar" --log="/var/log/$app/$app.log"
+
+#=================================================
+# BUILDING OPEN WEB CALENDAR
+#=================================================
+ynh_script_progression --message="Building $app..." --weight=5
+
+pushd "$install_dir"
+	python3 -m venv venv
+	venv/bin/pip install --upgrade pip
+	venv/bin/pip install -r requirements.txt
+popd
 
 #=================================================
 # RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)

tests.toml

@@ -32,7 +32,7 @@ test_format = 1.0
     ## * change_url
     ## NB: you should NOT need this except if you really have a good reason...
 
-    # exclude = ["install.private", "install.multi"]
+    exclude = ["install.multi"]
 
     ## For special usecases, sometimes you need to setup other things on the machine
     ## prior to installing the app (such as installing another app)