Merge pull request #27 from YunoHost-Apps/testing

Testing

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)
 

conf/app.src

@@ -1,3 +1,3 @@
-SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.3
+SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.4
-SOURCE_SUM=4022a743ddc0555f8d4f114ec3c3aa439eec44659cbf0d1564d0e3cc2ff30426
+SOURCE_SUM=00fafe6887af62e34ee97dc9b8e4be0720af9f27ea1cdb16ab6217f462574a3c
 SOURCE_FORMAT=zip

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": {

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.

scripts/install

@@ -104,14 +104,20 @@ 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
+
+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

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