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 #50 from YunoHost-Apps/fix-upgrade

Browse source 
fix upgrade
This commit is contained in:
JimboJoe 2020-04-04 09:33:37 +02:00 committed by GitHub
commit 5ce5232256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
scripts/upgrade
View file

@ -31,6 +31,9 @@ admin_pwd=$(ynh_app_setting_get --app=$app --key=admin_pwd)
#================================================= #=================================================
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
# Workaround for now to force all instances to get the latest LDAP plugin
# in order to create the dedicated tables
upgrade_type="UPGRADE_APP"
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
@ -107,13 +110,13 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=3 ynh_script_progression --message="Upgrading source files..." --weight=3
# Create tmp directory and fetch app inside # Create tmp directory and fetch app inside
tmpdir="$(ynh_smart_mktemp --min_size=300)" tmpdir="$(ynh_smart_mktemp --min_size=300)"
ynh_setup_source --dest_dir="$tmpdir" ynh_setup_source --dest_dir="$tmpdir"
# Fetch needed plugins # Fetch needed plugins
mkdir -p $tmpdir/plugins/Ldap_Login 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/Ldap_Login" --source_id=ldap_plugin
ynh_setup_source --dest_dir="$tmpdir/plugins" --source_id=log_failed_logins_plugin ynh_setup_source --dest_dir="$tmpdir/plugins" --source_id=log_failed_logins_plugin
fi fi
#================================================= #=================================================
@ -158,31 +161,34 @@ shopt -s extglob
datapath=/home/yunohost.app/$app datapath=/home/yunohost.app/$app
# Install files and set permissions if [ "$upgrade_type" == "UPGRADE_APP" ]
cp -a $tmpdir/!(upload|_data|galleries) $final_path then
# Install files and set permissions
cp -a $tmpdir/!(upload|_data|galleries) $final_path
# Backward compatibility: # Backward compatibility:
# If the _data subdirectory wasn't already moved to /home/yunohost.app/$app, # If the _data subdirectory wasn't already moved to /home/yunohost.app/$app,
# then move it there # then move it there
if [ ! -h $final_path/_data ] ; then if [ ! -h $final_path/_data ] ; then
mv $final_path/_data $datapath mv $final_path/_data $datapath
ln -sd $datapath/_data $final_path/_data ln -sd $datapath/_data $final_path/_data
fi fi
# Backward compatibility: # Backward compatibility:
# If the galleries subdirectory wasn't already moved to /home/yunohost.app/$app, # If the galleries subdirectory wasn't already moved to /home/yunohost.app/$app,
# then move it there # then move it there
if [ ! -h $final_path/galleries ] ; then if [ ! -h $final_path/galleries ] ; then
mv $final_path/galleries $datapath mv $final_path/galleries $datapath
ln -sd $datapath/galleries $final_path/galleries ln -sd $datapath/galleries $final_path/galleries
fi
ynh_secure_remove --file="$tmpdir"
fi fi
chown -R $app: $final_path chown -R $app: $final_path
chown -R $app: $datapath chown -R $app: $datapath
chmod 755 -R $final_path/_data chmod 755 -R $final_path/_data
ynh_secure_remove --file="$tmpdir"
#================================================= #=================================================
# UPGRADE APPLICATION WITH CURL # UPGRADE APPLICATION WITH CURL
#================================================= #=================================================
@ -237,6 +243,9 @@ ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"
#================================================= #=================================================
ynh_script_progression --message="Configuring LDAP plugin..." 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 # Activate the LDAP plugin using the WS API
# Login with admin account # Login with admin account