Remove bashisms in {join,leave}cluster scripts

So they can run in any POSIX shell, not bash only.

diff --git a/tools/joincluster b/tools/joincluster
index ff2e0380f512cdf5e5246048a263ca690cc576cd..8379622360ac55a41cd05ab6dc6b9b01c174d9af 100755 (executable)
--- 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 b2dfea0c7213c659b51b23425b7bb77ce752f11e..feacdce2dd9a6f2da14f2a18824c829a37a6e71e 100755 (executable)
--- 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