diff --git a/base/sysfiles/etc_rc.d_functions-ansi.in.txt b/base/sysfiles/etc_rc.d_functions-ansi.in.txt index ca8b00241..d408662d8 100644 --- a/base/sysfiles/etc_rc.d_functions-ansi.in.txt +++ b/base/sysfiles/etc_rc.d_functions-ansi.in.txt @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../sysfiles/etc_rc.d_functions.in.txt +# Filename: package/.../sysfiles/etc_rc.d_functions-ansi.in.txt # Copyright (C) 2006 - 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. @@ -68,16 +68,3 @@ status() $ECHO "$BELL$COLOR_FAILURE$ART_FAILURE$COLOR_NORMAL" fi } - -check() -{ - $* || error=$? -} - -action() -{ - title "$1" - shift - $* || error=$? - status -} diff --git a/base/sysfiles/etc_rc.d_functions.in.txt b/base/sysfiles/etc_rc.d_functions.in.txt new file mode 100644 index 000000000..d4e26faf4 --- /dev/null +++ b/base/sysfiles/etc_rc.d_functions.in.txt @@ -0,0 +1,58 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../sysfiles/etc_rc.d_functions.in.txt +# Copyright (C) 2006 - 2008 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +if [ -z "$NOCOLOR" ]; then + # assuming this terminal supports ANSI escape sequences + # + . /etc/rc.d/functions-ansi.in +else + # if not, use plain text + # + + banner() + { + echo "$*" + } + + title() + { + echo -n "$* ..." + error=0 + } + + status() + { + if [ ${1:-$error} -eq 0 ]; then + echo " OK" + else + echo " FAIL" + fi + } +fi + +# flow functions don't change +# +check() +{ + $* || error=$? +} + +action() +{ + title "$1" + shift + $* || error=$? + status +} +