Merge pull request #1 from midoks/master

merge

class/core/common.py

@@ -82,6 +82,10 @@ def initInitD():
     doContentReplace(script, script_bin)
     mw.execShell('chmod +x ' + script_bin)
 
+    # 在linux系统中,确保/etc/init.d存在
+    if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
+        mw.execShell('mkdir -p /etc/init.d')
+
     # initd
     if os.path.exists("/etc/init.d"):
         initd_bin = '/etc/init.d/mw'

scripts/init.d/mw.tpl

@@ -14,7 +14,7 @@
 
 
 PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-export LC_ALL="en_US.UTF-8"
+# export LC_ALL="en_US.UTF-8"
 
 mw_path={$SERVER_PATH}
 PATH=$PATH:$mw_path/bin

scripts/lib.sh

@@ -329,7 +329,7 @@ else
 
     yum install -y openldap openldap-devel libtirpc libtirpc-devel rpcgen
 
-    yum install -y bison re2c
+    yum install -y bison re2c cmake
 
     yum install -y libmemcached libmemcached-devel
     yum install -y curl-devel