Merge pull request #62 from YunoHost-Apps/testing

Testing

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
 

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
 

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.

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",
+          "type": "domain"
-          "example": "domain.org"
         },
         {
           "name": "admin",
-          "type": "user",
+          "type": "user"
-          "example": "johndoe"
         },
         {
           "name": "language",

scripts/_common.sh

@@ -5,8 +5,8 @@
 #=================================================
 
 # commit hashes
-# 2021.07
+# 2021.09
-version_commit="d1d208f18b9b43916378ccfd09b963246fe631dd"
+version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1"
 addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb"
 
 # dependencies used by the app

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 "
 

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