YunoHost-Apps/matomo_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/matomo_ynh.git synced 2024-09-03 19:45:56 +02:00
Code Issues Activity Actions

Fix

Browse source
This commit is contained in:
ericgaspar 2021-05-18 11:41:30 +02:00
parent 91c0a78bd4
commit 06722ed55d
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/install
View file

@ -103,7 +103,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Installing Composer and dependencies..." ynh_script_progression --message="Installing Composer and dependencies..."
ynh_install_composer #--phpversion="$phpversion" --workdir="$final_path" ynh_install_composer
# Install missing icons # Install missing icons
ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons" ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons"

20
scripts/upgrade
View file

@ -84,16 +84,7 @@ then
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path"
else else
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path" #--keep="foo bar" to integrate when https://github.com/YunoHost/yunohost/pull/1200 is upstream ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php"
# Copy the admin saved settings from tmp directory to final path
cp -a "$tmpdir/config.ini.php" "$final_path/config/config.ini.php"
# Remove the tmp directory securely
ynh_secure_remove --file="$tmpdir"
# Download, check integrity, uncompress and patch the source from app.src
#ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini.php"
fi fi
fi fi
@ -130,14 +121,7 @@ ynh_script_progression --message="Installating composer and dependencies..."
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_install_composer
ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
# if [[ -f "$final_path/config/config.ini.php" ]]; then
# php$phpversion $final_path/console core:update -n
# fi
php$phpversion $final_path/console core:update -n php$phpversion $final_path/console core:update -n
fi fi