From 063cc02ad75925d8b16cb2bdef4befb1a94fd5d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Aug 2021 07:18:27 +0200 Subject: [PATCH 1/5] Update change_url --- scripts/change_url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 19501d4..ff06606 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade From 3a99180fe390091ddce73013c551dd6833dac3a2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 23:28:49 +0200 Subject: [PATCH 2/5] Update manifest.json --- manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index f7ea83f..ffb8c34 100644 --- a/manifest.json +++ b/manifest.json @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", From 90de8ea8c63a7a5b869e9fadef289f5a588a5754 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 23 Sep 2021 23:42:12 +0200 Subject: [PATCH 3/5] Add teemplates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ conf/app.src | 1 - manifest.json | 2 +- scripts/install | 2 -- 5 files changed, 72 insertions(+), 4 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE.md create mode 100755 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100755 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100755 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/conf/app.src b/conf/app.src index 6b5fce5..fb74725 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,4 @@ SOURCE_SUM=sha256 checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index ffb8c34..6a4c0d0 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "packaging_format": 1, "description": { "en": "Improved File Manager", - "fr": "Improved File Manager " + "fr": "Gestionnaire de fichiers amélioré" }, "version": "2.6.3~ynh1", "url": "https://github.com/misterunknown/ifm", diff --git a/scripts/install b/scripts/install index 2da932c..58feb03 100755 --- a/scripts/install +++ b/scripts/install @@ -59,8 +59,6 @@ ynh_system_user_create --username=$app --home_dir="$final_path" ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path -# Download, check integrity, uncompress and patch the source from app.src -#ynh_setup_source --dest_dir="$final_path" mkdir -p $final_path mv "../conf/ifm.php" "$final_path/ifm.php" From 1748c0955907e5d6506e727c12121239bd8b6db4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Sep 2021 07:33:53 +0200 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6a4c0d0..a12d621 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Improved File Manager", "fr": "Gestionnaire de fichiers amélioré" }, - "version": "2.6.3~ynh1", + "version": "2.6.3~ynh2", "url": "https://github.com/misterunknown/ifm", "upstream": { "license": "MIT", From 35cc9dfb99a6c84209b220ad2ebb4ca72a7e963b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 24 Sep 2021 05:33:57 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7cb664..a5e3951 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using - simple authentication (LDAP via `ldap_bind` possible) -**Shipped version:** 2.6.3~ynh1 +**Shipped version:** 2.6.3~ynh2 **Demo:** https://ifmdemo.gitea.de/ diff --git a/README_fr.md b/README_fr.md index 089fe81..c493143 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ L'IFM est un gestionnaire de fichiers basé sur le Web, qui se présente sous la - aperçu de l'image - authentification simple (LDAP via `ldap_bind` possible) -**Version incluse :** 2.6.3~ynh1 +**Version incluse :** 2.6.3~ynh2 **Démo :** https://ifmdemo.gitea.de/