wok diff mariadb/receipt @ rev 19512

busybox: add hd (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 22 15:47:28 2016 +0100 (2016-11-22)
parents 92e8a75bdf91
children bf261b0db903
line diff
     1.1 --- a/mariadb/receipt	Tue Jun 03 08:06:16 2014 +0000
     1.2 +++ b/mariadb/receipt	Tue Nov 22 15:47:28 2016 +0100
     1.3 @@ -83,10 +83,10 @@
     1.4  	user=mysql
     1.5  	group=mysql
     1.6  	
     1.7 -	if ! grep -q $user $1/etc/passwd; then
     1.8 +	if ! grep -q $user "$1/etc/passwd"; then
     1.9  		echo -n "Adding user/group $user..."
    1.10 -		chroot $1/ addgroup -S $group
    1.11 -		chroot $1/ adduser -s /bin/false -S -D -H -G $group $user
    1.12 +		chroot "$1/" addgroup -S $group
    1.13 +		chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user
    1.14  		status
    1.15  	fi
    1.16  
    1.17 @@ -104,9 +104,9 @@
    1.18  pre_install()
    1.19  {
    1.20  	# Cleanup old files
    1.21 -	rm -f $1/usr/libexec/mysql*
    1.22 +	rm -f "$1/usr/libexec/mysql"*
    1.23  	# Mv config
    1.24 -	[ -f $1/etc/my.cnf ] && mv -f $1/etc/my.cnf $1/etc/mysql/my.cnf
    1.25 +	[ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf"
    1.26  }
    1.27  
    1.28  post_remove()