projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lsb-functions: avoid usage of SYSTEMD variable
[grml-etc-core.git]
/
etc
/
grml
/
lsb-functions
diff --git
a/etc/grml/lsb-functions
b/etc/grml/lsb-functions
index
4dc8441
..
de1cd4c
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"}"
@@
-419,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" "$*"
}
@@
-439,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