X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Flsb-functions;h=4dc84413977baa621afe1a8e7a91b4afbda5f1c0;hb=refs%2Ftags%2Fv0.13.0;hp=d95be1db89c32a94323f38dc8d6bac21a6420041;hpb=43b9baab8a85123b4f152cf0cbf450d869db1f0f;p=grml-etc-core.git diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions index d95be1d..4dc8441 100644 --- a/etc/grml/lsb-functions +++ b/etc/grml/lsb-functions @@ -30,6 +30,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then + SYSTEMD=true +else + SYSTEMD=false +fi + # log_*() functions {{{ TPUT="${TPUT:-"/usr/bin/tput"}" @@ -174,6 +180,11 @@ if [ -r /proc/cmdline ] ; then fi [ -n "$NOCOLORS" ] && RC_NOCOLOR='yes' RC_NOCOLOR="${RC_NOCOLOR:-no}" +if [ "$RC_NOCOLOR" = "no" ] ; then + if [ -r /etc/grml_colors ] ; then + . /etc/grml_colors + fi +fi # Can the terminal handle endcols? if [ "${RC_NOCOLOR}" = "yes" ]; then @@ -408,4 +419,27 @@ ewend() { } #}}} +# if we're using systemd then redfine functions for +# output in systemd style +if $SYSTEMD ; then + einfo() { + printf "[ ${GREEN}OK${NORMAL} ] %s\n" "$*" + } + + ewarn() { + printf "[ ${YELLOW}WARN${NORMAL} ] %s\n" "$*" + } + + eerror() { + printf "[ ${RED}FAIL${NORMAL} ] %s\n" "$*" + } + + eend() { + : + } +fi + +# don't expose unneeded local variables +unset SYSTEMD + # vim: ft=sh tw=80 ts=4 foldmethod=marker