wok-next diff mysql/receipt @ rev 20985

Small updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Sep 29 16:54:07 2018 +0300 (2018-09-29)
parents 0e7893ac206d
children d5aab818505e
line diff
     1.1 --- a/mysql/receipt	Sat Feb 24 16:17:33 2018 +0200
     1.2 +++ b/mysql/receipt	Sat Sep 29 16:54:07 2018 +0300
     1.3 @@ -104,9 +104,11 @@
     1.4  
     1.5  pre_install_mysql() {
     1.6  	# Cleanup old files
     1.7 -	rm -f "$1/usr/libexec/mysql"*
     1.8 +	rm -f "$1"/usr/libexec/mysql*
     1.9  	# Move old config
    1.10 -	[ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf"
    1.11 +	if [ -f "$1/etc/my.cnf" ]; then
    1.12 +		mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf"
    1.13 +	fi
    1.14  }
    1.15  
    1.16  post_install_mysql() {
    1.17 @@ -130,7 +132,12 @@
    1.18  	#chroot "$1/" /bin/chown $user.$group $(cat "$1/$INSTALLED/$PACKAGE/files.list")
    1.19  	mkdir -p "$1/var/lib/mysql"
    1.20  	chroot "$1/" /bin/chown -R $user.$group /var/lib/mysql
    1.21 -	chroot "$1/" mysql_install_db --user=$user --basedir=/usr
    1.22 +
    1.23 +	if [ -n "$quiet" ]; then
    1.24 +		chroot "$1/" mysql_install_db --user=$user --basedir=/usr >/dev/null 2>&1
    1.25 +	else
    1.26 +		chroot "$1/" mysql_install_db --user=$user --basedir=/usr
    1.27 +	fi
    1.28  
    1.29  	[ -n "$quiet" ] || cat <<EOF
    1.30