From 17f861165f7b40b505cfb0826388ca0320293f5c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Pialasse <jpp@koozali.org>
Date: Thu, 10 Apr 2025 18:34:56 -0400
Subject: [PATCH] * Thu Apr 10 2025 Jean-Philippe Pialasse <jpp@koozali.org>
 1.6-10.sme - fix login to roundcube after restore [SME: 12981]

---
 .../etc/e-smith/sql/init/80roundcube          | 19 ++++++-------------
 smeserver-roundcube.spec                      |  4 ++--
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
index 37ba68f..a8ad9cb 100644
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
+++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube
@@ -5,25 +5,18 @@
     $OUT .= <<END
 #!/bin/sh
 
-
-    if [ ! -d /var/lib/mysql/$db ]; then
-#if you need to add plugins:
-#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/calendar/drivers/database/SQL/mysql.initial.sql
-#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
-#    /usr/bin/mariadb  $db < /usr/share/roundcubemail/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
-
-    /usr/bin/mariadb <<EOF
-    CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-    use $db;
-    source /usr/share/roundcubemail/SQL/mysql.initial.sql;
-EOF
-    fi
     /usr/bin/mariadb <<EOF
+    CREATE DATABASE IF NOT EXISTS $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
     use mysql;
     GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
             IDENTIFIED BY '$pass';
     flush privileges;
 EOF
+
+    if [ ! -f /var/lib/mysql/$db/users.ibd ] ; then
+        cat /usr/share/roundcubemail/SQL/mysql.initial.sql | /usr/bin/mariadb $db
+    fi
+
 exit 0
 END
 }
diff --git a/smeserver-roundcube.spec b/smeserver-roundcube.spec
index c681b0e..17c1690 100644
--- a/smeserver-roundcube.spec
+++ b/smeserver-roundcube.spec
@@ -1,6 +1,6 @@
 %define name smeserver-roundcube
 %define version 1.6
-%define release 9
+%define release 10
 
 Summary: smeserver rpm to setup roundcube, an IMAP mail client
 Name: %{name}
@@ -85,7 +85,7 @@ fi
 %attr(755,root,root) /usr/bin/rcplugin_update.sh
 
 %changelog
-* Tue Apr 08 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-9.sme
+* Thu Apr 10 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-10.sme
 - fix login to roundcube after restore [SME: 12981]
 
 * Sun Mar 30 2025 Jean-Philippe Pialasse <jpp@koozali.org> 1.6-8.sme