From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Mon, 30 Jun 2025 05:19:40 +0000 (-0400)
Subject: Adjusting mysql creation
X-Git-Tag: tag-0.11~9
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=d8d6d3c0e97124b3a806c007f1bfcb87e895673e;p=jmp%2Fmailleur

Adjusting mysql creation
---

diff --git a/support/crdb.sh b/support/crdb.sh
index 8e8c4a3..b5d8c9f 100755
--- a/support/crdb.sh
+++ b/support/crdb.sh
@@ -66,7 +66,7 @@ case "$DB_TYPE" in
     ;;
   "POSTGRESQL"		)
     SQL="/usr/bin/psql -q"
-    MSQL="/usr/bin/psql -U $APPNAME -q $APPNAME"
+    MSQL="/usr/bin/psql --default-character-set=utf8 -U $APPNAME -q $APPNAME"
     /etc/rc.d/init.d/postgresql status
     if [ $? != 0 ] ; then
       echo "Postgresql serveur NOT found up and running (exiting!)"
@@ -96,10 +96,10 @@ case "$DB_TYPE" in
 #loading database definition
 if [ -n "$MSQL" ] ; then
   cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql | $MSQL
-   DIST=`/usr/sbin/receiver -v | cut -d '-' -f2`
-   #is this de developpement version?
-   if [ "$DIST" = "dvl" ] ; then
-     # set a minimal test database
-     cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/datatest.sql | $MSQL
-     fi
+  DIST=`/usr/sbin/receiver -v | cut -d '-' -f2`
+  #is this de developpement version?
+  if [ "$DIST" = "dvl" ] ; then
+    # set a minimal test database
+    cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/datatest.sql | $MSQL
+    fi
   fi