Ver Fonte

utils: kamctl, kamdbctl improve POSIX compatibility for embedded systems (#1815)

- Use portable "#!/bin/sh" shebang. This may still be a symlink to bash (or some other shell).
- Also replace the redirection to "/dev/stderr" with a POSIX redirection to stderr. "/dev/stderr" is not available on all systems and is also not recognized by all shells (example: ash). On systems without a working "/dev/stderr" the user will not see the prompts etc.
- Signed-off-by: Sebastian Kemper <[email protected]>
micmac1 há 6 anos atrás
pai
commit
30857dfe5d
4 ficheiros alterados com 7 adições e 7 exclusões
  1. 1 1
      utils/kamctl/kamctl
  2. 3 3
      utils/kamctl/kamctl.base
  3. 2 2
      utils/kamctl/kamctl.sqlbase
  4. 1 1
      utils/kamctl/kamdbctl

+ 1 - 1
utils/kamctl/kamctl

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # control tool for maintaining Kamailio
 #

+ 3 - 3
utils/kamctl/kamctl.base

@@ -651,7 +651,7 @@ in SIP_DOMAIN"
 check_aor() {
 	echo "$1" | $EGREP "^$USERNAME_RE@.*\..*" >/dev/null
 	if [ $? -ne 0 ] ; then
-		echo "error: invalid AoR: $1" > /dev/stderr
+		echo "error: invalid AoR: $1" >&2
 		exit 1
 	fi
 }
@@ -670,7 +670,7 @@ is_aor() {
 check_sipaor() {
 	echo "$1" | $EGREP "^sip(s)?:$USERNAME_RE@.*\..*" >/dev/null
 	if [ $? -ne 0 ] ; then
-		echo "error: invalid SIP AoR: $1" > /dev/stderr
+		echo "error: invalid SIP AoR: $1" >&2
 		exit 1
 	fi
 }
@@ -681,7 +681,7 @@ check_sipaor() {
 check_uri() {
 	echo "$1" | $EGREP "^sip(s)?:($USERNAME_RE@)?.*\..*"  > /dev/null
 	if [ $? -ne 0 ] ; then
-		echo "error: invalid SIP URI: $1" > /dev/stderr
+		echo "error: invalid SIP URI: $1" >&2
 		exit 1
 	fi
 }

+ 2 - 2
utils/kamctl/kamctl.sqlbase

@@ -38,9 +38,9 @@ prompt_pw() {
 	if [ -z "$DBRWPW" ] ; then
 		savetty=`stty -g`
 		if [ -z "$1" ] ; then
-			printf "Password: " > /dev/stderr
+			printf "Password: " >&2
 		else
-			printf "$1: " > /dev/stderr
+			printf "$1: " >&2
 		fi
 		stty -echo
     	read DBRWPW

+ 1 - 1
utils/kamctl/kamdbctl

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # control tool for maintaining Kamailio databases
 #