From 3cf43042ea218680222ea3671ea994d98fa63e30 Mon Sep 17 00:00:00 2001
From: ericgaspar
Date: Mon, 12 Oct 2020 10:06:16 +0200
Subject: [PATCH] Fix
---
README.md | 71 ++++++++++++++++++++++++++++++++++++++++++-------
check_process | 8 ++++--
scripts/backup | 5 ----
scripts/install | 5 ----
scripts/restore | 1 -
5 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index ef9083f..1e299c7 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,81 @@
# Adminer for Yunohost
-[![Integration level](https://dash.yunohost.org/integration/adminer.svg)](https://dash.yunohost.org/appci/app/adminer)
-[![Install Adminer with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=adminer)
+[![Integration level](https://dash.yunohost.org/integration/adminer.svg)](https://dash.yunohost.org/appci/app/adminer) ![](https://ci-apps.yunohost.org/ci/badges/adminer.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/adminer.maintain.svg)
+[![Install adminer with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=adminer)
-> *This package allow you to install Adminer 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.*
+*[Lire ce readme en français.](./README_fr.md)*
+> *This package allows you to install adminer 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
Replace phpMyAdmin with Adminer and you will get a tidier user interface, better support for MySQL features, higher performance and more security. See detailed comparison https://www.adminer.org/en/phpmyadmin/.
Adminer development priorities are: 1. Security, 2. User experience, 3. Performance, 4. Feature set, 5. Size.
+
+Adminer (formerly phpMinAdmin better alternate to phpmyadmin) is a full-featured database management tool written in PHP.
+
+You need to know the root password from here /etc/yunohost/mysql or the app username and password from setting.yml under /etc/yunohost/apps/appname to login.
+For themes download the adminer.css from the main website and put the file in the app folder.
+If you have problems with drivers see here: https://www.adminer.org/en/drivers.
+
+
+
**Shipped version:** 4.7.6
## Screenshots
![](Link to a screenshot of this app.)
+## Demo
-Adminer (formerly phpMinAdmin better alternate to phpmyadmin) is a full-featured database management tool written in PHP.
+* [Official demo](Link to a demo site for this app.)
-http://www.adminer.org
-You need to know the root password from here /etc/yunohost/mysql or the app username and password from setting.yml under /etc/yunohost/apps/appname to login.
-For themes download the adminer.css from the main website and put the file in the app folder.
-If you have problems with drivers see here: https://www.adminer.org/en/drivers.
+## Configuration
+How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+## Documentation
+
+ * Official documentation: Link to the official documentation of this app
+ * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+
+## YunoHost specific features
+
+#### Multi-user support
+
+ * Are LDAP and HTTP auth supported?
+ * Can the app be used by multiple users?
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/adminer_%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/adminer/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/adminer_%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/adminer/)
+
+## Limitations
+
+* Any known limitations.
+
+## Additional information
+
+* Other info you would like to add about this app.
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/adminer_ynh/issues
+ * App website: https://www.adminer.org/
+ * Upstream app repository: https://github.com/vrana/adminer/
+ * YunoHost website: https://yunohost.org/
+
+---
+
+## Developer info
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/adminer_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/adminer_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade adminer -u https://github.com/YunoHost-Apps/adminer_ynh/tree/testing --debug
+```
diff --git a/check_process b/check_process
index 1e021bb..682885c 100644
--- a/check_process
+++ b/check_process
@@ -5,8 +5,8 @@
;; Test complet
; Manifest
domain="domain.tld" (DOMAIN)
- path="/path" (PATH)
- is_public=1 (PUBLIC|public=1|private=0)
+ path="/path" (PATH)
+ is_public=1 (PUBLIC|public=1|private=0)
; Checks
pkg_linter=1
@@ -26,3 +26,7 @@
;;; Options
Email= anmol@datamol.org
Notification=change
+;;; Upgrade options
+ ; commit=CommitHash
+ name=Name and date of the commit.
+ manifest_arg=domain=DOMAIN&path=PATH&is_public=1&
diff --git a/scripts/backup b/scripts/backup
index aee48a7..bc09c2e 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -14,11 +14,6 @@ source /usr/share/yunohost/helpers
# MANAGE SCRIPT FAILURE
#=================================================
-ynh_clean_setup () {
- ### Remove this function if there's nothing to clean before calling the remove script.
- true
-}
-# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
diff --git a/scripts/install b/scripts/install
index 404ee7b..6e2ea11 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,11 +13,6 @@ source /usr/share/yunohost/helpers
# MANAGE SCRIPT FAILURE
#=================================================
-ynh_clean_setup () {
- ### Remove this function if there's nothing to clean before calling the remove script.
- true
-}
-# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
diff --git a/scripts/restore b/scripts/restore
index b9a7914..0255619 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers
# MANAGE SCRIPT FAILURE
#=================================================
-# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================