Merge pull request #790 from micmac1/init-return

Treewide: Use return in init scripts instead of exit

7 files changed, 11 insertions, 11 deletions

diff --git a/net/asterisk/files/asterisk.init b/net/asterisk/files/asterisk.init
index 2e02f06..51ab259 100644
--- a/net/asterisk/files/asterisk.init
+++ b/net/asterisk/files/asterisk.init
@@ -26,7 +26,7 @@ start_service() {
   config_get_bool enabled general enabled 0
   if [ $enabled -eq 0 ]; then
     $LOGGER service not enabled in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   config_get_bool log_stderr general log_stderr 1
diff --git a/net/baresip/files/baresip.init b/net/baresip/files/baresip.init
index 72149be..d48e5d6 100644
--- a/net/baresip/files/baresip.init
+++ b/net/baresip/files/baresip.init
@@ -21,7 +21,7 @@ start_service() {
   if [ "$ENABLE_BARESIP" != yes ]; then
     $LOGGER User configuration incomplete - not starting $DAEMON
     $LOGGER Check ENABLE_BARESIP in $DEFAULT
-    exit 1
+    return 1
   fi
 
   procd_open_instance
diff --git a/net/coturn/Makefile b/net/coturn/Makefile
index 728c482..850c95a 100644
--- a/net/coturn/Makefile
+++ b/net/coturn/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coturn
 PKG_VERSION:=4.5.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/coturn/coturn/tar.gz/$(PKG_VERSION)?
diff --git a/net/coturn/files/turnserver.init b/net/coturn/files/turnserver.init
index 8f36d5a..73bf916 100755
--- a/net/coturn/files/turnserver.init
+++ b/net/coturn/files/turnserver.init
@@ -20,7 +20,7 @@ start_service() {
   config_get_bool enabled general enabled 0
   if [ $enabled -eq 0 ]; then
     $LOG_ERR service not enabled in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   config_get_bool log_stderr general log_stderr 1
diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index c390b9f..f2b0c9c 100644
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -26,7 +26,7 @@ start_service() {
   config_get_bool enabled general enabled 0
   if [ $enabled -eq 0 ]; then
     $LOG_ERR service not enabled in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   config_get_bool log_stderr general log_stderr 1
@@ -46,7 +46,7 @@ start_service() {
     $LOG_INFO using procd\'s default term_timeout
   elif ! [ 0 -lt "$term_timeout" ] 2>/dev/null; then
     $LOG_ERR invalid term_timeout in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   for i in "$dir_localstate" "$dir_run"; do
diff --git a/net/kamailio/files/kamailio.init b/net/kamailio/files/kamailio.init
index a796407..bf36507 100644
--- a/net/kamailio/files/kamailio.init
+++ b/net/kamailio/files/kamailio.init
@@ -26,7 +26,7 @@ check_listen() {
 
   [ -z "$value" ] && {
     $LOG_ERR empty $type entry
-    exit 1
+    return 1
   }
 
   # IPv6 addresses need to be enclosed in square brackets. If there are
@@ -39,7 +39,7 @@ check_listen() {
   # Bail if more than 2 colons.
   [ $(echo "$value" | awk -F ":" '{print NF-1}') -gt 2 ] && {
     $LOG_ERR init script does not understand $type entry \""$value"\"
-    exit 1
+    return 1
   }
 
   IFS=":" read one two three << EOF
@@ -93,7 +93,7 @@ start_service() {
 
   if [ $enabled -eq 0 ]; then
     $LOG_ERR service not enabled in /etc/config/$NAME
-    exit 1
+    return 1
   fi
 
   config_get user       general user       $NAME
diff --git a/net/rtpproxy/files/rtpproxy.init b/net/rtpproxy/files/rtpproxy.init
index f71ec6a..4c94ba2 100644
--- a/net/rtpproxy/files/rtpproxy.init
+++ b/net/rtpproxy/files/rtpproxy.init
@@ -48,13 +48,13 @@ check_ipaddr() {
 
 	[ -z "$value" ] && {
 		$LOG_ERR empty $type entry
-		exit 1
+		return 1
 	}
 
 	# Bail if more than 1 slash.
 	[ $(echo "$value" | awk -F "/" '{print NF-1}') -gt 1 ] && {
 		$LOG_ERR init script does not understand $type entry \""$value"\"
-		exit 1
+		return 1
 	}
 
 	IFS="/" read one two << EOF