Merge branch 'hykilpikonna:master' into fix-sed

This commit is contained in:
OldWorldOrdr 2023-08-18 13:44:07 -04:00 committed by GitHub
commit 4a90533097
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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}nl}" [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}nl}"
[[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}"
else else