From 1f4d8fd4d77a1f6042d768339d5f141357c8edfb Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Thu, 24 Sep 2015 15:09:39 +0200 Subject: [PATCH] Remove bashisms in {join,leave}cluster scripts So they can run in any POSIX shell, not bash only. --- tools/joincluster | 6 +++--- tools/leavecluster | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/joincluster b/tools/joincluster index ff2e0380f..837962236 100755 --- a/tools/joincluster +++ b/tools/joincluster @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Add the current ejabberd node in a cluster @@ -15,7 +15,7 @@ # 30 : network issue # 31 : node names incompatibility -function error +error() { echo "Error: $1" >&2 exit $2 @@ -67,7 +67,7 @@ CTL=$(which ejabberdctl) echo "Using commands:" [ -x "$CTL" ] && echo $CTL || error "can't find ejabberdctl" 10 -. $CTL stop 2>/dev/null >/dev/null +$CTL stop 2>/dev/null >/dev/null ERLC=${ERL}c [ -x $ERL ] && echo $ERL || error "can't find erl" 11 diff --git a/tools/leavecluster b/tools/leavecluster index b2dfea0c7..feacdce2d 100755 --- a/tools/leavecluster +++ b/tools/leavecluster @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Remove the current ejabberd node in a cluster @@ -11,7 +11,7 @@ # 12 : erlc not found # 22 : temporary dir can not be created -function error +error() { echo "Error: $1" >&2 exit $2 @@ -45,7 +45,7 @@ CTL=$(which ejabberdctl) echo "Using commands:" [ -x "$CTL" ] && echo $CTL || error "can't find ejabberdctl" 10 -. $CTL stop 2>/dev/null >/dev/null +$CTL stop 2>/dev/null >/dev/null ERLC=${ERL}c [ -x $ERL ] && echo $ERL || error "can't find erl" 11