From 084d9af1e59f0f98cc34ae7e32b00db3328fcef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lemonsu=20Lo=C3=AFc?= Date: Thu, 8 Jul 2021 08:11:39 +0200 Subject: [PATCH] Changed the URL of the sources to include all sub modules (#48) * Change for the URL used in the official documentation This archive contains the git sub-modules such as the tag manager for example * no more need for the specific setup part * Same, no more need for the specific setup part --- conf/app.src | 4 ++-- scripts/install | 9 --------- scripts/upgrade | 22 ---------------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/conf/app.src b/conf/app.src index 5e9b8ce..98d6c1d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/matomo-org/matomo/archive/refs/tags/4.3.1.tar.gz -SOURCE_SUM=1b81dff17dd35e1b3a1fe6a5fe28a2916c5fb5537bf3fafc13020f52becf888a +SOURCE_URL=https://builds.matomo.org/matomo-4.3.1.tar.gz +SOURCE_SUM=55ee0fd5c555fee679f4171069464b4d33b0a635fbbdea1ff6347497763dc4e4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index d256023..a040cdd 100755 --- a/scripts/install +++ b/scripts/install @@ -97,15 +97,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC SETUP #================================================= -# INSTALL COMPOSER AND DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing Composer and dependencies..." - -ynh_install_composer - -# Install missing icons -ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons" -chmod -R 755 "$final_path/plugins/Morpheus" #================================================= # SETUP A CRON diff --git a/scripts/upgrade b/scripts/upgrade index d07323b..5d36b94 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -119,28 +119,6 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= # SPECIFIC UPGRADE #================================================= -# INSTALL COMPOSER AND DEPENDENCIES -#================================================= -ynh_script_progression --message="Installating composer and dependencies..." - -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - 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 -fi - -#================================================= -# INSTALL MISSING ICONS -#================================================= - -if [ ! "$(ls -A "$final_path/plugins/Morpheus/icons")" ] -then - ynh_script_progression --message="Installating Morpheus icons..." - ynh_setup_source --dest_dir="$final_path/plugins/Morpheus/icons" --source_id="icons" - chmod -R 755 "$final_path/plugins/Morpheus" -fi #================================================= # SETUP A CRON