Merge pull request #56 from YunoHost-Apps/testing

Testing

README.md

@@ -1,7 +1,7 @@
 # Lutim for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/lutim.svg)](https://dash.yunohost.org/appci/app/lutim) ![](https://ci-apps.yunohost.org/ci/badges/lutim.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/lutim.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-)  
-[![Install Lutim with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lutim)
+[![Install Lutim with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lutim)
 
 *[Lire ce readme en français.](./README_fr.md)*
 

README_fr.md

@@ -1,7 +1,7 @@
 # Lutim pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/lutim.svg)](https://dash.yunohost.org/appci/app/lutim) ![](https://ci-apps.yunohost.org/ci/badges/lutim.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/lutim.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-)  
-[![Installer Lutim avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lutim)
+[![Installer Lutim avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lutim)
 
 *[Read this readme in english.](./README.md)*
 

check_process

@@ -28,8 +28,6 @@
         change_url=1
         actions=1
         config_panel=1
-;;; Levels
-    Level 5=auto
 ;;; Options
 Email=
 Notification=change

scripts/_common.sh

@@ -53,7 +53,7 @@ ynh_multimedia_build_main_dir () {
 	local checksum="806a827ba1902d6911095602a9221181"
 
 	# Download yunohost.multimedia scripts
-	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz
+	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1
 
 	# Check the control sum
 	echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \

scripts/backup

@@ -35,7 +35,6 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-CHECK_SIZE "$final_path"
 ynh_backup --src_path="$final_path"
 
 #=================================================

scripts/install

@@ -191,7 +191,7 @@ ynh_use_logrotate
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
-yunohost service add $app --log $final_path/log/production.log
+yunohost service add $app --log="$final_path/log/production.log"
 
 #=================================================
 # SETUP SSOWAT

scripts/restore

@@ -88,19 +88,13 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=60
 
 ynh_install_app_dependencies $pkg_depencencies
 
-#=================================================
-# ADVERTISE SERVICE IN ADMIN PANEL
-#=================================================
-
-yunohost service add $app --log $final_path/log/production.log
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
 ynh_script_progression --message="Restoring the systemd configuration..."
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service
+systemctl enable $app.service --quiet
 
 #=================================================
 # RESTORE THE CRON FILE
@@ -117,6 +111,12 @@ mkdir -p /var/log/$app/
 touch /var/log/$app/production.log
 chown $app -R /var/log/$app
 
+#=================================================
+# ADVERTISE SERVICE IN ADMIN PANEL
+#=================================================
+
+yunohost service add $app --log="$final_path/log/production.log"
+
 #=================================================
 # RESTORE LOGROTATE CONFIGURATION
 #=================================================

scripts/upgrade

@@ -150,13 +150,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # ACTIVATE MAINTENANCE MODE
 #=================================================
@@ -274,7 +267,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading $app with Carton..." --weight=4
     (cd $final_path
-    carton install 2>&1 | tee -a "/var/log/$app/setup_carton.log")
+    ynh_secure_remove --file="$final_path/local"
+    carton install --deployment --without=mysql --without=htpasswd --without=test)
 fi
 
 #=================================================
@@ -294,6 +288,12 @@ ynh_script_progression --message="Upgrading logrotate configuration..."
 ynh_use_logrotate --non-append
 chown $app -R /var/log/$app
 
+#=================================================
+# ADVERTISE SERVICE IN ADMIN PANEL
+#=================================================
+
+yunohost service add $app --log="$final_path/log/production.log"
+
 #=================================================
 # RELOAD NGINX
 #=================================================