Fix linter warnings

2024-09-03 18:26:13 +02:00 · 2020-12-18 22:56:28 +01:00 · 2020-12-18 22:56:28 +01:00 · 3be837d749
commit 3be837d749
parent 2ad9f594ac
8 changed files with 55 additions and 21 deletions
--- a/README.md
+++ b/README.md
@ -1,19 +1,16 @@
-diaspora_ynh
-==========
+Diaspora for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/diaspora.svg)](https://dash.yunohost.org/appci/app/diaspora) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.maintain.svg)[![Shipped version](https://img.shields.io/github/v/release/yunohost-apps/diaspora_ynh)](https://github.com/yunohost-apps/diaspora_ynh/releases)
-
-[![Install diaspora with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=diaspora)
+[![Integration level](https://dash.yunohost.org/integration/diaspora.svg)](https://dash.yunohost.org/appci/app/diaspora) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.maintain.svg)[![Shipped version](https://img.shields.io/github/v/release/yunohost-apps/diaspora_ynh)](https://github.com/yunohost-apps/diaspora_ynh/releases)  
+[![Install Diaspora with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diaspora)

 ## Overview

-> *This package allow you to install diaspora* quickly and simply on a YunoHost server.  
+> *This package allow you to install Diaspora quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*

 **Shipped version:** 0.7.13.0

-Notes
--------------
+## Notes

 Before installing, you have to:

@ -25,5 +22,20 @@ Installation effects:
 - Thank you for being patient as deployment time can take up to about 1 hour (raspberry pi).
 - The installation directory can take up to 900MB and app start time can be take 5 minutes

+## Links

-Report a bug: https://github.com/YunoHost-Apps/diaspora_ynh/issues
+ * Report a bug: https://github.com/YunoHost-Apps/diaspora_ynh/issues
+ * YunoHost website: https://yunohost.org/
+
+---
+
+## Developer info
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade diaspora -u https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
+```
--- a/3
+++ b/3
@ -16,9 +16,6 @@
 		multi_instance=1
 		port_already_use=0
 		change_url=0 # not supported upstream
-;;; Levels
-	# If the level 5 (Package linter) is forced to 1. Please add justifications here.
-	Level 5=auto
 ;;; Options
 	Email=
 	Notification=none
--- a/manifest.json
+++ b/manifest.json
@ -8,13 +8,13 @@
    "fr": "Service de réseau social distribué"
  },
  "license": "AGPL-3.0",
-  "version": "0.7.14.0~ynh1",
+  "version": "0.7.14.0~ynh2",
  "maintainer": {
    "name": "rafi59",
    "email": ""
  },
  "requirements": {
-    "yunohost": ">= 3.7.0"
+    "yunohost": ">= 3.8.1"
  },
  "multi_instance": true,
  "services": [
--- a/scripts/backup
+++ b/scripts/backup
@ -18,7 +18,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+ynh_print_info --message="Loading installation settings..."

 app=$YNH_APP_INSTANCE_NAME

@ -30,18 +30,20 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 # clean folder
 ynh_secure_remove --file="$final_path/backup"
 mkdir -p $final_path/backup
+
 #=================================================
 # BACKUP DIASPORA DATABASE
 #=================================================
-ynh_script_progression --message="Backup Diaspora DB..." --weight=10
+
 db_pass=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 dump_file="$final_path/backup/$app.dump"
 pg_dump -d "dbname=$app user=$app password=$db_pass host=localhost" -Fc -f $dump_file
 ynh_backup --src_path="$dump_file"
+
 #=================================================
 # BACKUP DIASPORA UPLOADS
 #=================================================
-ynh_script_progression --message="Backup uploads..." --weight=10
+
 if [ -x $final_path/diaspora/public/uploads ]; then
  ynh_backup --src_path="$final_path/diaspora/public/uploads"
 else
@ -51,11 +53,11 @@ fi
 #=================================================
 # BACKUP CONF FILES
 #=================================================
-ynh_script_progression --message="Backup configuration files of Diaspora..."
+
 ynh_backup --src_path="$final_path/diaspora/config/database.yml"
 ynh_backup --src_path="$final_path/diaspora/config/diaspora.yml"

 #=================================================
 # END OF SCRIPT
 #=================================================
-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
--- a/scripts/install
+++ b/scripts/install
@ -179,6 +179,7 @@ ynh_app_setting_set $app unprotected_uris "/"
 # CREATE AN ADMIN
 #=================================================
 ynh_script_progression --message="Create admin..." --weight=1
+
 pushd $final_path/diaspora
 sudo -u $app /bin/bash --login << EOF
 RAILS_ENV=production bundle exec rails console << END
--- a/scripts/remove
+++ b/scripts/remove
@ -31,7 +31,7 @@ final_path=$(ynh_app_setting_get $app final_path)
 ynh_script_progression --message="Remove services"
 yunohost service remove $app.target
 systemctl stop ${app}.target ${app}_sidekiq.service ${app}_web.service
-systemctl disable ${app}.target ${app}_sidekiq.service ${app}_web.service
+systemctl disable ${app}.target ${app}_sidekiq.service ${app}_web.service --quiet
 ynh_secure_remove --file="/etc/systemd/system/${app}_web.service"
 ynh_secure_remove --file="/etc/systemd/system/${app}_sidekiq.service"
 ynh_secure_remove --file="/etc/tmpfiles.d/${app}.conf"
--- a/scripts/restore
+++ b/scripts/restore
@ -51,6 +51,7 @@ can_remove_home=1
 # Reinstall dependencies
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=27
+
 ynh_install_app_dependencies $pkg_dependencies $ruby_build_dependencies

 # now that we have psql for sure, test db existence
@ -62,6 +63,7 @@ can_remove_db=1
 # Restoring dedicated USER
 #=================================================
 ynh_script_progression --message="Restoring user..." --weight=1
+
 ynh_system_user_create --username=$app --home_dir=$final_path --use_shell
 can_remove_user=1
 mkdir -p $final_path
@ -72,6 +74,7 @@ chown $app:www-data $final_path
 # INSTALL RVM AND RUBY FOR CURRENT USER
 #=================================================
 ynh_script_progression --message="Reinstalling rvm and ruby..." --weight=50
+
 source ./install_ruby

 #=================================================
@ -112,24 +115,27 @@ ynh_secure_remove --file=/tmp/diaspora.dump
 #=================================================
 # Bundle the ruby app
 #=================================================
-ynh_script_progression --message="Precompile assets..." --weight=200
+ynh_script_progression --message="Precompile assets..." --weight=20
 source ./bundle_app

 #=================================================
 # Restore nginx conf files
 #=================================================
 ynh_script_progression --message="Recreate nginx config from source"
+
 ynh_add_nginx_config

 #=================================================
 # Restore services
 #=================================================
 ynh_script_progression --message="Restore services..."
+
 source ./create_services

 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
+
 yunohost service add $app.target\
  --log $final_path/diaspora/log/production.log \
        $final_path/diaspora/log/unicorn-stderr.log\
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers
 # LOAD SETTINGS
 #=================================================
 ynh_script_progression --message="Loading installation settings..."
+
 app=$YNH_APP_INSTANCE_NAME

 # Retrieve arguments
@ -30,18 +31,21 @@ ynh_abort_if_errors
 # Check upgrade type
 #=================================================
 ynh_script_progression --message="Check upgrade type..."
+
 upgrade_type=$(ynh_check_app_version_changed)

 #=================================================
 # Stop services
 #=================================================
 ynh_script_progression --message="Stop services..."
+
 systemctl stop $app.target 

 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
+
 ynh_install_app_dependencies $pkg_dependencies $ruby_build_dependencies

 #=================================================
@ -86,10 +90,21 @@ then
  source ./bundle_app
 fi

+#=================================================
+# ADVERTISE SERVICE IN ADMIN PANEL
+#=================================================
+yunohost service add $app.target \
+  --log $final_path/diaspora/log/production.log \
+        $final_path/diaspora/log/unicorn-stderr.log\
+        $final_path/diaspora/log/unicorn-stdout.log\
+        $final_path/diaspora/log/sidekiq.log\
+  --description "Diaspora service (unicorn web and sidekiq)"
+
 #=================================================
 # restart services
 #=================================================
 ynh_script_progression --message="Recreate and start services..."
+
 source ./create_services

 #=================================================
@ -97,6 +112,7 @@ source ./create_services
 #=================================================
 # Create a dedicated nginx config
 ynh_script_progression --message="configure nginx..." --weight=1
+
 ynh_add_nginx_config