From 2c008d99dc6610194f3997d597b443ca36893da0 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 28 May 2018 10:54:41 +0200 Subject: [PATCH 1/4] Create pull_request_template.md Duplicated from https://github.com/YunoHost-Apps/searx_ynh/pull/35, merged as a micro decision --- pull_request_template.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..264852c --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,25 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how you fix that* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +*Minor decision* +- **Upgrade previous version** : +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +- [ ] **Approval (LGTM)** : +- **CI succeeded** : +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/piwigo_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/piwigo_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.* +or +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/piwigo_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/piwigo_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From 436a86545db1a2016f9afa64bf000a8d5f3a19f6 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 15 Jul 2018 09:34:45 +0200 Subject: [PATCH 2/4] Upgrade to upstream version 2.9.4 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dbefa27..c98ad3a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Piwigo for YunoHost Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and opensource. -**Shipped version:** 2.9.3 +**Shipped version:** 2.9.4 ![](http://piwigo.org/screenshots/homepage/piwigo-batch-manager.png) diff --git a/conf/app.src b/conf/app.src index 6e2da07..bf52705 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.3 -SOURCE_SUM=4022a743ddc0555f8d4f114ec3c3aa439eec44659cbf0d1564d0e3cc2ff30426 +SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.4 +SOURCE_SUM=00fafe6887af62e34ee97dc9b8e4be0720af9f27ea1cdb16ab6217f462574a3c SOURCE_FORMAT=zip diff --git a/manifest.json b/manifest.json index f5d8366..3d7f095 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "photo gallery", "fr": "Galerie photo" }, - "version": "2.9.3~ynh1", + "version": "2.9.4~ynh1", "url": "http://piwigo.org", "license": "GPL-2.0", "maintainer": { From 37bdda0d8b9234cf7e8caccb8a8d567dbe15a0dc Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Tue, 31 Jul 2018 21:35:38 +0200 Subject: [PATCH 3/4] Move `galleries directory to /home/yunohost.app, and avoid deleting it during upgrade (fixes #26) --- scripts/install | 4 +++- scripts/upgrade | 18 ++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index 6796574..4c48073 100644 --- a/scripts/install +++ b/scripts/install @@ -104,14 +104,16 @@ ynh_system_user_create $app # Create a dedicated system user # Install files and set permissions mkdir $final_path -cp -a $tmpdir/!(upload|_data) $final_path +cp -a $tmpdir/!(upload|_data|galleries) $final_path datapath=/home/yunohost.app/$app mkdir -p $datapath/_data mkdir -p $datapath/upload +mkdir -p $datapath/galleries ln -sd $datapath/_data $final_path/_data ln -sd $datapath/upload $final_path/upload +ln -sd $datapath/galleries $final_path/galleries chown -R $app: $final_path chown -R $app: $datapath diff --git a/scripts/upgrade b/scripts/upgrade index c03beee..518363c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,17 +128,8 @@ ynh_system_user_create $app # Create dedicated user if not existing # We store photos (potentially large data) on /home/yunohost.app datapath=/home/yunohost.app/$app -# Backward compatibility: -# If the galleries subdirectory was moved, -# remove the link and overwrite it -# (this directory always includes only a single index.php file...) -if [ -h $final_path/galleries ] ; then - rm -f $final_path/galleries # only a symbolic link, ynh_secure_remove can't handle that - ynh_secure_remove $datapath/galleries -fi - # Install files and set permissions -cp -a $tmpdir/!(upload|_data) $final_path +cp -a $tmpdir/!(upload|_data|galleries) $final_path # Backward compatibility: @@ -149,6 +140,13 @@ if [ ! -h $final_path/_data ] ; then ln -sd $datapath/_data $final_path/_data fi +# Backward compatibility: +# If the galleries subdirectory wasn't already moved to /home/yunohost.app/$app, +# then move it there +if [ ! -h $final_path/galleries ] ; then + mv $final_path/galleries $datapath + ln -sd $datapath/galleries $final_path/galleries +fi chown -R $app: $final_path chown -R $app: $datapath From 2d216e16f9ada7accb0cfb205d2f9ec343b61515 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Tue, 31 Jul 2018 22:29:39 +0200 Subject: [PATCH 4/4] Copy initial archive files in _data, galleries and upload directories --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 4c48073..9cb15be 100644 --- a/scripts/install +++ b/scripts/install @@ -115,6 +115,10 @@ ln -sd $datapath/_data $final_path/_data ln -sd $datapath/upload $final_path/upload ln -sd $datapath/galleries $final_path/galleries +cp -Rp $tmpdir/_data/. $final_path/_data +cp -Rp $tmpdir/upload/. $final_path/upload +cp -Rp $tmpdir/galleries/. $final_path/galleries + chown -R $app: $final_path chown -R $app: $datapath chmod 755 -R $final_path/_data