Merge pull request #790 from micmac1/init-return

Treewide: Use return in init scripts instead of exit

diff --git a/net/asterisk/files/asterisk.init b/net/asterisk/files/asterisk.init
index 2e02f0626781890ee3cfd200789bb061b35510d1..51ab25949ba41024a106c3ac501942387ecc36b3 100644 (file)
--- 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 72149be2a709a6e463cf6ba07bb5a6a3a983a7a7..d48e5d60fcc42cac79b47386923004727705e772 100644 (file)
--- 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 728c482267f69d4039df0339571a7f7558a96ded..850c95a47900faab98d21f3cbfb523d15e51bd54 100644 (file)
--- 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 8f36d5aca5efed78a165f15cd7210f84c1f01609..73bf916d39f58c3f3b3728bae62f2f76eaa2d2a7 100755 (executable)
--- 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 c390b9fca4c9c9a03e967d5f17e907e8cc1f544f..f2b0c9c1343d9ae8af80e90a960ceb820836a27d 100644 (file)
--- 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 a7964070d9349a6762128699d366007ac7c4d604..bf365072327dda90138662f2acc08ac6dfcecbed 100644 (file)
--- 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 f71ec6af52593e5b5fb479a2eb7fd34c55d7a244..4c94ba255be0cdcf0a54b78ccf8cd9b8d39b8849 100644 (file)
--- 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