From 48d5f2dc9d1ff7a3aea9bb0239816bdb1c94b385 Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Sun, 14 Sep 2014 17:05:40 +0400
Subject: [PATCH] Fix initscript for ubuntu/debian, again
---
extra/dist/tarantool.init | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/extra/dist/tarantool.init b/extra/dist/tarantool.init
index 015b1f6727..df8f42d941 100644
--- a/extra/dist/tarantool.init
+++ b/extra/dist/tarantool.init
@@ -30,13 +30,16 @@ fi
if [ -e "/etc/sysconfig/tarantool" ]; then
sysconfig_tarantool="/etc/sysconfig/tarantool"
elif [ -e "/etc/default/tarantool" ]; then
- sysconfig_tarantool="/etc/sysconfig/tarantool"
+ sysconfig_tarantool="/etc/default/tarantool"
fi
-CONF_DIR=`echo "dofile('$sysconfig_tarantool') print(instance_dir)" | tarantool`
-if [ "$CONF_DIR" = "nil" ]; then
- CONF_DIR="/etc/tarantool/instances.enabled"
+
+if [ -n "$sysconfig_tarantool" ]; then
+ CONF_DIR=`echo "dofile('$sysconfig_tarantool') print(instance_dir)" | tarantool`
fi
+if [ -z "$sysconfig_tarantool" || "$CONF_DIR" = "nil" ]; then
+ CONF_DIR="/etc/tarantool/instances.enabled"
+fi
INSTANCES=`find $CONF_DIR -xtype f -name '*lua'`
--
GitLab