From bbbebf90baeae38fc61b13e58781198842369ad2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 25 Sep 2021 19:46:15 +0200 Subject: [PATCH 1/3] Upgrade to 2021.09 --- doc/DESCRIPTION.md | 3 +++ manifest.json | 8 +++----- scripts/_common.sh | 4 ++-- scripts/restore | 2 -- 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..4b3d428 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,3 @@ +Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services. + +Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. \ No newline at end of file diff --git a/manifest.json b/manifest.json index d7a26e5..caac2b8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Social Communication Server", "fr": "Serveur de Communication Social" }, - "version": "2021.07~ynh2", + "version": "2021.09~ynh1", "url": "http://friendi.ca", "upstream": { "license": "AGPL-3.0-only", @@ -38,13 +38,11 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "language", diff --git a/scripts/_common.sh b/scripts/_common.sh index 09f6831..9a647ae 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,8 @@ #================================================= # commit hashes -# 2021.07 -version_commit="d1d208f18b9b43916378ccfd09b963246fe631dd" +# 2021.09 +version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1" addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb" # dependencies used by the app diff --git a/scripts/restore b/scripts/restore index 87e8ae2..16865b2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -41,8 +41,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From aea2539ae0fedcb2a943a16ff863217b8efdc1dd Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 25 Sep 2021 17:46:20 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 6 ++++-- README_fr.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ef28d2..df5457c 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Social Communication Server +Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services. -**Shipped version:** 2021.07~ynh2 +Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. + +**Shipped version:** 2021.09~ynh1 **Demo:** https://dir.friendica.social/servers diff --git a/README_fr.md b/README_fr.md index 8d72885..5c7cac6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,9 +11,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Serveur de Communication Social +Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services. -**Version incluse :** 2021.07~ynh2 +Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. + +**Version incluse :** 2021.09~ynh1 **Démo :** https://dir.friendica.social/servers From cc5c4503069b8d863e4c39fe9bdcf6d9a7984187 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 26 Sep 2021 20:10:18 +0200 Subject: [PATCH 3/3] Update upgrade --- scripts/upgrade | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0e3113d..5ada0d1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,17 +33,6 @@ language=$(ynh_app_setting_get --app=$app --key=language) upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=3 - -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -61,6 +50,13 @@ ynh_abort_if_errors #================================================= # CHECK THE PATH #================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=3 + +# If db_name doesn't exist, create it +if [ -z "$db_name" ]; then + db_name=$(ynh_sanitize_dbid --db_name=$app) + ynh_app_setting_set --app=$app --key=db_name --value=$db_name +fi # If final_path doesn't exist, create it if [ -z "$final_path" ]; then