Module: sip-router Branch: master Commit: f89005faf1fa47745a4bdb9770d23476fbfe891d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f89005fa...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: Thu Sep 23 13:27:27 2010 +0200

kamctl: include .base lib before sercmd detection

- merr() function is declared there

---

utils/kamctl/kamctl | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index e5252a5..be65363 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -50,6 +50,16 @@ if [ -z "$MYLIBDIR" ] ; then fi fi

+##### ------------------------------------------------ ##### +### load base functions +# +if [ -f "$MYLIBDIR/kamctl.base" ]; then + . "$MYLIBDIR/kamctl.base" +else + echo -e "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n" + exit -1 +fi + # locate sercmd if [ -z "$SERCMD" ] ; then # try same dir as kamctl @@ -77,16 +87,6 @@ else fi fi

-##### ------------------------------------------------ ##### -### load base functions -# -if [ -f "$MYLIBDIR/kamctl.base" ]; then - . "$MYLIBDIR/kamctl.base" -else - echo -e "Cannot load core functions '$MYLIBDIR/kamctl.base' - exiting ...\n" - exit -1 -fi - # ##### ------------------------------------------------ ##### ### DBENGINE