Merge branch 'hykilpikonna:master' into fix-sed
This commit is contained in:
@@ -2456,7 +2456,7 @@ get_de() {
|
|||||||
# TODO:
|
# TODO:
|
||||||
# - New config option + flag: --de_display_server on/off ?
|
# - New config option + flag: --de_display_server on/off ?
|
||||||
# - Add display of X11, Arcan and anything else relevant.
|
# - Add display of X11, Arcan and anything else relevant.
|
||||||
[[ $de ]] && [[ $os != "Windows" ]] &&
|
[[ $de ]] && [[ -n $XDG_SESSION_TYPE ]] &&
|
||||||
de+=" (${XDG_SESSION_TYPE})"
|
de+=" (${XDG_SESSION_TYPE})"
|
||||||
|
|
||||||
de_run=1
|
de_run=1
|
||||||
@@ -5087,7 +5087,7 @@ get_cols() {
|
|||||||
printf -v block_spaces "%${block_height}s"
|
printf -v block_spaces "%${block_height}s"
|
||||||
|
|
||||||
# Convert the spaces into rows of blocks.
|
# Convert the spaces into rows of blocks.
|
||||||
if [[ $BASH_VERSION == 3* ]]; then
|
if [ "${BASH_VERSION%%.*}" -lt 5 ]; then
|
||||||
[[ "$blocks" ]] && cols+="${block_spaces// /${blocks}[39;49mnl}"
|
[[ "$blocks" ]] && cols+="${block_spaces// /${blocks}[39;49mnl}"
|
||||||
[[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}[39;49mnl}"
|
[[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}[39;49mnl}"
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user