lede-packages-rs

commit 2dbf4507c3253b36c43b874a7e4e9e44d994ca57
parent 38b1cf314e5581a6190882cf185f6114837e9434
Author: Jo-Philipp Wich <jow@openwrt.org>
Date:   Thu,  2 Jul 2015 14:20:30 +0200

mysql: fix datadir check in init script

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Diffstat:
M
utils/mysql/Makefile
 | 
4
++--
M
utils/mysql/files/mysqld.init
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/mysql/Makefile b/utils/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=mysql
 PKG_VERSION:=5.1.73
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=\
diff --git a/utils/mysql/files/mysqld.init b/utils/mysql/files/mysqld.init
@@ -13,7 +13,7 @@ error() {
 }
 
 start() {
-	local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" /etc/my.cnf)
+	local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]\"']*\([^[:space:]\"']*\)[[:space:]\"']*/\1/p" /etc/my.cnf)
 	if [ ! -d "$datadir" ]; then
 		error "Error: datadir '$datadir' in /etc/my.cnf doesn't exist"
 		return 1