From 9890de09be2e26cad7369e79697580100f706c26 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Mon, 23 Jan 2012 13:14:25 +0400
Subject: [PATCH] package-rpm: cosmetic fixes before a merge into main.
---
extra/tarantool | 8 +++++++-
extra/tarantool_expand.sh | 12 ++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/extra/tarantool b/extra/tarantool
index 33077270e6..192e4a7f8f 100755
--- a/extra/tarantool
+++ b/extra/tarantool
@@ -14,7 +14,13 @@ export PIDFILE="/var/${INST}/pid"
export WRAP_PIDFILE="/var/${INST}/wrapper.pid"
export OPTIONS=""
-# We must not run immediate!
+# This script is normally invoked via a symlink.
+# An own symlink is created for each instance.
+# E.g., in case of 4 instances, there are symlinks
+# tarantool0, tarantool1, tarantool2, tarantool3.
+# If, for some reason, this script is invoked not via
+# a symlink, do nothing.
+#
if [ "${INST}" == "tarantool" ]
then
echo_failure
diff --git a/extra/tarantool_expand.sh b/extra/tarantool_expand.sh
index c188b855f2..45adb282ce 100755
--- a/extra/tarantool_expand.sh
+++ b/extra/tarantool_expand.sh
@@ -26,7 +26,7 @@
#
#
-# Tarantool DB expand script
+# Tarantool instance expansion script
#
prompt_name=`basename $0`
@@ -47,7 +47,7 @@ log() {
}
usage() {
- echo "Tarantool DB expand script"
+ echo "Tarantool expansion script: add more Tarantool instances."
echo "usage: tarantool_expand.sh [options] <instances>"
echo
echo " --prefix <path> installation path (/usr/local)"
@@ -92,7 +92,7 @@ rollback() {
try() {
cmd="$*"
[ $act_debug -gt 0 ] && log $cmd
- if [ $act_dry -eq 0 ]; then
+ if [ $act_dry -eq 0 ]; then
eval $cmd
if [ $? -gt 0 ]; then
rollback
@@ -122,7 +122,7 @@ deploy_instance() {
# setting up wrapper
try "ln -s \"${prefix}/bin/tarantool_multi.sh\" \"${prefix}/bin/tarantool$id.sh\""
-
+
# setting up startup script
try "ln -s \"${prefix_etc}/init.d/tarantool\" \"${prefix_etc}/init.d/tarantool$id\""
}
@@ -184,7 +184,7 @@ if [ -f $deploy_cfg ]; then
fi
# displaying status
-if [ $act_status -ne 0 ]; then
+if [ $act_status -ne 0 ]; then
if [ $deploy_exists -eq 0 ]; then
log "no tarantool instances found."
else
@@ -199,7 +199,7 @@ is_num_positive $deploy_count
if [ $deploy_count -le $deploy_current ]; then
error "expand only is supported (required instances number $deploy_count" \
- "is lower/equal than deployed $deploy_current)"
+ "is lower/equal than deployed $deploy_current)"
fi
# asking permission to continue
--
GitLab