projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
screenrc: Add 'xterm-256color' to terminals
[grml-etc-core.git]
/
etc
/
grml
/
lsb-functions
diff --git
a/etc/grml/lsb-functions
b/etc/grml/lsb-functions
index
d6513db
..
17a42a3
100644
(file)
--- a/
etc/grml/lsb-functions
+++ b/
etc/grml/lsb-functions
@@
-30,12
+30,6
@@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# 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"}"
# log_*() functions {{{
TPUT="${TPUT:-"/usr/bin/tput"}"
@@
-157,7
+151,7
@@
log_end_msg() {
# initialisation {{{
# internal variables
# initialisation {{{
# internal variables
-# Dont output to stdout?
+# Don
'
t output to stdout?
RC_QUIET_STDOUT="no"
# Default values for e-message indentation and dots
RC_QUIET_STDOUT="no"
# Default values for e-message indentation and dots
@@
-165,7
+159,7
@@
RC_INDENTATION=''
RC_DEFAULT_INDENT=2
#RC_DOT_PATTERN=' .'
RC_DOT_PATTERN=''
RC_DEFAULT_INDENT=2
#RC_DOT_PATTERN=' .'
RC_DOT_PATTERN=''
-# dont output to stdout?
+# don
'
t output to stdout?
rc_quiet_stdout="no"
# default values for e-message indentation and dots
rc_quiet_stdout="no"
# default values for e-message indentation and dots
@@
-180,6
+174,11
@@
if [ -r /proc/cmdline ] ; then
fi
[ -n "$NOCOLORS" ] && RC_NOCOLOR='yes'
RC_NOCOLOR="${RC_NOCOLOR:-no}"
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
# Can the terminal handle endcols?
if [ "${RC_NOCOLOR}" = "yes" ]; then
@@
-414,9
+413,9
@@
ewend() {
}
#}}}
}
#}}}
-# if we're using systemd then red
fine functions for
-# output in systemd style
-if
$SYSTEMD
; then
+# if we're using systemd then red
efine functions
+#
for
output in systemd style
+if
[ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ]
; then
einfo() {
printf "[ ${GREEN}OK${NORMAL} ] %s\n" "$*"
}
einfo() {
printf "[ ${GREEN}OK${NORMAL} ] %s\n" "$*"
}
@@
-434,7
+433,4
@@
if $SYSTEMD ; then
}
fi
}
fi
-# don't expose unneeded local variables
-unset SYSTEMD
-
# vim: ft=sh tw=80 ts=4 foldmethod=marker
# vim: ft=sh tw=80 ts=4 foldmethod=marker