X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=8d59fa4b0cd1cb897b8199605930a604058adf6b;hb=d11d0f5b306ab65e0df21f462e9169e047a79d8a;hp=57b9ecfe52b2fb695279f8816ed4c77c83d5c080;hpb=07b7055d3ae14fa8caeef26d3a7b43686b3eef4e;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql b/handlers/mysql
index 57b9ecf..8d59fa4 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -22,7 +22,7 @@ if [ "$user" == "" ]; then
 	user=root;
 else
 	userset=true;
-	userhome=`grep "^$user:" /etc/passwd | awk -F: '{print $6}'`
+	userhome=`getent passwd "$user" | awk -F: '{print $6}'`
 	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
 fi
 
@@ -57,7 +57,7 @@ then
 	[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
 	# is it running ?
 	running=`$VSERVERINFO $vsname RUNNING`
-	[ $running = 1 ] || fatal "vserver $vsname is not running."
+	[ "$running" = "1" ] || fatal "vserver $vsname is not running."
 fi
 	
 # create backup dirs, the vroot variable will be empty if no vsname was specified
@@ -95,7 +95,7 @@ fi
 
 defaultsfile=""
 if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
-	home=`grep '^root:' /etc/passwd | awk -F: '{print $6}'`
+	home=`getent passwd "root" | awk -F: '{print $6}'`
 	[ -d $home ] || fatal "Can't find root's home directory ($home)."
 	mycnf="$home/.my.cnf"
 	if [ -f $mycnf ]; then