diff --git a/manifest.json b/manifest.json index 1fe5354..4aad6af 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A CMS with a focus on collaborative edition and multilingualism", "fr": "Un CMS conçu pour l'édition collaborative et le multilinguisme" }, - "version": "3.2.7~ynh2", + "version": "3.2.7~ynh3", "url": "http://www.spip.net/", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 516c436..eb4d86a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # SET ALL CONSTANTS #================================================= -pkg_dependencies="php-sqlite3" +pkg_dependencies="php7.0-sqlite3" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index cf0c85c..3143e52 100644 --- a/scripts/install +++ b/scripts/install @@ -147,6 +147,9 @@ ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "adresse_db=localhost #ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" #ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" +# Fix db initialization +ynh_local_curl "/ecrire/?exec=install" "etape=3b" + email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" diff --git a/scripts/upgrade b/scripts/upgrade index 420c53f..713e1bc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -188,6 +188,9 @@ ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "adresse_db=localhost #ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=ldap5" "adresse_ldap=localhost" "port_ldap=389" "tls_ldap=no" "protocole_ldap=3" "base_ldap=dc=yunohost,dc=org" "statut_ldap=$status" "ldap_login=sAMAccountName,uid,login,userid,cn,sn" "ldap_nom=cn" "ldap_email=mail" "ldap_bio=description" #ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "ldap_present=true" +# Fix db initialization +ynh_local_curl "/ecrire/?exec=install" "etape=3b" + email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin"