mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
fix helpers
This commit is contained in:
parent
80bb0a1051
commit
4ba5a6516b
2 changed files with 12 additions and 3 deletions
|
@ -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"
|
||||||
|
|
|
@ -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
|
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"
|
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
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue