[sr-dev] git:master:7f1b5ed7: kamctl: install kamctl.rpcfifo file

Module: kamailio Branch: master Commit: 7f1b5ed7ccacbf5df3a4a252d535f09d25d2c205 URL: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2016-12-16T20:48:00+01:00 kamctl: install kamctl.rpcfifo file --- Modified: utils/kamctl/Makefile Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… Patch: https://github.com/kamailio/kamailio/commit/7f1b5ed7ccacbf5df3a4a252d535f09… --- diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 3a00ac8..13dee83 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -36,7 +36,7 @@ install-bin: $(bin_prefix)/$(bin_dir) rm -fr $(kamctltmpdir)/kamctl sed -e "s#/usr/local/sbin#$(bin_target)#g" \ < kamctl.base > $(kamctltmpdir)/kamctl.base - mkdir -p $(modules_prefix)/$(lib_dir)/kamctl + mkdir -p $(modules_prefix)/$(lib_dir)/kamctl $(INSTALL_TOUCH) \ $(modules_prefix)/$(lib_dir)/kamctl $(INSTALL_CFG) $(kamctltmpdir)/kamctl.base \ @@ -53,6 +53,11 @@ install-bin: $(bin_prefix)/$(bin_dir) $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo rm -fr $(kamctltmpdir)/kamctl.fifo sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.rpcfifo > $(kamctltmpdir)/kamctl.rpcfifo + $(INSTALL_CFG) $(kamctltmpdir)/kamctl.rpcfifo \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.rpcfifo + rm -fr $(kamctltmpdir)/kamctl.rpcfifo + sed -e "s#/usr/local#$(bin_target)#g" \ < kamctl.ser > $(kamctltmpdir)/kamctl.ser $(INSTALL_CFG) $(kamctltmpdir)/kamctl.ser \ $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 27929dd..36088ad 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -82,7 +82,7 @@ rpc_cmd() fi if [ ! -w $RPCFIFOPATH ]; then merr "Error opening Kamailio's FIFO $RPCFIFOPATH" - merr "Make sure you have loaded the jsonrpc-s module and set FIFO transport parameters" + merr "Make sure you have loaded the jsonrpcs module and set FIFO transport parameters" if [ ! -z $CHROOT_DIR ]; then merr "[chrooted environment] Check that $RPCFIFOPATH is symlinked to ${CHROOT_DIR}${RPCFIFOPATH}" fi @@ -175,7 +175,7 @@ rpc_kamailio_monitor() { fi if [ ! -w $RPCFIFOPATH ]; then merr "Error opening Kamailio's FIFO $RPCFIFOPATH" - merr "Make sure you have loaded the jsonrpc-s module and set FIFO transport parameters" + merr "Make sure you have loaded the jsonrpcs module and set FIFO transport parameters" exit 1 fi if ! test -p $path; then @@ -189,9 +189,9 @@ rpc_kamailio_monitor() { trap "rm $path; clear; echo monitor ^C-ed; exit 1" 2 attempt=0 if [ "$2" = "" ]; then - loops=-1; + loops=-1; else - loops=$2; + loops=$2; fi clear while [ $loops -ne $attempt ] ; do