diff --git a/check_process b/check_process index 17e1c9f..e5c8250 100644 --- a/check_process +++ b/check_process @@ -3,7 +3,7 @@ domain="domain.tld" path="/path" admin="john" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 language="fr" dav_support=1 signup=0 @@ -24,9 +24,6 @@ upgrade=1 from_commit=d03eaae18c5b99f7933ae18378d5567fc46389f5 backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 - port_already_use=0 change_url=0 ;;; Options Email=anmol@datamol.org diff --git a/conf/app.src b/conf/app.src index 22ade3d..1fc95d7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/monicahq/monica/archive/v3.0.1.zip -SOURCE_SUM=92e182b4b9fdeb11ff03390b22a5bb1931fdd643fca99ca697642b5f1e009736 +SOURCE_URL=https://github.com/monicahq/monica/archive/refs/tags/v3.1.3.zip +SOURCE_SUM=bd1f47d89b84e9f14723663d0d917ac9cc9cd8b5dbe31237d6ec6532500e031c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=v3.0.1.zip +SOURCE_FILENAME=v3.1.3.zip diff --git a/manifest.json b/manifest.json index 5bfd32b..b6d85df 100644 --- a/manifest.json +++ b/manifest.json @@ -3,9 +3,10 @@ "id": "monica", "packaging_format": 1, "description": { - "en": " Personal Relationship Manager - a new kind of CRM to organize interactions with your friends and family." + "en": "Personal Relationship Manager", + "fr": "Gestionnaire de relations personnelles" }, - "version": "3.0.1~ynh1", + "version": "3.1.3~ynh1", "url": "https://monicahq.com", "license": "GPL-3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index e750c35..478b7ce 100644 --- a/scripts/install +++ b/scripts/install @@ -99,10 +99,12 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -git clone https://github.com/monicahq/monica.git $final_path -pushd "$final_path" - git checkout tags/$version -popd +ynh_setup_source --dest_dir="$final_path" + +# git clone https://github.com/monicahq/monica.git $final_path +# pushd "$final_path" +# git checkout tags/$version +# popd chmod 750 "$final_path" chmod -R o-rwx "$final_path" @@ -204,14 +206,6 @@ popd update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= -ynh_script_progression --message="Storing the config file checksum..." - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$config" - chmod 400 "$config" chown $app:$app "$config" @@ -233,8 +227,6 @@ ynh_script_progression --message="Configuring permissions..." # Make app public if necessary if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi diff --git a/scripts/upgrade b/scripts/upgrade index aa5ac43..5436261 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,6 +71,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + # Create a permission if needed if ! ynh_permission_exists --permission="api"; then ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" @@ -82,7 +89,7 @@ fi ynh_script_progression --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CHECK VERSION NUMBER @@ -98,21 +105,11 @@ previous_version="${version}" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." + ynh_script_progression --message="Upgrading source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src - if git -C "$final_path" rev-parse --is-inside-work-tree` >/dev/null 2>/dev/null - then - pushd "$final_path" - git fetch - git checkout tags/$version - popd - else - ynh_setup_source --dest_dir="$final_path" - fi - + ynh_setup_source --dest_dir="$final_path" fi -ynh_app_setting_set --app=$app --key=version --value=$version chmod 750 "$final_path" chmod -R o-rwx "$final_path" @@ -245,14 +242,6 @@ fi update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= -ynh_script_progression --message="Storing the config file checksum..." - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$config" - chmod 400 "$config" chown $app:$app "$config"