YunoHost-Apps/piwigo_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/piwigo_ynh.git synced 2024-09-03 20:06:03 +02:00
Code Issues Activity Actions 1

Merge pull request #52 from YunoHost-Apps/testing

Browse source
This commit is contained in:
JimboJoe 2020-05-02 09:20:29 +02:00 committed by GitHub
commit 74ce9c3834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
[Piwigo](http://piwigo.org) is a photo gallery software for the web, built by an active community of users and developers
Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and opensource.
**Shipped version:** 2.10.1
**Shipped version:** 2.10.2
## Screenshots

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.10.1
SOURCE_SUM=4967bc5ebca1eae5b20cdd5849dc2e1628e281c400d73d12d116d4381e4d432b
SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.10.2
SOURCE_SUM=0de75de7da9d9b8058e208cf78d6f20852a790fca6d8231d432f3f62d12939ff
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "photo gallery",
"fr": "Galerie photo"
},
"version": "2.10.1~ynh2",
"version": "2.10.2~ynh1",
"url": "http://piwigo.org",
"license": "GPL-2.0",
"maintainer": {

52
scripts/upgrade
View file

@ -107,13 +107,13 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=3
# Create tmp directory and fetch app inside
tmpdir="$(ynh_smart_mktemp --min_size=300)"
ynh_setup_source --dest_dir="$tmpdir"
tmpdir="$(ynh_smart_mktemp --min_size=300)"
ynh_setup_source --dest_dir="$tmpdir"
# Fetch needed plugins
mkdir -p $tmpdir/plugins/Ldap_Login
ynh_setup_source --dest_dir="$tmpdir/plugins/Ldap_Login" --source_id=ldap_plugin
ynh_setup_source --dest_dir="$tmpdir/plugins" --source_id=log_failed_logins_plugin
# Fetch needed plugins
mkdir -p $tmpdir/plugins/Ldap_Login
ynh_setup_source --dest_dir="$tmpdir/plugins/Ldap_Login" --source_id=ldap_plugin
ynh_setup_source --dest_dir="$tmpdir/plugins" --source_id=log_failed_logins_plugin
fi
#=================================================
@ -158,31 +158,34 @@ shopt -s extglob
datapath=/home/yunohost.app/$app
# Install files and set permissions
cp -a $tmpdir/!(upload|_data|galleries) $final_path
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
# Install files and set permissions
cp -a $tmpdir/!(upload|_data|galleries) $final_path
# Backward compatibility:
# If the _data subdirectory wasn't already moved to /home/yunohost.app/$app,
# then move it there
if [ ! -h $final_path/_data ] ; then
mv $final_path/_data $datapath
ln -sd $datapath/_data $final_path/_data
fi
# Backward compatibility:
# If the _data subdirectory wasn't already moved to /home/yunohost.app/$app,
# then move it there
if [ ! -h $final_path/_data ] ; then
mv $final_path/_data $datapath
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
# 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
ynh_secure_remove --file="$tmpdir"
fi
chown -R $app: $final_path
chown -R $app: $datapath
chmod 755 -R $final_path/_data
ynh_secure_remove --file="$tmpdir"
#=================================================
# UPGRADE APPLICATION WITH CURL
#=================================================
@ -237,6 +240,9 @@ ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"
#=================================================
ynh_script_progression --message="Configuring LDAP plugin..."
# Disable LDAP plugin to avoid warning messages during API call
ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name <<< "DELETE FROM plugins WHERE id='Ldap_Login';"
# Activate the LDAP plugin using the WS API
# Login with admin account