diff --git a/scripts/upgrade b/scripts/upgrade index 5d89110..b453b76 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,17 +19,19 @@ upgrade_type=$(ynh_check_app_version_changed) # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 +if [ "$upgrade_type" == "UPGRADE_APP" ]; then + ynh_script_progression --message="Upgrading source files..." --weight=5 - # Download, check integrity, uncompress and patch the source from app.src - # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep - noncore_extensions="$(echo tools/{accountactivationbyemail,advancedsearch,benevolat,ferme,fontautoinstall,importer,ipblock,lms,login-sso,logincas,loginldap,maintenance,multideletepages,nextcloudconnector,publication,qrcode,stats,tabdyn,twolevels,webhooks,yunohost})" - ferme_instances="$(cd $install_dir; for p in $(ls -- */wakka.config.php 2>/dev/null); do dirname "$p"; done)" - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env wakka.config.php files custom private themes $noncore_extensions $ferme_instances" + # Download, check integrity, uncompress and patch the source from app.src + # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep + noncore_extensions="$(echo tools/{accountactivationbyemail,advancedsearch,benevolat,ferme,fontautoinstall,importer,ipblock,lms,login-sso,logincas,loginldap,maintenance,multideletepages,nextcloudconnector,publication,qrcode,stats,tabdyn,twolevels,webhooks,yunohost})" + ferme_instances="$( + cd $install_dir + for p in $(ls -- */wakka.config.php 2>/dev/null); do dirname "$p"; done + )" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env wakka.config.php files custom private themes $noncore_extensions $ferme_instances" - ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php" + ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php" fi chmod -R o-rwx "$install_dir" @@ -66,6 +68,10 @@ ynh_secure_remove "$install_dir/tools/yunohost" mkdir -p "$install_dir/tools/yunohost" ynh_setup_source --dest_dir="$install_dir/tools/yunohost" --source_id="yunohostplugin" +# Download importer plugin from yeswiki repository +ynh_secure_remove "$install_dir/tools/importer" +mkdir -p "$install_dir/tools/importer" +ynh_setup_source --dest_dir="$install_dir/tools/importer" --source_id="importerplugin" #================================================= # SECURE FILES AND DIRECTORIES