YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

fix helpers

Browse source
This commit is contained in:
Kay0u 2021-03-18 14:50:44 +01:00
parent 80bb0a1051
commit 4ba5a6516b
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/_ynh_mysql_connect_as.sh
View file

@ -28,6 +28,8 @@ ynh_mysql_connect_as() {
if [ -n "$default_character_set" ] if [ -n "$default_character_set" ]
then then
default_character_set="--default-character-set=$default_character_set" default_character_set="--default-character-set=$default_character_set"
else
default_character_set="--default-character-set=latin1"
fi fi
mysql --user="$user" --password="$password" "$default_character_set" --batch "$database" mysql --user="$user" --password="$password" "$default_character_set" --batch "$database"

13
scripts/_ynh_mysql_dump_db.sh
View file

@ -5,7 +5,7 @@
# example: ynh_mysql_dump_db --database=roundcube --default_character_set="utf8mb4" > ./dump.sql # example: ynh_mysql_dump_db --database=roundcube --default_character_set="utf8mb4" > ./dump.sql
# #
# usage: ynh_mysql_dump_db --database=database # usage: ynh_mysql_dump_db --database=database
# | arg: -d, --database= - the database name to dump # | arg: -d, --database= - the database name to dump
# | arg: -c, --default_character_set= - the charset to use # | arg: -c, --default_character_set= - the charset to use
# | ret: the mysqldump output # | ret: the mysqldump output
# #
@ -23,7 +23,14 @@ ynh_mysql_dump_db() {
if [ -n "$default_character_set" ] if [ -n "$default_character_set" ]
then then
default_character_set="--default-character-set=$default_character_set" default_character_set="--default-character-set=$default_character_set"
else
# By default, default character set is "latin1"
default_character_set="--default-character-set=latin1"
fi
if [ -f "$MYSQL_ROOT_PWD_FILE" ]; then
mysqldump --user="root" --password="$(cat $MYSQL_ROOT_PWD_FILE)" --single-transaction --skip-dump-date "$default_character_set" "$database"
else
mysqldump --single-transaction --skip-dump-date "$default_character_set" "$database"
fi fi
mysqldump --user="root" --password="$(cat $MYSQL_ROOT_PWD_FILE)" --single-transaction --skip-dump-date "$default_character_set" "$database"
} }