diff options
| -rw-r--r-- | sh/init-functions.sh | 2 | ||||
| -rwxr-xr-x | sh/net.sh | 2 | ||||
| -rwxr-xr-x | sh/rc-help.sh | 12 | ||||
| -rwxr-xr-x | sh/runscript.sh | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sh/init-functions.sh b/sh/init-functions.sh index 38b65033..ced84897 100644 --- a/sh/init-functions.sh +++ b/sh/init-functions.sh @@ -63,7 +63,7 @@ check_statedir() { #splash "critical" & echo eerror "To function properly, \"$1\" needs to exist." - if [ "${RC_FORCE_AUTO}" = "yes" ] ; then + if yesno ${RC_FORCE_AUTO}; then eerror "Attempting to create \"$1\" for you ..." mount -o remount,rw / mkdir -p "$1" @@ -118,7 +118,7 @@ _wait_for_carrier() { # Incase users don't want this nice feature ... [ ${timeout} -le 0 ] && return 0 - [ "${RC_PARALLEL}" = "yes" ] && efunc=einfo + yesno ${RC_PARALLEL} && efunc=einfo ${efunc} "Waiting for carrier (${timeout} seconds) " while [ ${timeout} -gt 0 ] ; do sleep 1 diff --git a/sh/rc-help.sh b/sh/rc-help.sh index d4995df7..45f939f0 100755 --- a/sh/rc-help.sh +++ b/sh/rc-help.sh @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -if [ "${RC_NOCOLOR}" = "yes" ] ; then +if yesno ${RC_NOCOLOR}; then unset BLUE GREEN OFF CYAN else BLUE="\033[34;01m" @@ -61,7 +61,7 @@ printf "Usage: ${CYAN}${SERVICE}${OFF} [ ${GREEN}flags${OFF} ] < ${GREEN}options ${CYAN}Normal Commands:${OFF}" -if [ "${BE_VERBOSE}" = "yes" ] ; then +if yesno ${BE_VERBOSE}; then printf " ${GREEN}describe${OFF} Describe what the service and any extra options do. @@ -142,7 +142,7 @@ ${CYAN}Flags:${OFF}${NL} ${GREEN}--nocolor${OFF} Suppress the use of colors " -if [ "${BE_VERBOSE}" = "yes" ] ; then +if yesno ${BE_VERBOSE}; then printf " ${CYAN}Dependencies:${OFF} @@ -245,7 +245,7 @@ printf " ${CYAN}Configuration files:${OFF} " -if [ "${BE_VERBOSE}" = "yes" ] ; then +if yesno ${BE_VERBOSE}; then printf " There are two files which will be sourced for possible configuration by the rc-scripts. They are (sourced from left to right, top to bottom): @@ -259,7 +259,7 @@ printf " /etc/conf.d/rc /etc/rc.conf \${RC_SOFTLEVEL} denotes the name of the runlevel" -if [ "${BE_VERBOSE}" = "yes" ] ; then +if yesno ${BE_VERBOSE}; then printf " You can add extra dependencies to ${SERVICE} by adding some variables to /etc/conf.d/${SERVICE} @@ -273,7 +273,7 @@ printf " " fi -if [ "${BE_VERBOSE}" = "yes" ] ; then +if yesno ${BE_VERBOSE}; then printf "\n ${CYAN}Management:${OFF} diff --git a/sh/runscript.sh b/sh/runscript.sh index 8aab605c..5ba1004d 100755 --- a/sh/runscript.sh +++ b/sh/runscript.sh @@ -59,7 +59,7 @@ describe() { done } -[ "${RC_DEBUG}" = "yes" ] && set -x +yesno ${RC_DEBUG} && set -x # If we're net.eth0 or openvpn.work then load net or openvpn config rc_c=${SVCNAME%%.*} |