From 6537580c9cb926b4ac5c98d69546c588ab89e84d Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 20 Jun 2022 20:41:17 +0800 Subject: [PATCH 1/3] Update common.py --- class/core/common.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/class/core/common.py b/class/core/common.py index 74fa811d0..b91df42b8 100755 --- a/class/core/common.py +++ b/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' From 9e9abb85c35f55857c2fb21675c00a28ce3ba7f2 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 20 Jun 2022 20:44:20 +0800 Subject: [PATCH 2/3] Update mw.tpl --- scripts/init.d/mw.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 5abe3da35..4c5192f11 100755 --- a/scripts/init.d/mw.tpl +++ b/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 From bc235eba3164c9d676121bb361e3ba677508afc6 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 20 Jun 2022 20:53:05 +0800 Subject: [PATCH 3/3] Update lib.sh --- scripts/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib.sh b/scripts/lib.sh index 90e9859c9..63d453d9c 100755 --- a/scripts/lib.sh +++ b/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